roms-tools 1.6.2__py3-none-any.whl → 2.0.0__py3-none-any.whl

roms_tools/setup/vertical_coordinate.py

@@ -1,5 +1,6 @@
 import numpy as np
 import xarray as xr
+from roms_tools.setup.utils import transpose_dimensions
 
 
 def compute_cs(sigma, theta_s, theta_b):
@@ -83,7 +84,7 @@ def compute_depth(zeta, h, hc, cs, sigma):
 
     Parameters
     ----------
-    zeta : xr.DataArray
+    zeta : xr.DataArray or scalar
         The sea surface height.
     h : xr.DataArray
         The depth of the sea bottom.
@@ -98,23 +99,11 @@ def compute_depth(zeta, h, hc, cs, sigma):
     -------
     z : xr.DataArray
         The depth at different sigma levels.
-
-    Raises
-    ------
-    ValueError
-        If theta_s or theta_b are less than or equal to zero.
     """
 
-    # Expand dimensions
-    sigma = sigma.expand_dims(dim={"eta_rho": h.eta_rho, "xi_rho": h.xi_rho})
-    cs = cs.expand_dims(dim={"eta_rho": h.eta_rho, "xi_rho": h.xi_rho})
-
-    s = (hc * sigma + h * cs) / (hc + h)
-    z = zeta + (zeta + h) * s
+    z = (hc * sigma + h * cs) / (hc + h)
+    z = zeta + (zeta + h) * z
 
-    if "s_rho" in z.dims:
-        z = z.transpose("s_rho", "eta_rho", "xi_rho")
-    elif "s_w" in z.dims:
-        z = z.transpose("s_w", "eta_rho", "xi_rho")
+    z = -transpose_dimensions(z)
 
     return z

roms_tools/tests/test_setup/test_boundary_forcing.py

@@ -241,10 +241,14 @@ def test_boundary_forcing_save(boundary_forcing, tmp_path):
 def test_bgc_boundary_forcing_plot(bgc_boundary_forcing_from_climatology):
     """Test plot method."""
 
-    bgc_boundary_forcing_from_climatology.plot(var_name="ALK_south")
-    bgc_boundary_forcing_from_climatology.plot(var_name="ALK_east")
-    bgc_boundary_forcing_from_climatology.plot(var_name="ALK_north")
-    bgc_boundary_forcing_from_climatology.plot(var_name="ALK_west")
+    bgc_boundary_forcing_from_climatology.plot(
+        var_name="ALK_south", layer_contours=True
+    )
+    bgc_boundary_forcing_from_climatology.plot(var_name="ALK_east", layer_contours=True)
+    bgc_boundary_forcing_from_climatology.plot(
+        var_name="ALK_north", layer_contours=True
+    )
+    bgc_boundary_forcing_from_climatology.plot(var_name="ALK_west", layer_contours=True)
 
 
 def test_bgc_boundary_forcing_save(bgc_boundary_forcing_from_climatology, tmp_path):
@@ -390,10 +394,9 @@ def test_from_yaml_missing_boundary_forcing(tmp_path, request, use_dask):
       center_lon: -10
       center_lat: 61
       rot: -20
-      topography_source: ETOPO5
-      smooth_factor: 8
+      topography_source:
+        name: ETOPO5
       hmin: 5.0
-      rmax: 0.2
     """
     )
     # Create a temporary filepath using the tmp_path fixture

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

@@ -3,7 +3,7 @@
     "end_time": "2021-06-30 00:00:00",
     "hc": 250.0,
     "model_reference_date": "2000-01-01 00:00:00",
-    "roms_tools_version": "0.1.dev157+dirty",
+    "roms_tools_version": "0.1.dev169+dirty",
     "source": "CESM_REGRIDDED",
     "start_time": "2021-06-29 00:00:00",
     "theta_b": 2.0,