hefty 0.2.0__tar.gz → 0.2.1__tar.gz

{hefty-0.2.0/src/hefty.egg-info → hefty-0.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hefty
-Version: 0.2.0
+Version: 0.2.1
 Summary: Some (relatively) lightweight short-term energy forecasting tools for solar, wind, and load.
 Author: Will Hobbs
 License-Expression: BSD-3-Clause

{hefty-0.2.0 → hefty-0.2.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "hefty"
-version = "0.2.0"
+version = "0.2.1"
 description = "Some (relatively) lightweight short-term energy forecasting tools for solar, wind, and load."
 readme = "README.md"
 requires-python = ">=3.11"

{hefty-0.2.0 → hefty-0.2.1}/src/hefty/solar.py

@@ -388,7 +388,6 @@ def get_solar_forecast(latitude, longitude, init_date, run_length,
             # irradiance that resets every 6 hours
             mixed = df[['sdswrf']].copy()
             mixed['hour'] = mixed.index.hour
-            mixed['hour'] = mixed.index.hour
             mixed['hour_of_mixed_period'] = ((mixed['hour'] - 1) % 6) + 1
             mixed['sdswrf_prev'] = mixed['sdswrf'].shift(
                 periods=1,
@@ -913,7 +912,6 @@ def get_solar_forecast_fast(latitude, longitude, init_date, run_length,
             # irradiance that resets every 6 hours
             mixed = df[['sdswrf']].copy()
             mixed['hour'] = mixed.index.hour
-            mixed['hour'] = mixed.index.hour
             mixed['hour_of_mixed_period'] = ((mixed['hour'] - 1) % 6) + 1
             mixed['sdswrf_prev'] = mixed['sdswrf'].shift(
                 periods=1,
@@ -2249,7 +2247,6 @@ def get_solar_forecast_ensemble(latitude, longitude, init_date, run_length,
                 # irradiance that resets every 6 hours
                 mixed = df[['sdswrf']].copy()
                 mixed['hour'] = mixed.index.hour
-                mixed['hour'] = mixed.index.hour
                 mixed['hour_of_mixed_period'] = ((mixed['hour'] - 1) % 6) + 1
                 mixed['sdswrf_prev'] = mixed['sdswrf'].shift(
                     periods=1,

{hefty-0.2.0 → hefty-0.2.1}/src/hefty/utilities.py

@@ -24,8 +24,10 @@ def get_fcast_definition(model='gfs'):
 
     Notes
     -----
-    ``delay_intercept`` and ``delay_slope`` values are based on this gist,
-    https://gist.github.com/williamhobbs/9585ff5d1248ab5de4d9e8665d7c8ea6,
+    ``delay_intercept`` and ``delay_slope`` values are based on this notebook,
+    https://github.com/williamhobbs/hefty/blob/main/docs/forecast_model_delays.ipynb,
+    also available as a markdown file,
+    https://github.com/williamhobbs/hefty/blob/main/docs/forecast_model_delays.md,
     and https://dynamical.org/status/, along with
     https://confluence.ecmwf.int/display/DAC/Dissemination+schedule and 
     https://confluence.ecmwf.int/display/CKB/CAMS%3A+Global+atmospheric+composition+forecast+data+documentation#heading-DataavailabilityHHMM.
@@ -47,7 +49,7 @@ def get_fcast_definition(model='gfs'):
     - ``'update_period'``: number of hours between cycles for the schdeule,
     e.g., ``12`` for 12 hour updates.
     - ``'delay_intercept'``: intercept of a fit between forecast delivery
-    delay in minutes and the forecast hour, e.g., ``515`` minutes. 
+    delay in minutes and the forecast hour, e.g., ``515`` minutes.
     - ``'delay_slope'``: slope of a fit between forecast delivery delay in
     minutes and the forecast hour, e.g., ``0.02`` for a model schedule that
     delivers one  forecast hours per 0.02 minues (50 hours per minute).
@@ -70,32 +72,24 @@ def get_fcast_definition(model='gfs'):
         'interval': [3, 6, 3],
         'first_cycle': [0, 0, 6],
         'update_period': [12, 12, 12],
-        'delay_intercept': [515, 515, 450],
-        'delay_slope': [0.006, 0.006, 0.006],
+        'delay_intercept': [515, 515, 448],
+        'delay_slope': [0.005, 0.002, 0.006],
         'product': ['oper', 'oper', 'scda'],
     }
 
     # Nov 2024 extended 'oper' and 'scda' horizons
     # https://github.com/blaylockbk/Herbie/discussions/421
     fcast_sched_dict_ifs_2 = {
+        **fcast_sched_dict_ifs_1,
         'start_date': ['2024-11-12 12:00',
                        '2024-11-12 12:00',
                        '2024-11-12 06:00'],
-        'start_hour': [0, 150, 0],
         'end_hour': [144, 360, 144],
-        'interval': [3, 6, 3],
-        'first_cycle': [0, 0, 6],
-        'update_period': [12, 12, 12],
-        'delay_intercept': [515, 515, 450],
-        'delay_slope': [0.006, 0.006, 0.006],
-        'product': ['oper', 'oper', 'scda'],
     }
 
-    # Approx Oct 1 2025, removed 1hr extra delay in releasing files
-    # Start date is just a guess, needs confirmation. Descriptoin changed
-    # sometime between Nov 6 [1] and Nov 22 [2] 2025, but the changes to the
-    # ECMWF open data website are often delayed. Maybe it corresponded with
-    # this press release [3]?
+    # Oct 1 2025, removed 1hr extra delay in releasing files. Date confirmed.
+    # Description changed sometime between Nov 6 [1] and Nov 22 [2] 2025.
+    # It corresponded with this press release [3].
     #
     # [1] https://web.archive.org/web/20251106132450/https://www.ecmwf.int/en/forecasts/datasets/open-data
     # [2] https://web.archive.org/web/20251122204201/https://www.ecmwf.int/en/forecasts/datasets/open-data
@@ -105,7 +99,8 @@ def get_fcast_definition(model='gfs'):
         'start_date': ['2025-10-01 12:00',
                        '2025-10-01 12:00',
                        '2025-10-01 06:00'],
-        'delay_intercept': [455, 455, 390],
+        'delay_intercept': [455, 455, 388],
+        'delay_slope': [0.003, 0.002, 0.006],
     }
 
     fcast_definition_ifs = {
@@ -135,8 +130,8 @@ def get_fcast_definition(model='gfs'):
         'interval': [3, 6, 3],
         'first_cycle': [0, 0, 6],
         'update_period': [12, 12, 12],
-        'delay_intercept': [520, 520, 484],
-        'delay_slope': [0.02, 0.02, 0.03],
+        'delay_intercept': [515, 515, 448],
+        'delay_slope': [0.003, 0.002, 0.006],
         'product': ['enfo', 'enfo', 'enfo'],
     }
 
@@ -154,7 +149,7 @@ def get_fcast_definition(model='gfs'):
         'start_date': ['2025-10-01 12:00',
                        '2025-10-01 12:00',
                        '2025-10-01 06:00'],
-        'delay_intercept': [460, 460, 424],
+        'delay_intercept': [455, 455, 388],
     }
 
     fcast_definition_ifs_ens = {
@@ -174,8 +169,8 @@ def get_fcast_definition(model='gfs'):
         'interval': [6],
         'first_cycle': [0],
         'update_period': [6],
-        'delay_intercept': [339],
-        'delay_slope': [0.008],
+        'delay_intercept': [370],
+        'delay_slope': [0.003],
         'product': ['aifs'],
     }
 
@@ -188,8 +183,6 @@ def get_fcast_definition(model='gfs'):
     # AIFS ENS
     # First available 2025-07-2, added one day, as I seem to recall some
     # variables were missing for a few days (https://herbie.readthedocs.io/en/stable/gallery/ecmwf_models/ecmwf.html)
-    # Schedule is unverified, based on
-    # https://confluence.ecmwf.int/display/DAC/Dissemination+schedule
     fcast_sched_dict_aifs_ens = {
         'start_date': ['2025-07-03 00:00'],
         'start_hour': [0, 0],
@@ -197,8 +190,8 @@ def get_fcast_definition(model='gfs'):
         'interval': [6, 6],
         'first_cycle': [0, 6],
         'update_period': [12, 12],
-        'delay_intercept': [400, 400],
-        'delay_slope': [0.125, 0.125],
+        'delay_intercept': [380, 380],
+        'delay_slope': [0.06, 0.06],
         'product': ['enfo', 'enfo'],
     }
 
@@ -240,8 +233,8 @@ def get_fcast_definition(model='gfs'):
         'interval': [1, 1],
         'first_cycle': [0, 0],
         'update_period': [1, 6],
-        'delay_intercept': [61, 63],
-        'delay_slope': [1.862, 1.125],
+        'delay_intercept': [61, 65],
+        'delay_slope': [1.86, 1.126],
         'product': ['18h', '48h'],
     }
 
@@ -267,8 +260,8 @@ def get_fcast_definition(model='gfs'):
         'interval': [1, 3],
         'first_cycle': [0, 0],
         'update_period': [6, 6],
-        'delay_intercept': [238, 238],
-        'delay_slope': [0.263, 0.263],
+        'delay_intercept': [235, 235],
+        'delay_slope': [0.262, 0.262],
         'product': ['pgrb2.0p25', 'pgrb2.0p25'],
     }
 
@@ -285,15 +278,16 @@ def get_fcast_definition(model='gfs'):
     # Implemented 2020-09-23 (https://www.emc.ncep.noaa.gov/emc/pages/numerical_forecast_systems/gefs.php)
     fcast_sched_dict_gefs = {
         'start_date': ['2020-09-24 01:00',
+                       '2020-09-24 00:00',
                        '2020-09-24 00:00'],
-        'start_hour': [0, 390],
-        'end_hour': [384, 840],
-        'interval': [3, 6],
-        'first_cycle': [0, 0],
-        'update_period': [6, 24],
-        'delay_intercept': [235, 265],
-        'delay_slope': [0.429, 0.332],
-        'product': ['3-hourly', 'extended'],  # needs update
+        'start_hour': [0, 246, 390],
+        'end_hour': [240, 384, 840],
+        'interval': [3, 6, 6],
+        'first_cycle': [0, 0, 0],
+        'update_period': [6, 6, 24],
+        'delay_intercept': [245, 250, 1435],  # 6h, extended are set manually
+        'delay_slope': [0.434, 0.43, 0.335],
+        'product': ['3-hourly', '6-hourly', 'extended'],  # needs update
     }
 
     fcast_definition_gefs = {
@@ -648,7 +642,7 @@ def model_input_formatter(init_date, run_length, lead_time_to_start=0,
     elif model == 'gefs':
         # GEFS:
         # 0.5 deg:
-        #   0 to 384 by 3, 390 to 840 by 6 for 00z cycle only
+        #   0 to 240 by 3, 246 to 840 by 6 for 00z cycle only
         # 0.25 deg:
         #   0 to 240 by 3
         # runs every 6 hours starting at 00z
@@ -694,6 +688,16 @@ def model_input_formatter(init_date, run_length, lead_time_to_start=0,
 
         # set forecast lead times
         fxx_range = range(lead_time_to_start, fxx_max + 1, 3)
+        if lead_time_to_start <= 240 and fxx_max > 240:
+            fxx_max = round(fxx_max/6)*6
+            fxx_range = [*range(lead_time_to_start, 240+3, 3),
+                         *range(246, fxx_max + 1, 6)]
+        elif lead_time_to_start > 240:
+            fxx_max = round(fxx_max/6)*6
+            lead_time_to_start = round(lead_time_to_start/6)*6
+            fxx_range = range(lead_time_to_start, fxx_max + 1, 6)
+        else:
+            fxx_range = range(lead_time_to_start, fxx_max + 1, 3)
 
     elif model == 'ifs' or model == 'ifs_ens':
         # From https://www.ecmwf.int/en/forecasts/datasets/open-data

{hefty-0.2.0 → hefty-0.2.1/src/hefty.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hefty
-Version: 0.2.0
+Version: 0.2.1
 Summary: Some (relatively) lightweight short-term energy forecasting tools for solar, wind, and load.
 Author: Will Hobbs
 License-Expression: BSD-3-Clause