kgos for incompressile and compressible boussinesq test

firedrakeproject · Mar 22, 2024 · 3e4308d · 3e4308d
1 parent 9fc53d7
commit 3e4308d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/integration-tests/data/compressible_boussinesq_chkpt.h5 b/integration-tests/data/compressible_boussinesq_chkpt.h5
diff --git a/...ration-tests/data/incompressible_chkpt.h5 → ...s/data/incompressible_boussinesq_chkpt.h5 b/...ration-tests/data/incompressible_chkpt.h5 → ...s/data/incompressible_boussinesq_chkpt.h5
diff --git a/integration-tests/equations/test_boussinesq.py b/integration-tests/equations/test_boussinesq.py
@@ -25,7 +25,7 @@ def run_boussinesq(tmpdir, compressible):
     ncols = 10  # number of columns
     Lx = 1000.0
     Lz = 1000.0
-    mesh_name = 'incompressible_mesh'
+    mesh_name = 'boussinesq_mesh'
     m = PeriodicIntervalMesh(ncols, Lx)
     mesh = ExtrudedMesh(m, layers=nlayers, layer_height=Lz/nlayers, name=mesh_name)
     domain = Domain(mesh, dt, "CG", 1)
@@ -64,8 +64,7 @@ def run_boussinesq(tmpdir, compressible):
     # Time stepper
     stepper = SemiImplicitQuasiNewton(eqn, io, transported_fields,
                                       transport_methods,
-                                      linear_solver=linear_solver,
-                                      num_outer=4, num_inner=1)
+                                      linear_solver=linear_solver)
 
     # ------------------------------------------------------------------------ #
     # Initial conditions
@@ -100,9 +99,9 @@ def run_boussinesq(tmpdir, compressible):
 
     # State for checking checkpoints
     if compressible:
-        checkpoint_name = 'compressible_chkpt.h5'
+        checkpoint_name = 'compressible_boussinesq_chkpt.h5'
     else:
-        checkpoint_name = 'incompressible_chkpt.h5'
+        checkpoint_name = 'incompressible_boussinesq_chkpt.h5'
     new_path = join(abspath(dirname(__file__)), '..', f'data/{checkpoint_name}')
     check_output = OutputParameters(dirname=output_dirname,
                                     checkpoint_pickup_filename=new_path,
@@ -117,7 +116,7 @@ def run_boussinesq(tmpdir, compressible):
     return stepper, check_stepper
 
 
-@pytest.mark.parametrize("compressible", [False])
+@pytest.mark.parametrize("compressible", [True, False])
 def test_boussinesq(tmpdir, compressible):
 
     dirname = str(tmpdir)