Use order 2 convergence rates for omega

Author: cbegeman

polaris/ocean/suites/omega_pr.txt

@@ -1,3 +1,4 @@
 ocean/planar/manufactured_solution/convergence_both
+ocean/spherical/icos/rotation_2d/convergence_both
 ocean/spherical/icos/cosine_bell/decomp
 ocean/spherical/icos/cosine_bell/restart

polaris/ocean/tasks/sphere_transport/analysis.py

@@ -71,8 +71,14 @@ def convergence_parameters(self, field_name=None):
             The maximum convergence rate
         """
         config = self.config
+        model = config.get('ocean', 'model')
+        if model == 'omega' and self.case_name == 'rotation_2d':
+            order = 2
+        else:
+            order = 3
         section = config[self.case_name]
-        conv_thresh = section.getfloat(f'convergence_thresh_{field_name}')
+        conv_thresh = section.getfloat(
+            f'convergence_thresh_{field_name}_order{order}')
 
         section = config['convergence']
         error_type = section.get('error_type')

polaris/ocean/tasks/sphere_transport/correlated_tracers_2d.cfg

@@ -9,9 +9,9 @@ vel_amp = 10.
 correlation_coefficients = -0.8, 0.0, 0.9
 
 # convergence threshold below which the test fails
-convergence_thresh_tracer1 = 1.5
-convergence_thresh_tracer2 = 1.3
-convergence_thresh_tracer3 = 1.0
+convergence_thresh_tracer1_order3 = 1.5
+convergence_thresh_tracer2_order3 = 1.3
+convergence_thresh_tracer3_order3 = 1.0
 
 # time in days at which to evaluate mixing
 mixing_evaluation_time = 6.0

polaris/ocean/tasks/sphere_transport/divergent_2d.cfg

@@ -5,6 +5,6 @@
 vel_amp = 5.
 
 # convergence threshold below which the test fails
-convergence_thresh_tracer1 = 1.8
-convergence_thresh_tracer2 = 1.5
-convergence_thresh_tracer3 = 0.3
+convergence_thresh_tracer1_order3 = 1.8
+convergence_thresh_tracer2_order3 = 1.5
+convergence_thresh_tracer3_order3 = 0.3

polaris/ocean/tasks/sphere_transport/nondivergent_2d.cfg

@@ -5,9 +5,9 @@
 vel_amp = 10.
 
 # convergence threshold below which the test fails
-convergence_thresh_tracer1 = 1.5
-convergence_thresh_tracer2 = 1.1
-convergence_thresh_tracer3 = 0.3
+convergence_thresh_tracer1_order3 = 1.5
+convergence_thresh_tracer2_order3 = 1.1
+convergence_thresh_tracer3_order3 = 0.3
 
 # time in days at which to evaluate filament preservation
 filament_evaluation_time = 6.0

polaris/ocean/tasks/sphere_transport/rotation_2d.cfg

@@ -4,7 +4,12 @@
 # rotation vector in cartesian coordinates
 rotation_vector = 0.2, 0.7, 1.0
 
-# convergence threshold below which the test fails
-convergence_thresh_tracer1 = 1.8
-convergence_thresh_tracer2 = 2.0
-convergence_thresh_tracer3 = 0.4
+# convergence threshold below which the test fails for order 3
+convergence_thresh_tracer1_order3 = 1.8
+convergence_thresh_tracer2_order3 = 2.0
+convergence_thresh_tracer3_order3 = 0.4
+
+# convergence threshold below which the test fails for order 2
+convergence_thresh_tracer1_order2 = 1.0
+convergence_thresh_tracer2_order2 = 1.6
+convergence_thresh_tracer3_order2 = 0.3