Merge pull request #801 from xylar/create-rrswisc6to18e3r5

New Mesh: RRSwISC6to18E3r5

compass/ocean/tests/global_ocean/mesh/rrs6to18/dynamic_adjustment.yaml

@@ -63,6 +63,6 @@ dynamic_adjustment:
       run_duration: 18_00:00:00
       output_interval: 10_00:00:00
       restart_interval: 06_00:00:00
-      dt: 00:06:00
-      btr_dt: 00:00:12
+      dt: 00:05:00
+      btr_dt: 00:00:10
       Rayleigh_damping_coeff: None

compass/ocean/tests/global_ocean/mesh/rrs6to18/namelist.init

@@ -4,4 +4,6 @@ config_rx1_vert_smooth_weight = 10.0
 config_rx1_slope_weight = 1e-1
 config_rx1_zstar_weight = 10.0
 config_rx1_horiz_smooth_open_ocean_cells = 40
-config_rx1_min_layer_thickness = 0.1
+config_rx1_min_levels = 8
+config_rx1_min_layer_thickness = 2.5
+config_global_ocean_minimum_depth = 20.0

compass/ocean/tests/global_ocean/mesh/rrs6to18/rrs6to18.cfg

@@ -52,21 +52,22 @@ approx_cell_count = 4000000
 # the prefix (e.g. QU, EC, WC, SO)
 prefix = RRS
 # a description of the mesh and initial condition
-mesh_description = MPAS Eddy Closure mesh for E3SM version ${e3sm_version} with
-                   enhanced resolution around the equator (30 km), South pole
-                   (35 km), Greenland (${min_res} km), ${max_res}-km resolution
-                   at mid latitudes, and ${levels} vertical levels
+mesh_description = MPAS Rossby-radius scaled (RRS) mesh for E3SM version
+                   ${e3sm_version} with ${min_res}-km resolution at the poles,
+                   ${max_res}-km resolution at the equator, and <<<levels>>>
+                   vertical levels. This mesh includes cavities under the ice
+                   shelves around Antarctica.
 # E3SM version that the mesh is intended for
 e3sm_version = 3
 # The revision number of the mesh, which should be incremented each time the
 # mesh is revised
-mesh_revision = 1
+mesh_revision = 5
 # the minimum (finest) resolution in the mesh
 min_res = 6
 # the maximum (coarsest) resolution in the mesh, can be the same as min_res
 max_res = 18
 # The URL of the pull request documenting the creation of the mesh
-pull_request = <<<Missing>>>
+pull_request = https://github.com/MPAS-Dev/compass/pull/801
 
 
 # config options related to remapping topography to an MPAS-Ocean mesh