Add days between temps

ihmeuw · Jul 23, 2024 · 4ddfffc · 4ddfffc
1 parent 39b41ac
commit 4ddfffc
Show file tree

Hide file tree

Showing 2 changed files with 55 additions and 0 deletions.
diff --git a/src/climate_data/generate/scenario_annual.py b/src/climate_data/generate/scenario_annual.py
@@ -11,6 +11,12 @@
 from climate_data.generate import utils
 
 TEMP_THRESHOLDS = list(range(20, 35))
+BETWEEN_TEMP_THRESHOLDS = [
+    (15, 30),
+    (20, 30),
+    (15, 35),
+    (20, 35),
+]
 
 
 TRANSFORM_MAP = {
@@ -36,6 +42,16 @@
         )
         for temp in TEMP_THRESHOLDS
     },
+    **{
+        f"days_under_{upper}C_over_{lower}C": utils.Transform(
+            source_variables=["mean_temperature"],
+            transform_funcs=[
+                utils.count_between_threshold(lower, upper),
+                utils.annual_sum,
+            ],
+        )
+        for lower, upper in BETWEEN_TEMP_THRESHOLDS
+    },
     "mean_heat_index": utils.Transform(
         source_variables=["heat_index"],
         transform_funcs=[utils.annual_mean],
@@ -51,6 +67,16 @@
         )
         for temp in TEMP_THRESHOLDS
     },
+    **{
+        f"days_under_{upper}C_over_{lower}C_heat_index": utils.Transform(
+            source_variables=["heat_index"],
+            transform_funcs=[
+                utils.count_between_threshold(lower, upper),
+                utils.annual_sum,
+            ],
+        )
+        for lower, upper in BETWEEN_TEMP_THRESHOLDS
+    },
     "mean_humidex": utils.Transform(
         source_variables=["humidex"],
         transform_funcs=[utils.annual_mean],
@@ -66,6 +92,16 @@
         )
         for temp in TEMP_THRESHOLDS
     },
+    **{
+        f"days_under_{upper}C_over_{lower}C_humidex": utils.Transform(
+            source_variables=["humidex"],
+            transform_funcs=[
+                utils.count_between_threshold(lower, upper),
+                utils.annual_sum,
+            ],
+        )
+        for lower, upper in BETWEEN_TEMP_THRESHOLDS
+    },
     "mean_effective_temperature": utils.Transform(
         source_variables=["effective_temperature"],
         transform_funcs=[utils.annual_mean],
@@ -81,6 +117,16 @@
         )
         for temp in TEMP_THRESHOLDS
     },
+    **{
+        f"days_under_{upper}C_over_{lower}C_effective_temperature": utils.Transform(
+            source_variables=["effective_temperature"],
+            transform_funcs=[
+                utils.count_between_threshold(lower, upper),
+                utils.annual_sum,
+            ],
+        )
+        for lower, upper in BETWEEN_TEMP_THRESHOLDS
+    },
     "wind_speed": utils.Transform(
         source_variables=["wind_speed"],
         transform_funcs=[utils.annual_mean],

diff --git a/src/climate_data/generate/utils.py b/src/climate_data/generate/utils.py
@@ -141,6 +141,15 @@ def count(ds: xr.Dataset) -> xr.Dataset:
     return count
 
 
+def count_between_threshold(
+    lower_threshold: int | float, upper_threshold: int | float
+) -> Callable[[xr.Dataset], xr.Dataset]:
+    def count(ds: xr.Dataset) -> xr.Dataset:
+        return (ds > lower_threshold) & (ds < upper_threshold)
+
+    return count
+
+
 ########################
 # Data transformations #
 ########################