Merge branch 'release'

jorgensd · Oct 15, 2024 · ea69c78 · ea69c78
2 parents 0a79e58 + 94447f3
commit ea69c78
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 12 deletions.
diff --git a/.github/workflows/book_stable.yml b/.github/workflows/book_stable.yml
@@ -16,7 +16,7 @@ env:
 jobs:
   build-book:
     runs-on: ubuntu-latest
-    container: ghcr.io/fenics/dolfinx/lab:v0.8.0
+    container: ghcr.io/fenics/dolfinx/lab:stable
 
     env:
       PYVISTA_TRAME_SERVER_PROXY_PREFIX: "/proxy/"

diff --git a/.github/workflows/test_nightly.yml b/.github/workflows/test_nightly.yml
@@ -39,6 +39,9 @@ jobs:
       - name: Test building the book
         run: PYVISTA_OFF_SCREEN=false jupyter-book build  -W .
 
+      - name: Test building the book
+        run: PYVISTA_OFF_SCREEN=false jupyter-book build  -W .
+
       - name: Test complex notebooks in parallel
         working-directory: chapter1
         run: |
@@ -67,7 +70,6 @@ jobs:
           mpirun -n 2 python3 nonlinpoisson_code.py
           mpirun -n 2 python3 ns_code1.py
           mpirun -n 2 python3 ns_code2.py
-
       - name: Test chapter 3
         working-directory: chapter3
         run: |
@@ -77,7 +79,6 @@ jobs:
           mpirun -n 2 python3 robin_neumann_dirichlet.py
           mpirun -n 2 python3 component_bc.py
           mpirun -n 2 python3 em.py
-
       - name: Test chapter 4
         working-directory: chapter4
         run: |

diff --git a/.github/workflows/test_stable.yml b/.github/workflows/test_stable.yml
@@ -14,7 +14,7 @@ env:
 jobs:
   test:
     runs-on: ubuntu-latest
-    container: ghcr.io/fenics/dolfinx/lab:v0.8.0
+    container: ghcr.io/fenics/dolfinx/lab:stable
     env:
       PYVISTA_OFF_SCREEN: true
 
@@ -33,7 +33,7 @@ jobs:
         run: |
           export PKG_CONFIG_PATH=/usr/local/dolfinx-complex/lib/pkgconfig:$PKG_CONFIG_PATH
           export PETSC_ARCH=linux-gnu-complex128-32
-          export PYTHONPATH=/usr/local/dolfinx-complex/lib/python3.10/dist-packages:$PYTHONPATH
+          export PYTHONPATH=/usr/local/dolfinx-complex/lib/python3.12/dist-packages:$PYTHONPATH
           export LD_LIBRARY_PATH=/usr/local/dolfinx-complex/lib:$LD_LIBRARY_PATH
           python3 complex_mode.py
           mpirun -n 2 python3 complex_mode.py

diff --git a/Changelog.md b/Changelog.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## v0.9.0
+
+- `scale` in `apply_lifting` has been renamed to `alpha`
+- Use `dolfinx.fem.Function.x.petsc_vec` as opposed to `dolfinx.fem.Function.vector`
+
 ## v0.8.0
 
 - Replace all `ufl.FiniteElement` and `ufl.VectorElement` with the appropriate `basix.ufl.element`

diff --git a/chapter4/compiler_parameters.ipynb b/chapter4/compiler_parameters.ipynb
@@ -58,7 +58,7 @@
    "id": "3f832e78",
    "metadata": {},
    "source": [
-    "Next we generate a general function to assemble the mass matrix for a unit cube. Note that we use `dolfinx.fem.Form` to compile the variational form. For codes using `dolfinx.LinearProblem`, you can supply `jit_options` as a keyword argument."
+    "Next we generate a general function to assemble the mass matrix for a unit cube. Note that we use `dolfinx.fem.form` to compile the variational form. For codes using `dolfinx.fem.petsc.LinearProblem`, you can supply `jit_options` as a keyword argument."
    ]
   },
   {

diff --git a/chapter4/compiler_parameters.py b/chapter4/compiler_parameters.py
@@ -46,7 +46,7 @@
 print(f"Directory to put C files in: {cache_dir}")
 # -
 
-# Next we generate a general function to assemble the mass matrix for a unit cube. Note that we use `dolfinx.fem.Form` to compile the variational form. For codes using `dolfinx.LinearProblem`, you can supply `jit_options` as a keyword argument.
+# Next we generate a general function to assemble the mass matrix for a unit cube. Note that we use `dolfinx.fem.form` to compile the variational form. For codes using `dolfinx.fem.petsc.LinearProblem`, you can supply `jit_options` as a keyword argument.
 
 # +
 

diff --git a/chapter4/newton-solver.ipynb b/chapter4/newton-solver.ipynb
diff --git a/fem.md b/fem.md
@@ -40,13 +40,13 @@ The tutorial uses several dependencies for meshing, plotting and timings. A comp
 To use the notebooks in this tutorial with DOLFINx on your own computer, you should use the docker image obtained using the following command:
 
 ```bash
-  docker run --init -p 8888:8888 -v "$(pwd)":/root/shared ghcr.io/jorgensd/dolfinx-tutorial:v0.7.2
+  docker run --init -p 8888:8888 -v "$(pwd)":/root/shared ghcr.io/jorgensd/dolfinx-tutorial:release
 ```
 
 This image can also be used as a normal docker container by adding:
 
 ```bash
-  docker run --ti -v "$(pwd)":/root/shared  --entrypoint="/bin/bash" ghcr.io/jorgensd/dolfinx-tutorial:v0.7.2
+  docker run --ti -v "$(pwd)":/root/shared  --entrypoint="/bin/bash" ghcr.io/jorgensd/dolfinx-tutorial:release
 ```
 
 The tutorials can also be exported as an IPython notebook or PDF by clicking the ![Download](save.png)-symbol in the top right corner of the relevant tutorial. The notebook can in turn be used with a Python kernel which has DOLFINx.
@@ -58,7 +58,7 @@ The [Dockerfile](https://github.com/FEniCS/dolfinx/blob/main/docker/Dockerfile)
 provides a definitive build recipe. As the DOLFINx docker images are hosted at Docker-hub, one can directly access the image using:
 
 ```bash
-docker run dolfinx/dolfinx:v0.8.0
+docker run dolfinx/dolfinx:stable
 ```
 
 There are several ways of customizing a docker container, such as mounting volumes/sharing folder, setting a working directory, sharing graphical interfaces etc. See `docker run --help` for an extensive list.