Merge pull request #11 from tjhei/merge2

Merge from upstream

Author: bangerth

.github/workflows/build_dealii_master.yml

@@ -20,7 +20,7 @@ jobs:
     if: github.repository == 'geodynamics/aspect'
     steps:    
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3

.github/workflows/build_dealii_master_clang.yml

@@ -20,7 +20,7 @@ jobs:
     if: github.repository == 'geodynamics/aspect'
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3

.github/workflows/clang.yml

@@ -31,7 +31,7 @@ jobs:
       options: '--user 0 --name container'
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - name: clang-tidy
       run: |
         mkdir build

.github/workflows/docker.yml

@@ -25,7 +25,7 @@ jobs:
     if: github.repository == 'geodynamics/aspect'
     steps:    
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
@@ -77,7 +77,7 @@ jobs:
     if: github.repository == 'geodynamics/aspect'
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3

.github/workflows/linux.yml

@@ -28,7 +28,7 @@ jobs:
     runs-on: [ubuntu-22.04]
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - name: setup
       run: |
         sudo apt-get update
@@ -50,7 +50,7 @@ jobs:
     runs-on: [ubuntu-24.04]
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - name: setup
       run: |
         sudo apt-get update
@@ -109,12 +109,12 @@ jobs:
         include:
           - image: "geodynamics/aspect-tester:focal-dealii-9.5-v3"
             run-tests: "ON"
-            compare-tests: "ON"
+            compare-tests: "OFF"
             result-file: "changes-test-results-9.5.diff"
             container-options: '--name container'
           - image: "geodynamics/aspect-tester:jammy-dealii-9.6-v1"
-            run-tests: "OFF"
-            compare-tests: "OFF"
+            run-tests: "ON"
+            compare-tests: "ON"
             result-file: "changes-test-results-9.6.diff"
             container-options: '--user 0 --name container'
           - image: "geodynamics/aspect-tester:focal-dealii-master"
@@ -128,7 +128,7 @@ jobs:
       options: ${{ matrix.container-options }}
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
       with:
         submodules: recursive
     - uses: astral-sh/setup-uv@v6

.github/workflows/typos.yml

@@ -19,7 +19,7 @@ jobs:
     timeout-minutes: 5
     steps:
       - name: Checkout the Checkout Actions Repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           persist-credentials: false
       - name: Check spelling with typos

Jenkinsfile

@@ -30,7 +30,7 @@ pipeline {
       {
         // first build a docker image for running the tests from the repo
         docker {
-          image 'geodynamics/aspect-tester:focal-dealii-9.5-v3'
+          image 'geodynamics/aspect-tester:jammy-dealii-9.6-v1'
           // We mount /repos into the docker image. This allows us to cache
           // the git repo by setting "advanced clone behaviors". If the
           // directory does not exist, this will be ignored.

benchmarks/advection/drop_supg.prm

@@ -1,7 +1,7 @@
 # Dropping box benchmark on the right half of the domain
 
 set Dimension                              = 2
-set Use years in output instead of seconds = false
+set Use years instead of seconds           = false
 set End time                               = 5.0
 set Output directory                       = output-drop-supg
 set Nonlinear solver scheme                = single Advection, no Stokes

benchmarks/advection/rotate_shape_supg.prm

@@ -1,7 +1,7 @@
 # Rotating shapes
 
 set Dimension                              = 2
-set Use years in output instead of seconds = false
+set Use years instead of seconds           = false
 set End time                               = 6.2831
 set Output directory                       = output-rotate-shape-supg
 set Nonlinear solver scheme                = single Advection, no Stokes

benchmarks/advection_in_annulus/advection_in_annulus.prm

@@ -18,7 +18,7 @@ set Additional shared libraries            = ./libadvection_in_annulus.so
 set Dimension                              = 2
 set Start time                             = 0
 set End time                               = 1
-set Use years in output instead of seconds = false
+set Use years instead of seconds           = false
 set Nonlinear solver scheme                = single Advection, no Stokes
 set Output directory                       = output_advection_in_annulus
 set Pressure normalization                 = surface