From 21ca20fa3d9d9c28a975de126680c289e5d3f333 Mon Sep 17 00:00:00 2001 From: Xylar Asay-Davis Date: Wed, 20 Sep 2023 02:05:00 -0500 Subject: [PATCH 1/5] Update PR URL for WCwISC14to60E3r1 --- compass/ocean/tests/global_ocean/mesh/wc14/wc14.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compass/ocean/tests/global_ocean/mesh/wc14/wc14.cfg b/compass/ocean/tests/global_ocean/mesh/wc14/wc14.cfg index 6e4d0510cc..633e552415 100644 --- a/compass/ocean/tests/global_ocean/mesh/wc14/wc14.cfg +++ b/compass/ocean/tests/global_ocean/mesh/wc14/wc14.cfg @@ -45,7 +45,7 @@ min_res = 14 # the maximum (coarsest) resolution in the mesh, can be the same as min_res max_res = 60 # The URL of the pull request documenting the creation of the mesh -pull_request = https://github.com/MPAS-Dev/MPAS-Model/pull/628 +pull_request = https://github.com/MPAS-Dev/compass/pull/699 # config options related to initial condition and diagnostics support files From ebde8e3b1d3c47a623749b1523d45b1ba5a05b99 Mon Sep 17 00:00:00 2001 From: Xylar Asay-Davis Date: Wed, 20 Sep 2023 03:37:37 -0500 Subject: [PATCH 2/5] Only try to add metadata if a file exists --- compass/ocean/tests/global_ocean/metadata.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compass/ocean/tests/global_ocean/metadata.py b/compass/ocean/tests/global_ocean/metadata.py index aa161b0f10..a8a1370bfd 100644 --- a/compass/ocean/tests/global_ocean/metadata.py +++ b/compass/ocean/tests/global_ocean/metadata.py @@ -107,7 +107,7 @@ def add_mesh_and_init_metadata(output_filenames, config, init_filename): metadata = _get_metadata(dsInit, config) for filename in output_filenames: - if filename.endswith('.nc'): + if filename.endswith('.nc') and os.path.exists(filename): args = ['ncks'] for key, value in metadata.items(): args.extend(['--glb_att_add', f'{key}={value}']) From 29bcd79e3c2115b11ba6d545179f1b50d6a1f51c Mon Sep 17 00:00:00 2001 From: Xylar Asay-Davis Date: Wed, 20 Sep 2023 03:41:58 -0500 Subject: [PATCH 3/5] Only add output.nc to simulation step, not damped adj. Some damped adjustment steps may not produce output.nc and that's allowed. --- .../ocean/tests/global_ocean/dynamic_adjustment/__init__.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/compass/ocean/tests/global_ocean/dynamic_adjustment/__init__.py b/compass/ocean/tests/global_ocean/dynamic_adjustment/__init__.py index 1544f33b53..b51bafbfbe 100644 --- a/compass/ocean/tests/global_ocean/dynamic_adjustment/__init__.py +++ b/compass/ocean/tests/global_ocean/dynamic_adjustment/__init__.py @@ -206,7 +206,8 @@ def _add_step(self, step_name, options, get_dt_from_min_res, if previous_restart_filename is not None: step.add_input_file(filename=f'../{previous_restart_filename}') step.add_output_file(filename=f'../{restart_filename}') - step.add_output_file(filename='output.nc') + if step_name == 'simulation': + step.add_output_file(filename='output.nc') self.add_step(step) From a4e3a699010dfc834572ec1e2c4261ffb24896e7 Mon Sep 17 00:00:00 2001 From: Xylar Asay-Davis Date: Wed, 20 Sep 2023 04:56:44 -0500 Subject: [PATCH 4/5] Reduce the maximum Haney number to 10 As with the EC mesh, this seems to be necessary to avoid large pressure gradient errors. --- compass/ocean/tests/global_ocean/mesh/wc14/wc14.cfg | 3 +++ 1 file changed, 3 insertions(+) diff --git a/compass/ocean/tests/global_ocean/mesh/wc14/wc14.cfg b/compass/ocean/tests/global_ocean/mesh/wc14/wc14.cfg index 633e552415..173d487da3 100644 --- a/compass/ocean/tests/global_ocean/mesh/wc14/wc14.cfg +++ b/compass/ocean/tests/global_ocean/mesh/wc14/wc14.cfg @@ -24,6 +24,9 @@ transition_levels = 28 # options for global ocean testcases [global_ocean] +# Maximum allowed Haney number for configurations with ice-shelf cavities +rx1_max = 10 + # the approximate number of cells in the mesh approx_cell_count = 410000 From 2c0e214dd535525cd66c7a9fdeb456054b0f9dfe Mon Sep 17 00:00:00 2001 From: Xylar Asay-Davis Date: Thu, 28 Sep 2023 09:34:17 -0500 Subject: [PATCH 5/5] Update URL and revision number for WC14to60E3r2 --- compass/ocean/tests/global_ocean/mesh/wc14/wc14.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compass/ocean/tests/global_ocean/mesh/wc14/wc14.cfg b/compass/ocean/tests/global_ocean/mesh/wc14/wc14.cfg index 173d487da3..47431ed47c 100644 --- a/compass/ocean/tests/global_ocean/mesh/wc14/wc14.cfg +++ b/compass/ocean/tests/global_ocean/mesh/wc14/wc14.cfg @@ -42,13 +42,13 @@ mesh_description = MPAS North America and Arctic Focused Water Cycle mesh for E3 e3sm_version = 3 # The revision number of the mesh, which should be incremented each time the # mesh is revised -mesh_revision = 1 +mesh_revision = 2 # the minimum (finest) resolution in the mesh min_res = 14 # the maximum (coarsest) resolution in the mesh, can be the same as min_res max_res = 60 # The URL of the pull request documenting the creation of the mesh -pull_request = https://github.com/MPAS-Dev/compass/pull/699 +pull_request = https://github.com/MPAS-Dev/compass/pull/707 # config options related to initial condition and diagnostics support files