roms-tools 3.3.0__tar.gz → 3.4.0__tar.gz

{roms_tools-3.3.0/roms_tools.egg-info → roms_tools-3.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: roms-tools
-Version: 3.3.0
+Version: 3.4.0
 Summary: Tools for running and analysing UCLA-ROMS simulations
 Author-email: Nora Loose <nora.loose@gmail.com>, Thomas Nicholas <tom@cworthy.org>, Scott Eilerman <scott.eilerman@cworthy.org>
 License: Apache-2

{roms_tools-3.3.0 → roms_tools-3.4.0}/conftest.py

@@ -15,8 +15,8 @@ from roms_tools import (
     SurfaceForcing,
     TidalForcing,
 )
-from roms_tools.download import download_test_data
-from roms_tools.setup.lat_lon_datasets import (
+from roms_tools.datasets.download import download_test_data
+from roms_tools.datasets.lat_lon_datasets import (
     CESMBGCDataset,
     CESMBGCSurfaceForcingDataset,
     ERA5Dataset,
@@ -339,34 +339,6 @@ def initial_conditions_on_large_grid(large_grid, use_dask):
     )
 
 
-@pytest.fixture(scope="session")
-def initial_conditions_adjusted_for_zeta(use_dask: bool) -> InitialConditions:
-    """Fixture for creating an InitialConditions object."""
-    grid = 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
-    )
-
-    fname = Path(download_test_data("GLORYS_coarse_test_data.nc"))
-
-    return InitialConditions(
-        grid=grid,
-        ini_time=datetime(2021, 6, 29),
-        source={"path": fname, "name": "GLORYS"},
-        adjust_depth_for_sea_surface_height=True,
-        use_dask=use_dask,
-    )
-
-
 @pytest.fixture(scope="session")
 def initial_conditions_with_bgc(use_dask: bool) -> InitialConditions:
     """Fixture for creating an InitialConditions object."""
@@ -396,36 +368,6 @@ def initial_conditions_with_bgc(use_dask: bool) -> InitialConditions:
     )
 
 
-@pytest.fixture(scope="session")
-def initial_conditions_with_bgc_adjusted_for_zeta(use_dask: bool) -> InitialConditions:
-    """Fixture for creating an InitialConditions object."""
-    grid = 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
-    )
-
-    fname = Path(download_test_data("GLORYS_coarse_test_data.nc"))
-    fname_bgc = Path(download_test_data("CESM_regional_test_data_one_time_slice.nc"))
-
-    return InitialConditions(
-        grid=grid,
-        ini_time=datetime(2021, 6, 29),
-        source={"path": fname, "name": "GLORYS"},
-        bgc_source={"path": fname_bgc, "name": "CESM_REGRIDDED"},
-        adjust_depth_for_sea_surface_height=True,
-        use_dask=use_dask,
-    )
-
-
 @pytest.fixture(scope="session")
 def initial_conditions_with_bgc_from_climatology(use_dask: bool) -> InitialConditions:
     """Fixture for creating an InitialConditions object."""
@@ -504,24 +446,6 @@ def boundary_forcing(use_dask: bool, small_grid: Grid) -> BoundaryForcing:
     )
 
 
-@pytest.fixture(scope="session")
-def boundary_forcing_adjusted_for_zeta(
-    use_dask: bool, small_grid: Grid
-) -> BoundaryForcing:
-    """Fixture for creating a BoundaryForcing object."""
-    fname1 = Path(download_test_data("GLORYS_NA_20120101.nc"))
-    fname2 = Path(download_test_data("GLORYS_NA_20121231.nc"))
-    return BoundaryForcing(
-        grid=small_grid,
-        start_time=datetime(2012, 1, 1),
-        end_time=datetime(2012, 12, 31),
-        source={"name": "GLORYS", "path": [fname1, fname2]},
-        apply_2d_horizontal_fill=False,
-        adjust_depth_for_sea_surface_height=True,
-        use_dask=use_dask,
-    )
-
-
 @pytest.fixture(scope="session")
 def boundary_forcing_with_2d_fill(use_dask: bool, small_grid: Grid) -> BoundaryForcing:
     """Fixture for creating a BoundaryForcing object."""
@@ -537,24 +461,6 @@ def boundary_forcing_with_2d_fill(use_dask: bool, small_grid: Grid) -> BoundaryF
     )
 
 
-@pytest.fixture(scope="session")
-def boundary_forcing_with_2d_fill_adjusted_for_zeta(
-    use_dask: bool, small_grid: Grid
-) -> BoundaryForcing:
-    """Fixture for creating a BoundaryForcing object."""
-    fname1 = Path(download_test_data("GLORYS_NA_20120101.nc"))
-    fname2 = Path(download_test_data("GLORYS_NA_20121231.nc"))
-    return BoundaryForcing(
-        grid=small_grid,
-        start_time=datetime(2012, 1, 1),
-        end_time=datetime(2012, 12, 31),
-        source={"name": "GLORYS", "path": [fname1, fname2]},
-        apply_2d_horizontal_fill=True,
-        adjust_depth_for_sea_surface_height=True,
-        use_dask=use_dask,
-    )
-
-
 @pytest.fixture(scope="session")
 def bgc_boundary_forcing_from_climatology(use_dask: bool) -> BoundaryForcing:
     """Fixture for creating a BoundaryForcing object."""

{roms_tools-3.3.0 → roms_tools-3.4.0}/docs/api.rst

@@ -88,4 +88,4 @@ Utilities
    roms_tools.tiling.partition.partition_netcdf
    roms_tools.tiling.join.join_netcdf
    roms_tools.plot.plot
-   roms_tools.setup.lat_lon_datasets.get_glorys_bounds
+   roms_tools.datasets.lat_lon_datasets.get_glorys_bounds