From e2382c0e8f9c5528773342288ad20c3791c0ccef Mon Sep 17 00:00:00 2001 From: Thomas Bendall Date: Thu, 29 Feb 2024 15:46:55 +0000 Subject: [PATCH 1/5] change default iterations for SIQN to 2x2 --- gusto/timeloop.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gusto/timeloop.py b/gusto/timeloop.py index a63b4abdb..25db9a3c1 100644 --- a/gusto/timeloop.py +++ b/gusto/timeloop.py @@ -479,7 +479,7 @@ def __init__(self, equation_set, io, transport_schemes, spatial_methods, auxiliary_equations_and_schemes=None, linear_solver=None, diffusion_schemes=None, physics_schemes=None, slow_physics_schemes=None, fast_physics_schemes=None, - alpha=Constant(0.5), num_outer=4, num_inner=1): + alpha=Constant(0.5), num_outer=2, num_inner=2): """ Args: @@ -518,12 +518,12 @@ def __init__(self, equation_set, io, transport_schemes, spatial_methods, corresponds to fully explicit. Defaults to Constant(0.5). 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. """ From 81c11a624756d3a9a7093e3b2312a6deebbc4519 Mon Sep 17 00:00:00 2001 From: Thomas Bendall Date: Thu, 29 Feb 2024 15:48:51 +0000 Subject: [PATCH 2/5] set compressible integration-test to use 4x1 --- integration-tests/equations/test_dry_compressible.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/integration-tests/equations/test_dry_compressible.py b/integration-tests/equations/test_dry_compressible.py index d9eb21713..846d38bbf 100644 --- 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 From 8bcd62df25a0ffac5545bfef51dbf54e9fdece38 Mon Sep 17 00:00:00 2001 From: Thomas Bendall Date: Thu, 29 Feb 2024 15:49:18 +0000 Subject: [PATCH 3/5] set compressible integration-test to use 4x1 --- integration-tests/equations/test_incompressible.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/integration-tests/equations/test_incompressible.py b/integration-tests/equations/test_incompressible.py index b70b88598..c7153cb21 100644 --- 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 From 57a9350448e8916763398ce4296e537eaf959bc3 Mon Sep 17 00:00:00 2001 From: Thomas Bendall Date: Thu, 29 Feb 2024 15:50:06 +0000 Subject: [PATCH 4/5] set moist compressible integration-test to use 4x1 --- integration-tests/equations/test_moist_compressible.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/integration-tests/equations/test_moist_compressible.py b/integration-tests/equations/test_moist_compressible.py index 04e931777..44d53acf2 100644 --- 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 From 8cb1749ceb41a8cd8ce5efcdab2617f764e7379f Mon Sep 17 00:00:00 2001 From: Thomas Bendall Date: Thu, 29 Feb 2024 15:50:43 +0000 Subject: [PATCH 5/5] set sw_fplane integration-test to use 4x1 --- integration-tests/equations/test_sw_fplane.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/integration-tests/equations/test_sw_fplane.py b/integration-tests/equations/test_sw_fplane.py index 7fd472ca3..65a237183 100644 --- 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