fix tests, examples and missing use of lat/lon function

example.era5_cropped.yaml

@@ -44,19 +44,13 @@ inputs:
       time:
         method: rename
         dim: time
-      x:
-        method: rename
-        dim: longitude
-      y:
-        method: rename
-        dim: latitude
       forcing_feature:
         method: stack_variables_by_var_name
         dims: [level]
         name_format: "{var_name}{level}hPa"
       grid_index:
         method: stack
-        dims: [x, y]
+        dims: [longitude, latitude]
     target_output_variable: forcing
 
   era5_surface:
@@ -68,18 +62,12 @@ inputs:
       time:
         method: rename
         dim: time
-      x:
-        method: rename
-        dim: longitude
-      y:
-        method: rename
-        dim: latitude
       forcing_feature:
         method: stack_variables_by_var_name
         name_format: "{var_name}"
       grid_index:
         method: stack
-        dims: [x, y]
+        dims: [longitude, latitude]
     target_output_variable: forcing
 
   era5_static:
@@ -88,18 +76,12 @@ inputs:
     variables:
       - land_sea_mask
     dim_mapping:
-      x:
-        method: rename
-        dim: longitude
-      y:
-        method: rename
-        dim: latitude
       static_feature:
         method: stack_variables_by_var_name
         name_format: "{var_name}"
       grid_index:
         method: stack
-        dims: [x, y]
+        dims: [longitude, latitude]
     target_output_variable: static
 
 extra:

mllam_data_prep/ops/cropping.py

@@ -23,9 +23,6 @@ def _get_latlon_coords(da: xr.DataArray) -> tuple:
     elif "lat" in da.coords and "lon" in da.coords:
         return (da.lat, da.lon)
     else:
-        import ipdb
-
-        ipdb.set_trace()
         raise Exception("Could not find lat/lon coordinates in DataArray.")
 
 
@@ -132,9 +129,9 @@ def distance_to_convex_hull_boundary(
     # only consider points that are external to the convex hull
     ds_exterior = ds.where(~da_ch_mask, drop=True)
 
-    da_xyz = _latlon_to_unit_sphere_xyz(ds_exterior.lat, ds_exterior.lon)
+    da_xyz = _latlon_to_unit_sphere_xyz(*_get_latlon_coords(ds_exterior))
     da_xyz_ref = _latlon_to_unit_sphere_xyz(
-        ds_reference_separate_gridindex.lat, ds_reference_separate_gridindex.lon
+        *_get_latlon_coords(ds_reference_separate_gridindex)
     )
 
     def calc_dist(da_pt_xyz):

tests/test_convex_hull_cropping.py

@@ -69,5 +69,5 @@ def test_create_convex_hull_mask():
     )
 
     # check that there are fewer points in this margin region
-    n_points_margin_region = da_convex_hull_margin_crop.count().values
+    n_points_margin_region = da_convex_hull_margin_crop.count()
     assert n_points_margin_region < n_outside

tests/test_from_config.py

@@ -10,6 +10,22 @@
 import tests.data as testdata
 
 
+def _find_example_config_files():
+    fps = Path(__file__).parent.parent.glob("example.*.yaml")
+    examples = {fp.name.split(".")[1]: fp for fp in fps}
+    return examples
+
+
+EXAMPLE_YAML_FILES = _find_example_config_files()
+
+
+@pytest.mark.parametrize("example_name", EXAMPLE_YAML_FILES.keys())
+def test_yaml_example(example_name):
+    fp_config = EXAMPLE_YAML_FILES[example_name]
+    with tempfile.TemporaryDirectory(suffix=".zarr") as tmpdir:
+        mdp.create_dataset_zarr(fp_config=fp_config, fp_zarr=tmpdir)
+
+
 def test_gen_data():
     tmpdir = tempfile.TemporaryDirectory()
     testdata.create_data_collection(
@@ -277,12 +293,6 @@ def test_feature_collision(use_common_feature_var_name):
         mdp.create_dataset_zarr(fp_config=fp_config)
 
 
-def test_danra_example():
-    fp_config = Path(__file__).parent.parent / "example.danra.yaml"
-    with tempfile.TemporaryDirectory(suffix=".zarr") as tmpdir:
-        mdp.create_dataset_zarr(fp_config=fp_config, fp_zarr=tmpdir)
-
-
 @pytest.mark.parametrize("extra_content", [None, {"foobar": {"baz": 42}}])
 def test_optional_extra_section(extra_content):
     """