Merge pull request #239 from cbegeman/fixup-convergence-time-integrator

Map time integrator for convergence tests

This PR uses a mapping between MPAS-O and Omega time integrator namelist options in the convergence forward step rather than in the manufactured solution test case. As more non-convergence Omega tests and supported Omega time integration schemes are added, this mapping may be moved.

polaris/ocean/convergence/forward.py

@@ -117,7 +117,6 @@ def dynamic_model_config(self, at_setup):
         section = config['convergence_forward']
 
         time_integrator = section.get('time_integrator')
-
         # dt is proportional to resolution: default 30 seconds per km
         if time_integrator == 'RK4':
             dt_per_km = section.getfloat('rk4_dt_per_km')
@@ -139,6 +138,16 @@ def dynamic_model_config(self, at_setup):
         output_interval_str = get_time_interval_string(
             seconds=output_interval * s_per_hour)
 
+        time_integrator_map = dict([('RK4', 'RungeKutta4')])
+        model = config.get('ocean', 'model')
+        if model == 'omega':
+            if time_integrator in time_integrator_map.keys():
+                time_integrator = time_integrator_map[time_integrator]
+            else:
+                print('Warning: mapping from time integrator '
+                      f'{time_integrator} to omega not found, '
+                      'retaining name given in config')
+
         replacements = dict(
             time_integrator=time_integrator,
             dt=dt_str,

polaris/ocean/tasks/manufactured_solution/__init__.py

@@ -71,13 +71,3 @@ def __init__(self, component):
         self.config.add_from_package(
             'polaris.ocean.tasks.manufactured_solution',
             'manufactured_solution.cfg')
-
-    def configure(self):
-        """
-        Set omega default config options
-        """
-        super().configure()
-        config = self.config
-        model = config.get('ocean', 'model')
-        if model == 'omega':
-            config.set('convergence_forward', 'time_integrator', 'RungeKutta4')