ETo 2.2.0__tar.gz → 2.2.1__tar.gz

{eto-2.2.0 → eto-2.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: ETo
-Version: 2.2.0
+Version: 2.2.1
 Summary: Class and functions to estimate reference ET
 Project-URL: Homepage, https://github.com/mullenkamp/ETo
 Project-URL: Documentation, https://mullenkamp.github.io/ETo/

{eto-2.2.0 → eto-2.2.1}/eto/__init__.py

@@ -2,4 +2,4 @@ from eto.core import ETo
 import eto.datasets
 import eto.methods
 
-__version__ = '2.2.0'
+__version__ = '2.2.1'

{eto-2.2.0 → eto-2.2.1}/eto/param_est.py

@@ -210,6 +210,12 @@ def param_est(self, data, freq='D', z_msl=None, lat=None, lon=None, TZ_lon=None,
         # be in any time zone (e.g. UTC), so the solar time can fall on the previous or next day:
         # the declination and sunset angle use that solar day.
         t_mid = np.asarray(hour, dtype=np.float64) + (0.5 if time_label == 'start' else -0.5)
+        # The midpoint belongs to its own day: a period-ending label at hour 0 is the previous day's last
+        # hour, so the equation of time (Eq 32-33, J of the period) uses that day, as the same hour labelled
+        # by its start does.
+        mid_shift = np.floor(t_mid/24)
+        Day = Day + mid_shift
+        t_mid = t_mid - 24*mid_shift
         b = (2*np.pi*(Day - 81))/364
         S_c = 0.1645*np.sin(2*b) - 0.1255*np.cos(b) - 0.025*np.sin(b)
         # lon - TZ_lon wrapped to [-180, 180): the same place given as 183.5 or -176.5 is the same offset.

{eto-2.2.0 → eto-2.2.1}/eto/tests/test_hourly_fao.py

@@ -243,3 +243,21 @@ def test_sunrise_and_sunset_hours_integrate_only_the_sunlit_part():
         w = np.pi / 12 * (((t + 0.06667 * 171.5 + sc0) % 24) - 12)
         inst = 0.082 * dr * np.maximum(np.sin(phi) * np.sin(delta) + np.cos(phi) * np.cos(delta) * np.cos(w), 0)
         assert ra[h] == pytest.approx(inst.mean() * 60, abs=2e-3), h
+
+
+def test_both_labellings_of_the_same_hours_agree_across_midnight():
+    # Two January days at a Canterbury point, labelled by UTC timestamps as a real series is: the hour
+    # 23:00-24:00 is 'start' 23 on day 15 and 'end' 0 on day 16. Every quantity must match exactly,
+    # including the equation of time, which once came from the end label's day (16) instead of the
+    # midpoint's (15).
+    n = 48
+    data = {'T_mean': np.full(n, 20.0), 'RH_mean': np.full(n, 60.0), 'U_z': np.full(n, 2.0),
+            'R_s': np.full(n, 0.5)}
+    start = np.datetime64('2000-01-15T00', 'h') + np.arange(n)
+    end = start + np.timedelta64(1, 'h')
+    kw = {'z_msl': 300, 'lat': -43.5, 'lon': 171.5, 'TZ_lon': 0.0, 'rs_rso_init': 1.0}
+    a = ETo(data, 'h', dates=start, time_label='start', **kw)
+    b = ETo(data, 'h', dates=end, time_label='end', **kw)
+    np.testing.assert_allclose(b.ts_param['R_a'], a.ts_param['R_a'], rtol=1e-13, atol=0)
+    np.testing.assert_allclose(b.eto_fao(min_ETo=None, max_ETo=None, decimals=None),
+                               a.eto_fao(min_ETo=None, max_ETo=None, decimals=None), rtol=1e-13, atol=0)