roms-tools 1.7.0__py3-none-any.whl → 2.1.0__py3-none-any.whl

roms_tools/tests/test_setup/test_data/grid.zarr/Cs_w/.zattrs

@@ -2,6 +2,6 @@
     "_ARRAY_DIMENSIONS": [
         "s_w"
     ],
-    "long_name": "S-coordinate stretching curves at w-points",
+    "long_name": "Vertical stretching function at w-points",
     "units": "nondimensional"
 }

roms_tools/tests/test_setup/test_data/grid.zarr/{layer_depth_rho → sigma_r}/.zarray

@@ -1,8 +1,6 @@
 {
     "chunks": [
-        100,
-        3,
-        3
+        100
     ],
     "compressor": {
         "blocksize": 0,
@@ -16,9 +14,7 @@
     "filters": null,
     "order": "C",
     "shape": [
-        100,
-        3,
-        3
+        100
     ],
     "zarr_format": 2
 }

roms_tools/tests/test_setup/test_data/grid.zarr/sigma_r/.zattrs

@@ -0,0 +1,7 @@
+{
+    "_ARRAY_DIMENSIONS": [
+        "s_rho"
+    ],
+    "long_name": "Fractional vertical stretching coordinate at rho-points",
+    "units": "nondimensional"
+}

roms_tools/tests/test_setup/test_data/grid.zarr/sigma_w/.zarray

@@ -0,0 +1,20 @@
+{
+    "chunks": [
+        101
+    ],
+    "compressor": {
+        "blocksize": 0,
+        "clevel": 5,
+        "cname": "lz4",
+        "id": "blosc",
+        "shuffle": 1
+    },
+    "dtype": "<f4",
+    "fill_value": "NaN",
+    "filters": null,
+    "order": "C",
+    "shape": [
+        101
+    ],
+    "zarr_format": 2
+}

roms_tools/tests/test_setup/test_data/grid.zarr/sigma_w/.zattrs

@@ -0,0 +1,7 @@
+{
+    "_ARRAY_DIMENSIONS": [
+        "s_w"
+    ],
+    "long_name": "Fractional vertical stretching coordinate at w-points",
+    "units": "nondimensional"
+}

roms_tools/tests/test_setup/test_data/grid_that_straddles_dateline.zarr/.zattrs

@@ -1,10 +1,9 @@
 {
     "center_lat": 0,
     "center_lon": 0,
-    "coordinates": "interface_depth_rho interface_depth_u interface_depth_v layer_depth_rho layer_depth_u layer_depth_v",
     "hc": 300.0,
     "hmin": 5.0,
-    "roms_tools_version": "0.1.dev157+dirty",
+    "roms_tools_version": "0.1.dev239+dirty",
     "rot": 20,
     "size_x": 100,
     "size_y": 100,

roms_tools/tests/test_setup/test_data/grid_that_straddles_dateline.zarr/.zmetadata

@@ -3,10 +3,9 @@
         ".zattrs": {
             "center_lat": 0,
             "center_lon": 0,
-            "coordinates": "interface_depth_rho interface_depth_u interface_depth_v layer_depth_rho layer_depth_u layer_depth_v",
             "hc": 300.0,
             "hmin": 5.0,
-            "roms_tools_version": "0.1.dev157+dirty",
+            "roms_tools_version": "0.1.dev239+dirty",
             "rot": 20,
             "size_x": 100,
             "size_y": 100,
@@ -42,7 +41,7 @@
             "_ARRAY_DIMENSIONS": [
                 "s_rho"
             ],
-            "long_name": "S-coordinate stretching curves at rho-points",
+            "long_name": "Vertical stretching function at rho-points",
             "units": "nondimensional"
         },
         "Cs_w/.zarray": {
@@ -69,7 +68,7 @@
             "_ARRAY_DIMENSIONS": [
                 "s_w"
             ],
-            "long_name": "S-coordinate stretching curves at w-points",
+            "long_name": "Vertical stretching function at w-points",
             "units": "nondimensional"
         },
         "angle/.zarray": {
@@ -193,108 +192,9 @@
                 "xi_rho"
             ],
             "coordinates": "lat_rho lon_rho",
-            "long_name": "Final bathymetry at rho-points",
+            "long_name": "Bathymetry at rho-points",
             "units": "meter"
         },
-        "interface_depth_rho/.zarray": {
-            "chunks": [
-                101,
-                3,
-                3
-            ],
-            "compressor": {
-                "blocksize": 0,
-                "clevel": 5,
-                "cname": "lz4",
-                "id": "blosc",
-                "shuffle": 1
-            },
-            "dtype": "<f4",
-            "fill_value": "NaN",
-            "filters": null,
-            "order": "C",
-            "shape": [
-                101,
-                3,
-                3
-            ],
-            "zarr_format": 2
-        },
-        "interface_depth_rho/.zattrs": {
-            "_ARRAY_DIMENSIONS": [
-                "s_w",
-                "eta_rho",
-                "xi_rho"
-            ],
-            "long_name": "Interface depth at rho-points",
-            "units": "m"
-        },
-        "interface_depth_u/.zarray": {
-            "chunks": [
-                101,
-                3,
-                2
-            ],
-            "compressor": {
-                "blocksize": 0,
-                "clevel": 5,
-                "cname": "lz4",
-                "id": "blosc",
-                "shuffle": 1
-            },
-            "dtype": "<f4",
-            "fill_value": "NaN",
-            "filters": null,
-            "order": "C",
-            "shape": [
-                101,
-                3,
-                2
-            ],
-            "zarr_format": 2
-        },
-        "interface_depth_u/.zattrs": {
-            "_ARRAY_DIMENSIONS": [
-                "s_w",
-                "eta_rho",
-                "xi_u"
-            ],
-            "long_name": "Interface depth at u-points",
-            "units": "m"
-        },
-        "interface_depth_v/.zarray": {
-            "chunks": [
-                101,
-                2,
-                3
-            ],
-            "compressor": {
-                "blocksize": 0,
-                "clevel": 5,
-                "cname": "lz4",
-                "id": "blosc",
-                "shuffle": 1
-            },
-            "dtype": "<f4",
-            "fill_value": "NaN",
-            "filters": null,
-            "order": "C",
-            "shape": [
-                101,
-                2,
-                3
-            ],
-            "zarr_format": 2
-        },
-        "interface_depth_v/.zattrs": {
-            "_ARRAY_DIMENSIONS": [
-                "s_w",
-                "eta_v",
-                "xi_rho"
-            ],
-            "long_name": "Interface depth at v-points",
-            "units": "m"
-        },
         "lat_coarse/.zarray": {
             "chunks": [
                 2,
@@ -415,105 +315,6 @@
             "long_name": "latitude of v-points",
             "units": "degrees North"
         },
-        "layer_depth_rho/.zarray": {
-            "chunks": [
-                100,
-                3,
-                3
-            ],
-            "compressor": {
-                "blocksize": 0,
-                "clevel": 5,
-                "cname": "lz4",
-                "id": "blosc",
-                "shuffle": 1
-            },
-            "dtype": "<f4",
-            "fill_value": "NaN",
-            "filters": null,
-            "order": "C",
-            "shape": [
-                100,
-                3,
-                3
-            ],
-            "zarr_format": 2
-        },
-        "layer_depth_rho/.zattrs": {
-            "_ARRAY_DIMENSIONS": [
-                "s_rho",
-                "eta_rho",
-                "xi_rho"
-            ],
-            "long_name": "Layer depth at rho-points",
-            "units": "m"
-        },
-        "layer_depth_u/.zarray": {
-            "chunks": [
-                100,
-                3,
-                2
-            ],
-            "compressor": {
-                "blocksize": 0,
-                "clevel": 5,
-                "cname": "lz4",
-                "id": "blosc",
-                "shuffle": 1
-            },
-            "dtype": "<f4",
-            "fill_value": "NaN",
-            "filters": null,
-            "order": "C",
-            "shape": [
-                100,
-                3,
-                2
-            ],
-            "zarr_format": 2
-        },
-        "layer_depth_u/.zattrs": {
-            "_ARRAY_DIMENSIONS": [
-                "s_rho",
-                "eta_rho",
-                "xi_u"
-            ],
-            "long_name": "Layer depth at u-points",
-            "units": "m"
-        },
-        "layer_depth_v/.zarray": {
-            "chunks": [
-                100,
-                2,
-                3
-            ],
-            "compressor": {
-                "blocksize": 0,
-                "clevel": 5,
-                "cname": "lz4",
-                "id": "blosc",
-                "shuffle": 1
-            },
-            "dtype": "<f4",
-            "fill_value": "NaN",
-            "filters": null,
-            "order": "C",
-            "shape": [
-                100,
-                2,
-                3
-            ],
-            "zarr_format": 2
-        },
-        "layer_depth_v/.zattrs": {
-            "_ARRAY_DIMENSIONS": [
-                "s_rho",
-                "eta_v",
-                "xi_rho"
-            ],
-            "long_name": "Layer depth at v-points",
-            "units": "m"
-        },
         "lon_coarse/.zarray": {
             "chunks": [
                 2,
@@ -820,6 +621,60 @@
             "long_name": "Curvilinear coordinate metric in eta-direction",
             "units": "meter-1"
         },
+        "sigma_r/.zarray": {
+            "chunks": [
+                100
+            ],
+            "compressor": {
+                "blocksize": 0,
+                "clevel": 5,
+                "cname": "lz4",
+                "id": "blosc",
+                "shuffle": 1
+            },
+            "dtype": "<f4",
+            "fill_value": "NaN",
+            "filters": null,
+            "order": "C",
+            "shape": [
+                100
+            ],
+            "zarr_format": 2
+        },
+        "sigma_r/.zattrs": {
+            "_ARRAY_DIMENSIONS": [
+                "s_rho"
+            ],
+            "long_name": "Fractional vertical stretching coordinate at rho-points",
+            "units": "nondimensional"
+        },
+        "sigma_w/.zarray": {
+            "chunks": [
+                101
+            ],
+            "compressor": {
+                "blocksize": 0,
+                "clevel": 5,
+                "cname": "lz4",
+                "id": "blosc",
+                "shuffle": 1
+            },
+            "dtype": "<f4",
+            "fill_value": "NaN",
+            "filters": null,
+            "order": "C",
+            "shape": [
+                101
+            ],
+            "zarr_format": 2
+        },
+        "sigma_w/.zattrs": {
+            "_ARRAY_DIMENSIONS": [
+                "s_w"
+            ],
+            "long_name": "Fractional vertical stretching coordinate at w-points",
+            "units": "nondimensional"
+        },
         "spherical/.zarray": {
             "chunks": [],
             "compressor": null,

roms_tools/tests/test_setup/test_data/grid_that_straddles_dateline.zarr/Cs_r/.zattrs

@@ -2,6 +2,6 @@
     "_ARRAY_DIMENSIONS": [
         "s_rho"
     ],
-    "long_name": "S-coordinate stretching curves at rho-points",
+    "long_name": "Vertical stretching function at rho-points",
     "units": "nondimensional"
 }

roms_tools/tests/test_setup/test_data/grid_that_straddles_dateline.zarr/Cs_w/.zattrs

@@ -2,6 +2,6 @@
     "_ARRAY_DIMENSIONS": [
         "s_w"
     ],
-    "long_name": "S-coordinate stretching curves at w-points",
+    "long_name": "Vertical stretching function at w-points",
     "units": "nondimensional"
 }

roms_tools/tests/test_setup/test_data/grid_that_straddles_dateline.zarr/h/.zattrs

@@ -4,6 +4,6 @@
         "xi_rho"
     ],
     "coordinates": "lat_rho lon_rho",
-    "long_name": "Final bathymetry at rho-points",
+    "long_name": "Bathymetry at rho-points",
     "units": "meter"
 }

roms_tools/tests/test_setup/test_data/grid_that_straddles_dateline.zarr/sigma_r/.zarray

@@ -0,0 +1,20 @@
+{
+    "chunks": [
+        100
+    ],
+    "compressor": {
+        "blocksize": 0,
+        "clevel": 5,
+        "cname": "lz4",
+        "id": "blosc",
+        "shuffle": 1
+    },
+    "dtype": "<f4",
+    "fill_value": "NaN",
+    "filters": null,
+    "order": "C",
+    "shape": [
+        100
+    ],
+    "zarr_format": 2
+}

roms_tools/tests/test_setup/test_data/grid_that_straddles_dateline.zarr/sigma_r/.zattrs

@@ -0,0 +1,7 @@
+{
+    "_ARRAY_DIMENSIONS": [
+        "s_rho"
+    ],
+    "long_name": "Fractional vertical stretching coordinate at rho-points",
+    "units": "nondimensional"
+}

roms_tools/tests/test_setup/test_data/grid_that_straddles_dateline.zarr/sigma_w/.zarray

@@ -0,0 +1,20 @@
+{
+    "chunks": [
+        101
+    ],
+    "compressor": {
+        "blocksize": 0,
+        "clevel": 5,
+        "cname": "lz4",
+        "id": "blosc",
+        "shuffle": 1
+    },
+    "dtype": "<f4",
+    "fill_value": "NaN",
+    "filters": null,
+    "order": "C",
+    "shape": [
+        101
+    ],
+    "zarr_format": 2
+}

roms_tools/tests/test_setup/test_data/grid_that_straddles_dateline.zarr/sigma_w/.zattrs

@@ -0,0 +1,7 @@
+{
+    "_ARRAY_DIMENSIONS": [
+        "s_w"
+    ],
+    "long_name": "Fractional vertical stretching coordinate at w-points",
+    "units": "nondimensional"
+}

roms_tools/tests/test_setup/test_data/river_forcing_no_climatology.zarr/.zmetadata

@@ -120,8 +120,7 @@
                 "nriver"
             ],
             "coordinates": "abs_time river_name tracer_name",
-            "long_name": "River tracer data",
-            "units": "degrees C [temperature]; psu [salinity]"
+            "long_name": "River tracer data"
         },
         "river_volume/.zarray": {
             "chunks": [
@@ -165,7 +164,7 @@
                 "id": "blosc",
                 "shuffle": 1
             },
-            "dtype": "<U11",
+            "dtype": "<U4",
             "fill_value": null,
             "filters": null,
             "order": "C",

roms_tools/tests/test_setup/test_data/river_forcing_no_climatology.zarr/river_tracer/.zattrs

@@ -5,6 +5,5 @@
         "nriver"
     ],
     "coordinates": "abs_time river_name tracer_name",
-    "long_name": "River tracer data",
-    "units": "degrees C [temperature]; psu [salinity]"
+    "long_name": "River tracer data"
 }

roms_tools/tests/test_setup/test_data/river_forcing_no_climatology.zarr/tracer_name/.zarray

@@ -9,7 +9,7 @@
         "id": "blosc",
         "shuffle": 1
     },
-    "dtype": "<U11",
+    "dtype": "<U4",
     "fill_value": null,
     "filters": null,
     "order": "C",

roms_tools/tests/test_setup/test_data/{river_forcing.zarr → river_forcing_with_bgc.zarr}/.zmetadata

@@ -121,7 +121,7 @@
         "river_tracer/.zarray": {
             "chunks": [
                 12,
-                2,
+                34,
                 6
             ],
             "compressor": {
@@ -137,7 +137,7 @@
             "order": "C",
             "shape": [
                 12,
-                2,
+                34,
                 6
             ],
             "zarr_format": 2
@@ -149,8 +149,7 @@
                 "nriver"
             ],
             "coordinates": "abs_time month river_name tracer_name",
-            "long_name": "River tracer data",
-            "units": "degrees C [temperature]; psu [salinity]"
+            "long_name": "River tracer data"
         },
         "river_volume/.zarray": {
             "chunks": [
@@ -185,7 +184,7 @@
         },
         "tracer_name/.zarray": {
             "chunks": [
-                2
+                34
             ],
             "compressor": {
                 "blocksize": 0,
@@ -199,7 +198,7 @@
             "filters": null,
             "order": "C",
             "shape": [
-                2
+                34
             ],
             "zarr_format": 2
         },

roms_tools/tests/test_setup/test_data/{river_forcing.zarr → river_forcing_with_bgc.zarr}/river_tracer/.zarray

@@ -1,7 +1,7 @@
 {
     "chunks": [
         12,
-        2,
+        34,
         6
     ],
     "compressor": {
@@ -17,7 +17,7 @@
     "order": "C",
     "shape": [
         12,
-        2,
+        34,
         6
     ],
     "zarr_format": 2

roms_tools/tests/test_setup/test_data/{river_forcing.zarr → river_forcing_with_bgc.zarr}/river_tracer/.zattrs

@@ -5,6 +5,5 @@
         "nriver"
     ],
     "coordinates": "abs_time month river_name tracer_name",
-    "long_name": "River tracer data",
-    "units": "degrees C [temperature]; psu [salinity]"
+    "long_name": "River tracer data"
 }

roms_tools/tests/test_setup/test_data/{river_forcing.zarr → river_forcing_with_bgc.zarr}/tracer_name/.zarray

@@ -1,6 +1,6 @@
 {
     "chunks": [
-        2
+        34
     ],
     "compressor": {
         "blocksize": 0,
@@ -14,7 +14,7 @@
     "filters": null,
     "order": "C",
     "shape": [
-        2
+        34
     ],
     "zarr_format": 2
 }

roms_tools/tests/test_setup/test_datasets.py

@@ -431,8 +431,8 @@ def test_era5_correction_choose_subdomain(use_dask):
     data = ERA5Correction(use_dask=use_dask)
     lats = data.ds.latitude[10:20]
     lons = data.ds.longitude[10:20]
-    coords = {"latitude": lats, "longitude": lons}
-    data.choose_subdomain(coords, straddle=False)
+    target_coords = {"lat": lats, "lon": lons}
+    data.choose_subdomain(target_coords, straddle=False)
     assert (data.ds["latitude"] == lats).all()
     assert (data.ds["longitude"] == lons).all()