Merge branch 'main' into jpdean/submesh_bc_demo

Author: jorgensd

.github/workflows/spack.yml

@@ -62,7 +62,7 @@ jobs:
           . ./spack/share/spack/setup-env.sh
           spack env create cpp-main
           spack env activate cpp-main
-          spack add fenics-dolfinx@main+adios2
+          spack add fenics-dolfinx@main+petsc+adios2
           spack install
       - name: Get DOLFINx code (to access test files)
         uses: actions/checkout@v4
@@ -73,7 +73,7 @@ jobs:
           . ./spack/share/spack/setup-env.sh
           spack env create cpp-main-test
           spack env activate cpp-main-test
-          spack add fenics-dolfinx@main+adios2 cmake py-fenics-ffcx@main
+          spack add fenics-dolfinx@main+petsc+adios2 cmake py-fenics-ffcx@main
           spack install
           cd dolfinx-main/cpp/
           cd demo/poisson
@@ -87,7 +87,7 @@ jobs:
           . ./spack/share/spack/setup-env.sh
           spack env create cpp-release
           spack env activate cpp-release
-          spack add fenics-dolfinx@${DOLFINX_RELEASE_VERSION}+adios2
+          spack add fenics-dolfinx@${DOLFINX_RELEASE_VERSION}+petsc+adios2
           spack install
       - name: Get DOLFINx release code (to access test files)
         uses: actions/checkout@v4
@@ -99,7 +99,7 @@ jobs:
           . ./spack/share/spack/setup-env.sh
           spack env create cpp-release-test
           spack env activate cpp-release-test
-          spack add fenics-dolfinx@${DOLFINX_RELEASE_VERSION}+adios2 cmake py-fenics-ffcx
+          spack add fenics-dolfinx@${DOLFINX_RELEASE_VERSION}+petsc+adios2 cmake py-fenics-ffcx
           spack install
           cd dolfinx-release/cpp/
           cd demo/poisson

README.md

@@ -61,7 +61,7 @@ git clone https://github.com/spack/spack.git
 . ./spack/share/spack/setup-env.sh
 spack env create fenicsx-env
 spack env activate fenicsx-env
-spack add fenics-dolfinx+adios2 py-fenics-dolfinx cflags="-O3" fflags="-O3"
+spack add fenics-dolfinx+petsc+adios2 py-fenics-dolfinx cflags="-O3" fflags="-O3"
 spack install
 ```
 

cpp/dolfinx/nls/NewtonSolver.cpp

@@ -148,6 +148,7 @@ std::pair<int, bool> nls::petsc::NewtonSolver::solve(Vec x)
   _iteration = 0;
   _krylov_iterations = 0;
   _residual = -1;
+  _residual0 = 0.0;
 
   if (!_fnF)
   {

docker/Dockerfile.redhat

@@ -8,7 +8,7 @@ FROM rockylinux/rockylinux:9
 ARG BUILD_NP=4
 
 ARG HDF5_VERSION=1.14.6
-ARG PETSC_VERSION=3.23.0
+ARG PETSC_VERSION=3.23.1
 ARG MPICH_VERSION=4.2.3
 
 WORKDIR /tmp

docker/Dockerfile.test-env

@@ -22,8 +22,8 @@ ARG KAHIP_VERSION=3.18
 # the most recent Numba release, see
 # https://numba.readthedocs.io/en/stable/user/installing.html#version-support-information
 ARG NUMPY_VERSION=2.1.3
-ARG PETSC_VERSION=3.23.0
-ARG SLEPC_VERSION=3.23.0
+ARG PETSC_VERSION=3.23.1
+ARG SLEPC_VERSION=3.23.1
 ARG SPDLOG_VERSION=1.15.1
 
 ARG MPICH_VERSION=4.2.3

python/demo/demo_mixed-poisson.py

@@ -376,6 +376,9 @@
 reason = ksp.getConvergedReason()
 assert reason > 0, f"Krylov solver has not converged {reason}."
 ksp.view()
+
+sigma.x.scatter_forward()
+u.x.scatter_forward()
 # -
 
 # We save the solution `u` in VTX format:

python/pyproject.toml

@@ -23,9 +23,9 @@ dependencies = [
       "numpy>=1.21",
       "cffi",
       "mpi4py",
-      "fenics-basix>=0.10.0.dev0,<0.11.0",
-      "fenics-ffcx>=0.10.0.dev0,<0.11.0",
-      "fenics-ufl>=2024.3.0.dev0,<2024.4.0",
+      "fenics-basix>=0.10.0.dev0",
+      "fenics-ffcx>=0.10.0.dev0",
+      "fenics-ufl>=2025.2.0.dev0",
 ]
 
 [project.optional-dependencies]

python/test/unit/io/test_vtkhdf.py

@@ -135,10 +135,16 @@ def test_read_write_higher_order_mesh(order):
     ref_mesh = dolfinx.io.gmshio.model_to_mesh(gmsh.model, comm, rank).mesh
     gmsh.finalize()
 
-    ref_volume_form = dolfinx.fem.form(1 * ufl.dx(domain=ref_mesh))
+    ref_volume_form = dolfinx.fem.form(
+        1 * ufl.dx(domain=ref_mesh),
+        dtype=ref_mesh.geometry.x.dtype,
+    )
     ref_volume = comm.allreduce(dolfinx.fem.assemble_scalar(ref_volume_form), op=MPI.SUM)
 
-    ref_surface_form = dolfinx.fem.form(1 * ufl.ds(domain=ref_mesh))
+    ref_surface_form = dolfinx.fem.form(
+        1 * ufl.ds(domain=ref_mesh),
+        dtype=ref_mesh.geometry.x.dtype,
+    )
     ref_surface = comm.allreduce(dolfinx.fem.assemble_scalar(ref_surface_form), op=MPI.SUM)
 
     # Write to file
@@ -150,10 +156,10 @@ def test_read_write_higher_order_mesh(order):
     mesh = read_mesh(comm, filename)
 
     # Compare surface and volume metrics
-    volume_form = dolfinx.fem.form(1 * ufl.dx(domain=mesh))
+    volume_form = dolfinx.fem.form(1 * ufl.dx(domain=mesh), dtype=mesh.geometry.x.dtype)
     volume = comm.allreduce(dolfinx.fem.assemble_scalar(volume_form), op=MPI.SUM)
     assert np.isclose(ref_volume, volume)
 
-    surface_form = dolfinx.fem.form(1 * ufl.ds(domain=mesh))
+    surface_form = dolfinx.fem.form(1 * ufl.ds(domain=mesh), dtype=mesh.geometry.x.dtype)
     surface = comm.allreduce(dolfinx.fem.assemble_scalar(surface_form), op=MPI.SUM)
     assert np.isclose(ref_surface, surface)