Time parallel RIDC and SDC

.github/workflows/build.yml

@@ -33,7 +33,7 @@ jobs:
       GUSTO_PARALLEL_LOG: CONSOLE
       PYOP2_CFLAGS: -O0
       # Make sure that tests with >4 processes are not silently skipped
-      PYTEST_MPI_MAX_NPROCS: 4
+      PYTEST_MPI_MAX_NPROCS: 6
       EXTRA_PYTEST_ARGS: --durations=100 --timeout=3600 --timeout-method=thread -o faulthandler_timeout=3660 --show-capture=no --verbose gusto-repo/unit-tests gusto-repo/integration-tests gusto-repo/examples
     steps:
       - name: Fix HOME
@@ -118,6 +118,13 @@ jobs:
           firedrake-run-split-tests 4 3 "$EXTRA_PYTEST_ARGS" "--log-file=gusto4_{#}.log"
         timeout-minutes: 10
 
+      - name: Run tests (nprocs = 6)
+        if: success() || steps.install-two.conclusion == 'success'
+        run: |
+          . venv-gusto/bin/activate
+          firedrake-run-split-tests 6 2 "$EXTRA_PYTEST_ARGS" "--log-file=gusto6_{#}.log"
+        timeout-minutes: 30
+
       - name: Upload pytest log files
         uses: actions/upload-artifact@v4
         if: success() || steps.install-two.conclusion == 'success'

.github/workflows/docs.yml

@@ -22,7 +22,7 @@ jobs:
     runs-on: ubuntu-latest
     # The docker container to use.
     container:
-      image: firedrakeproject/firedrake-docdeps:latest
+      image: firedrakeproject/firedrake-vanilla-default:latest
 
     steps:
       - uses: actions/checkout@v4

gusto/core/io.py

@@ -55,7 +55,7 @@ def pick_up_mesh(output, mesh_name, comm=COMM_WORLD):
     else:
         dumpdir = path.join("results", output.dirname)
         chkfile = path.join(dumpdir, "chkpt.h5")
-    with CheckpointFile(chkfile, 'r', comm=comm) as chk:
+    with CheckpointFile(chkfile, 'r', comm) as chk:
         mesh = chk.load_mesh(mesh_name)
 
     if dumpdir:
@@ -635,7 +635,7 @@ def pick_up_from_checkpoint(self, state_fields, comm=COMM_WORLD):
                     step = chk.read_attribute("/", "step")
 
             else:
-                with CheckpointFile(chkfile, 'r', comm) as chk:
+                with CheckpointFile(chkfile, 'r', self.domain.mesh.comm) as chk:
                     mesh = self.domain.mesh
                     # Recover compulsory fields from the checkpoint
                     for field_name in self.to_pick_up:
@@ -739,7 +739,7 @@ def dump(self, state_fields, time_data):
                 if last_ref_update_time is not None:
                     self.chkpt.write_attribute("/", "last_ref_update_time", last_ref_update_time)
             else:
-                with CheckpointFile(self.chkpt_path, 'w') as chk:
+                with CheckpointFile(self.chkpt_path, 'w', self.mesh.comm) as chk:
                     chk.save_mesh(self.domain.mesh)
                     for field_name in self.to_pick_up:
                         chk.save_function(state_fields(field_name), name=field_name)
@@ -943,7 +943,7 @@ def make_nc_dataset(filename, access, comm):
 
     """
     try:
-        nc_field_file = Dataset(filename, access, parallel=True)
+        nc_field_file = Dataset(filename, access, parallel=True, comm=comm)
         nc_supports_parallel = True
     except ValueError:
         # parallel netCDF not available, use the serial version instead

gusto/time_discretisation/__init__.py

@@ -4,4 +4,5 @@
 from gusto.time_discretisation.imex_runge_kutta import *      # noqa
 from gusto.time_discretisation.multi_level_schemes import *   # noqa
 from gusto.time_discretisation.wrappers import *              # noqa
-from gusto.time_discretisation.sdc import *                   # noqa
+from gusto.time_discretisation.deferred_correction import *   # noqa
+from gusto.time_discretisation.parallel_dc import *           # noqa