Merge development branch

.github/workflows/codecov.yml

@@ -5,7 +5,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Build and run the unit tests
         run: |
           cp config/coverage-gcc.mk config.mk

.github/workflows/codeql-analysis.yml

@@ -36,7 +36,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL

.github/workflows/regression.yml

@@ -1,6 +1,6 @@
 # Regression tests (serial)
 
-name: "Regression"
+name: "build, test"
 
 on:
   pull_request:
@@ -15,7 +15,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Build
       run: |
@@ -35,7 +35,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Build
       run: |
@@ -49,13 +49,14 @@ jobs:
       run: |
         make unit
         make -C tests d3q15
+        cat tests/regression/d3q15/*.new
 
   make-d3q19-short:
     runs-on: ubuntu-latest
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Build
       run: |
@@ -75,7 +76,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Build
       run: |
@@ -90,3 +91,39 @@ jobs:
       run: |
         make unit
         make -C tests d3q27
+
+  d2q9-mpi:
+    name: d2q9 / mpi
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v4
+    - name: Set up MPI
+      uses: mpi4py/setup-mpi@v1
+    - run: mpicc --version
+    - run: cp config/github-mpicc.mk config.mk
+    - run: make -j 2
+    - run: export OMP_NUM_THREADS=2
+    - run: make unit
+    - run: export OMP_NUM_THREADS=1
+    - run: make -C tests d2q9
+
+  d3q15-mpi:
+    name: d3q15 / mpi
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v4
+    - name: Set up MPI
+      uses: mpi4py/setup-mpi@v1
+    - run: mpicc --version
+    - run: cp config/github-mpicc.mk config.mk
+    - run: sed -i "s/D2Q9/D3Q15/" config.mk
+    - run: make -j 2
+    - run: export OMP_NUM_THREADS=2
+    - run: make unit
+    - run: export OMP_NUM_THREADS=1
+    - run: make -C tests d3q15
+    - run: cat tests/regression/d3q15/*new

README.md

@@ -3,7 +3,7 @@
 
 A lattice Boltzmann code for complex fluids
 
-[![Build Status](https://travis-ci.com/ludwig-cf/ludwig.svg?branch=develop)](https://travis-ci.com/ludwig-cf/ludwig)
+![Build Status](https://github.com/ludwig-cf/ludwig/actions/workflows/regression.yml/badge.svg)
 [![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/1998/badge)](https://bestpractices.coreinfrastructure.org/projects/1998)
 
 

config/epcc-cirrus-nvcc.mk

@@ -2,18 +2,15 @@
 #
 #  nvcc build
 #
-#  There are a number of ways forward here... see further comments below
+#  "Serial" build.
 #
-#  E.g., serial with stub MPI
-#  module load nvidia/nvhpc-nompi/22.11
-#
-#  E.g., parallel using NVHPC with MPI ...
-#  module load nvidia/nvhpc/22.11
+#  module load nvidia/nvhpc-nompi
 #
 ###############################################################################
 
-BUILD  = parallel
+BUILD  = serial
 MODEL  = -D_D3Q19_
+TARGET = nvcc
 
 CC     = nvcc
 CFLAGS = -g -DADDR_SOA -O2 -arch=sm_70 -x cu -dc
@@ -24,13 +21,3 @@ CFLAGS = -g -DADDR_SOA -O2 -arch=sm_70 -x cu -dc
 AR = ar
 ARFLAGS = -cr
 LDFLAGS = -arch=sm_70
-
-# nvhpc (mpicc is present but drives nvc not nvcc) so use nvcc still ... but
-MPI_HOME     = ${NVHPC_ROOT}/comm_libs/mpi
-MPI_INC_PATH = -I$(MPI_HOME)/include
-MPI_LIB_PATH = -L$(MPI_HOME)/lib -lmpi
-
-# NVHPC bundled MPI must use mpirun supplied ...
-LAUNCH_SERIAL_CMD =
-LAUNCH_MPIRUN_CMD = mpirun
-MPIRUN_NTASK_FLAG = -np

config/travis-mpicc.mk → config/github-mpicc.mk

@@ -1,25 +1,19 @@
 ##############################################################################
 #
-#  travis-mpicc.mk
+#  github-mpicc.mk
 #
-#  Parallel unit tests
+#  We expect mpicc driving gcc; tests run on two mpi processes.
 #
 ##############################################################################
 
 BUILD   = parallel
-MODEL   = -D_D3Q19_
+MODEL   = -D_D2Q9_
 
 CC      = mpicc -fopenmp
-CFLAGS  = -O2 -g -Wall -Werror
+CFLAGS  = -g -Wall -O2
 
 AR      = ar
 ARFLAGS = -cru
 LDFLAGS =
 
-LAUNCH_SERIAL_CMD =
-LAUNCH_MPIRUN_CMD = mpirun --oversubscribe
-MPIRUN_NTASK_FLAG = -np
-
-# Unit tests only
-MPIRUN_NTASK_UNIT = 4
-
+LAUNCH_MPIRUN_CMD = mpirun -np 2