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

Add ignore_orientation and ignore_interior_facets flags #1050

Merged
merged 7 commits into from
Oct 25, 2023
Merged

Add ignore_orientation and ignore_interior_facets flags #1050

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
cf431d8
Add ignore_orientation flag
kinnala Aug 17, 2023
c8320b2
Test ignore_orientation
kinnala Oct 25, 2023
836d9d9
Fix syntax error
kinnala Oct 25, 2023
b274fd6
Merge branch 'master' into add-ignore-orientation
kinnala Oct 25, 2023
7fe0f99
Ignore types in matplotlib
kinnala Oct 25, 2023
1847358
Add another ignore_interior_facets flag
kinnala Oct 25, 2023
e7f0722
Add changelog entry
kinnala Oct 25, 2023
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
67 changes: 36 additions & 31 deletions skfem/io/meshio.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,8 @@
def from_meshio(m,
out=None,
int_data_to_sets=False,
force_meshio_type=None):
force_meshio_type=None,
ignore_orientation=False):

cells = m.cells_dict
meshio_type = None
Expand Down Expand Up @@ -126,37 +127,41 @@ def from_meshio(m,
}
sorted_facets = {k: [tuple(np.sort(f)) for f in v]
for k, v in oriented_facets.items()}

for k, v in oriented_facets.items():
indices = []
oris = []
for i, f in enumerate(map(tuple, mtmp.facets.T)):
if f in sorted_facets[k]:
indices.append(i)
ix = sorted_facets[k].index(f)
facet = v[ix]
t1, t2 = mtmp.f2t[:, i]
if t2 == -1:
# orientation on boundary is 0
oris.append(0)
continue
if len(f) == 2:
# rotate tangent to find normal
tangent = mtmp.p[:, facet[1]] - mtmp.p[:, facet[0]]
normal = np.array([-tangent[1], tangent[0]])
elif len(f) == 3:
# cross product to find normal
tangent1 = mtmp.p[:, facet[1]] - mtmp.p[:, facet[0]]
tangent2 = mtmp.p[:, facet[2]] - mtmp.p[:, facet[0]]
normal = -np.cross(tangent1, tangent2)
else:
raise NotImplementedError
# find another vector using node outside of boundary
third = np.setdiff1d(mtmp.t[:, t1],
np.array(f))[0]
outplane = mtmp.p[:, f[0]] - mtmp.p[:, third]
oris.append(1 if np.dot(normal, outplane) > 0 else 0)
boundaries[k] = OrientedBoundary(indices, oris)
if ignore_orientation:
a = np.array(sorted_facets[k])
b = mtmp.facets.T
boundaries[k] = np.nonzero((a == b[:, None]).all(axis=2).any(axis=1))[0]
else:
indices = []
oris = []
for i, f in enumerate(map(tuple, mtmp.facets.T)):
if f in sorted_facets[k]:
indices.append(i)
ix = sorted_facets[k].index(f)
facet = v[ix]
t1, t2 = mtmp.f2t[:, i]
if t2 == -1:
# orientation on boundary is 0
oris.append(0)
continue
if len(f) == 2:
# rotate tangent to find normal
tangent = mtmp.p[:, facet[1]] - mtmp.p[:, facet[0]]
normal = np.array([-tangent[1], tangent[0]])
elif len(f) == 3:
# cross product to find normal
tangent1 = mtmp.p[:, facet[1]] - mtmp.p[:, facet[0]]
tangent2 = mtmp.p[:, facet[2]] - mtmp.p[:, facet[0]]
normal = -np.cross(tangent1, tangent2)
else:
raise NotImplementedError
# find another vector using node outside of boundary
third = np.setdiff1d(mtmp.t[:, t1],
np.array(f))[0]
outplane = mtmp.p[:, f[0]] - mtmp.p[:, third]
oris.append(1 if np.dot(normal, outplane) > 0 else 0)
boundaries[k] = OrientedBoundary(indices, oris)

# MSH 2.2 tag parsing
if len(boundaries) == 0 and m.cell_data and m.field_data:
Expand Down