hefty 0.3.1__tar.gz → 0.3.2__tar.gz

{hefty-0.3.1/src/hefty.egg-info → hefty-0.3.2}/PKG-INFO

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

{hefty-0.3.1 → hefty-0.3.2}/pyproject.toml

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

{hefty-0.3.1 → hefty-0.3.2}/src/hefty/solar.py

@@ -346,7 +346,8 @@ def get_solar_forecast(latitude, longitude, init_date, run_length,
             unmixed = ((mixed['hour_of_mixed_period'] * mixed['sdswrf']
                         - (mixed['hour_of_mixed_period'] - mixed['int_len'])
                         * mixed['sdswrf_prev']) / mixed['int_len'])
-            df['ghi'] = unmixed
+            # clip to avoid occasional small negative ghi in GEFS, see GH #35
+            df['ghi'] = unmixed.clip(lower=0)
 
         elif model in {'ifs', 'ifs_ens', 'aifs', 'aifs_ens', 'cams'}:
             # for ifs ghi: cumulative J/m^s to average W/m^2 over the interval
@@ -407,7 +408,7 @@ def get_solar_forecast(latitude, longitude, init_date, run_length,
             df['ghi_csi'] = df['ghi'] / df['ghi_clear']
 
             # avoid divide by zero issues
-            df.loc[df['ghi'] == 0, 'ghi_csi'] = 0
+            df.loc[df['ghi_clear'] == 0, 'ghi_csi'] = 0
 
             # 60min version of data, centered at bottom of the hour
             new_index = pd.date_range(df.index.min(),
@@ -828,7 +829,8 @@ def get_solar_forecast_fast(latitude, longitude, init_date, run_length,
             unmixed = ((mixed['hour_of_mixed_period'] * mixed['sdswrf']
                         - (mixed['hour_of_mixed_period'] - mixed['int_len'])
                         * mixed['sdswrf_prev']) / mixed['int_len'])
-            df['ghi'] = unmixed
+            # clip to avoid occasional small negative ghi in GEFS, see GH #35
+            df['ghi'] = unmixed.clip(lower=0)
 
         elif model in ['ifs', 'ifs_ens', 'aifs', 'aifs_ens']:
             # for ifs ghi: cumulative J/m^s to average W/m^2 over the interval
@@ -879,7 +881,7 @@ def get_solar_forecast_fast(latitude, longitude, init_date, run_length,
             df['ghi_csi'] = df['ghi'] / df['ghi_clear']
 
             # avoid divide by zero issues
-            df.loc[df['ghi'] == 0, 'ghi_csi'] = 0
+            df.loc[df['ghi_clear'] == 0, 'ghi_csi'] = 0
 
             # 60min version of data, centered at bottom of the hour
             new_index = pd.date_range(df.index.min(),
@@ -1268,7 +1270,7 @@ def get_solar_forecast_ensemble_subset(
             df['ghi_csi'] = df['ghi'] / df['ghi_clear']
 
             # avoid divide by zero issues
-            df.loc[df['ghi'] == 0, 'ghi_csi'] = 0
+            df.loc[df['ghi_clear'] == 0, 'ghi_csi'] = 0
 
             # make a dummy column
             df['dummy'] = 0
@@ -1729,7 +1731,7 @@ def get_solar_forecast_ensemble(latitude, longitude, init_date, run_length,
                 df['ghi_csi'] = df['ghi'] / df['ghi_clear']
 
                 # avoid divide by zero issues
-                df.loc[df['ghi'] == 0, 'ghi_csi'] = 0
+                df.loc[df['ghi_clear'] == 0, 'ghi_csi'] = 0
 
                 # 60min version of data, centered at bottom of the hour
                 new_index = pd.date_range(df.index.min(),
@@ -1869,7 +1871,8 @@ def get_solar_forecast_ensemble(latitude, longitude, init_date, run_length,
                 unmixed = ((mixed['hour_of_mixed_period'] * mixed['sdswrf']
                            - (mixed['hour_of_mixed_period'] - mixed['int_len'])
                            * mixed['sdswrf_prev']) / mixed['int_len'])
-                df['ghi'] = unmixed
+                # clip to avoid occasional small negative ghi in GEFS, see GH #35
+                df['ghi'] = unmixed.clip(lower=0)
 
                 # make 1min interval clear sky data covering our time range
                 times = pd.date_range(
@@ -1905,7 +1908,7 @@ def get_solar_forecast_ensemble(latitude, longitude, init_date, run_length,
                 df['ghi_csi'] = df['ghi'] / df['ghi_clear']
 
                 # avoid divide by zero issues
-                df.loc[df['ghi'] == 0, 'ghi_csi'] = 0
+                df.loc[df['ghi_clear'] == 0, 'ghi_csi'] = 0
 
                 # 60min version of data, centered at bottom of the hour
                 new_index = pd.date_range(df.index.min(),

{hefty-0.3.1 → hefty-0.3.2/src/hefty.egg-info}/PKG-INFO

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

{hefty-0.3.1 → hefty-0.3.2}/tests/test_adjust_forecast_datetimes.py

@@ -20,7 +20,7 @@ def test_tz_warning():
 
 
 def test_hrrr_too_far():
-    available_date = '2026-09-24 02:00'
+    available_date = '2026-09-24 02:00+00:00'
     run_length_needed = 43
     lead_time_to_start_needed = 1
     model = 'hrrr'
@@ -32,7 +32,7 @@ def test_hrrr_too_far():
 
 
 def test_gfs_way_too_far():
-    available_date = '2026-09-24 00:00'
+    available_date = '2026-09-24 00:00+00:00'
     run_length_needed = 385
     lead_time_to_start_needed = 0
     model = 'gfs'

{hefty-0.3.1 → hefty-0.3.2}/tests/test_get_solar_forecast.py

@@ -7,8 +7,10 @@ from hefty.solar import get_solar_forecast
 
 # ignore xarray FutureWarnings (see https://github.com/blaylockbk/Herbie/issues/525).
 # ignore grib file removal warnings
-@pytest.mark.filterwarnings('ignore:.*Will not remove GRIB.*')
-@pytest.mark.filterwarnings('ignore:.*In a future version.*')
+pytestmark = [
+    pytest.mark.filterwarnings('ignore:.*Will not remove GRIB.*'),
+    pytest.mark.filterwarnings('ignore:.*In a future version.*')
+]
 
 
 def test_hrrr():

{hefty-0.3.1 → hefty-0.3.2}/tests/test_get_solar_forecast_ensemble.py

@@ -7,8 +7,10 @@ from hefty.solar import get_solar_forecast_ensemble
 
 # ignore xarray FutureWarnings (see https://github.com/blaylockbk/Herbie/issues/525).
 # ignore grib file removal warnings
-@pytest.mark.filterwarnings('ignore:.*Will not remove GRIB.*')
-@pytest.mark.filterwarnings('ignore:.*In a future version.*')
+pytestmark = [
+    pytest.mark.filterwarnings('ignore:.*Will not remove GRIB.*'),
+    pytest.mark.filterwarnings('ignore:.*In a future version.*')
+]
 
 
 def test_gefs_dynamical():

{hefty-0.3.1 → hefty-0.3.2}/tests/test_get_solar_forecast_fast.py

@@ -7,8 +7,10 @@ from hefty.solar import get_solar_forecast_fast
 
 # ignore xarray FutureWarnings (see https://github.com/blaylockbk/Herbie/issues/525).
 # ignore grib file removal warnings
-@pytest.mark.filterwarnings('ignore:.*Will not remove GRIB.*')
-@pytest.mark.filterwarnings('ignore:.*In a future version.*')
+pytestmark = [
+    pytest.mark.filterwarnings('ignore:.*Will not remove GRIB.*'),
+    pytest.mark.filterwarnings('ignore:.*In a future version.*')
+]
 
 
 def test_hrrr():

{hefty-0.3.1 → hefty-0.3.2}/tests/test_get_wind_forecast.py

@@ -7,8 +7,10 @@ from hefty.wind import get_wind_forecast
 
 # ignore xarray FutureWarnings (see https://github.com/blaylockbk/Herbie/issues/525).
 # ignore grib file removal warnings
-@pytest.mark.filterwarnings('ignore:.*Will not remove GRIB.*')
-@pytest.mark.filterwarnings('ignore:.*In a future version.*')
+pytestmark = [
+    pytest.mark.filterwarnings('ignore:.*Will not remove GRIB.*'),
+    pytest.mark.filterwarnings('ignore:.*In a future version.*')
+]
 
 
 def test_hrrr():