Merge pull request #232 from xylar/fix-omega-time-integrator

Set default `time_integrator` for Omega
E3SM-Project · Oct 15, 2024 · ece864c · ece864c
2 parents 8356cef + 5bc4d53
commit ece864c
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/polaris/ocean/convergence/convergence.cfg b/polaris/ocean/convergence/convergence.cfg
@@ -12,7 +12,9 @@ error_type = l2
 # config options for convergence forward steps
 [convergence_forward]
 
-# time integrator: {'split_explicit', 'RK4'}
+# time integrator
+#  mpas-ocean: {'split_explicit', 'RK4'}
+#  omega: {'Forward-Backward', 'RungeKutta4', 'RungeKutta2'}
 time_integrator = RK4
 
 # RK4 time step per resolution (s/km), since dt is proportional to resolution

diff --git a/polaris/ocean/tasks/manufactured_solution/__init__.py b/polaris/ocean/tasks/manufactured_solution/__init__.py
@@ -71,3 +71,13 @@ 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')
diff --git a/polaris/ocean/tasks/manufactured_solution/manufactured_solution.cfg b/polaris/ocean/tasks/manufactured_solution/manufactured_solution.cfg
@@ -69,7 +69,9 @@ error_type = l2
 # config options for spherical convergence tests
 [convergence_forward]
 
-# time integrator: {'split_explicit', 'RK4'}
+# time integrator
+#  mpas-ocean: {'split_explicit', 'RK4'}
+#  omega: {'Forward-Backward', 'RungeKutta4', 'RungeKutta2'}
 time_integrator = RK4
 
 # RK4 time step per resolution (s/km), since dt is proportional to resolution