Skip to content

New EdgeDescriptor API #120

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

Draft
pbrubeck wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

New EdgeDescriptor API #120

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 12 additions & 17 deletions ngsPETSc/plex.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ def buildSimplices(plex, points=None):
return np.array(T, dtype=PETSc.IntType)


def addSimplices(ngMesh, dim, index, data, project_geometry, isoccgeom, edgenr_mapping):
def addSimplices(ngMesh, dim, index, data, project_geometry, isoccgeom):
"""
Add simplices to a Netgen mesh

Expand All @@ -82,24 +82,21 @@ def addSimplices(ngMesh, dim, index, data, project_geometry, isoccgeom, edgenr_m
:arg data: a numpy.array with the vertices of each simplex
:project_geometry: whether to project points to the geometry
:isoccgeom: whether we have an OCCGeometry, required to decide index conventions
:edgenr_mapping: a dict mapping from region index to edgenr

"""
if len(data) == 0:
return
if dim == 1:
edgenr = index-1 if isoccgeom else index
if edgenr_mapping is not None:
edgenr = edgenr_mapping.get(index, edgenr)
for edge in data:
ngMesh.Add(ngm.Element1D(list(edge+1), index=index, edgenr=edgenr),
project_geominfo=project_geometry)
else:
if dim == 2:
surfnr = index if isoccgeom else index-1
index = ngMesh.Add(ngm.FaceDescriptor(bc=index, surfnr=surfnr))
ngMesh.AddElements(dim=dim, index=index, data=data, base=0,
project_geometry=project_geometry)
d = ngm.EdgeDescriptor()
d.index = index
d.edgenr = edgenr
index = ngMesh.Add(d)
elif dim == 2:
surfnr = index if isoccgeom else index-1
index = ngMesh.Add(ngm.FaceDescriptor(bc=index, surfnr=surfnr))
ngMesh.AddElements(dim=dim, index=index, data=data, base=0,
project_geometry=project_geometry)


def createNetgenMesh(plex, geo):
Expand All @@ -114,10 +111,8 @@ def createNetgenMesh(plex, geo):
tdim = plex.getDimension()
gdim = plex.getCoordinateDim()
ngMesh = ngm.Mesh(dim=gdim)
edgenr_mapping = None
if geo is not None:
if isinstance(geo, ngm.Mesh):
edgenr_mapping = {e.index: e.edgenr for e in geo.Elements1D()}
geo = geo.GetGeometry()
ngMesh.SetGeometry(geo)
geoInfo = True
Expand Down Expand Up @@ -153,7 +148,7 @@ def createNetgenMesh(plex, geo):
points = plex.getStratumIS(labelName, index).indices
points = points[np.logical_and(pStart <= points, points < pEnd)]
T = buildSimplices(plex, points=points)
addSimplices(ngMesh, depth, index, T, geoInfo, isoccgeom, edgenr_mapping)
addSimplices(ngMesh, depth, index, T, geoInfo, isoccgeom)

# Add unlabeled cells
labelName = codim_label[0]
Expand All @@ -166,7 +161,7 @@ def createNetgenMesh(plex, geo):
points = None
index = plex.getLabelSize(labelName) + 1
T = buildSimplices(plex, points=points)
addSimplices(ngMesh, tdim, index, T, geoInfo, isoccgeom, edgenr_mapping)
addSimplices(ngMesh, tdim, index, T, geoInfo, isoccgeom)

plex.setBasicAdjacency(*adjacency)
return ngMesh
Expand Down
Loading