Moving copernicusmarine unit tests to test_convert

Author: erikvansebille

tests/test_convert.py

@@ -1,8 +1,11 @@
+import pytest
 import xarray as xr
 
 import parcels
 import parcels.convert as convert
+from parcels import FieldSet
 from parcels._core.utils import sgrid
+from parcels._datasets.structured.circulation_models import datasets as datasets_circulation_models
 
 
 def test_nemo_to_sgrid():
@@ -34,3 +37,49 @@ def test_nemo_to_sgrid():
         meta.get_value_by_id("face_dimension1"),  # X center
         meta.get_value_by_id("node_dimension2"),  # Y edge
     }.issubset(set(ds["V"].dims))
+
+
+_COPERNICUS_DATASETS = [
+    datasets_circulation_models["ds_copernicusmarine"],
+    datasets_circulation_models["ds_copernicusmarine_waves"],
+]
+
+
+@pytest.mark.parametrize("ds", _COPERNICUS_DATASETS)
+def test_fieldset_from_copernicusmarine(ds, caplog):
+    if "uo" in ds:
+        fields = {"U": ds["uo"], "V": ds["vo"]}
+    elif "VSDX" in ds:
+        fields = {"U": ds["VSDX"], "V": ds["VSDY"]}
+    else:
+        raise ValueError("Test dataset does not contain recognized current variables.")
+    ds_fset = convert.copernicusmarine_to_sgrid(fields=fields)
+    fieldset = FieldSet.from_sgrid_conventions(ds_fset)
+    assert "U" in fieldset.fields
+    assert "V" in fieldset.fields
+    assert "UV" in fieldset.fields
+
+
+def test_fieldset_from_copernicusmarine_no_currents(caplog):
+    ds = datasets_circulation_models["ds_copernicusmarine"]
+    ds_fset = convert.copernicusmarine_to_sgrid(fields={"do": ds["uo"]})
+    fieldset = FieldSet.from_sgrid_conventions(ds_fset)
+    assert "U" not in fieldset.fields
+    assert "V" not in fieldset.fields
+    assert "UV" not in fieldset.fields
+    assert caplog.text == ""
+
+
+@pytest.mark.parametrize("ds", _COPERNICUS_DATASETS)
+def test_fieldset_from_copernicusmarine_no_logs(ds, caplog):
+    ds = ds.copy()
+    zeros = xr.zeros_like(list(ds.data_vars.values())[0])
+    ds["U"] = zeros
+    ds["V"] = zeros
+
+    ds_fset = convert.copernicusmarine_to_sgrid(fields={"U": ds["U"], "V": ds["V"]})
+    fieldset = FieldSet.from_sgrid_conventions(ds_fset)
+    assert "U" in fieldset.fields
+    assert "V" in fieldset.fields
+    assert "UV" in fieldset.fields
+    assert caplog.text == ""

tests/test_fieldset.py

@@ -8,7 +8,6 @@
 
 from parcels import Field, ParticleFile, ParticleSet, VectorField, XGrid
 from parcels._core.fieldset import CalendarError, FieldSet, _datetime_to_msg
-from parcels._datasets.structured.circulation_models import datasets as datasets_circulation_models
 from parcels._datasets.structured.generic import T as T_structured
 from parcels._datasets.structured.generic import datasets as datasets_structured
 from parcels._datasets.structured.generic import datasets_sgrid
@@ -243,76 +242,6 @@ def test_fieldset_add_field_after_pset():
     ...
 
 
-_COPERNICUS_DATASETS = [
-    datasets_circulation_models["ds_copernicusmarine"],
-    datasets_circulation_models["ds_copernicusmarine_waves"],
-]
-
-
-@pytest.mark.parametrize("ds", _COPERNICUS_DATASETS)
-def test_fieldset_from_copernicusmarine(ds, caplog):
-    fieldset = FieldSet.from_copernicusmarine(ds)
-    assert "U" in fieldset.fields
-    assert "V" in fieldset.fields
-    assert "UV" in fieldset.fields
-    assert "renamed it to 'U'" in caplog.text
-    assert "renamed it to 'V'" in caplog.text
-
-
-@pytest.mark.parametrize("ds", [datasets_circulation_models["ds_copernicusmarine"].copy()])
-def test_fieldset_from_copernicusmarine_missing_axis(ds, caplog):
-    del ds["latitude"].attrs["axis"]
-
-    with pytest.raises(
-        ValueError,
-        match="Dataset missing CF compliant metadata for axes "
-        ".*. Expected 'axis' attribute to be set "
-        "on all dimension axes .*. "
-        "HINT: Add xarray metadata attribute 'axis' to dimension .*",
-    ):
-        FieldSet.from_copernicusmarine(ds)
-
-
-def test_fieldset_from_copernicusmarine_no_currents(caplog):
-    ds = datasets_circulation_models["ds_copernicusmarine"].cf.drop_vars(
-        ["eastward_sea_water_velocity", "northward_sea_water_velocity"]
-    )
-    fieldset = FieldSet.from_copernicusmarine(ds)
-    assert "U" not in fieldset.fields
-    assert "V" not in fieldset.fields
-    assert "UV" not in fieldset.fields
-    assert caplog.text == ""
-
-
-@pytest.mark.parametrize("ds", _COPERNICUS_DATASETS)
-def test_fieldset_from_copernicusmarine_no_logs(ds, caplog):
-    ds = ds.copy()
-    zeros = xr.zeros_like(list(ds.data_vars.values())[0])
-    ds["U"] = zeros
-    ds["V"] = zeros
-
-    fieldset = FieldSet.from_copernicusmarine(ds)
-    assert "U" in fieldset.fields
-    assert "V" in fieldset.fields
-    assert "UV" in fieldset.fields
-    assert caplog.text == ""
-
-
-def test_fieldset_from_copernicusmarine_with_W(caplog):
-    ds = datasets_circulation_models["ds_copernicusmarine"]
-    ds = ds.copy()
-    ds["wo"] = ds["uo"]
-    ds["wo"].attrs["standard_name"] = "vertical_sea_water_velocity"
-
-    fieldset = FieldSet.from_copernicusmarine(ds)
-    assert "U" in fieldset.fields
-    assert "V" in fieldset.fields
-    assert "W" in fieldset.fields
-    assert "UV" in fieldset.fields
-    assert "UVW" in fieldset.fields
-    assert "renamed it to 'W'" in caplog.text
-
-
 def test_fieldset_from_fesom2():
     ds = datasets_unstructured["stommel_gyre_delaunay"]
     fieldset = FieldSet.from_fesom2(ds)