Merge pull request #131 from rom-py/no-sortby

No sortby
rom-py · Jan 28, 2025 · 78b316c · 78b316c
2 parents 980301b + a25746f
commit 78b316c
Show file tree

Hide file tree

Showing 7 changed files with 517 additions and 404 deletions.
diff --git a/notebooks/swan/example_declarative.ipynb b/notebooks/swan/example_declarative.ipynb
diff --git a/notebooks/swan/example_declarative.yml b/notebooks/swan/example_declarative.yml
@@ -140,6 +140,7 @@ config:
         - output: [hswell]
           fswell: 0.125
     block:
+      model_type: block
       sname: COMPGRID
       fname: swangrid.nc
       output: [depth, wind, hsign, tps, dir]

diff --git a/notebooks/swan/example_procedural.ipynb b/notebooks/swan/example_procedural.ipynb
diff --git a/notebooks/swan/example_sensitivity.ipynb b/notebooks/swan/example_sensitivity.ipynb
diff --git a/notebooks/swan/example_sensitivity.yml b/notebooks/swan/example_sensitivity.yml
@@ -130,6 +130,7 @@ output:
       - output: [hswell]
         fswell: 0.125
   block:
+    model_type: block
     sname: COMPGRID
     fname: swangrid.nc
     output: [depth, wind, hsign, tps, dir]

diff --git a/rompy/core/data.py b/rompy/core/data.py
@@ -187,9 +187,6 @@ def ds(self):
         ds = self.source.open(
             variables=self.variables, filters=self.filter, coords=self.coords
         )
-        # Sort the dataset by all coordinates to avoid cropping issues
-        for dim in ds.dims:
-            ds = ds.sortby(dim)
         return ds
 
     def _figsize(self, x0, x1, y0, y1, fscale):

diff --git a/rompy/core/filters.py b/rompy/core/filters.py
@@ -77,7 +77,8 @@ def derived_filter(ds, derived_variables):
     return ds
 
 
-def sort_filter(ds, coords=None):
+def sort_filter(ds, coords: list = []):
+    coords = list[coords] if isinstance(coords, str) else coords
     for c in coords:
         if c in ds:
             ds = ds.sortby(c)