Merge pull request #480 from firedrakeproject/TBendall/SIQN_came_by_2…

…x2_hurrah Change default iterations of SIQN to be 2x2
firedrakeproject · Mar 12, 2024 · 68d6fca · 68d6fca
2 parents 62db9f4 + e033008
commit 68d6fca
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 7 deletions.
diff --git a/gusto/timeloop.py b/gusto/timeloop.py
@@ -480,7 +480,7 @@ def __init__(self, equation_set, io, transport_schemes, spatial_methods,
                  diffusion_schemes=None, physics_schemes=None,
                  slow_physics_schemes=None, fast_physics_schemes=None,
                  alpha=Constant(0.5), off_centred_u=False,
-                 num_outer=4, num_inner=1):
+                 num_outer=2, num_inner=2):
 
         """
         Args:
@@ -522,12 +522,12 @@ def __init__(self, equation_set, io, transport_schemes, spatial_methods,
                 is centred. If True offcentring uses value of alpha.
             num_outer (int, optional): number of outer iterations in the semi-
                 implicit algorithm. The outer loop includes transport and any
-                fast physics schemes. Defaults to 4. Note that default used by
+                fast physics schemes. Defaults to 2. Note that default used by
                 the Met Office's ENDGame and GungHo models is 2.
             num_inner (int, optional): number of inner iterations in the semi-
                 implicit algorithm. The inner loop includes the evaluation of
                 implicit forcing (pressure gradient and Coriolis) terms, and the
-                linear solve. Defaults to 1. Note that default used by the Met
+                linear solve. Defaults to 2. Note that default used by the Met
                 Office's ENDGame and GungHo models is 2.
         """
 

diff --git a/integration-tests/equations/test_dry_compressible.py b/integration-tests/equations/test_dry_compressible.py
@@ -52,7 +52,8 @@ def run_dry_compressible(tmpdir):
     # Time stepper
     stepper = SemiImplicitQuasiNewton(eqn, io, transported_fields,
                                       transport_methods,
-                                      linear_solver=linear_solver)
+                                      linear_solver=linear_solver,
+                                      num_outer=4, num_inner=1)
 
     # ------------------------------------------------------------------------ #
     # Initial conditions

diff --git a/integration-tests/equations/test_incompressible.py b/integration-tests/equations/test_incompressible.py
@@ -50,7 +50,8 @@ def run_incompressible(tmpdir):
     # Time stepper
     stepper = SemiImplicitQuasiNewton(eqn, io, transported_fields,
                                       transport_methods,
-                                      linear_solver=linear_solver)
+                                      linear_solver=linear_solver,
+                                      num_outer=4, num_inner=1)
 
     # ------------------------------------------------------------------------ #
     # Initial conditions

diff --git a/integration-tests/equations/test_moist_compressible.py b/integration-tests/equations/test_moist_compressible.py
@@ -53,7 +53,8 @@ def run_moist_compressible(tmpdir):
     # Time stepper
     stepper = SemiImplicitQuasiNewton(eqn, io, transported_fields,
                                       transport_methods,
-                                      linear_solver=linear_solver)
+                                      linear_solver=linear_solver,
+                                      num_outer=4, num_inner=1)
 
     # ------------------------------------------------------------------------ #
     # Initial conditions

diff --git a/integration-tests/equations/test_sw_fplane.py b/integration-tests/equations/test_sw_fplane.py
@@ -44,7 +44,9 @@ def run_sw_fplane(tmpdir):
                          DGUpwind(eqns, "D")]
 
     # Time stepper
-    stepper = SemiImplicitQuasiNewton(eqns, io, transported_fields, transport_methods)
+    stepper = SemiImplicitQuasiNewton(eqns, io, transported_fields,
+                                      transport_methods,
+                                      num_outer=4, num_inner=1)
 
     # ------------------------------------------------------------------------ #
     # Initial conditions