Merge branch 'v4-dev' into convert_api_use_fields_for_coords

Author: erikvansebille

.github/workflows/additional.yml

@@ -13,9 +13,11 @@ jobs:
     steps:
       - uses: actions/checkout@v5
       - uses: astral-sh/setup-uv@v7
+        with:
+          version: "0.9.26"
       - run: |
-          uv run --with 'minimum-dependency-versions @ git+https://github.com/xarray-contrib/minimum-dependency-versions@v1.0.0' \
-          python -m minimum_versions validate \
+          uvx --from xarray-minimum-dependency-policy==2.0.0 \
+          minimum-versions validate \
           --policy=.github/ci/policy.yaml \
           --manifest-path=./pixi.toml \
           pixi:test-minimum
@@ -25,7 +27,6 @@ jobs:
     runs-on: "ubuntu-latest"
 
     steps:
-      - uses: actions/checkout@v5
       - uses: actions/checkout@v5
       - uses: prefix-dev/setup-pixi@v0.9.0
       - run: pixi run docs-linkcheck

src/parcels/convert.py

@@ -93,11 +93,12 @@ def _pick_expected_coords(coords: xr.Dataset, expected_coord_names: list[str]) -
     return xr.Dataset(coords_to_use)
 
 
-def _maybe_bring_UV_depths_to_depth(ds):
-    if "U" in ds.variables and "depthu" in ds.U.coords and "depth" in ds.coords:
-        ds["U"] = ds["U"].assign_coords(depthu=ds["depth"].values).rename({"depthu": "depth"})
-    if "V" in ds.variables and "depthv" in ds.V.coords and "depth" in ds.coords:
-        ds["V"] = ds["V"].assign_coords(depthv=ds["depth"].values).rename({"depthv": "depth"})
+def _maybe_bring_other_depths_to_depth(ds):
+    if "depth" in ds.coords:
+        for var in ds.data_vars:
+            for old_depth in ["depthu", "depthv", "deptht", "depthw"]:
+                if old_depth in ds[var].dims:
+                    ds[var] = ds[var].assign_coords(**{old_depth: ds["depth"].values}).rename({old_depth: "depth"})
     return ds
 
 
@@ -295,7 +296,7 @@ def nemo_to_sgrid(*, fields: dict[str, xr.Dataset | xr.DataArray], coords: xr.Da
     ds = xr.merge(list(fields.values()) + [coords])
     ds = _maybe_rename_variables(ds, _NEMO_VARNAMES_MAPPING)
     ds = _maybe_create_depth_dim(ds)
-    ds = _maybe_bring_UV_depths_to_depth(ds)
+    ds = _maybe_bring_other_depths_to_depth(ds)
     ds = _drop_unused_dimensions_and_coords(ds, _NEMO_DIMENSION_COORD_NAMES)
     ds = _assign_dims_as_coords(ds, _NEMO_DIMENSION_COORD_NAMES)
     ds = _set_coords(ds, _NEMO_DIMENSION_COORD_NAMES)