Skip to content

Commit

Permalink
Update mesh mask file to mesh_mask202108.nc
Browse files Browse the repository at this point in the history
Change mesh mask file name to mesh_mask202108.nc in config and tests. Excluded
configs:
* nowcast-dev - because we're going to drop it
* nowcast-agrif - still running NEMO 201702 config
* vhfr fvcom - because we have dropped those runs
  • Loading branch information
douglatornell committed Dec 30, 2023
1 parent e5733ec commit a110542
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 11 deletions.
10 changes: 5 additions & 5 deletions config/nowcast.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ temperature salinity:
# **Must be quoted to project {} characters**
file template: 'LiveOcean_v201905_{:y%Ym%md%d}.nc'
# Mesh mask from which to get grid parameters for boundary conditions files
mesh mask: /SalishSeaCast/grid/mesh_mask201702.nc
mesh mask: /SalishSeaCast/grid/mesh_mask202108.nc
# Parameter set to use to convert from LiveOcean to SalishSeaCast
parameter set: v201905

Expand Down Expand Up @@ -288,7 +288,7 @@ run types:
config name: SalishSeaCast_Blue
coordinates: coordinates_seagrid_SalishSea201702.nc
bathymetry: bathymetry_201702.nc
mesh mask: mesh_mask201702.nc
mesh mask: mesh_mask202108.nc
land processor elimination: bathymetry_201702.csv
duration: 1 # day
restart from: nowcast-green
Expand All @@ -304,7 +304,7 @@ run types:
config name: SalishSeaCast
coordinates: coordinates_seagrid_SalishSea201702.nc
bathymetry: bathymetry_201702.nc
mesh mask: mesh_mask201702.nc
mesh mask: mesh_mask202108.nc
land processor elimination: bathymetry_201702.csv
duration: 1 # day
restart from: nowcast-green
Expand All @@ -321,15 +321,15 @@ run types:
config name: SalishSeaCast_Blue
coordinates: coordinates_seagrid_SalishSea201702.nc
bathymetry: bathymetry_201702.nc
mesh mask: mesh_mask201702.nc
mesh mask: mesh_mask202108.nc
land processor elimination: bathymetry_201702.csv
duration: 1.5 # days
restart from: nowcast
forecast2:
config name: SalishSeaCast_Blue
coordinates: coordinates_seagrid_SalishSea201702.nc
bathymetry: bathymetry_201702.nc
mesh mask: mesh_mask201702.nc
mesh mask: mesh_mask202108.nc
land processor elimination: bathymetry_201702.csv
duration: 1.25 # days
restart from: forecast
Expand Down
6 changes: 3 additions & 3 deletions tests/workers/test_make_CHS_currents_file.py
Original file line number Diff line number Diff line change
Expand Up @@ -141,9 +141,9 @@ def test_figures_section(self, prod_config):

def test_run_types_section(self, prod_config):
run_types = prod_config["run types"]
assert run_types["nowcast"]["mesh mask"] == "mesh_mask201702.nc"
assert run_types["forecast"]["mesh mask"] == "mesh_mask201702.nc"
assert run_types["forecast2"]["mesh mask"] == "mesh_mask201702.nc"
assert run_types["nowcast"]["mesh mask"] == "mesh_mask202108.nc"
assert run_types["forecast"]["mesh mask"] == "mesh_mask202108.nc"
assert run_types["forecast2"]["mesh mask"] == "mesh_mask202108.nc"

def test_results_archive_section(self, prod_config):
results_archive = prod_config["results archive"]
Expand Down
2 changes: 1 addition & 1 deletion tests/workers/test_make_live_ocean_files.py
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ def test_temperature_salinity_section(self, prod_config):
)
assert (
temperature_salinity["mesh mask"]
== "/SalishSeaCast/grid/mesh_mask201702.nc"
== "/SalishSeaCast/grid/mesh_mask202108.nc"
)
assert (
temperature_salinity["download"]["dest dir"]
Expand Down
2 changes: 1 addition & 1 deletion tests/workers/test_make_surface_current_tiles.py
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ def test_run_types_section(self, run_type, prod_config):
== "coordinates_seagrid_SalishSea201702.nc"
)
assert run_types[run_type]["bathymetry"] == "bathymetry_201702.nc"
assert run_types[run_type]["mesh mask"] == "mesh_mask201702.nc"
assert run_types[run_type]["mesh mask"] == "mesh_mask202108.nc"


@pytest.mark.parametrize("run_type", ("nowcast-green", "forecast", "forecast2"))
Expand Down
2 changes: 1 addition & 1 deletion tests/workers/test_make_ww3_current_file.py
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ def test_wave_forecasts_section(self, prod_config):

def test_run_types_section(self, prod_config):
run_types = prod_config["run types"]
assert run_types["nowcast"]["mesh mask"] == "mesh_mask201702.nc"
assert run_types["nowcast"]["mesh mask"] == "mesh_mask202108.nc"


@pytest.mark.parametrize("run_type", ["forecast2", "forecast"])
Expand Down

0 comments on commit a110542

Please sign in to comment.