Merge branch 'pbrubeck/submesh-comm-self' into pbrubeck/bddc-primal-vertices

Author: pbrubeck

firedrake/__init__.py

@@ -3,7 +3,7 @@
 # the specific version, here we are more permissive. This is to catch the
 # case where users don't update their PETSc for a really long time or
 # accidentally install a too-new release that isn't yet supported.
-PETSC_SUPPORTED_VERSIONS = ">=3.25.0"
+PETSC_SUPPORTED_VERSIONS = ">=3.24.1"
 
 
 def init_petsc():

firedrake/mesh.py

@@ -4731,7 +4731,7 @@ def SubDomainData(geometric_expr):
     return op2.Subset(m.cell_set, indices)
 
 
-def Submesh(mesh, subdim, subdomain_id, label_name=None, name=None, ignore_halo=False, comm=None):
+def Submesh(mesh, subdim, subdomain_id, label_name=None, name=None, ignore_halo=False, reorder=True, comm=None):
     """Construct a submesh from a given mesh.
 
     Parameters
@@ -4747,7 +4747,9 @@ def Submesh(mesh, subdim, subdomain_id, label_name=None, name=None, ignore_halo=
     name : str
         Name of the submesh.
     ignore_halo : bool
-        Excludes the halo from the submesh.
+        Whether to exclude the halo from the submesh.
+    reorder : bool
+        Whether to reorder the mesh entities.
     comm : PETSc.Comm
         An optional sub-communicator to define the submesh.
 
@@ -4836,7 +4838,7 @@ def Submesh(mesh, subdim, subdomain_id, label_name=None, name=None, ignore_halo=
         submesh_parent=mesh,
         name=name,
         comm=subplex.comm,
-        reorder=False,
+        reorder=reorder,
         distribution_parameters={
             "partition": False,
             "overlap_type": (DistributedMeshOverlapType.NONE, 0),

setup.py

@@ -20,7 +20,7 @@
 
 
 # Ensure that the PETSc getting linked against is compatible
-petsctools.init(version_spec=">=3.25.0")
+petsctools.init(version_spec=">=3.24.1")
 import petsc4py
 
 

tests/firedrake/submesh/test_submesh_comm.py

@@ -8,9 +8,8 @@
 def test_submesh_comm_self():
     comm = PETSc.COMM_SELF
     nx = 4
-    mesh = UnitSquareMesh(nx, nx, quadrilateral=True)
-    tdim = mesh.topological_dimension
-    submesh = Submesh(mesh, tdim, None, ignore_halo=True, comm=comm)
+    mesh = UnitSquareMesh(nx, nx, quadrilateral=True, reorder=False)
+    submesh = Submesh(mesh, mesh.topological_dimension, None, ignore_halo=True, comm=comm, reorder=False)
 
     assert submesh.submesh_parent is mesh
     assert submesh.comm.size == 1