roms-tools 2.1.0__tar.gz → 2.2.0__tar.gz

{roms_tools-2.1.0 → roms_tools-2.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: roms-tools
-Version: 2.1.0
+Version: 2.2.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.1.0 → roms_tools-2.2.0}/conftest.py

@@ -17,6 +17,7 @@ from roms_tools.setup.datasets import (
 )
 from roms_tools.setup.download import download_test_data
 import hashlib
+from pathlib import Path
 
 
 def pytest_addoption(parser):
@@ -85,7 +86,7 @@ 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 = download_test_data("TPXO_regional_test_data.nc")
+    fname = Path(download_test_data("TPXO_regional_test_data.nc"))
 
     return TidalForcing(
         grid=grid, source={"name": "TPXO", "path": fname}, ntides=1, use_dask=use_dask
@@ -110,7 +111,7 @@ def initial_conditions(request, use_dask):
         hc=250.0,  # critical depth
     )
 
-    fname = download_test_data("GLORYS_coarse_test_data.nc")
+    fname = Path(download_test_data("GLORYS_coarse_test_data.nc"))
 
     return InitialConditions(
         grid=grid,
@@ -138,8 +139,8 @@ def initial_conditions_with_bgc(request, use_dask):
         hc=250.0,  # critical depth
     )
 
-    fname = download_test_data("GLORYS_coarse_test_data.nc")
-    fname_bgc = download_test_data("CESM_regional_test_data_one_time_slice.nc")
+    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,
@@ -168,8 +169,8 @@ def initial_conditions_with_bgc_from_climatology(request, use_dask):
         hc=250.0,  # critical depth
     )
 
-    fname = download_test_data("GLORYS_coarse_test_data.nc")
-    fname_bgc = download_test_data("CESM_regional_test_data_climatology.nc")
+    fname = Path(download_test_data("GLORYS_coarse_test_data.nc"))
+    fname_bgc = Path(download_test_data("CESM_regional_test_data_climatology.nc"))
 
     return InitialConditions(
         grid=grid,
@@ -202,7 +203,7 @@ def boundary_forcing(request, use_dask):
         hc=250.0,  # critical depth
     )
 
-    fname = download_test_data("GLORYS_coarse_test_data.nc")
+    fname = Path(download_test_data("GLORYS_coarse_test_data.nc"))
 
     return BoundaryForcing(
         grid=grid,
@@ -232,7 +233,9 @@ def bgc_boundary_forcing_from_climatology(request, use_dask):
         hc=250.0,  # critical depth
     )
 
-    fname_bgc = download_test_data("CESM_regional_coarse_test_data_climatology.nc")
+    fname_bgc = Path(
+        download_test_data("CESM_regional_coarse_test_data_climatology.nc")
+    )
 
     return BoundaryForcing(
         grid=grid,
@@ -262,7 +265,7 @@ def surface_forcing(request, use_dask):
     start_time = datetime(2020, 1, 31)
     end_time = datetime(2020, 2, 2)
 
-    fname = download_test_data("ERA5_global_test_data.nc")
+    fname = Path(download_test_data("ERA5_global_test_data.nc"))
 
     return SurfaceForcing(
         grid=grid,
@@ -290,7 +293,7 @@ def coarse_surface_forcing(request, use_dask):
     start_time = datetime(2020, 1, 31)
     end_time = datetime(2020, 2, 2)
 
-    fname = download_test_data("ERA5_global_test_data.nc")
+    fname = Path(download_test_data("ERA5_global_test_data.nc"))
 
     return SurfaceForcing(
         grid=grid,
@@ -320,7 +323,7 @@ def corrected_surface_forcing(request, use_dask):
     start_time = datetime(2020, 1, 31)
     end_time = datetime(2020, 2, 2)
 
-    fname = download_test_data("ERA5_global_test_data.nc")
+    fname = Path(download_test_data("ERA5_global_test_data.nc"))
 
     return SurfaceForcing(
         grid=grid,
@@ -348,7 +351,7 @@ def bgc_surface_forcing(request, use_dask):
     start_time = datetime(2020, 2, 1)
     end_time = datetime(2020, 2, 1)
 
-    fname_bgc = download_test_data("CESM_surface_global_test_data.nc")
+    fname_bgc = Path(download_test_data("CESM_surface_global_test_data.nc"))
 
     return SurfaceForcing(
         grid=grid,
@@ -376,7 +379,7 @@ def bgc_surface_forcing_from_climatology(request, use_dask):
     start_time = datetime(2020, 2, 1)
     end_time = datetime(2020, 2, 1)
 
-    fname_bgc = download_test_data("CESM_surface_global_test_data_climatology.nc")
+    fname_bgc = Path(download_test_data("CESM_surface_global_test_data_climatology.nc"))
 
     return SurfaceForcing(
         grid=grid,

{roms_tools-2.1.0 → roms_tools-2.2.0}/docs/releases.md

@@ -1,6 +1,6 @@
 # Release notes
 
-## v2.2.0 (unreleased)
+## v2.3.0 (unreleased)
 
 ### New Features
 
@@ -12,6 +12,14 @@
 
 ### Bugfixes
 
+## v2.2.0
+
+### Bugfixes
+
+* Fix bug in validation of tidal forcing which led to memory blow-ups ([#211](https://github.com/CWorthy-ocean/roms-tools/pull/211))
+* Make sure correct masks are used for validation ([#214](https://github.com/CWorthy-ocean/roms-tools/pull/214))
+* Correctly write Pathlib objects to YAML file ([#212](https://github.com/CWorthy-ocean/roms-tools/pull/212))
+
 ## v2.1.0
 
 ### New Features