Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow partitioner to be passed to model_to_mesh #2394

Merged
merged 9 commits into from
Oct 11, 2022
Merged

Allow partitioner to be passed to model_to_mesh #2394

Changes from 3 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
908ce88
Pass partitioner
jpdean Oct 6, 2022
6082e71
Flake8
jpdean Oct 6, 2022
8255d1d
Add docs
jpdean Oct 6, 2022
02ba89d
Typing
jpdean Oct 7, 2022
5807099
Same for msh to mesh
jpdean Oct 7, 2022
23787b9
Merge branch 'main' into jpdean/msh_to_mesh_partitioner
jpdean Oct 8, 2022
15af652
Minor doc formatting changes
garth-wells Oct 11, 2022
47030b2
Merge remote-tracking branch 'origin/main' into jpdean/msh_to_mesh_pa…
garth-wells Oct 11, 2022
ccc132e
Merge branch 'main' into jpdean/msh_to_mesh_partitioner
garth-wells Oct 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions python/dolfinx/io/gmshio.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,8 +161,11 @@ def extract_geometry(model: gmsh.model, name: str = None) -> npt.NDArray[np.floa
assert np.all(indices[perm_sort] == np.arange(len(indices)))
return points[perm_sort]

def model_to_mesh(model: gmsh.model, comm: _MPI.Comm, rank: int,
gdim: int = 3) -> typing.Tuple[Mesh, _cpp.mesh.MeshTags_int32, _cpp.mesh.MeshTags_int32]:
def model_to_mesh(
model: gmsh.model, comm: _MPI.Comm, rank: int,
gdim: int = 3,
partitioner=create_cell_partitioner(GhostMode.none)) -> typing.Tuple[
jpdean marked this conversation as resolved.
Show resolved Hide resolved
Mesh, _cpp.mesh.MeshTags_int32, _cpp.mesh.MeshTags_int32]:
"""
Given a Gmsh model, take all physical entities of the highest
topological dimension and create the corresponding DOLFINx mesh.
Expand All @@ -178,6 +181,7 @@ def model_to_mesh(model: gmsh.model, comm: _MPI.Comm, rank: int,
rank: The rank the Gmsh model is initialized on
model: The Gmsh model
gdim: Geometrical dimension of the mesh
partitioner: Function that computes the parallel distribution of cells across MPI ranks

Returns:
A triplet (mesh, cell_tags, facet_tags) where cell_tags hold
Expand Down Expand Up @@ -241,8 +245,7 @@ def model_to_mesh(model: gmsh.model, comm: _MPI.Comm, rank: int,
ufl_domain = ufl_mesh(cell_id, gdim)
gmsh_cell_perm = cell_perm_array(_cpp.mesh.to_type(str(ufl_domain.ufl_cell())), num_nodes)
cells = cells[:, gmsh_cell_perm]
part = create_cell_partitioner(GhostMode.none)
mesh = create_mesh(comm, cells, x[:, :gdim], ufl_domain, part)
mesh = create_mesh(comm, cells, x[:, :gdim], ufl_domain, partitioner)

# Create MeshTags for cells
local_entities, local_values = _cpp.io.distribute_entity_data(mesh, mesh.topology.dim, cells, cell_values)
Expand Down