diff --git a/polaris/ocean/convergence/convergence.cfg b/polaris/ocean/convergence/convergence.cfg index e4e202244e..5f8b0752d1 100644 --- 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 index 2c95b634e5..a689553e12 100644 --- 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 index 4dc4195b58..079efdd926 100644 --- 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