Update other ocean tasks for config_models

polaris/ocean/tasks/baroclinic_channel/forward.py

@@ -86,7 +86,8 @@ def __init__(self, component, resolution, name='forward', subdir=None,
         if nu is not None:
             # update the viscosity to the requested value *after* loading
             # forward.yaml
-            self.add_model_config_options(options=dict(config_mom_del2=nu))
+            self.add_model_config_options(options=dict(config_mom_del2=nu),
+                                          config_model='mpas-ocean')
 
         self.add_output_file(
             filename='output.nc',
@@ -153,4 +154,5 @@ def dynamic_model_config(self, at_setup):
         self.dt = dt
         self.btr_dt = btr_dt
 
-        self.add_model_config_options(options=options)
+        self.add_model_config_options(options=options,
+                                      config_model='mpas-ocean')

polaris/ocean/tasks/baroclinic_channel/forward.yaml

@@ -1,4 +1,4 @@
-omega:
+mpas-ocean:
   io:
     config_write_output_on_startup: false
   hmix_del2:

polaris/ocean/tasks/baroclinic_channel/restart/forward.yaml

@@ -1,4 +1,4 @@
-omega:
+mpas-ocean:
   time_management:
     config_start_time: {{ start_time }}
     config_run_duration: {{ run_duration }}

polaris/ocean/tasks/baroclinic_channel/rpe/forward.yaml

@@ -1,4 +1,4 @@
-omega:
+mpas-ocean:
   time_management:
     config_run_duration: 20_00:00:00
   streams:

polaris/ocean/tasks/cosine_bell/forward.yaml

@@ -1,4 +1,4 @@
-omega:
+mpas-ocean:
   run_modes:
     config_ocean_run_mode: forward
   time_management:

polaris/ocean/tasks/geostrophic/forward.yaml

@@ -1,4 +1,4 @@
-omega:
+mpas-ocean:
   time_management:
     config_run_duration: {{ run_duration }}
   time_integration:

polaris/ocean/tasks/ice_shelf_2d/forward.yaml

@@ -1,4 +1,4 @@
-omega:
+mpas-ocean:
   io:
     config_write_output_on_startup: false
   hmix_del2:

polaris/ocean/tasks/ice_shelf_2d/global_stats.yaml

@@ -1,4 +1,4 @@
-omega:
+mpas-ocean:
   AM_globalStats:
     config_AM_globalStats_enable: true
     config_AM_globalStats_compute_on_startup: true

polaris/ocean/tasks/ice_shelf_2d/ssh_forward.yaml

@@ -1,4 +1,4 @@
-omega:
+mpas-ocean:
   hmix_del2:
     config_use_mom_del2: true
     config_mom_del2: 10.0

polaris/ocean/tasks/ice_shelf_2d/tidal_forcing.yaml

@@ -1,4 +1,4 @@
-omega:
+mpas-ocean:
   tidal_forcing:
     config_use_tidal_forcing: true
     config_use_tidal_forcing_tau: 10000

polaris/ocean/tasks/inertial_gravity_wave/forward.yaml

@@ -1,4 +1,4 @@
-omega:
+mpas-ocean:
   time_management:
     config_run_duration: {{ run_duration }}
   time_integration:

polaris/ocean/tasks/internal_wave/forward.py

@@ -76,12 +76,14 @@ def __init__(self, component, name='forward', subdir=None, indir=None,
         if nu is not None:
             # update the viscosity to the requested value *after* loading
             # forward.yaml
-            self.add_model_config_options(options=dict(config_mom_del2=nu))
+            self.add_model_config_options(options=dict(config_mom_del2=nu),
+                                          config_model='mpas-ocean')
 
         vadv_dict = {'standard': 'flux-form',
                      'vlr': 'remap'}
         self.add_model_config_options({
-            'config_vert_advection_method': f"{vadv_dict[vadv_method]}"})
+            'config_vert_advection_method': f"{vadv_dict[vadv_method]}"},
+            config_model='mpas-ocean')
 
         self.add_output_file(
             filename='output.nc',
@@ -136,4 +138,5 @@ def dynamic_model_config(self, at_setup):
             run_seconds = self.run_time_steps * dt
             options['config_run_duration'] = \
                 time.strftime('%H:%M:%S', time.gmtime(run_seconds))
-        self.add_model_config_options(options=options)
+        self.add_model_config_options(options=options,
+                                      config_model='mpas-ocean')

polaris/ocean/tasks/internal_wave/forward.yaml

@@ -1,4 +1,4 @@
-omega:
+mpas-ocean:
   time_management:
     config_run_duration: 0000_00:15:00
   time_integration:

polaris/ocean/tasks/internal_wave/rpe/forward.yaml

@@ -1,4 +1,4 @@
-omega:
+mpas-ocean:
   time_management:
     config_run_duration: 20_00:00:00
   streams:

polaris/ocean/tasks/single_column/forward.yaml

@@ -1,4 +1,4 @@
-omega:
+mpas-ocean:
   run_modes:
     config_ocean_run_mode: forward
   time_management:

polaris/ocean/tasks/single_column/ideal_age/forward.yaml

@@ -1,4 +1,4 @@
-omega:
+mpas-ocean:
   tracer_forcing_idealAgeTracers:
     config_use_idealAgeTracers: true
     config_use_idealAgeTracers_idealAge_forcing: true

polaris/ocean/tasks/sphere_transport/forward.py

@@ -40,8 +40,11 @@ def __init__(self, component, name, subdir, resolution, base_mesh, init,
                    'nondivergent_2d': 2,
                    'divergent_2d': 3,
                    'correlated_tracers_2d': 4}
-        namelist_options = dict(
-            config_transport_tests_flow_id=flow_id[case_name])
+        namelist_options = {
+            'mpas-ocean': {
+                'config_transport_tests_flow_id': flow_id[case_name]
+            }
+        }
         validate_vars = ['normalVelocity', 'tracer1', 'tracer2', 'tracer3']
         super().__init__(component=component, name=name, subdir=subdir,
                          resolution=resolution, mesh=base_mesh,

polaris/ocean/tasks/sphere_transport/forward.yaml

@@ -1,4 +1,4 @@
-omega:
+mpas-ocean:
   run_modes:
     config_ocean_run_mode: forward
   time_management: