diff --git a/compass/ocean/tests/global_ocean/mesh/rrs6to18/dynamic_adjustment.yaml b/compass/ocean/tests/global_ocean/mesh/rrs6to18/dynamic_adjustment.yaml index 8dadf614bd..16c8fb448d 100644 --- a/compass/ocean/tests/global_ocean/mesh/rrs6to18/dynamic_adjustment.yaml +++ b/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 diff --git a/compass/ocean/tests/global_ocean/mesh/rrs6to18/namelist.init b/compass/ocean/tests/global_ocean/mesh/rrs6to18/namelist.init index a5920ecde0..58a2736873 100644 --- a/compass/ocean/tests/global_ocean/mesh/rrs6to18/namelist.init +++ b/compass/ocean/tests/global_ocean/mesh/rrs6to18/namelist.init @@ -4,4 +4,7 @@ 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 +config_min_pc_fraction = 0.2 diff --git a/compass/ocean/tests/global_ocean/mesh/rrs6to18/rrs6to18.cfg b/compass/ocean/tests/global_ocean/mesh/rrs6to18/rrs6to18.cfg index 76aace69b4..a5443e9a98 100644 --- a/compass/ocean/tests/global_ocean/mesh/rrs6to18/rrs6to18.cfg +++ b/compass/ocean/tests/global_ocean/mesh/rrs6to18/rrs6to18.cfg @@ -41,25 +41,31 @@ forward_update_pio = False # the approximate number of cells in the mesh approx_cell_count = 4000000 +# time step per resolution (s/km), since dt is proportional to resolution +dt_per_km = 10 +# barotropic time step per resolution (s/km) +btr_dt_per_km = 0.5 + ## metadata related to the mesh # 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 <<>> + 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 = 7 # 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 = <<>> +pull_request = https://github.com/MPAS-Dev/compass/pull/819 # config options related to remapping topography to an MPAS-Ocean mesh