roms-tools 2.4.0__py3-none-any.whl → 2.5.0__py3-none-any.whl

roms_tools/tests/test_setup/test_surface_forcing.py

@@ -351,6 +351,53 @@ def test_successful_initialization_with_global_data(grid_fixture, request, use_d
             assert not sfc_forcing.use_coarse_grid
 
 
+def test_start_time_end_time_error(use_dask):
+    """Test error when start_time and end_time are not both provided or both None."""
+    # Case 1: Only start_time provided
+    with pytest.raises(
+        ValueError, match="Both `start_time` and `end_time` must be provided together"
+    ):
+        SurfaceForcing(
+            grid=None,
+            start_time=datetime(2022, 1, 1),
+            end_time=None,  # end_time is None, should raise an error
+            source={"name": "ERA5", "path": "era5_data.nc"},
+            use_dask=use_dask,
+        )
+
+    # Case 2: Only end_time provided
+    with pytest.raises(
+        ValueError, match="Both `start_time` and `end_time` must be provided together"
+    ):
+        SurfaceForcing(
+            grid=None,
+            start_time=None,  # start_time is None, should raise an error
+            end_time=datetime(2022, 1, 2),
+            source={"name": "ERA5", "path": "era5_data.nc"},
+            use_dask=use_dask,
+        )
+
+
+def test_start_time_end_time_warning(grid_that_straddles_dateline, use_dask, caplog):
+    """Test that a warning is triggered when both start_time and end_time are None."""
+    fname = Path(download_test_data("ERA5_regional_test_data.nc"))
+
+    with caplog.at_level(logging.INFO):
+        SurfaceForcing(
+            grid=grid_that_straddles_dateline,
+            start_time=None,
+            end_time=None,
+            source={"name": "ERA5", "path": fname},
+            use_dask=use_dask,
+        )
+
+    # Verify the warning message in the log
+    assert (
+        "Both `start_time` and `end_time` are None. No time filtering will be applied to the source data."
+        in caplog.text
+    )
+
+
 def test_nans_filled_in(grid_that_straddles_dateline, use_dask):
     """Test that the surface forcing fields contain no NaNs.
 

roms_tools/tests/test_setup/test_validation.py

@@ -70,7 +70,39 @@ def test_check_results(forcing_fixture, request):
 
     fname = _get_fname(forcing_fixture)
     expected_forcing_ds = xr.open_zarr(fname, decode_timedelta=False)
-
     forcing = request.getfixturevalue(forcing_fixture)
 
-    xr.testing.assert_allclose(forcing.ds, expected_forcing_ds, rtol=1.0e-5)
+    xr.testing.assert_allclose(forcing.ds, expected_forcing_ds, rtol=1.0e-5, atol=1e-08)
+
+
+@pytest.mark.parametrize(
+    "forcing_fixture",
+    [
+        "tidal_forcing",
+        "initial_conditions_with_bgc_from_climatology",
+        "surface_forcing",
+        "coarse_surface_forcing",
+        "corrected_surface_forcing",
+        "bgc_surface_forcing",
+        "bgc_surface_forcing_from_climatology",
+        "boundary_forcing",
+        "bgc_boundary_forcing_from_climatology",
+    ],
+)
+def test_dask_vs_no_dask(forcing_fixture, request, tmp_path, use_dask):
+    """Test comparing the forcing created with and without Dask on same platform."""
+
+    if not use_dask:
+        pytest.skip("Test only runs when --use_dask is specified")
+
+    # Get the forcing with Dask
+    forcing_with_dask = request.getfixturevalue(forcing_fixture)
+
+    filepath = tmp_path / "test.yaml"
+    forcing_with_dask.to_yaml(filepath)
+
+    # Get the forcing without Dask
+    forcing_without_dask = type(forcing_with_dask).from_yaml(filepath, use_dask=False)
+
+    # Compare the two datasets using assert_equal (only within the same platform)
+    xr.testing.assert_equal(forcing_with_dask.ds, forcing_without_dask.ds)

{roms_tools-2.4.0.dist-info → roms_tools-2.5.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: roms-tools
-Version: 2.4.0
+Version: 2.5.0
 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