diff --git a/compass/ocean/tests/global_ocean/global_ocean.cfg b/compass/ocean/tests/global_ocean/global_ocean.cfg
index 9d032e857a..a2c0b75504 100644
--- a/compass/ocean/tests/global_ocean/global_ocean.cfg
+++ b/compass/ocean/tests/global_ocean/global_ocean.cfg
@@ -47,6 +47,11 @@ btr_dt_per_km = 1.5
# Maximum allowed Haney number for configurations with ice-shelf cavities
rx1_max = 20
+# the number of iterations of topography smoothing
+topo_smooth_iterations = 0
+# the weight given to the central cell during each iteration of smoothing,
+# where the n cellsOnCell (neighbors) are given a weight (1-weight)/n.
+topo_smooth_weight = 0.9
# number of cores to use
init_ntasks = 36
diff --git a/compass/ocean/tests/global_ocean/init/initial_state.py b/compass/ocean/tests/global_ocean/init/initial_state.py
index d9ea96eedf..82c6d76c2f 100644
--- a/compass/ocean/tests/global_ocean/init/initial_state.py
+++ b/compass/ocean/tests/global_ocean/init/initial_state.py
@@ -139,9 +139,21 @@ def setup(self):
Get resources at setup from config options
"""
self._get_resources()
- rx1_max = self.config.getfloat('global_ocean', 'rx1_max')
- self.add_namelist_options({'config_rx1_max': f'{rx1_max}'},
- mode='init')
+ section = self.config['global_ocean']
+ rx1_max = section.getfloat('rx1_max')
+ topo_smooth_iterations = section.getint('topo_smooth_iterations')
+ topo_smooth_weight = section.getfloat('topo_smooth_weight')
+
+ options = {
+ 'config_rx1_max':
+ f'{rx1_max}',
+ 'config_global_ocean_topography_smooth_iterations':
+ f'{topo_smooth_iterations}',
+ 'config_global_ocean_topography_smooth_weight':
+ f'{topo_smooth_weight}',
+ }
+
+ self.add_namelist_options(options, mode='init')
def constrain_resources(self, available_resources):
"""
diff --git a/compass/ocean/tests/global_ocean/init/namelist.init b/compass/ocean/tests/global_ocean/init/namelist.init
index aa4b5efc83..1661fe08c6 100644
--- a/compass/ocean/tests/global_ocean/init/namelist.init
+++ b/compass/ocean/tests/global_ocean/init/namelist.init
@@ -53,4 +53,3 @@ config_global_ocean_depth_conversion_factor = 1.0
config_global_ocean_minimum_depth = 10
config_global_ocean_deepen_critical_passages = .false.
config_block_decomp_file_prefix = 'graph.info.part.'
-config_global_ocean_topography_smooth_iterations = 0
diff --git a/compass/ocean/tests/global_ocean/mesh/ec30to60/ec30to60.cfg b/compass/ocean/tests/global_ocean/mesh/ec30to60/ec30to60.cfg
index cd8e91d994..6b01b43600 100644
--- a/compass/ocean/tests/global_ocean/mesh/ec30to60/ec30to60.cfg
+++ b/compass/ocean/tests/global_ocean/mesh/ec30to60/ec30to60.cfg
@@ -25,7 +25,7 @@ transition_levels = 28
[global_ocean]
# Maximum allowed Haney number for configurations with ice-shelf cavities
-rx1_max = 10
+rx1_max = 5
# the approximate number of cells in the mesh
approx_cell_count = 240000
@@ -42,10 +42,10 @@ mesh_description = MPAS Eddy Closure mesh for E3SM version ${e3sm_version} with
e3sm_version = 3
# The revision number of the mesh, which should be incremented each time the
# mesh is revised
-mesh_revision = 2
+mesh_revision = 4
# the minimum (finest) resolution in the mesh
min_res = 30
# 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/689
+pull_request = https://github.com/MPAS-Dev/compass/pull/728
diff --git a/compass/ocean/tests/global_ocean/streams.forward b/compass/ocean/tests/global_ocean/streams.forward
index 56ca24f4a9..767b381610 100644
--- a/compass/ocean/tests/global_ocean/streams.forward
+++ b/compass/ocean/tests/global_ocean/streams.forward
@@ -18,6 +18,7 @@
+