roms-tools 1.0.1__py3-none-any.whl → 1.2.0__py3-none-any.whl

roms_tools/tests/test_grid.py

@@ -1,6 +1,7 @@
 import pytest
 import numpy as np
 import numpy.testing as npt
+import xarray as xr
 from roms_tools import Grid
 import os
 import tempfile
@@ -8,9 +9,44 @@ import importlib.metadata
 import textwrap
 
 
-def test_simple_regression():
+@pytest.fixture
+def simple_grid():
+
     grid = Grid(nx=1, ny=1, size_x=100, size_y=100, center_lon=-20, center_lat=0, rot=0)
 
+    return grid
+
+
+def test_grid_creation(simple_grid):
+
+    assert simple_grid.nx == 1
+    assert simple_grid.ny == 1
+    assert simple_grid.size_x == 100
+    assert simple_grid.size_y == 100
+    assert simple_grid.center_lon == -20
+    assert simple_grid.center_lat == 0
+    assert simple_grid.rot == 0
+    assert isinstance(simple_grid.ds, xr.Dataset)
+
+
+def test_plot_save_methods(simple_grid, tmp_path):
+
+    simple_grid.plot(bathymetry=True)
+    filepath = tmp_path / "grid.nc"
+    simple_grid.save(filepath)
+    assert filepath.exists()
+
+
+@pytest.fixture
+def simple_grid_that_straddles_dateline():
+
+    grid = Grid(nx=1, ny=1, size_x=100, size_y=100, center_lon=0, center_lat=0, rot=20)
+
+    return grid
+
+
+def test_simple_regression(simple_grid):
+
     expected_lat = np.array(
         [
             [-8.99249453e-01, -8.99249453e-01, -8.99249453e-01],
@@ -26,9 +62,158 @@ def test_simple_regression():
         ]
     )
 
+    expected_lat_u = np.array(
+        [
+            [-8.99249453e-01, -8.99249453e-01],
+            [-2.39610306e-15, -2.28602368e-15],
+            [8.99249453e-01, 8.99249453e-01],
+        ]
+    )
+
+    expected_lon_u = np.array(
+        [
+            [339.55036143, 340.44963857],
+            [339.55036143, 340.44963857],
+            [339.55036143, 340.44963857],
+        ]
+    )
+
+    expected_lat_v = np.array(
+        [[-0.44962473, -0.44962473, -0.44962473], [0.44962473, 0.44962473, 0.44962473]]
+    )
+
+    expected_lon_v = np.array(
+        [[339.10072286, 340.0, 340.89927714], [339.10072286, 340.0, 340.89927714]]
+    )
+
+    expected_lat_coarse = np.array(
+        [[-1.34887418, -1.34887418], [1.34887418, 1.34887418]]
+    )
+
+    expected_lon_coarse = np.array(
+        [[338.65108429, 341.34891571], [338.65108429, 341.34891571]]
+    )
+
+    expected_angle = np.array(
+        [
+            [0.00000000e00, 0.00000000e00, 0.00000000e00],
+            [-3.83707366e-17, -3.83707366e-17, -3.83707366e-17],
+            [0.00000000e00, 0.00000000e00, 0.00000000e00],
+        ]
+    )
+
+    expected_angle_coarse = np.array(
+        [[1.91853683e-17, 1.91853683e-17], [1.91853683e-17, 1.91853683e-17]]
+    )
+
+    # TODO: adapt tolerances according to order of magnitude of respective fields
+    npt.assert_allclose(simple_grid.ds["lat_rho"], expected_lat, atol=1e-8)
+    npt.assert_allclose(simple_grid.ds["lon_rho"], expected_lon, atol=1e-8)
+    npt.assert_allclose(simple_grid.ds["lat_u"], expected_lat_u, atol=1e-8)
+    npt.assert_allclose(simple_grid.ds["lon_u"], expected_lon_u, atol=1e-8)
+    npt.assert_allclose(simple_grid.ds["lat_v"], expected_lat_v, atol=1e-8)
+    npt.assert_allclose(simple_grid.ds["lon_v"], expected_lon_v, atol=1e-8)
+    npt.assert_allclose(simple_grid.ds["lat_coarse"], expected_lat_coarse, atol=1e-8)
+    npt.assert_allclose(simple_grid.ds["lon_coarse"], expected_lon_coarse, atol=1e-8)
+    npt.assert_allclose(simple_grid.ds["angle"], expected_angle, atol=1e-8)
+    npt.assert_allclose(
+        simple_grid.ds["angle_coarse"], expected_angle_coarse, atol=1e-8
+    )
+
+
+def test_simple_regression_dateline(simple_grid_that_straddles_dateline):
+
+    expected_lat = np.array(
+        [
+            [-1.15258151e00, -8.45014017e-01, -5.37470876e-01],
+            [-3.07559747e-01, -2.14815958e-15, 3.07559747e-01],
+            [5.37470876e-01, 8.45014017e-01, 1.15258151e00],
+        ]
+    )
+    expected_lon = np.array(
+        [
+            [3.59462527e02, 3.07583728e-01, 1.15258257e00],
+            [3.59154948e02, 7.81866146e-16, 8.45052212e-01],
+            [3.58847417e02, 3.59692416e02, 5.37473154e-01],
+        ]
+    )
+    expected_lat_u = np.array(
+        [
+            [-0.99879776, -0.69124245],
+            [-0.15377987, 0.15377987],
+            [0.69124245, 0.99879776],
+        ]
+    )
+    expected_lon_u = np.array(
+        [
+            [3.59885055e02, 7.30083149e-01],
+            [3.59577474e02, 4.22526106e-01],
+            [3.59269917e02, 1.14944713e-01],
+        ]
+    )
+    expected_lat_v = np.array(
+        [[-0.73007063, -0.42250701, -0.11495556], [0.11495556, 0.42250701, 0.73007063]]
+    )
+    expected_lon_v = np.array(
+        [
+            [3.59308737e02, 1.53791864e-01, 9.98817391e-01],
+            [3.59001183e02, 3.59846208e02, 6.91262683e-01],
+        ]
+    )
+    expected_lat_coarse = np.array(
+        [[-1.72887807, -0.80621877], [0.80621877, 1.72887807]]
+    )
+    expected_lon_coarse = np.array(
+        [[359.19378677, 1.72883383], [358.27116617, 0.80621323]]
+    )
+    expected_angle = np.array(
+        [
+            [0.34910175, 0.34910175, 0.34910175],
+            [0.34906217, 0.34906217, 0.34906217],
+            [0.34910175, 0.34910175, 0.34910175],
+        ]
+    )
+    expected_angle_coarse = np.array(
+        [[0.34912155, 0.34912155], [0.34912155, 0.34912155]]
+    )
+
     # TODO: adapt tolerances according to order of magnitude of respective fields
-    npt.assert_allclose(grid.ds["lat_rho"], expected_lat, atol=1e-8)
-    npt.assert_allclose(grid.ds["lon_rho"], expected_lon, atol=1e-8)
+    npt.assert_allclose(
+        simple_grid_that_straddles_dateline.ds["lat_rho"], expected_lat, atol=1e-8
+    )
+    npt.assert_allclose(
+        simple_grid_that_straddles_dateline.ds["lon_rho"], expected_lon, atol=1e-8
+    )
+    npt.assert_allclose(
+        simple_grid_that_straddles_dateline.ds["lat_u"], expected_lat_u, atol=1e-8
+    )
+    npt.assert_allclose(
+        simple_grid_that_straddles_dateline.ds["lon_u"], expected_lon_u, atol=1e-8
+    )
+    npt.assert_allclose(
+        simple_grid_that_straddles_dateline.ds["lat_v"], expected_lat_v, atol=1e-8
+    )
+    npt.assert_allclose(
+        simple_grid_that_straddles_dateline.ds["lon_v"], expected_lon_v, atol=1e-8
+    )
+    npt.assert_allclose(
+        simple_grid_that_straddles_dateline.ds["lat_coarse"],
+        expected_lat_coarse,
+        atol=1e-8,
+    )
+    npt.assert_allclose(
+        simple_grid_that_straddles_dateline.ds["lon_coarse"],
+        expected_lon_coarse,
+        atol=1e-8,
+    )
+    npt.assert_allclose(
+        simple_grid_that_straddles_dateline.ds["angle"], expected_angle, atol=1e-8
+    )
+    npt.assert_allclose(
+        simple_grid_that_straddles_dateline.ds["angle_coarse"],
+        expected_angle_coarse,
+        atol=1e-8,
+    )
 
 
 def test_raise_if_domain_too_large():
@@ -85,9 +270,7 @@ def test_roundtrip_netcdf():
         center_lat=0.0,
         rot=0.0,
         topography_source="ETOPO5",
-        smooth_factor=2,
         hmin=5.0,
-        rmax=0.2,
     )
 
     # Create a temporary file
@@ -121,9 +304,7 @@ def test_roundtrip_yaml():
         center_lat=0.0,
         rot=0.0,
         topography_source="ETOPO5",
-        smooth_factor=2,
         hmin=5.0,
-        rmax=0.2,
     )
 
     # Create a temporary file
@@ -155,9 +336,7 @@ def test_from_yaml_missing_version():
       center_lat: 61
       rot: -20
       topography_source: ETOPO5
-      smooth_factor: 8
       hmin: 5.0
-      rmax: 0.2
     """
     )
     with tempfile.NamedTemporaryFile(delete=False) as tmp_file:
@@ -206,9 +385,7 @@ def test_from_yaml_version_mismatch():
       center_lat: 61
       rot: -20
       topography_source: ETOPO5
-      smooth_factor: 8
       hmin: 5.0
-      rmax: 0.2
     """
     )
 

roms_tools/tests/test_initial_conditions.py

@@ -1,6 +1,6 @@
 import pytest
 from datetime import datetime
-from roms_tools import InitialConditions, Grid, VerticalCoordinate
+from roms_tools import InitialConditions, Grid
 import xarray as xr
 import numpy as np
 import tempfile
@@ -16,30 +16,24 @@ def example_grid():
     Fixture for creating a Grid object.
     """
     grid = Grid(
-        nx=2, ny=2, size_x=500, size_y=1000, center_lon=0, center_lat=55, rot=10
-    )
-
-    return grid
-
-
-@pytest.fixture
-def example_vertical_coordinate(example_grid):
-    """
-    Fixture for creating a VerticalCoordinate object.
-    """
-    vertical_coordinate = VerticalCoordinate(
-        grid=example_grid,
+        nx=2,
+        ny=2,
+        size_x=500,
+        size_y=1000,
+        center_lon=0,
+        center_lat=55,
+        rot=10,
         N=3,  # number of vertical levels
         theta_s=5.0,  # surface control parameter
         theta_b=2.0,  # bottom control parameter
         hc=250.0,  # critical depth
     )
 
-    return vertical_coordinate
+    return grid
 
 
 @pytest.fixture
-def initial_conditions(example_grid, example_vertical_coordinate):
+def initial_conditions(example_grid):
     """
     Fixture for creating a dummy InitialConditions object.
     """
@@ -48,14 +42,13 @@ def initial_conditions(example_grid, example_vertical_coordinate):
 
     return InitialConditions(
         grid=example_grid,
-        vertical_coordinate=example_vertical_coordinate,
         ini_time=datetime(2021, 6, 29),
         physics_source={"path": fname, "name": "GLORYS"},
     )
 
 
 @pytest.fixture
-def initial_conditions_with_bgc(example_grid, example_vertical_coordinate):
+def initial_conditions_with_bgc(example_grid):
     """
     Fixture for creating a dummy InitialConditions object.
     """
@@ -65,7 +58,6 @@ def initial_conditions_with_bgc(example_grid, example_vertical_coordinate):
 
     return InitialConditions(
         grid=example_grid,
-        vertical_coordinate=example_vertical_coordinate,
         ini_time=datetime(2021, 6, 29),
         physics_source={"path": fname, "name": "GLORYS"},
         bgc_source={"path": fname_bgc, "name": "CESM_REGRIDDED"},
@@ -73,9 +65,7 @@ def initial_conditions_with_bgc(example_grid, example_vertical_coordinate):
 
 
 @pytest.fixture
-def initial_conditions_with_bgc_from_climatology(
-    example_grid, example_vertical_coordinate
-):
+def initial_conditions_with_bgc_from_climatology(example_grid):
     """
     Fixture for creating a dummy InitialConditions object.
     """
@@ -85,7 +75,6 @@ def initial_conditions_with_bgc_from_climatology(
 
     return InitialConditions(
         grid=example_grid,
-        vertical_coordinate=example_vertical_coordinate,
         ini_time=datetime(2021, 6, 29),
         physics_source={"path": fname, "name": "GLORYS"},
         bgc_source={
@@ -126,33 +115,27 @@ def test_initial_conditions_creation(ic_fixture, request):
 
 
 # Test initialization with missing 'name' in physics_source
-def test_initial_conditions_missing_physics_name(
-    example_grid, example_vertical_coordinate
-):
+def test_initial_conditions_missing_physics_name(example_grid):
     with pytest.raises(ValueError, match="`physics_source` must include a 'name'."):
         InitialConditions(
             grid=example_grid,
-            vertical_coordinate=example_vertical_coordinate,
             ini_time=datetime(2021, 6, 29),
             physics_source={"path": "physics_data.nc"},
         )
 
 
 # Test initialization with missing 'path' in physics_source
-def test_initial_conditions_missing_physics_path(
-    example_grid, example_vertical_coordinate
-):
+def test_initial_conditions_missing_physics_path(example_grid):
     with pytest.raises(ValueError, match="`physics_source` must include a 'path'."):
         InitialConditions(
             grid=example_grid,
-            vertical_coordinate=example_vertical_coordinate,
             ini_time=datetime(2021, 6, 29),
             physics_source={"name": "GLORYS"},
         )
 
 
 # Test initialization with missing 'name' in bgc_source
-def test_initial_conditions_missing_bgc_name(example_grid, example_vertical_coordinate):
+def test_initial_conditions_missing_bgc_name(example_grid):
 
     fname = download_test_data("GLORYS_test_data.nc")
     with pytest.raises(
@@ -160,7 +143,6 @@ def test_initial_conditions_missing_bgc_name(example_grid, example_vertical_coor
     ):
         InitialConditions(
             grid=example_grid,
-            vertical_coordinate=example_vertical_coordinate,
             ini_time=datetime(2021, 6, 29),
             physics_source={"name": "GLORYS", "path": fname},
             bgc_source={"path": "bgc_data.nc"},
@@ -168,7 +150,7 @@ def test_initial_conditions_missing_bgc_name(example_grid, example_vertical_coor
 
 
 # Test initialization with missing 'path' in bgc_source
-def test_initial_conditions_missing_bgc_path(example_grid, example_vertical_coordinate):
+def test_initial_conditions_missing_bgc_path(example_grid):
 
     fname = download_test_data("GLORYS_test_data.nc")
     with pytest.raises(
@@ -176,7 +158,6 @@ def test_initial_conditions_missing_bgc_path(example_grid, example_vertical_coor
     ):
         InitialConditions(
             grid=example_grid,
-            vertical_coordinate=example_vertical_coordinate,
             ini_time=datetime(2021, 6, 29),
             physics_source={"name": "GLORYS", "path": fname},
             bgc_source={"name": "CESM_REGRIDDED"},
@@ -184,15 +165,12 @@ def test_initial_conditions_missing_bgc_path(example_grid, example_vertical_coor
 
 
 # Test default climatology value
-def test_initial_conditions_default_climatology(
-    example_grid, example_vertical_coordinate
-):
+def test_initial_conditions_default_climatology(example_grid):
 
     fname = download_test_data("GLORYS_test_data.nc")
 
     initial_conditions = InitialConditions(
         grid=example_grid,
-        vertical_coordinate=example_vertical_coordinate,
         ini_time=datetime(2021, 6, 29),
         physics_source={"name": "GLORYS", "path": fname},
     )
@@ -201,16 +179,13 @@ def test_initial_conditions_default_climatology(
     assert initial_conditions.bgc_source is None
 
 
-def test_initial_conditions_default_bgc_climatology(
-    example_grid, example_vertical_coordinate
-):
+def test_initial_conditions_default_bgc_climatology(example_grid):
 
     fname = download_test_data("GLORYS_test_data.nc")
     fname_bgc = download_test_data("CESM_regional_test_data_one_time_slice.nc")
 
     initial_conditions = InitialConditions(
         grid=example_grid,
-        vertical_coordinate=example_vertical_coordinate,
         ini_time=datetime(2021, 6, 29),
         physics_source={"name": "GLORYS", "path": fname},
         bgc_source={"name": "CESM_REGRIDDED", "path": fname_bgc},
@@ -255,59 +230,48 @@ def test_initial_conditions_data_consistency_plot_save(
         [
             [
                 [
-                    [16.84414, 16.905312, 16.967817],
-                    [18.088203, 18.121834, 18.315424],
-                    [18.431192, 18.496748, 18.718002],
-                    [19.294329, 19.30358, 19.439777],
+                    [16.84414, 18.088203, 18.431192, 19.294329],
+                    [12.639833, 15.712767, 13.02848, 18.633307],
+                    [11.027701, 12.302642, 8.143677, 8.710737],
+                    [10.233599, 10.147332, 10.458557, 9.20282],
                 ],
                 [
-                    [12.639833, 13.479691, 14.426711],
-                    [15.712767, 15.920951, 16.10028],
-                    [13.02848, 14.5227165, 15.05175],
-                    [18.633307, 18.637077, 18.667465],
+                    [16.905312, 18.121834, 18.496748, 19.30358],
+                    [13.479691, 15.920951, 14.5227165, 18.637077],
+                    [11.650267, 12.646921, 11.435992, 11.25943],
+                    [10.546486, 10.502733, 11.209945, 10.667074],
                 ],
                 [
-                    [11.027701, 11.650267, 12.200586],
-                    [12.302642, 12.646921, 13.150708],
-                    [8.143677, 11.435992, 13.356925],
-                    [8.710737, 11.25943, 13.111585],
-                ],
-                [
-                    [10.233599, 10.546486, 10.671082],
-                    [10.147331, 10.502733, 10.68275],
-                    [10.458557, 11.209945, 11.377164],
-                    [9.20282, 10.667074, 11.752404],
+                    [16.967817, 18.315424, 18.718002, 19.439777],
+                    [14.426711, 16.10028, 15.05175, 18.667465],
+                    [12.200586, 13.150708, 13.356925, 13.111585],
+                    [10.671082, 10.68275, 11.377164, 11.752404],
                 ],
             ]
         ],
         dtype=np.float32,
     )
+
     expected_salt = np.array(
         [
             [
                 [
-                    [33.832672, 33.77759, 33.633846],
-                    [32.50002, 32.48105, 32.154694],
-                    [30.922323, 30.909824, 30.508572],
-                    [28.337738, 28.335176, 28.067144],
+                    [33.832672, 32.50002, 30.922323, 28.337738],
+                    [34.8002, 32.43797, 34.885834, 29.237692],
+                    [34.046825, 33.892323, 34.964134, 34.975933],
+                    [35.21593, 35.224304, 35.299217, 34.25124],
                 ],
                 [
-                    [34.8002, 34.691143, 34.382282],
-                    [32.43797, 32.369576, 32.027843],
-                    [34.885834, 34.82964, 34.775684],
-                    [29.237692, 29.232145, 29.09444],
+                    [33.77759, 32.48105, 30.909824, 28.335176],
+                    [34.691143, 32.369576, 34.82964, 29.232145],
+                    [33.950684, 33.84102, 34.91892, 34.48586],
+                    [35.209476, 35.209522, 35.31244, 33.828175],
                 ],
                 [
-                    [34.046825, 33.950684, 33.87148],
-                    [33.892323, 33.84102, 33.69169],
-                    [34.964134, 34.91892, 34.91941],
-                    [34.975933, 34.48586, 32.729057],
-                ],
-                [
-                    [35.21593, 35.209476, 35.20767],
-                    [35.224304, 35.209522, 35.20715],
-                    [35.299217, 35.31244, 35.31555],
-                    [34.25124, 33.828175, 33.234303],
+                    [33.633846, 32.154694, 30.508572, 28.067144],
+                    [34.382282, 32.027843, 34.775684, 29.09444],
+                    [33.87148, 33.69169, 34.91941, 32.729057],
+                    [35.20767, 35.20715, 35.31555, 33.234303],
                 ],
             ]
         ],
@@ -329,17 +293,23 @@ def test_initial_conditions_data_consistency_plot_save(
     expected_u = np.array(
         [
             [
-                [[-0.0, -0.0, -0.0], [-0.0, -0.0, -0.0], [0.0, -0.0, -0.0]],
-                [[0.0, -0.0, -0.0], [-0.0, -0.0, -0.0], [-0.0, -0.0, -0.0]],
                 [
-                    [0.0, 0.0, -0.0],
-                    [0.0, 0.0, -0.0],
-                    [0.06979556, 0.06167743, -0.02247071],
+                    [-0.0, -0.0, 0.0],
+                    [0.0, -0.0, -0.0],
+                    [0.0, 0.0, 0.06979556],
+                    [0.04268532, 0.04645353, 0.0211786],
                 ],
                 [
-                    [0.04268532, 0.03889201, 0.03351666],
-                    [0.04645353, 0.04914769, 0.03673013],
-                    [0.0211786, 0.03679834, 0.0274788],
+                    [-0.0, -0.0, -0.0],
+                    [-0.0, -0.0, -0.0],
+                    [0.0, 0.0, 0.06167743],
+                    [0.03889201, 0.04914769, 0.03679834],
+                ],
+                [
+                    [-0.0, -0.0, -0.0],
+                    [-0.0, -0.0, -0.0],
+                    [-0.0, -0.0, -0.02247071],
+                    [0.03351666, 0.03673013, 0.0274788],
                 ],
             ]
         ],
@@ -350,22 +320,19 @@ def test_initial_conditions_data_consistency_plot_save(
         [
             [
                 [
-                    [0.0, 0.0, 0.0],
-                    [0.0, 0.0, -0.0],
-                    [-0.0, -0.0, -0.0],
-                    [-0.0, -0.0, -0.0],
+                    [0.0, 0.0, -0.0, -0.0],
+                    [-0.0, -0.0, -0.03831354, -0.0],
+                    [-0.00951457, -0.0, 0.01915873, -0.06720348],
                 ],
                 [
-                    [-0.0, -0.0, -0.0],
-                    [-0.0, -0.0, -0.0],
-                    [-0.03831354, -0.02400788, -0.03179555],
-                    [-0.0, -0.0, -0.0],
+                    [0.0, 0.0, -0.0, -0.0],
+                    [-0.0, -0.0, -0.02400788, -0.0],
+                    [-0.00576979, -0.0, 0.02625698, -0.08354441],
                 ],
                 [
-                    [-0.00951457, -0.00576979, -0.02147919],
-                    [-0.0, -0.0, -0.0],
-                    [0.01915873, 0.02625698, 0.01757628],
-                    [-0.06720348, -0.08354441, -0.13835917],
+                    [0.0, -0.0, -0.0, -0.0],
+                    [-0.0, -0.0, -0.03179555, -0.0],
+                    [-0.02147919, -0.0, 0.01757628, -0.13835917],
                 ],
             ]
         ],
@@ -399,28 +366,22 @@ def test_initial_conditions_data_consistency_plot_save(
         [
             [
                 [
-                    [2341.926, 2340.8894, 2340.557],
-                    [2317.8875, 2315.86, 2315.2148],
-                    [2297.689, 2285.8933, 2284.404],
-                    [2276.4216, 2258.4436, 2256.1062],
+                    [2341.926, 2317.8875, 2297.689, 2276.4216],
+                    [2330.5837, 2317.878, 2278.9314, 2259.975],
+                    [2376.7534, 2362.5308, 2350.3384, 2310.4275],
+                    [2384.8064, 2383.737, 2380.2297, 2350.0762],
                 ],
                 [
-                    [2330.5837, 2329.8225, 2329.5264],
-                    [2317.878, 2316.6787, 2316.3088],
-                    [2278.9314, 2269.464, 2268.904],
-                    [2259.975, 2247.7456, 2246.0632],
+                    [2340.8894, 2315.86, 2285.8933, 2258.4436],
+                    [2329.8225, 2316.6787, 2269.464, 2247.7456],
+                    [2373.4402, 2360.5066, 2344.3135, 2287.6785],
+                    [2386.2126, 2385.1553, 2381.4849, 2342.5403],
                 ],
                 [
-                    [2376.7534, 2373.4402, 2372.9192],
-                    [2362.5308, 2360.5066, 2360.2224],
-                    [2350.3384, 2344.3135, 2343.6768],
-                    [2310.4275, 2287.6785, 2281.5872],
-                ],
-                [
-                    [2384.8064, 2386.2126, 2386.632],
-                    [2383.737, 2385.1553, 2385.6685],
-                    [2380.2297, 2381.4849, 2381.8616],
-                    [2350.0762, 2342.5403, 2339.2244],
+                    [2340.557, 2315.2148, 2284.404, 2256.1062],
+                    [2329.5264, 2316.3088, 2268.904, 2246.0632],
+                    [2372.9192, 2360.2224, 2343.6768, 2281.5872],
+                    [2386.632, 2385.6685, 2381.8616, 2339.2244],
                 ],
             ]
         ],
@@ -454,6 +415,15 @@ def test_initial_conditions_data_consistency_plot_save(
     )
 
     initial_conditions_with_bgc_from_climatology.plot(varname="temp", s=0)
+    initial_conditions_with_bgc_from_climatology.plot(
+        varname="temp", s=0, depth_contours=True
+    )
+    initial_conditions_with_bgc_from_climatology.plot(
+        varname="temp", eta=0, layer_contours=True
+    )
+    initial_conditions_with_bgc_from_climatology.plot(
+        varname="temp", xi=0, layer_contours=True
+    )
     initial_conditions_with_bgc_from_climatology.plot(varname="temp", eta=0)
     initial_conditions_with_bgc_from_climatology.plot(varname="temp", xi=0)
     initial_conditions_with_bgc_from_climatology.plot(varname="temp", s=0, xi=0)