anne-glerum · sac-bsa · Jul 11, 2022 · Jul 11, 2022 · Jul 11, 2022 · Jul 12, 2022
diff --git a/.gitattributes b/.gitattributes
@@ -1,11 +1,11 @@
 # The following files do not need to be in the release tarballs:
+.github/ export-ignore
 .gitattributes export-ignore
 .gitignore export-ignore
-doc/bump_version.sh export-ignore
-doc/release-tasklist export-ignore
+.gitmodules export-ignore
+contrib/release/ export-ignore
 doc/sphinx/ export-ignore
 doc/manual/ export-ignore
-doc/release-tasklist export-ignore
 doc/update_parameters.sh export-ignore
 Jenkinsfile export-ignore
 .zenodo.json export-ignore
@@ -21,4 +21,3 @@ tests/**/*.gnuplot linguist-generated
 
 # The world builder code shouldnt' be counted to ASPECT.
 contrib/world_builder/** linguist-vendored
-
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -0,0 +1,54 @@
+name: github-docker
+
+on: 
+  push: 
+    branches:
+      - 'main'
+  release:
+    types: [created]
+
+concurrency:
+  group: docker-build
+  cancel-in-progress: true
+
+permissions:
+  contents: read
+  packages: write
+
+jobs:
+  build-docker:
+    runs-on: ubuntu-latest
+    if: github.repository == 'geodynamics/aspect'
+    steps:    
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Login to DockerHub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_HUB_USERNAME }}
+          password: ${{ secrets.DOCKER_HUB_LOGIN }}
+
+      - name: Build and push Docker image for main
+        if: contains(github.event_name, 'push')
+        uses: docker/build-push-action@v3
+        with:
+          context: ./contrib/docker/docker/
+          cache-from: type=registry,ref=dealii/dealii:v9.4.0-focal
+          cache-to: type=inline
+          push: true
+          tags: geodynamics/aspect:latest
+
+      - name: Build and push Docker image for release
+        if: contains(github.event_name, 'release')
+        uses: docker/build-push-action@v3
+        with:
+          context: ./contrib/docker/docker/
+          cache-from: type=registry,ref=dealii/dealii:v9.4.0-focal
+          cache-to: type=inline
+          push: true
+          tags: geodynamics/aspect:${{github.ref_name}}
+
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -100,14 +100,17 @@ jobs:
           - image: "geodynamics/aspect-tester:focal-dealii-9.3-v2"
             run-tests: "ON"
             compare-tests: "ON"
+            result-file: "changes-test-results-9.3.diff"
             container-options: '--name container'
           - image: "geodynamics/aspect-tester:focal-dealii-9.4-v2"
             run-tests: "ON"
             compare-tests: "OFF"
+            result-file: "changes-test-results-9.4.diff"
             container-options: '--name container'
           - image: dealii/dealii:master-focal
             run-tests: "ON"
             compare-tests: "OFF"
+            result-file: "changes-test-results-master.diff"
             container-options: '--user 0 --name container'
 
     container: 
@@ -154,7 +157,7 @@ jobs:
     - name: archive test results
       uses: actions/upload-artifact@v2
       with:
-        name: changes-test-results.diff
+        name: ${{ matrix.result-file }}
         path: build/changes-test-results.diff
     - name: check test results
       run: |

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -139,19 +139,35 @@ if(ASPECT_WITH_WORLD_BUILDER)
   MESSAGE(STATUS "Using World Builder version ${WORLD_BUILDER_VERSION} found at ${WORLD_BUILDER_SOURCE_DIR}.")
 
   # add source and include dirs:
-  FILE(GLOB_RECURSE wb_files "${WORLD_BUILDER_SOURCE_DIR}/source/*.cc")
+  IF(WORLD_BUILDER_VERSION VERSION_LESS 0.5.0)
+    FILE(GLOB_RECURSE wb_files "${WORLD_BUILDER_SOURCE_DIR}/source/*.cc")
+  ELSE()
+    FILE(GLOB_RECURSE wb_files "${WORLD_BUILDER_SOURCE_DIR}/source/world_builder/*.cc")
+  ENDIF()
   LIST(APPEND TARGET_SRC ${wb_files})
 
   # generate config.cc and include it:
-  CONFIGURE_FILE("${WORLD_BUILDER_SOURCE_DIR}/source/config.cc.in" "${CMAKE_BINARY_DIR}/world_builder_config.cc" @ONLY)
-  LIST(INSERT TARGET_SRC 0 "${CMAKE_BINARY_DIR}/world_builder_config.cc")
+  IF(WORLD_BUILDER_VERSION VERSION_LESS 0.5.0)
+    CONFIGURE_FILE("${WORLD_BUILDER_SOURCE_DIR}/source/config.cc.in" "${CMAKE_BINARY_DIR}/source/world_builder/config.cc" @ONLY)
+    LIST(INSERT TARGET_SRC 0 "${CMAKE_BINARY_DIR}/source/world_builder/config.cc")
+    FILE(REMOVE "${CMAKE_BINARY_DIR}/include/world_builder/config.h")
+  ELSE()
+    CONFIGURE_FILE("${WORLD_BUILDER_SOURCE_DIR}/include/world_builder/config.h.in" "${CMAKE_BINARY_DIR}/include/world_builder/config.h" @ONLY)
+    INCLUDE_DIRECTORIES("${CMAKE_BINARY_DIR}/include/")
+    FILE(REMOVE "${CMAKE_BINARY_DIR}/source/world_builder/config.cc")
+  ENDIF()
 
   # Move some file to the end for unity builds to make sure other file come
   # "before". Note: The current design keeps all ASPECT files (including
   # ASPECT_UNITY_LAST files) before all GWB files. Mixing them will causes
   # many issues with non-unique namespace names like Utilities.
-  SET(UNITY_WB_LAST_FILES
-  "${WORLD_BUILDER_SOURCE_DIR}/source/parameters.cc")
+  IF(WORLD_BUILDER_VERSION VERSION_LESS 0.5.0)
+    SET(UNITY_WB_LAST_FILES
+    "${WORLD_BUILDER_SOURCE_DIR}/source/parameters.cc")
+  ELSE()
+    SET(UNITY_WB_LAST_FILES
+    "${WORLD_BUILDER_SOURCE_DIR}/source/world_builder/parameters.cc")
+  ENDIF()
 
   FOREACH(_source_file ${UNITY_WB_LAST_FILES})
     LIST(FIND TARGET_SRC ${_source_file} _index)

diff --git a/README.md b/README.md
@@ -44,9 +44,8 @@ output of ASPECT can also be found in the ASPECT
 [manual](http://www.math.clemson.edu/~heister/manual.pdf). This manual also
 discusses the structure of the source code.
 
-For getting started, you can also watch our online
-[tutorial](https://geodynamics.org/cig/events/calendar/2016-cig-all-hands-meeting/aspect-tutorial/tutorial/).
-
+For getting started, you can also watch recordings from our
+[tutorials](https://github.com/geodynamics/aspect/wiki/Tutorial-Materials).
 
 
 Contributing to ASPECT
@@ -70,10 +69,9 @@ For more information see:
  - The current [Online Documentation](https://aspect-documentation.readthedocs.io/en/latest/)
  - The current [PDF Manual](http://www.math.clemson.edu/~heister/manual.pdf)
  - [How to cite ASPECT](https://aspect.geodynamics.org/cite.html)
- - For questions on the source code of ASPECT, portability, installation, new or existing features, etc., use the [ASPECT forum](https://community.geodynamics.org/c/aspect). This forum is where the ASPECT users and developers all hang out. Archived discussions from the inactive aspect-devel mailing list can be downloaded at [aspect-devel archives](http://lists.geodynamics.org/pipermail/aspect-devel).
+ - For questions on the source code of ASPECT, portability, installation, new or existing features, etc., use the [ASPECT forum](https://community.geodynamics.org/c/aspect). This forum is where the ASPECT users and developers all hang out.
  - See the [Future Plan Board](https://github.com/geodynamics/aspect/projects/2) for a high level overview of items in development.
  - ASPECT is primarily based on the deal.II library. If you have particular questions about deal.II, contact the [deal.II discussion groups](https://www.dealii.org/mail.html).
- - In case of more general questions about mantle convection, you can contact the [CIG mantle convection mailing lists](http://lists.geodynamics.org/cgi-bin/mailman/listinfo/cig-MC).
  - ASPECT is being developed by a large, collaborative, and inclusive community. It is currently maintained by the following people:
      - Wolfgang Bangerth: [email protected]
      - Juliane Dannberg: [email protected]

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.5.0-pre
+2.4.0
diff --git a/benchmarks/free_surface_tractions/viscoelastic/free_surface_VE_cylinder_2D_loading.prm b/benchmarks/free_surface_tractions/viscoelastic/free_surface_VE_cylinder_2D_loading.prm
@@ -9,7 +9,7 @@ set Dimension                              = 2
 set Start time                             = 0
 set End time                               = 1500
 set Use years in output instead of seconds = true
-set Nonlinear solver scheme                = single Advection, single Stokes
+set Nonlinear solver scheme                = iterated Advection and Stokes
 set CFL number                             = 0.5
 set Maximum time step                      = 10
 set Output directory                       = output_free_surface_VE_cylinder_2D_loading
@@ -38,11 +38,24 @@ subsection Mesh refinement
   set Strategy         = strain rate
 end
 
+# One operator splitting step to update the stresses
+set Use operator splitting                 = true
+
+subsection Solver parameters
+  # Make sure to do only 1 splitting step
+  subsection Operator splitting parameters
+    set Reaction time step                     = 5000 # larger than maximum Stokes time step
+    set Reaction time steps per advection step = 1
+  end
+end
+
 # Element types
 subsection Discretization
   set Composition polynomial degree     = 2
   set Stokes velocity polynomial degree = 2
   set Temperature polynomial degree     = 1
+  # DG for viscoelastic stresses
+  set Use discontinuous composition discretization = true
 end
 
 # Formulation classification

diff --git a/benchmarks/free_surface_tractions/viscoelastic/free_surface_VE_cylinder_3D_loading.prm b/benchmarks/free_surface_tractions/viscoelastic/free_surface_VE_cylinder_3D_loading.prm
@@ -10,7 +10,7 @@ set Dimension                              = 3
 set Start time                             = 0
 set End time                               = 1500
 set Use years in output instead of seconds = true
-set Nonlinear solver scheme                = single Advection, single Stokes
+set Nonlinear solver scheme                = iterated Advection and Stokes
 set CFL number                             = 0.5
 set Maximum time step                      = 10
 set Output directory                       = output_free_surface_VE_cylinder_3D_loading
@@ -39,11 +39,24 @@ subsection Mesh refinement
   set Strategy         = strain rate
 end
 
+# One operator splitting step to update the stresses
+set Use operator splitting                 = true
+
+subsection Solver parameters
+  # Make sure to do only 1 splitting step
+  subsection Operator splitting parameters
+    set Reaction time step                     = 5000 # larger than maximum Stokes time step
+    set Reaction time steps per advection step = 1
+  end
+end
+
 # Element types
 subsection Discretization
   set Composition polynomial degree     = 2
   set Stokes velocity polynomial degree = 2
   set Temperature polynomial degree     = 1
+  # DG for viscoelastic stresses
+  set Use discontinuous composition discretization = true
 end
 
 # Formulation classification

diff --git a/benchmarks/viscoelastic_bending_beam/viscoelastic_bending_beam.prm b/benchmarks/viscoelastic_bending_beam/viscoelastic_bending_beam.prm
@@ -37,6 +37,19 @@ set Maximum time step                      = 1e3
 set Output directory                       = output
 set Pressure normalization                 = surface
 set Surface pressure                       = 0.
+set Nonlinear solver scheme                = iterated Advection and Stokes
+set Nonlinear solver tolerance             = 1e-5
+set Max nonlinear iterations               = 100
+
+set Use operator splitting                 = true
+
+subsection Solver parameters
+  # Make sure to do only 1 splitting step
+  subsection Operator splitting parameters
+    set Reaction time step                     = 5000 # larger than maximum Stokes time step
+    set Reaction time steps per advection step = 1
+  end
+end
 
 # Solver settings
 subsection Solver parameters

diff --git a/benchmarks/viscoelastic_plastic_shear_bands/gerya_2019/gerya_2019_vep.prm b/benchmarks/viscoelastic_plastic_shear_bands/gerya_2019/gerya_2019_vep.prm
@@ -6,11 +6,28 @@ include $ASPECT_SOURCE_DIR/benchmarks/viscoelastic_plastic_shear_bands/gerya_201
 #  Global parameters
 set End time                               = 500
 set Output directory                       = output_gerya_2019_vep
+set Nonlinear solver scheme                = iterated Advection and Stokes
+
+# One operator splitting step to update the stresses
+set Use operator splitting                 = true
+
+subsection Solver parameters
+  # Make sure to do only 1 splitting step
+  subsection Operator splitting parameters
+    set Reaction time step                     = 5000 # larger than maximum Stokes time step
+    set Reaction time steps per advection step = 1
+  end
+end
 
 subsection Formulation
   set Enable elasticity = true
 end
 
+subsection Discretization
+  # DG for viscoelastic stresses
+  set Use discontinuous composition discretization = true
+end
+
 # Number and name of compositional fields
 subsection Compositional fields
   set Number of fields = 6

diff --git a/benchmarks/viscoelastic_plastic_shear_bands/kaus_2010/kaus_2010_extension.prm b/benchmarks/viscoelastic_plastic_shear_bands/kaus_2010/kaus_2010_extension.prm
@@ -22,7 +22,7 @@ set Dimension                              = 2
 set Start time                             = 0
 set End time                               = 20e3
 set Use years in output instead of seconds = true
-set Nonlinear solver scheme                = single Advection, iterated Stokes
+set Nonlinear solver scheme                = iterated Advection and Stokes
 set Nonlinear solver tolerance             = 1e-4
 set Max nonlinear iterations               = 100
 set CFL number                             = 0.5
@@ -31,6 +31,17 @@ set Output directory                       = output_kaus_2010_extension
 set Timing output frequency                = 1
 set Pressure normalization                 = no
 
+# One operator splitting step to update the stresses
+set Use operator splitting                 = true
+
+subsection Solver parameters
+  # Make sure to do only 1 splitting step
+  subsection Operator splitting parameters
+    set Reaction time step                     = 5000 # larger than maximum Stokes time step
+    set Reaction time steps per advection step = 1
+  end
+end
+
 # Solver settings
 subsection Solver parameters
   subsection Stokes solver parameters
@@ -64,6 +75,8 @@ subsection Discretization
   set Composition polynomial degree     = 2
   set Stokes velocity polynomial degree = 2
   set Temperature polynomial degree     = 1
+  # DG for viscoelastic stresses
+  set Use discontinuous composition discretization = true
 end
 
 # Formulation classification

diff --git a/benchmarks/viscoelastic_plastic_simple_shear/viscoelastic_plastic_simple_shear.prm b/benchmarks/viscoelastic_plastic_simple_shear/viscoelastic_plastic_simple_shear.prm
@@ -29,11 +29,22 @@ set Maximum time step                          = 0.01
 set Output directory                           = output-viscoelastic_plastic_simple_shear
 set Pressure normalization                     = surface
 set Surface pressure                           = 0.
-set Nonlinear solver scheme                    = single Advection, iterated Stokes
+set Nonlinear solver scheme                    = iterated Advection and Stokes
 set Max nonlinear iterations                   = 30
 set Nonlinear solver tolerance                 = 1e-5
 set Max nonlinear iterations in pre-refinement = 0
 
+# To update the elastic stresses,
+# we do 1 operator splitting step.
+set Use operator splitting                 = true
+
+subsection Solver parameters
+  # Make sure to do only 1 splitting step
+  subsection Operator splitting parameters
+    set Reaction time step                     = 5000 # larger than maximum Stokes time step
+    set Reaction time steps per advection step = 1
+  end
+end
 
 # Solver settings
 subsection Solver parameters
@@ -42,6 +53,11 @@ subsection Solver parameters
   end
 end
 
+subsection Discretization
+  # DG for viscoelastic stresses
+  set Use discontinuous composition discretization = true
+end
+
 subsection Geometry model
   set Model name = box
   subsection Box

diff --git a/benchmarks/viscoelastic_plate_flexure/viscoelastic_plate_flexure.prm b/benchmarks/viscoelastic_plate_flexure/viscoelastic_plate_flexure.prm
@@ -24,12 +24,24 @@ set Dimension                              = 2
 set Start time                             = 0
 set End time                               = 1e3
 set Use years in output instead of seconds = true
-set Nonlinear solver scheme                = single Advection, single Stokes
+set Nonlinear solver scheme                = iterated Advection and Stokes
 set CFL number                             = 0.1
 set Maximum time step                      = 5
 set Output directory                       = output-viscoelastic_plate_flexure
 set Pressure normalization                 = no
 
+# To update the elastic stresses,
+# we do 1 operator splitting step.
+set Use operator splitting                 = true
+
+subsection Solver parameters
+  # Make sure to do only 1 splitting step
+  subsection Operator splitting parameters
+    set Reaction time step                     = 5000 # larger than maximum Stokes time step
+    set Reaction time steps per advection step = 1
+  end
+end
+
 # Model geometry (500 m initial resolution)
 subsection Geometry model
   set Model name = box