Changed call of climatological_mean within compute_horizon to calling…

… climatological_op; removed references to climatological_mean in warnings; Warning when op as dict > 1.
Ouranosinc · Nov 22, 2023 · d98f082 · d98f082
1 parent 2a03ba6
commit d98f082
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/xscen/aggregate.py b/xscen/aggregate.py
@@ -170,7 +170,12 @@ def climatological_op(
     # Daily data is not supported
     if len(ds.time) > 3 and xr.infer_freq(ds.time) == "D":
         raise NotImplementedError(
-            "xs.climatological_mean does not currently support daily data."
+            "xs.climatological_op does not currently support daily data."
+        )
+    # more than one operation per call is not supported (yet), case for dict
+    if isinstance(op, dict) and len(op) > 1:
+        raise NotImplementedError(
+            "xs.climatological_op does not currently support more than one operation per call."
         )
 
     # unstack 1D time in coords (day, month, and year) to make climatological mean faster
@@ -527,7 +532,7 @@ def compute_deltas(
     if "time" in ds:
         if (len(ds.time) >= 3) and (xr.infer_freq(ds.time) == "D"):
             raise NotImplementedError(
-                "xs.climatological_mean does not currently support daily data."
+                "xs.climatological_op does not currently support daily data."
             )
 
         # Remove references to 'year' in REF
@@ -1063,8 +1068,9 @@ def produce_horizon(
             ds_merge = xr.Dataset()
             for freq, ds_ind in ind_dict.items():
                 if freq != "fx":
-                    ds_mean = climatological_mean(
+                    ds_mean = climatological_op(
                         ds_ind,
+                        op="mean",
                     )
                 else:
                     ds_mean = ds_ind