Merge remote-tracking branch 'origin/main' into fix_quad_rule_warnings

.github/workflows/build.yml

@@ -15,7 +15,7 @@ jobs:
   build:
     name: "Build Gusto"
     # The type of runner that the job will run on
-    runs-on: self-hosted
+    runs-on: [self-hosted, Linux]
     # The docker container to use.
     container:
       image: firedrakeproject/firedrake-vanilla:latest
@@ -38,6 +38,7 @@ jobs:
           . /home/firedrake/firedrake/bin/activate
           firedrake-clean
           export GUSTO_PARALLEL_LOG=FILE
+          export PYOP2_CFLAGS=-O0
           python -m pytest \
             -n 12 --dist worksteal \
             --durations=100 \
@@ -54,7 +55,7 @@ jobs:
           find . -name "*.log" -exec cp --parents {} /__w/gusto/gusto/logs/ \;
       - name: Upload artifact
         if: always()
-        uses: actions/upload-pages-artifact@v1
+        uses: actions/upload-pages-artifact@v3
         with:
           name: log-files
           path: /__w/gusto/gusto/logs

.github/workflows/docs.yml

@@ -29,7 +29,7 @@ jobs:
     # Steps represent a sequence of tasks that will be executed as
     # part of the jobs
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Install checkedout Gusto
         run: |
           . /home/firedrake/firedrake/bin/activate
@@ -50,7 +50,7 @@ jobs:
           cd docs
           make html
       - name: Upload artifact
-        uses: actions/upload-pages-artifact@v1
+        uses: actions/upload-pages-artifact@v3
         with:
           name: github-pages
           path: /__w/gusto/gusto/docs/build/html

.github/workflows/lint.yml

@@ -12,9 +12,9 @@ jobs:
     name: "Run linter"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Setup python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: 3.11
       - name: Setup flake8 annotations
@@ -33,7 +33,7 @@ jobs:
     # #example-error-annotation-on-github-actions
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Check workflow files
         uses: docker://rhysd/actionlint:latest
         with:

.github/workflows/website.yml

@@ -27,16 +27,16 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Setup Pages
-        uses: actions/configure-pages@v3
+        uses: actions/configure-pages@v5
       - name: Build with Jekyll
         uses: actions/jekyll-build-pages@v1
         with:
           source: ./docs
           destination: ./docs/_site
       - name: Upload artifact
-        uses: actions/upload-pages-artifact@v1
+        uses: actions/upload-pages-artifact@v3
         with:
           path: ./docs/_site/
 
@@ -50,4 +50,4 @@ jobs:
     steps:
       - name: Deploy to GitHub Pages
         id: deployment
-        uses: actions/deploy-pages@v2
+        uses: actions/deploy-pages@v4

Makefile

@@ -32,4 +32,8 @@ integration_test:
 
 example:
 	@echo "    Running all examples"
-	@python3 -m pytest examples $(PYTEST_ARGS)
+	@python3 -m pytest examples -v -m "not parallel" $(PYTEST_ARGS)
+
+parallel_example:
+	@echo "    Running all parallel examples"
+	@python3 -m pytest examples -v -m "parallel" $(PYTEST_ARGS)

README.md

@@ -16,7 +16,7 @@ These compatible methods underpin the Met Office's next-generation model, [LFRic
 
 The best way to install Gusto is as an additional package when installing [Firedrake](http://firedrakeproject.org). Usually, for a Mac with Homebrew or an Ubuntu installation this is done by downloading the Firedrake install script and executing it:
 ```
-curl -0 https://raw.githubusercontent/com/firedrakeproject/firedrake/master/scripts/firedrake-install
+curl -0 https://raw.githubusercontent.com/firedrakeproject/firedrake/master/scripts/firedrake-install
 python3 firedrake-install --install gusto
 ```
 For an up-to-date installation guide, see the [firedrake installation instructions](http://firedrakeproject.org/download.html). Once installed, Gusto must be run from within the Firedrake virtual environment, which is activated via

docs/Gemfile.lock

@@ -222,8 +222,7 @@ GEM
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rexml (3.3.3)
-      strscan
+    rexml (3.3.9)
     rouge (3.26.0)
     ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
@@ -238,7 +237,6 @@ GEM
       faraday (>= 0.17.3, < 3)
     simpleidn (0.2.1)
       unf (~> 0.1.4)
-    strscan (3.1.0)
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
     typhoeus (1.4.0)
@@ -249,7 +247,7 @@ GEM
       unf_ext
     unf_ext (0.0.8.2)
     unicode-display_width (1.8.0)
-    webrick (1.8.1)
+    webrick (1.8.2)
 
 PLATFORMS
   x86_64-linux