V2.15.1b (#676)

* Updating development version to 2.13-dev * Release guidelines update * Add Changes to Changelog (#604) * Remoev UWGeodynamics installation from dockerfiles * Petsc 3.17 compatibility and removing duplicate examples python scripts * Add petsc variants to conda recipe * Add python 3.10 conda builds to actions. * Change PETSC and MPICH versions * Fix MPICH complaining... * Getting Dockerfiles ready: Ubuntu 22.04LTS and python 3.10. Note that this will fail for now because of h5py not being compatible. PR is on its way. * Update README * Update README * Transfer UWGeo documentation to Underworld * Remove python3-numpy-dbg for now * Fix Documentation Links (UWGeodynamics) Fix visualisation imports * Fix imports (UWGeodynamics) * Change Depth documentation toctree * UWGeodynamics Merging * Run tests * Move tests * H5py 3.7 is released, Use it in docker. * Typo in Petsc Dockerfile * Getting UWGeo internals to use uw2 mpi4py interface (#612) * Getting UWGeo internals to use uw2 mpi4py interface * Update CHANGES.md * ask per 2.13 release (#615) 2.13 release Co-authored-by: Romain Beucher <[email protected]> * Update _version.py * Fix for analytic ID, which changed during cmake update. Ganalytics should now be right * Typo fix for 3.10 * Dockerfile improvement - should be a single layer command * safer #define when not using an official release of petsc * Update PetscOptionsBegin() to be dev compatible. see https://gitlab.com/petsc/petsc/-/blob/f3ed01cd9ab452072c1a44e935347389f67d72c6/doc/docs/changes/dev.rst * Dockerfile updates. * Adding mpi dockerfiles - only openmpi for now, mpich coming soon. * Removing `base` image for now. * Resultant UW image is ~2.4Gb rather than 3Gb. * Add some documentation * Activate UWGeo testing * Updates github actions for Dockerfile change * Update CI.yml Fix typo * Update CI.yml * Update CI.yml * Update CI.yml * Update CI.yml * Update CI.yml * Update CI.yml * Update CI.yml * Update CI.yml * Update CI.yml * Update CI.yml * Update CI.yml * Update CI.yml * Update CI.yml * Update CI.yml * Update CI.yml * Update CI.yml * Updating versions of github actions * Fixing petsc image name * Rebuild UW is the dockerfile changes * Add checks * Forgot github action variable * checks variable is working or not? * Can't get underworld check in github action to work ???!!! * Fix? * Typo fix * Update CI.yml debug * Update CI.yml always! * Update CI.yml * Update CI.yml * Update CI.yml * Update CI.yml * Including vim in find docker image * Better way to look for h5 units. Previous h5py interface was causing erros on the c level. * Updates to build docker * Enable tests round 1 * Update CI.yml * Update CI.yml * Renmae UWGeo test, they take a while, might reintroduce later * Revert "Renmae UWGeo test, they take a while, might reintroduce later" This reverts commit d8a2268. * Smarter way to disable UWgeo tests for CI * Typo fix * Typo #2 * opss, fixes broken units check, thanks tests ;) * Typo #3 * type #4 * Enable multi arch build !!! * Update for dockerfiles and macos * Rename docker images * Update Dockerfile * Update Dockerfile new docker image names * Update Dockerfile new docker image names * CHAGES.md and checkin docker-builder.sh for manual docker image creation * docs/development/docker/docker-builder.sh * Updates for conda - still testing * Update CI.yml * Update CI.yml * Update CI.yml * Update CI.yml * Testing conda-forge connection to github actions * Making petsc version a build-arg for the dockerfiles. * Typo and adding UW_VERSION to github actions too. * Update CI.yml Can't resolve tag in `container` of github actions!!! * Disable arm build for underworld image - easier for now. * Dockerfile go * Work please * Dockerfile madness * Pin down psutil as a dependency was updating it - breaking jupyter-lab * Updates * psutil set to 5.9.3 for github action builds * Touch Lavavu * Dockerfile touch ups * remove psutil confusion * setuptools 65.6.0 has an error, so use 65.5.1 * update lavavu * fix * Fix typo in docker label * v2.14 branch upto with dev development (#640) * Updating development version to 2.13-dev * Release guidelines update * Add Changes to Changelog (#604) * Remoev UWGeodynamics installation from dockerfiles * Petsc 3.17 compatibility and removing duplicate examples python scripts * Add petsc variants to conda recipe * Add python 3.10 conda builds to actions. * Change PETSC and MPICH versions * Fix MPICH complaining... * Getting Dockerfiles ready: Ubuntu 22.04LTS and python 3.10. Note that this will fail for now because of h5py not being compatible. PR is on its way. * Update README * Update README * Transfer UWGeo documentation to Underworld * Remove python3-numpy-dbg for now * Fix Documentation Links (UWGeodynamics) Fix visualisation imports * Fix imports (UWGeodynamics) * Change Depth documentation toctree * UWGeodynamics Merging * Run tests * Move tests * H5py 3.7 is released, Use it in docker. * Typo in Petsc Dockerfile * Getting UWGeo internals to use uw2 mpi4py interface (#612) * Getting UWGeo internals to use uw2 mpi4py interface * Update CHANGES.md * ask per 2.13 release (#615) 2.13 release Co-authored-by: Romain Beucher <[email protected]> * Update _version.py * Fix for analytic ID, which changed during cmake update. Ganalytics should now be right * Typo fix for 3.10 * Dockerfile improvement - should be a single layer command * safer #define when not using an official release of petsc * Update PetscOptionsBegin() to be dev compatible. see https://gitlab.com/petsc/petsc/-/blob/f3ed01cd9ab452072c1a44e935347389f67d72c6/doc/docs/changes/dev.rst * Petsc 3.18 updates Petsc error handling updates only. Co-authored-by: Romain Beucher <[email protected]> * Add build-args for openmpi Docker creation * Dockerfile updates (#1) * Dockerfile updates. * Adding mpi dockerfiles - only openmpi for now, mpich coming soon. * Removing `base` image for now. * Resultant UW image is ~2.4Gb rather than 3Gb. * Add some documentation * Activate UWGeo testing * Updates github actions for Dockerfile change * Update CI.yml Fix typo * Update CI.yml * Update CI.yml * Update CI.yml * Update CI.yml * Update CI.yml * Update CI.yml * Update CI.yml * Update CI.yml * Update CI.yml * Update CI.yml * Update CI.yml * Update CI.yml * Update CI.yml * Update CI.yml * Update CI.yml * Update CI.yml * Updating versions of github actions * Fixing petsc image name * Rebuild UW is the dockerfile changes * Add checks * Forgot github action variable * checks variable is working or not? * Can't get underworld check in github action to work ???!!! * Fix? * Typo fix * Update CI.yml debug * Update CI.yml always! * Update CI.yml * Update CI.yml * Update CI.yml * Update CI.yml * Including vim in find docker image * Better way to look for h5 units. Previous h5py interface was causing erros on the c level. * Updates to build docker * Enable tests round 1 * Update CI.yml * Update CI.yml * Renmae UWGeo test, they take a while, might reintroduce later * Revert "Renmae UWGeo test, they take a while, might reintroduce later" This reverts commit d8a2268. * Smarter way to disable UWgeo tests for CI * Typo fix * Typo #2 * opss, fixes broken units check, thanks tests ;) * Typo #3 * type #4 * Enable multi arch build !!! * Update for dockerfiles and macos * Rename docker images * Update Dockerfile * Update Dockerfile new docker image names * Update Dockerfile new docker image names * CHAGES.md and checkin docker-builder.sh for manual docker image creation * docs/development/docker/docker-builder.sh * Updates for conda - still testing * Update CI.yml * Update CI.yml * Update CI.yml * Update CI.yml * Testing conda-forge connection to github actions * Making petsc version a build-arg for the dockerfiles. * Typo and adding UW_VERSION to github actions too. * Update CI.yml Can't resolve tag in `container` of github actions!!! * Disable arm build for underworld image - easier for now. * Dockerfile go * Work please * Dockerfile madness * Pin down psutil as a dependency was updating it - breaking jupyter-lab * Updates * psutil set to 5.9.3 for github action builds * Touch Lavavu * Dockerfile touch ups * remove psutil confusion * setuptools 65.6.0 has an error, so use 65.5.1 * update lavavu * fix * Fix typo in docker label * v2.14 branch upto with dev development (#640) * Updating development version to 2.13-dev * Release guidelines update * Add Changes to Changelog (#604) * Remoev UWGeodynamics installation from dockerfiles * Petsc 3.17 compatibility and removing duplicate examples python scripts * Add petsc variants to conda recipe * Add python 3.10 conda builds to actions. * Change PETSC and MPICH versions * Fix MPICH complaining... * Getting Dockerfiles ready: Ubuntu 22.04LTS and python 3.10. Note that this will fail for now because of h5py not being compatible. PR is on its way. * Update README * Update README * Transfer UWGeo documentation to Underworld * Remove python3-numpy-dbg for now * Fix Documentation Links (UWGeodynamics) Fix visualisation imports * Fix imports (UWGeodynamics) * Change Depth documentation toctree * UWGeodynamics Merging * Run tests * Move tests * H5py 3.7 is released, Use it in docker. * Typo in Petsc Dockerfile * Getting UWGeo internals to use uw2 mpi4py interface (#612) * Getting UWGeo internals to use uw2 mpi4py interface * Update CHANGES.md * ask per 2.13 release (#615) 2.13 release Co-authored-by: Romain Beucher <[email protected]> * Update _version.py * Fix for analytic ID, which changed during cmake update. Ganalytics should now be right * Typo fix for 3.10 * Dockerfile improvement - should be a single layer command * safer #define when not using an official release of petsc * Update PetscOptionsBegin() to be dev compatible. see https://gitlab.com/petsc/petsc/-/blob/f3ed01cd9ab452072c1a44e935347389f67d72c6/doc/docs/changes/dev.rst * Petsc 3.18 updates Petsc error handling updates only. Co-authored-by: Romain Beucher <[email protected]> * Add build-args for openmpi Docker creation Co-authored-by: Julian Giordani <[email protected]> Co-authored-by: Romain Beucher <[email protected]> * Enable the default args * disable petsc in github workflows * Update to underworldcode docker hub * update for 2.14 release (#642) * Images will push to underworldcode docker hub now * Change to kick off underworld2 image build * fix spacing in version file * Update CHANGES.md * Adding mpich Dockerfile * Disable github actions build of petsc and uw * Adding ARG smarts to petsc and UW image. Now MPI_IMAGE for petsc/Dockerfile and PETSC_IMAGE for uw2/Dockerfile are options that can we used to specify the exact docker image name. This will be used by github actions in future. * Update CI.yml * Update CI.yml Fix indenting of yaml * Update CI.yml * workdispatch only for openmpi/mpich and lavavu * Update CI.yml Adding MPICH_VERSION as an env var * Clean up docker-builder script * Smarts for docker-builder.sh * Include 'temperatureDot' checkpointing for UWGeo models by default * Adding pragmatric to petsc * cleanup of underworld2 dockerfile * Update version and disable conda for conda-forge staging process * Adding a fix for swarmvariable reloading. Thanks Arijit! * Removing unused imports * Disable openmpi. * Will delete this conda directory once the conda-forge feedstock is accepted. * Update for 2.14.2 * Fixes for temperatureDot checkpoint/restarting. * Petsc Dockerfile updates for h5py * Fixing the np.int deprecation issue. fixes #652 * Fixing some test. nbmark and matplotlib are needed for the tests. * Fixing/Shortening some models so they pass CI * removing ipynb version * Fixing all test in ./doc/test/* to not require matplotlib * update workflow with the new script name * Updating python dependencies. * Swig is a build dependency * Numpy version reducing to 1.20.3 for setonix * Fixes for checkpointing/restart with freeSurface's in UWGeo * Fix for #657 * Added path check in utils/_io.py * 1st cut adding Ben Knight's 3D surface veclocity code. Test model to come * Upload 3D SP example * Adding setonix install guide * starting for new release uw2.15 * Update surfaceProcesses.py Update timeField to record time of deposition of sediment in SP functions * Update surfaceProcesses.py Fix typo in 3D surface. Also reset time of the air material to the model time * Update surfaceProcesses.py fixed typo in func * updating the setonix jobs runners * Update surfaceProcesses.py Simplify 2D velocity and diffusivity SP functions * Update surfaceProcesses.py Didn't create object to bcast surface function to * Update surfaceProcesses Revert back to MPI gather of data over evaluate_global Update the examples * Adding melt dynamic heating to the advection diffusion solver see issue #669 * docker utils updates * Adding some final fixes to the dockerfile scripts * Update CHANGES.md * Remove obsolete glucifer bits * Update dockerfile Badlands install and CHANGES.md * Update CI for docker builds * Fixing the velocitySurface 2D and 3D implementation to handle restarts. Changes also include: * Renaming the surface tracers to prevent unexpected overwrites * The surfaceProcess class saving the passive tracer key to use during initialisation and solve. This is to make the code not save an instance of the pt to the swarm incase the pt is swapped in/out of Model memory. And helps with code readability. * Get the latest release of badlands from pypi --------- Co-authored-by: Romain Beucher <[email protected]> Co-authored-by: Julian Giordani <[email protected]> Co-authored-by: Ben Knight <[email protected]>
underworldcode · Oct 31, 2023 · 79402f5 · 79402f5
1 parent b72fc39
commit 79402f5
Show file tree

Hide file tree

Showing 42 changed files with 5,299 additions and 1,763 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -6,8 +6,8 @@ on:
   workflow_dispatch:
 
 env:
-  PETSC_VERSION: 3.18.1
-  UW_VERSION: 2.14.0
+  PETSC_VERSION: 3.19.4
+  UW_VERSION: 2.15.0
   OMPI_VERSION: 4.1.4
   MPICH_VERSION: 3.4.3
 
@@ -282,51 +282,52 @@ jobs:
       - name: Run Tests
         run: |
           cd docs
-          pytest -vvv pytests/test.py pytests/test_examples.py pytests/test_user_guide.py
+          pytest -vvv pytests/tests.py pytests/test_examples.py pytests/test_user_guide.py
           #cd test
           #cp -rf ../UWGeodynamics/examples UWGeodynamics/.
           #cp -rf ../UWGeodynamics/tutorials UWGeodynamics/.
           #cp -rf ../UWGeodynamics/benchmarks UWGeodynamics/.
           #pytest -vvv UWGeodynamics
 
-
-  conda_build:
-      name: Conda Build (Python ${{matrix.python-version}} ${{ matrix.os }})
-      runs-on: ${{ matrix.os }}
-      strategy:
-        fail-fast: false
-        matrix:
-          os: ["ubuntu-latest", "macos-latest"]
-          python-version: ["3.8", "3.9", "3.10"]
-      steps:
-        - uses: actions/checkout@v3
-        - uses: conda-incubator/setup-miniconda@v2
-          with:
-            auto-update-conda: true
-            python-version: ${{ matrix.python-version }}
-
-        - name: Config Conda
-          shell: bash -l {0}
-          run: |
-              conda install --channel conda-forge conda-build anaconda-client conda-verify
-              conda config --add channels conda-forge
-              conda config --add channels underworldcode
-              conda config --set anaconda_upload no
-              anaconda logout
-              
-        - name: Config Conda For Upload
-          if: github.event_name == 'release'
-          shell: bash -l {0}
-          run: conda config --set anaconda_upload yes
-
-        - name: Upload new Packages
-          if: github.event_name == 'release'
-          shell: bash -l {0}
-          run: |
-              conda info
-              anaconda login --hostname github-actions-${{ matrix.os  }}-$RANDOM --username ${{ secrets.ANACONDA_USERNAME }} --password ${{ secrets.ANACONDA_PASSWORD }}
-              conda-build --channel conda-forge --user geo-down-under conda
-              anaconda logout
+          #
+          #  conda_build:
+          #      name: Conda Build (Python ${{matrix.python-version}} ${{ matrix.os }})
+          #      runs-on: ${{ matrix.os }}
+          #      strategy:
+          #        fail-fast: false
+          #        matrix:
+          #          os: ["ubuntu-latest", "macos-latest"]
+          #          python-version: ["3.9", "3.10"]
+          #      steps:
+          #        - uses: actions/checkout@v3
+          #        - uses: conda-incubator/setup-miniconda@v2
+          #          with:
+          #            auto-update-conda: true
+          #            python-version: ${{ matrix.python-version }}
+          #      
+          #        - name: Config Conda
+          #          shell: bash -l {0}
+          #          run: |
+          #              conda install --channel conda-forge conda-build anaconda-client conda-verify
+          #              conda config --add channels conda-forge
+          #              conda config --add channels underworldcode
+          #              conda config --set anaconda_upload no
+          #              anaconda logout
+          #              
+          #        - name: Config Conda For Upload
+          #          if: github.event_name == 'release'
+          #          shell: bash -l {0}
+          #          run: conda config --set anaconda_upload yes
+          #
+          #        - name: Upload new Packages
+          #          if: github.event_name == 'release'
+          #          shell: bash -l {0}
+          #          run: |
+          #              conda info
+          #              anaconda login --hostname github-actions-${{ matrix.os  }}-$RANDOM --username ${{ secrets.ANACONDA_USERNAME }} --password ${{ secrets.ANACONDA_PASSWORD }}
+          #              conda-build --channel conda-forge --user geo-down-under conda
+          #              anaconda logout
+          #
 
   pypi:
     runs-on: ${{ matrix.os }}
@@ -336,7 +337,7 @@ jobs:
     strategy:
       matrix:
         os: ["ubuntu-latest", "macos-latest"]
-        python-version: ["3.8", "3.9", "3.10"]
+        python-version: ["3.9", "3.10"]
     steps:
       - uses: actions/checkout@v3
       - name: Set up Python

diff --git a/CHANGES.md b/CHANGES.md
@@ -1,6 +1,21 @@
 CHANGES: Underworld2
 =======================
 
+Release 2.15.0 [2023-04-19]
+---------------------------
+New:
+ * Move to Petsc-3.19.4
+ * New 3D free surface implementation. (Not fully tested).
+ * new install guides for Gadi and setonix.
+
+Changes:
+
+Fixes:
+ * UWGeodynamics - add dynamic heating back into the advection diffusion solver,
+  https://github.com/underworldcode/underworld2/issues/669
+ * Using updated Badlands-2.2.3 without license issue. 
+
+
 Release 2.14 [2022-11-29]
 ---------------------------
 New:

diff --git a/LICENSE.md b/LICENSE.md
@@ -16,7 +16,7 @@ Underworld has been in development since 2003. It has always been released under
 
 ### Copyright holders
 
-Copyright Australian National University, 2020-2022
+Copyright Australian National University, 2020-2023
 Copyright Melbourne University,           2014-2021
 Copyright Monash University,              2003-2021
 Copyright VPAC,                           2003-2009

diff --git a/conda/conda_build_config.yaml b/conda/conda_build_config.yaml
@@ -1,5 +1,5 @@
- mpi:
-    - mpich
-    - openmpi [linux]
- petsc:
-    - 3.18.1
+mpi:
+  - mpich
+  #- openmpi [linux]
+petsc:
+  - 3.18.1
diff --git a/conda/meta.yaml b/conda/meta.yaml
@@ -1,6 +1,6 @@
 {% set name = "underworld" %}
 {% set version = "2.14.0" %}
-{% set sha256 = "fdc6c7ae1034b5bd6159b465ae44d75a19ca9bb44021e9d16c9eafb6bced2e12" %}
+{% set sha256 = "a9323209b0e36743bc953bf3b3d8e0a84d5e4e7f1911a1e78d1404a0ade6337d" %}
 {% set build = 0 %}
 
 package:

diff --git a/docs/UWGeodynamics/examples/1_08_ViscoElasticHalfSpace.ipynb b/docs/UWGeodynamics/examples/1_08_ViscoElasticHalfSpace.ipynb
@@ -509,13 +509,7 @@
       "Step:   102 Model Time: 125465.2 year dt: 1230.1 year (2021-02-19 11:00:02)\n",
       "Step:   103 Model Time: 126695.2 year dt: 1230.1 year (2021-02-19 11:00:03)\n",
       "Step:   104 Model Time: 127925.3 year dt: 1230.1 year (2021-02-19 11:00:04)\n",
-      "Step:   105 Model Time: 129155.3 year dt: 1230.1 year (2021-02-19 11:00:05)\n"
-     ]
-    },
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
+      "Step:   105 Model Time: 129155.3 year dt: 1230.1 year (2021-02-19 11:00:05)\n",
       "Step:   106 Model Time: 130385.4 year dt: 1230.1 year (2021-02-19 11:00:06)\n",
       "Step:   107 Model Time: 131615.4 year dt: 1230.1 year (2021-02-19 11:00:07)\n",
       "Step:   108 Model Time: 132845.5 year dt: 1230.1 year (2021-02-19 11:00:08)\n",
@@ -623,13 +617,7 @@
       "Step:   210 Model Time: 258310.6 year dt: 1230.1 year (2021-02-19 11:01:41)\n",
       "Step:   211 Model Time: 259540.7 year dt: 1230.1 year (2021-02-19 11:01:42)\n",
       "Step:   212 Model Time: 260770.7 year dt: 1230.1 year (2021-02-19 11:01:43)\n",
-      "Step:   213 Model Time: 262000.8 year dt: 1230.1 year (2021-02-19 11:01:44)\n"
-     ]
-    },
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
+      "Step:   213 Model Time: 262000.8 year dt: 1230.1 year (2021-02-19 11:01:44)\n",
       "Step:   214 Model Time: 263230.8 year dt: 1230.1 year (2021-02-19 11:01:45)\n",
       "Step:   215 Model Time: 264460.9 year dt: 1230.1 year (2021-02-19 11:01:46)\n",
       "Step:   216 Model Time: 265690.9 year dt: 1230.1 year (2021-02-19 11:01:47)\n",
@@ -737,13 +725,7 @@
       "Step:   318 Model Time: 391156.1 year dt: 1230.1 year (2021-02-19 11:03:19)\n",
       "Step:   319 Model Time: 392386.1 year dt: 1230.1 year (2021-02-19 11:03:20)\n",
       "Step:   320 Model Time: 393616.2 year dt: 1230.1 year (2021-02-19 11:03:20)\n",
-      "Step:   321 Model Time: 394846.2 year dt: 1230.1 year (2021-02-19 11:03:21)\n"
-     ]
-    },
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
+      "Step:   321 Model Time: 394846.2 year dt: 1230.1 year (2021-02-19 11:03:21)\n",
       "Step:   322 Model Time: 396076.3 year dt: 1230.1 year (2021-02-19 11:03:22)\n",
       "Step:   323 Model Time: 397306.3 year dt: 1230.1 year (2021-02-19 11:03:23)\n",
       "Step:   324 Model Time: 398536.4 year dt: 1230.1 year (2021-02-19 11:03:24)\n",
@@ -851,13 +833,7 @@
       "Step:   426 Model Time: 524001.5 year dt: 1230.1 year (2021-02-19 11:04:53)\n",
       "Step:   427 Model Time: 525231.6 year dt: 1230.1 year (2021-02-19 11:04:54)\n",
       "Step:   428 Model Time: 526461.6 year dt: 1230.1 year (2021-02-19 11:04:55)\n",
-      "Step:   429 Model Time: 527691.7 year dt: 1230.1 year (2021-02-19 11:04:55)\n"
-     ]
-    },
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
+      "Step:   429 Model Time: 527691.7 year dt: 1230.1 year (2021-02-19 11:04:55)\n",
       "Step:   430 Model Time: 528921.7 year dt: 1230.1 year (2021-02-19 11:04:56)\n",
       "Step:   431 Model Time: 530151.8 year dt: 1230.1 year (2021-02-19 11:04:57)\n",
       "Step:   432 Model Time: 531381.8 year dt: 1230.1 year (2021-02-19 11:04:58)\n",
@@ -943,7 +919,7 @@
     }
    ],
    "source": [
-    "Model.run_for(duration=tMax, dt=1e-2*t_relax)"
+    "Model.run_for(duration=tMax/10., dt=1e-2*t_relax)"
    ]
   },
   {
@@ -1014,6 +990,13 @@
     "ax.legend(loc='best')\n",
     "plt.show()"
    ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": []
   }
  ],
  "metadata": {
@@ -1032,9 +1015,9 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.10.1"
+   "version": "3.10.0"
   }
  },
  "nbformat": 4,
- "nbformat_minor": 2
+ "nbformat_minor": 4
 }
diff --git a/docs/UWGeodynamics/examples/1_10_Viscoelastoplasticity-in-simple-shear.ipynb b/docs/UWGeodynamics/examples/1_10_Viscoelastoplasticity-in-simple-shear.ipynb
@@ -329,7 +329,7 @@
     "    previousStress_xy.append(\n",
     "        Model._previousStressField[2].evaluate(Model.swarm)[0])\n",
     "    totalStress_xy.append(        \n",
-    "        Model._stressFn[2].evaluate(Model.swarm)[0])\n"
+    "        Model._stressFn[2].evaluate(Model.swarm)[0][0])\n"
    ]
   },
   {
@@ -491,7 +491,7 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Python 3",
+   "display_name": "Python 3 (ipykernel)",
    "language": "python",
    "name": "python3"
   },
@@ -505,9 +505,9 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.9.1"
+   "version": "3.10.0"
   }
  },
  "nbformat": 4,
- "nbformat_minor": 2
+ "nbformat_minor": 4
 }
diff --git a/docs/UWGeodynamics/examples/1_28_Kaus2010_Free_Surface_Stabilization.ipynb b/docs/UWGeodynamics/examples/1_28_Kaus2010_Free_Surface_Stabilization.ipynb
@@ -510,7 +510,9 @@
     }
    ],
    "source": [
-    "Model.run_for(nstep=1000, checkpoint_interval=1, dt=5000*u.year)"
+    "steps = 1000\n",
+    "test_steps = 20\n",
+    "Model.run_for(nstep=test_steps, checkpoint_interval=1, dt=5000*u.year)"
    ]
   },
   {
@@ -546,9 +548,9 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "uw2_venv",
+   "display_name": "Python 3 (ipykernel)",
    "language": "python",
-   "name": "uw2_venv"
+   "name": "python3"
   },
   "language_info": {
    "codemirror_mode": {
@@ -560,7 +562,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.10.2"
+   "version": "3.10.0"
   }
  },
  "nbformat": 4,