New Mesh: WC14to60E3r2

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)
 

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
 
@@ -39,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/MPAS-Model/pull/628
+pull_request = https://github.com/MPAS-Dev/compass/pull/707
 
 
 # config options related to initial condition and diagnostics support files

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}'])