Merge pull request #11 from scientificcomputing/finsberg/max_facet_to_cell_links

API change due to FEniCS/dolfinx#4082

Author: jorgensd

src/io4dolfinx/checkpointing.py

@@ -6,6 +6,7 @@
 
 from __future__ import annotations
 
+import inspect
 import typing
 from pathlib import Path
 from typing import Any
@@ -383,6 +384,7 @@ def read_mesh(
     read_from_partition: bool = False,
     backend_args: dict[str, Any] | None = None,
     backend: str = "adios2",
+    max_facet_to_cell_links: int = 2,
 ) -> dolfinx.mesh.Mesh:
     """
     Read an ADIOS2 mesh into DOLFINx.
@@ -395,6 +397,8 @@ def read_mesh(
         time: Time stamp associated with mesh
         read_from_partition: Read mesh with partition from file
         backend_args: List of arguments to reader backend
+        max_facet_to_cell_links: Maximum number of cells a facet
+            can be connected to.
     Returns:
         The distributed mesh
     """
@@ -432,9 +436,18 @@ def partitioner(comm: MPI.Intracomm, n, m, topo):
             else:
                 return partition_graph
     else:
-        partitioner = dolfinx.cpp.mesh.create_cell_partitioner(ghost_mode)
+        sig = inspect.signature(dolfinx.mesh.create_cell_partitioner)
+        part_kwargs = {}
+        if "max_facet_to_cell_links" in list(sig.parameters.keys()):
+            part_kwargs["max_facet_to_cell_links"] = max_facet_to_cell_links
+        partitioner = dolfinx.cpp.mesh.create_cell_partitioner(ghost_mode, **part_kwargs)
+
     return dolfinx.mesh.create_mesh(
-        comm, cells=dist_in_data.cells, x=dist_in_data.x, e=domain, partitioner=partitioner
+        comm,
+        cells=dist_in_data.cells,
+        x=dist_in_data.x,
+        e=domain,
+        partitioner=partitioner,
     )
 
 

src/io4dolfinx/readers.py

@@ -6,6 +6,7 @@
 
 from __future__ import annotations
 
+import inspect
 import pathlib
 import typing
 from pathlib import Path
@@ -149,6 +150,7 @@ def read_mesh_from_legacy_h5(
     group: str,
     cell_type: str = "tetrahedron",
     backend: str = "adios2",
+    max_facet_to_cell_links: int = 2,
 ) -> dolfinx.mesh.Mesh:
     """
     Read mesh from `h5`-file generated by legacy DOLFIN `HDF5File.write` or `XDMF.write_checkpoint`.
@@ -158,6 +160,10 @@ def read_mesh_from_legacy_h5(
         filename: Path to `h5` or `xdmf` file
         group: Name of mesh in `h5`-file
         cell_type: What type of cell type, by default tetrahedron.
+        backend: The IO backend to use when reading the mesh (must
+            support legacy mesh reading, e.g., "adios2").
+        max_facet_to_cell_links: Maximum number of cells a facet
+            can be connected to.
     """
     # Make sure we use the HDF5File and check that the file is present
     check_file_exists(filename)
@@ -175,9 +181,18 @@ def read_mesh_from_legacy_h5(
         shape=(mesh_geometry.shape[1],),
     )
     domain = ufl.Mesh(element)
+    sig = inspect.signature(dolfinx.mesh.create_mesh)
+    kwargs: dict[str, int] = {}
+    if "max_facet_to_cell_links" in list(sig.parameters.keys()):
+        kwargs["max_facet_to_cell_links"] = max_facet_to_cell_links
 
     return dolfinx.mesh.create_mesh(
-        comm=MPI.COMM_WORLD, cells=mesh_topology, x=mesh_geometry, e=domain
+        comm=MPI.COMM_WORLD,
+        cells=mesh_topology,
+        x=mesh_geometry,
+        e=domain,
+        partitioner=None,
+        **kwargs,
     )