roms-tools 2.6.2__tar.gz → 2.7.0__tar.gz

{roms_tools-2.6.2 → roms_tools-2.7.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: roms-tools
-Version: 2.6.2
+Version: 2.7.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

{roms_tools-2.6.2 → roms_tools-2.7.0}/conftest.py

@@ -9,13 +9,13 @@ from roms_tools import (
     RiverForcing,
 )
 from roms_tools.setup.datasets import (
+    TPXODataset,
     GLORYSDataset,
     ERA5Dataset,
     CESMBGCDataset,
     CESMBGCSurfaceForcingDataset,
     UnifiedBGCDataset,
     UnifiedBGCSurfaceDataset,
-    TPXODataset,
 )
 from roms_tools.download import download_test_data
 import hashlib
@@ -91,10 +91,16 @@ def tidal_forcing(request, use_dask):
     grid = Grid(
         nx=3, ny=3, size_x=1500, size_y=1500, center_lon=235, center_lat=25, rot=-20
     )
-    fname = Path(download_test_data("TPXO_regional_test_data.nc"))
+    fname_grid = Path(download_test_data("regional_grid_tpxo10v2.nc"))
+    fname_h = Path(download_test_data("regional_h_tpxo10v2.nc"))
+    fname_u = Path(download_test_data("regional_u_tpxo10v2.nc"))
+    fname_dict = {"grid": fname_grid, "h": fname_h, "u": fname_u}
 
     return TidalForcing(
-        grid=grid, source={"name": "TPXO", "path": fname}, ntides=1, use_dask=use_dask
+        grid=grid,
+        source={"name": "TPXO", "path": fname_dict},
+        ntides=1,
+        use_dask=use_dask,
     )
 
 
@@ -724,10 +730,14 @@ def glorys_data(request, use_dask):
 
 @pytest.fixture(scope="session")
 def tpxo_data(request, use_dask):
-    fname = download_test_data("TPXO_regional_test_data.nc")
+    fname = download_test_data("regional_h_tpxo10v2a.nc")
+    fname_grid = download_test_data("regional_grid_tpxo10v2a.nc")
 
     data = TPXODataset(
         filename=fname,
+        grid_filename=fname_grid,
+        location="h",
+        var_names={"ssh_Re": "hRe", "ssh_Im": "hIm"},
         use_dask=use_dask,
     )
 

{roms_tools-2.6.2 → roms_tools-2.7.0}/docs/api.rst

@@ -50,6 +50,14 @@ River Forcing
 
    roms_tools.RiverForcing
 
+CDR Forcing
+--------------------
+
+.. autosummary::
+   :toctree: generated/
+
+   roms_tools.CDRVolumePointSource
+
 Nesting
 --------------------