Update smoke tests (#286)

* update smoke tests ... removed xfail for calendar fix

* added fix for time_bnds in concat operator

* added smoke test for regrid op with custom parameter

* added smoke test for custom grid with workflow

* handle custom grid parsing

* lint

* update comments

Author: cehbrecht

src/rook/utils/concat_utils.py

@@ -25,6 +25,18 @@
 }
 
 
+def drop_time_bnds(ds: xr.Dataset) -> xr.Dataset:
+    """
+    Drop time_bnds variable.
+
+    Drop time_bnds to avoid xarray CF encoding failures
+    with dask + datetime objects.
+    """
+    if "time_bnds" in ds.variables:
+        ds = ds.drop_vars("time_bnds")
+    return ds
+
+
 def patched_normalise(collection):
     # TODO: this is a patched function of daops to fix the gregorian calendar issue
     norm_collection = collections.OrderedDict()
@@ -108,6 +120,8 @@ def _calculate(self):
             {dim: (dim, np.array(processed_ds[dim].values, dtype="int32"))}
         )
         processed_ds.coords[dim].attrs = {"standard_name": standard_name}
+        # fix time_bnds issue
+        processed_ds = drop_time_bnds(processed_ds)
         # optional: average
         if self.params.get("apply_average", False):
             processed_ds = average(processed_ds, dims=[dim])

src/rook/utils/regrid_utils.py

@@ -1,8 +1,16 @@
+from rook.utils.input_utils import parse_custom_grid
+
+
 def run_regrid(args):
     from daops.ops.regrid import regrid
 
     args["apply_fixes"] = False
 
+    # Handle custom grid parsing
+    if args.get("grid") == "custom" and "custom_grid" in args:
+        # parse the string into a tuple/list
+        args["grid"] = parse_custom_grid(args.pop("custom_grid"))
+
     result = regrid(**args)
 
     return result.file_uris

tests/smoke/test_smoke_checks.py

@@ -126,6 +126,29 @@
     }
 )
 
+WF_C3S_CMIP6_REGRID_CUSTOM = json.dumps(
+    {
+        "doc": "subset+regrid on cmip6 with custom grid",
+        "inputs": {"ds": [C3S_CMIP6_MON_COLLECTION]},
+        "outputs": {"output": "regrid/output"},
+        "steps": {
+            "subset": {
+                "run": "subset",
+                "in": {"collection": "inputs/ds", "time": "2016/2016"},
+            },
+            "regrid": {
+                "run": "regrid",
+                "in": {
+                    "collection": "subset/output",
+                    "method": "nearest_s2d",
+                    "grid": "custom",
+                    "custom_grid": "0.5",
+                },
+            },
+        },
+    }
+)
+
 TC_ALL_DAYS = "day:01,02,03,04,05,06,07,08,09,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31"
 
 WF_C3S_CMIP6_360DAY_CALENDAR = json.dumps(
@@ -578,6 +601,21 @@ def test_smoke_execute_c3s_cmip6_regrid(wps):
     )
 
 
+def test_smoke_execute_c3s_cmip6_regrid_custom(wps):
+    inputs = [
+        ("collection", C3S_CMIP6_MON_COLLECTION),
+        ("grid", "custom"),
+        ("custom_grid", "0.5"),
+        ("method", "nearest_s2d"),
+    ]
+    urls = wps.execute("regrid", inputs)
+    assert len(urls) == 1
+    assert (
+        "rlds_Amon_INM-CM5-0_ssp245_r1i1p1f1_gr_20150116-21001216_regrid-nearest_s2d-360x720_cells_grid.nc"
+        in urls[0]
+    )
+
+
 def test_smoke_execute_c3s_cmip5_orchestrate(wps):
     inputs = [
         ("workflow", ComplexDataInput(WF_C3S_CMIP5)),
@@ -619,6 +657,18 @@ def test_smoke_execute_c3s_cmip6_regrid_orchestrate(wps):
     )
 
 
+def test_smoke_execute_c3s_cmip6_regrid_custom_orchestrate(wps):
+    inputs = [
+        ("workflow", ComplexDataInput(WF_C3S_CMIP6_REGRID_CUSTOM)),
+    ]
+    urls = wps.execute("orchestrate", inputs)
+    assert len(urls) == 1
+    assert (
+        "rlds_Amon_INM-CM5-0_ssp245_r1i1p1f1_gr_20160116-20161216_regrid-nearest_s2d-360x720_cells_grid.nc"
+        in urls[0]
+    )
+
+
 def test_smoke_execute_c3s_cmip6_360day_calendar_orchestrate(wps):
     inputs = [
         ("workflow", ComplexDataInput(WF_C3S_CMIP6_360DAY_CALENDAR)),
@@ -664,7 +714,6 @@ def test_smoke_execute_c3s_cordex_orchestrate(wps):
     )
 
 
-@pytest.mark.xfail(reason="issue with datatime and xarray+dask")
 def test_smoke_execute_c3s_cmip6_decadal_orchestrate(wps):
     inputs = [
         ("workflow", ComplexDataInput(WF_C3S_CMIP6_DECADAL)),
@@ -675,7 +724,6 @@ def test_smoke_execute_c3s_cmip6_decadal_orchestrate(wps):
     assert "19951116-19951216.nc" in urls[0]
 
 
-@pytest.mark.xfail(reason="calendar fix does not work with latest xarray")
 def test_smoke_execute_c3s_cmip6_decadal_fix_calendar_orchestrate(wps):
     inputs = [
         ("workflow", ComplexDataInput(WF_C3S_CMIP6_DECADAL_2)),