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

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

@@ -38,10 +38,7 @@
             "_ARRAY_DIMENSIONS": [
                 "bry_time"
             ],
-            "axis": "T",
             "calendar": "gregorian",
-            "long_name": "Time",
-            "standard_name": "time",
             "units": "seconds since 1970-01-01"
         },
         "bry_time/.zarray": {
@@ -892,7 +889,6 @@
             ],
             "coordinates": "abs_time",
             "long_name": "eastern boundary sea surface height",
-            "standard_name": "sea_surface_height_above_geoid",
             "units": "m"
         },
         "zeta_north/.zarray": {
@@ -924,7 +920,6 @@
             ],
             "coordinates": "abs_time",
             "long_name": "northern boundary sea surface height",
-            "standard_name": "sea_surface_height_above_geoid",
             "units": "m"
         },
         "zeta_south/.zarray": {
@@ -956,7 +951,6 @@
             ],
             "coordinates": "abs_time",
             "long_name": "southern boundary sea surface height",
-            "standard_name": "sea_surface_height_above_geoid",
             "units": "m"
         },
         "zeta_west/.zarray": {
@@ -988,7 +982,6 @@
             ],
             "coordinates": "abs_time",
             "long_name": "western boundary sea surface height",
-            "standard_name": "sea_surface_height_above_geoid",
             "units": "m"
         }
     },

roms_tools/tests/test_setup/test_data/boundary_forcing.zarr/abs_time/.zattrs

@@ -2,9 +2,6 @@
     "_ARRAY_DIMENSIONS": [
         "bry_time"
     ],
-    "axis": "T",
     "calendar": "gregorian",
-    "long_name": "Time",
-    "standard_name": "time",
     "units": "seconds since 1970-01-01"
 }

roms_tools/tests/test_setup/test_data/boundary_forcing.zarr/zeta_east/.zattrs

@@ -5,6 +5,5 @@
     ],
     "coordinates": "abs_time",
     "long_name": "eastern boundary sea surface height",
-    "standard_name": "sea_surface_height_above_geoid",
     "units": "m"
 }

roms_tools/tests/test_setup/test_data/boundary_forcing.zarr/zeta_north/.zattrs

@@ -5,6 +5,5 @@
     ],
     "coordinates": "abs_time",
     "long_name": "northern boundary sea surface height",
-    "standard_name": "sea_surface_height_above_geoid",
     "units": "m"
 }

roms_tools/tests/test_setup/test_data/boundary_forcing.zarr/zeta_south/.zattrs

@@ -5,6 +5,5 @@
     ],
     "coordinates": "abs_time",
     "long_name": "southern boundary sea surface height",
-    "standard_name": "sea_surface_height_above_geoid",
     "units": "m"
 }

roms_tools/tests/test_setup/test_data/boundary_forcing.zarr/zeta_west/.zattrs

@@ -5,6 +5,5 @@
     ],
     "coordinates": "abs_time",
     "long_name": "western boundary sea surface height",
-    "standard_name": "sea_surface_height_above_geoid",
     "units": "m"
 }

roms_tools/tests/test_setup/test_datasets.py

@@ -1,4 +1,5 @@
 import pytest
+import logging
 from datetime import datetime
 import numpy as np
 import xarray as xr
@@ -229,12 +230,12 @@ def test_multiple_matching_times(
     assert dataset.ds["time"].values == np.datetime64(datetime(2022, 2, 1, 0, 0))
 
 
-def test_warnings_times(global_dataset, tmp_path, use_dask):
+def test_warnings_times(global_dataset, tmp_path, caplog, use_dask):
     """Test handling when no matching times are found."""
     # Create a temporary file
     filepath = tmp_path / "test.nc"
     global_dataset.to_netcdf(filepath)
-    with pytest.warns(Warning, match="No records found at or before the start_time."):
+    with caplog.at_level(logging.WARNING):
         start_time = datetime(2021, 1, 1)
         end_time = datetime(2021, 2, 1)
 
@@ -245,8 +246,10 @@ def test_warnings_times(global_dataset, tmp_path, use_dask):
             end_time=end_time,
             use_dask=use_dask,
         )
+    # Verify the warning message in the log
+    assert "No records found at or before the start_time." in caplog.text
 
-    with pytest.warns(Warning, match="No records found at or after the end_time."):
+    with caplog.at_level(logging.WARNING):
         start_time = datetime(2024, 1, 1)
         end_time = datetime(2024, 2, 1)
 
@@ -257,6 +260,8 @@ def test_warnings_times(global_dataset, tmp_path, use_dask):
             end_time=end_time,
             use_dask=use_dask,
         )
+    # Verify the warning message in the log
+    assert "No records found at or after the end_time." in caplog.text
 
 
 def test_from_ds(global_dataset, global_dataset_with_noon_times, use_dask, tmp_path):

roms_tools/tests/test_setup/test_grid.py

@@ -1,4 +1,5 @@
 import pytest
+import logging
 import xarray as xr
 from roms_tools import Grid
 import importlib.metadata
@@ -390,7 +391,7 @@ def test_from_yaml_missing_grid(tmp_path):
         yaml_filepath.unlink()
 
 
-def test_from_yaml_version_mismatch(tmp_path):
+def test_from_yaml_version_mismatch(tmp_path, caplog):
     yaml_content = textwrap.dedent(
         """\
     ---
@@ -423,11 +424,11 @@ def test_from_yaml_version_mismatch(tmp_path):
             with open(yaml_filepath, "w") as f:
                 f.write(yaml_content)
 
-        with pytest.warns(
-            UserWarning,
-            match="Current roms-tools version.*does not match the version in the YAML header.*",
-        ):
+        with caplog.at_level(logging.WARNING):
             Grid.from_yaml(yaml_filepath)
 
+        # Verify the warning message in the log
+        assert "Current roms-tools version" in caplog.text
+
         yaml_filepath = Path(yaml_filepath)
         yaml_filepath.unlink()

roms_tools/tests/test_setup/test_initial_conditions.py

@@ -176,10 +176,8 @@ def test_interpolation_from_climatology(
     )
 
 
-def test_initial_conditions_plot_save(
-    initial_conditions_with_bgc_from_climatology, tmp_path
-):
-    """Test plot and save methods."""
+def test_initial_conditions_plot(initial_conditions_with_bgc_from_climatology):
+    """Test plot method."""
 
     initial_conditions_with_bgc_from_climatology.plot(var_name="temp", s=0)
     initial_conditions_with_bgc_from_climatology.plot(
@@ -213,6 +211,12 @@ def test_initial_conditions_plot_save(
     initial_conditions_with_bgc_from_climatology.plot(var_name="ALK", s=0, xi=0)
     initial_conditions_with_bgc_from_climatology.plot(var_name="ALK", eta=0, xi=0)
 
+
+def test_initial_conditions_save(
+    initial_conditions_with_bgc_from_climatology, tmp_path
+):
+    """Test save method."""
+
     for file_str in ["test_ic", "test_ic.nc"]:
         # Create a temporary filepath using the tmp_path fixture
         for filepath in [

roms_tools/tests/test_setup/test_surface_forcing.py

@@ -187,12 +187,6 @@ def grid_that_straddles_180_degree_meridian():
 def test_successful_initialization_with_regional_data(grid_fixture, request, use_dask):
     """Test the initialization of SurfaceForcing with regional ERA5 data.
 
-    This test checks the following:
-    1. SurfaceForcing object initializes successfully with provided regional data.
-    2. Attributes such as `start_time`, `end_time`, and `source` are set correctly.
-    3. The dataset contains expected variables, including "uwnd", "vwnd", "swrad", "lwrad", "Tair", "qair", and "rain".
-    4. Surface forcing plots for "uwnd", "vwnd", and "rain" are generated without errors.
-
     The test is performed twice:
     - First with the default fine grid.
     - Then with the coarse grid enabled.
@@ -513,8 +507,8 @@ def test_surface_forcing_pco2_replication(sfc_forcing_fixture, request):
         "coarse_surface_forcing",
     ],
 )
-def test_surface_forcing_plot_save(sfc_forcing_fixture, request, tmp_path):
-    """Test plot and save methods."""
+def test_surface_forcing_save(sfc_forcing_fixture, request, tmp_path):
+    """Test save method."""
     sfc_forcing = request.getfixturevalue(sfc_forcing_fixture)
     sfc_forcing.plot(var_name="uwnd", time=0)
 
@@ -525,16 +519,24 @@ def test_surface_forcing_plot_save(sfc_forcing_fixture, request, tmp_path):
             str(tmp_path / file_str),
         ]:  # test for Path object and str
 
-            # Test saving without partitioning
+            # Test saving without partitioning and grouping
             saved_filenames = sfc_forcing.save(filepath)
             filepath_str = str(Path(filepath).with_suffix(""))
+            expected_filepath = Path(f"{filepath_str}.nc")
+            assert saved_filenames == [expected_filepath]
+            assert expected_filepath.exists()
+            expected_filepath.unlink()
+
+            # Test saving without partitioning but with grouping
+            saved_filenames = sfc_forcing.save(filepath, group=True)
+            filepath_str = str(Path(filepath).with_suffix(""))
             expected_filepath = Path(f"{filepath_str}_202002.nc")
             assert saved_filenames == [expected_filepath]
             assert expected_filepath.exists()
             expected_filepath.unlink()
 
             # Test saving with partitioning
-            saved_filenames = sfc_forcing.save(filepath, np_eta=1)
+            saved_filenames = sfc_forcing.save(filepath, np_eta=1, group=True)
 
             expected_filepath_list = [
                 Path(filepath_str + f"_202002.{index}.nc") for index in range(1)
@@ -545,12 +547,15 @@ def test_surface_forcing_plot_save(sfc_forcing_fixture, request, tmp_path):
                 expected_filepath.unlink()
 
 
-def test_surface_forcing_bgc_plot_save(bgc_surface_forcing, tmp_path):
-    """Test plot and save methods."""
+def test_surface_forcing_bgc_plot(bgc_surface_forcing):
+    """Test plot method."""
 
-    # Check the values in the dataset
     bgc_surface_forcing.plot(var_name="pco2_air", time=0)
 
+
+def test_surface_forcing_bgc_save(bgc_surface_forcing, tmp_path):
+    """Test save method."""
+
     for file_str in ["test_sf", "test_sf.nc"]:
         # Create a temporary filepath using the tmp_path fixture
         for filepath in [
@@ -558,16 +563,24 @@ def test_surface_forcing_bgc_plot_save(bgc_surface_forcing, tmp_path):
             str(tmp_path / file_str),
         ]:  # test for Path object and str
 
-            # Test saving without partitioning
+            # Test saving without partitioning and grouping
             saved_filenames = bgc_surface_forcing.save(filepath)
             filepath_str = str(Path(filepath).with_suffix(""))
+            expected_filepath = Path(f"{filepath_str}.nc")
+            assert saved_filenames == [expected_filepath]
+            assert expected_filepath.exists()
+            expected_filepath.unlink()
+
+            # Test saving without partitioning but with grouping
+            saved_filenames = bgc_surface_forcing.save(filepath, group=True)
+            filepath_str = str(Path(filepath).with_suffix(""))
             expected_filepath = Path(f"{filepath_str}_202002.nc")
             assert saved_filenames == [expected_filepath]
             assert expected_filepath.exists()
             expected_filepath.unlink()
 
             # Test saving with partitioning
-            saved_filenames = bgc_surface_forcing.save(filepath, np_xi=5)
+            saved_filenames = bgc_surface_forcing.save(filepath, np_xi=5, group=True)
 
             expected_filepath_list = [
                 Path(filepath_str + f"_202002.{index}.nc") for index in range(5)
@@ -578,13 +591,10 @@ def test_surface_forcing_bgc_plot_save(bgc_surface_forcing, tmp_path):
                 expected_filepath.unlink()
 
 
-def test_surface_forcing_bgc_from_clim_plot_save(
+def test_surface_forcing_bgc_from_clim_save(
     bgc_surface_forcing_from_climatology, tmp_path
 ):
-    """Test plot and save methods."""
-
-    # Check the values in the dataset
-    bgc_surface_forcing_from_climatology.plot(var_name="pco2_air", time=0)
+    """Test save method."""
 
     for file_str in ["test_sf", "test_sf.nc"]:
         # Create a temporary filepath using the tmp_path fixture
@@ -593,17 +603,27 @@ def test_surface_forcing_bgc_from_clim_plot_save(
             str(tmp_path / file_str),
         ]:  # test for Path object and str
 
-            # Test saving without partitioning
+            # Test saving without partitioning and grouping
             saved_filenames = bgc_surface_forcing_from_climatology.save(filepath)
             filepath_str = str(Path(filepath).with_suffix(""))
+            expected_filepath = Path(f"{filepath_str}.nc")
+            assert saved_filenames == [expected_filepath]
+            assert expected_filepath.exists()
+            expected_filepath.unlink()
+
+            # Test saving without partitioning but with grouping
+            saved_filenames = bgc_surface_forcing_from_climatology.save(
+                filepath, group=True
+            )
+            filepath_str = str(Path(filepath).with_suffix(""))
             expected_filepath = Path(f"{filepath_str}_clim.nc")
             assert saved_filenames == [expected_filepath]
             assert expected_filepath.exists()
             expected_filepath.unlink()
 
-            # Test saving with partitioning
+            # Test saving with partitioning and grouping
             saved_filenames = bgc_surface_forcing_from_climatology.save(
-                filepath, np_eta=5
+                filepath, np_eta=5, group=True
             )
 
             expected_filepath_list = [
@@ -666,9 +686,9 @@ def test_files_have_same_hash(sfc_forcing_fixture, request, tmp_path, use_dask):
     filepath2 = tmp_path / "test2.nc"
 
     sfc_forcing.to_yaml(yaml_filepath)
-    sfc_forcing.save(filepath1)
+    sfc_forcing.save(filepath1, group=True)
     sfc_forcing_from_file = SurfaceForcing.from_yaml(yaml_filepath, use_dask=use_dask)
-    sfc_forcing_from_file.save(filepath2)
+    sfc_forcing_from_file.save(filepath2, group=True)
 
     filepath_str1 = str(Path(filepath1).with_suffix(""))
     filepath_str2 = str(Path(filepath2).with_suffix(""))
@@ -694,9 +714,9 @@ def test_files_have_same_hash_clim(
     filepath2 = tmp_path / "test2.nc"
 
     bgc_surface_forcing_from_climatology.to_yaml(yaml_filepath)
-    bgc_surface_forcing_from_climatology.save(filepath1)
+    bgc_surface_forcing_from_climatology.save(filepath1, group=True)
     sfc_forcing_from_file = SurfaceForcing.from_yaml(yaml_filepath, use_dask=use_dask)
-    sfc_forcing_from_file.save(filepath2)
+    sfc_forcing_from_file.save(filepath2, group=True)
 
     filepath_str1 = str(Path(filepath1).with_suffix(""))
     filepath_str2 = str(Path(filepath2).with_suffix(""))

roms_tools/tests/test_setup/test_tides.py

@@ -169,13 +169,15 @@ def test_insufficient_number_of_consituents(grid_that_straddles_dateline, use_da
         )
 
 
-def test_tidal_forcing_plot_save(tidal_forcing, tmp_path):
-    """Test plot and save methods in the same test since we dask arrays are already
-    computed."""
-    tidal_forcing.ds.load()
+def test_tidal_forcing_plot(tidal_forcing):
+    """Test plot method."""
 
     tidal_forcing.plot(var_name="ssh_Re", ntides=0)
 
+
+def test_tidal_forcing_save(tidal_forcing, tmp_path):
+    """Test save method."""
+
     for file_str in ["test_tides", "test_tides.nc"]:
         # Create a temporary filepath using the tmp_path fixture
         for filepath in [

{roms_tools-1.6.0.dist-info → roms_tools-1.6.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: roms-tools
-Version: 1.6.0
+Version: 1.6.2
 Summary: Tools for running and analysing UCLA-ROMS simulations
 Author-email: Nora Loose <nora.loose@gmail.com>, Thomas Nicholas <tom@cworthy.org>
 License: Apache-2
@@ -15,6 +15,7 @@ Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE