diff --git a/compass/ocean/tests/global_ocean/mesh/so12to30/so12to30.cfg b/compass/ocean/tests/global_ocean/mesh/so12to30/so12to30.cfg index d0bdfa0351..d7450979bb 100644 --- a/compass/ocean/tests/global_ocean/mesh/so12to30/so12to30.cfg +++ b/compass/ocean/tests/global_ocean/mesh/so12to30/so12to30.cfg @@ -2,28 +2,47 @@ [vertical_grid] # the type of vertical grid -grid_type = index_tanh_dz +grid_type = tanh_dz # Number of vertical levels -vert_levels = 64 +vert_levels = 80 # Depth of the bottom of the ocean bottom_depth = 5500.0 # The minimum layer thickness -min_layer_thickness = 10.0 +min_layer_thickness = 2.0 # The maximum layer thickness -max_layer_thickness = 250.0 +max_layer_thickness = 150.0 -# The characteristic number of levels over which the transition between -# the min and max occurs -transition_levels = 28 +# Options relate to adjusting the sea-surface height or land-ice pressure +# below ice shelves to they are dynamically consistent with one another +[ssh_adjustment] + +# the number of iterations of ssh adjustment to perform +iterations = 4 # options for global ocean testcases [global_ocean] +## config options related to the initial_state step + +# minimum number of vertical levels, both in the open ocean and in ice-shelf +# cavities +min_levels = 5 +cavity_min_levels = ${min_levels} + +# minimum thickness of layers in ice-shelf cavities at the beginning and end +# of iterative ssh init +cavity_min_layer_thickness_initial = 2.0 +cavity_min_layer_thickness_final = 1.0 + +# Maximum allowed Haney number for configurations with ice-shelf cavities +rx1_max = 20.0 + + # the approximate number of cells in the mesh approx_cell_count = 570000