Merge pull request #165 from emileten/correct-DTR-ceiling

Corrected DTR ceiling

Author: emileten

CHANGELOG.md

@@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Fixed
+- Fix boolean condition error in DTR ceiling application (PR #165, @emileten)
 
 ## [0.15.0] - 2021-12-27
 ### Added

dodola/core.py

@@ -589,7 +589,10 @@ def non_polar_dtr_ceiling(ds, ceiling):
 
     """
 
-    ds_corrected = ds.where((ds <= ceiling) & (ds.lat > -60) & (ds.lat < 60), ceiling)
+    ds_corrected = ds.where(
+        (ds <= ceiling) | (ds["lat"] <= -60 or ds["lat"] >= 60), ceiling
+    )
+
     return ds_corrected
 
 

dodola/tests/test_services.py

@@ -807,13 +807,21 @@ def test_apply_non_polar_dtr_ceiling():
     apply_non_polar_dtr_ceiling(in_url, out=out_url, ceiling=ceiling)
     ds_dtr_corrected = repository.read(out_url)
 
+    # check values that should be capped
     assert all(
         x == ceiling
         for x in ds_dtr_corrected["fakevariable"].where(
             ds_dtr["fakevariable"] > ceiling, drop=True
         )
     )
 
+    # check values that should not be capped
+    left = ds_dtr_corrected["fakevariable"].where(
+        ds_dtr["fakevariable"] <= ceiling, drop=True
+    )
+    right = ds_dtr["fakevariable"].where(ds_dtr["fakevariable"] <= ceiling, drop=True)
+    xr.testing.assert_equal(left, right)
+
     # case 2 : polar regions, shouldn't be applied
     # Make some fake dtr data
     n = 10
@@ -827,7 +835,9 @@ def test_apply_non_polar_dtr_ceiling():
     apply_non_polar_dtr_ceiling(in_url, out=out_url, ceiling=ceiling)
     ds_dtr_corrected = repository.read(out_url)
 
-    assert ds_dtr_corrected == ds_dtr
+    np.testing.assert_equal(
+        ds_dtr["fakevariable"].values, ds_dtr_corrected["fakevariable"].values
+    )
 
 
 def test_adjust_maximum_precipitation():