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

Implement alternating division schemes between adjacent hexahedra and wedges #172

Merged
merged 11 commits into from
Nov 11, 2024
Merged

Implement alternating division schemes between adjacent hexahedra and wedges #172

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
fb4960d
Implement alternation flag
connoramoreno Nov 1, 2024
a2ae206
Change alternate scheme flag to local variable and change name
connoramoreno Nov 2, 2024
d99f5fe
Introduce additional alternate scheme flags to ensure face alignment …
connoramoreno Nov 2, 2024
4d339b3
Fix which hexahedron division scheme is considered the alternate
connoramoreno Nov 2, 2024
da08ac4
Incorporate review suggestions
connoramoreno Nov 7, 2024
1857293
Fix num_theta and num_phi checks and update tests
connoramoreno Nov 7, 2024
ed787fa
Change naming convention for references to flux-coordinate axes
connoramoreno Nov 8, 2024
6b26f2c
Finalize changes to naming convention
connoramoreno Nov 8, 2024
939e946
Modify vertex indexing scheme
connoramoreno Nov 8, 2024
4270974
Update parameter references in source mesh test
connoramoreno Nov 8, 2024
12f55ff
Incorporate review suggestions
connoramoreno Nov 11, 2024
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
49 changes: 37 additions & 12 deletions parastell/source_mesh.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,13 +375,25 @@ def _create_tets_from_hex(self, s_idx, theta_idx, phi_idx):
# first, ordered clockwise relative to the thumb, followed by the
# remaining vertex at the end of the thumb.
# See Moreno, Bader, Wilson 2024 for hexahedron splitting
hex_canon_ids = [
[idx_list[0], idx_list[2], idx_list[1], idx_list[5]],
[idx_list[0], idx_list[3], idx_list[2], idx_list[7]],
[idx_list[0], idx_list[7], idx_list[5], idx_list[4]],
[idx_list[7], idx_list[2], idx_list[5], idx_list[6]],
[idx_list[0], idx_list[2], idx_list[5], idx_list[7]],
]
# Conditionally alternate ordering of vertices defining hexahedron
# splitting to avoid gaps and overlaps between non-planar hexahedron
# faces
if self.alt_flag:
hex_canon_ids = [
[idx_list[0], idx_list[2], idx_list[1], idx_list[5]],
[idx_list[0], idx_list[3], idx_list[2], idx_list[7]],
[idx_list[0], idx_list[7], idx_list[5], idx_list[4]],
[idx_list[7], idx_list[2], idx_list[5], idx_list[6]],
[idx_list[0], idx_list[2], idx_list[5], idx_list[7]],
]
else:
hex_canon_ids = [
[idx_list[0], idx_list[3], idx_list[1], idx_list[4]],
[idx_list[1], idx_list[3], idx_list[2], idx_list[6]],
[idx_list[1], idx_list[4], idx_list[6], idx_list[5]],
[idx_list[3], idx_list[6], idx_list[4], idx_list[7]],
[idx_list[1], idx_list[3], idx_list[6], idx_list[4]],
]

for vertex_ids in hex_canon_ids:
self._create_tet(vertex_ids)
Expand Down Expand Up @@ -420,11 +432,20 @@ def _create_tets_from_wedge(self, theta_idx, phi_idx):
# first, ordered clockwise relative to the thumb, followed by the
# remaining vertex at the end of the thumb.
# See Moreno, Bader, Wilson 2024 for wedge splitting
wedge_canon_ids = [
[idx_list[0], idx_list[2], idx_list[1], idx_list[3]],
[idx_list[3], idx_list[2], idx_list[4], idx_list[5]],
[idx_list[3], idx_list[2], idx_list[1], idx_list[4]],
]
# Conditionally alternate ordering of vertices defining wedge splitting
# to avoid gaps and overlaps between non-planar wedge faces
if self.alt_flag:
wedge_canon_ids = [
[idx_list[0], idx_list[2], idx_list[1], idx_list[3]],
[idx_list[1], idx_list[3], idx_list[5], idx_list[4]],
[idx_list[1], idx_list[3], idx_list[2], idx_list[5]],
]
else:
wedge_canon_ids = [
[idx_list[0], idx_list[2], idx_list[1], idx_list[3]],
[idx_list[3], idx_list[2], idx_list[4], idx_list[5]],
[idx_list[3], idx_list[2], idx_list[1], idx_list[4]],
]

for vertex_ids in wedge_canon_ids:
self._create_tet(vertex_ids)
Expand All @@ -437,14 +458,18 @@ def create_mesh(self):
self.mbc.add_entity(self.mesh_set, self.verts)

for phi_idx in range(self.num_phi - 1):
# Set alternation flag to true at beginning of each toroidal block
self.alt_flag = True
connoramoreno marked this conversation as resolved.
Show resolved Hide resolved
# Create tetrahedra for wedges at center of plasma
for theta_idx in range(1, self.num_theta):
self._create_tets_from_wedge(theta_idx, phi_idx)
self.alt_flag = not self.alt_flag

# Create tetrahedra for hexahedra beyond center of plasma
for s_idx in range(self.num_s - 2):
for theta_idx in range(1, self.num_theta):
self._create_tets_from_hex(s_idx, theta_idx, phi_idx)
self.alt_flag = not self.alt_flag

def export_mesh(self, filename="source_mesh", export_dir=""):
"""Use PyMOAB interface to write source mesh with source strengths
Expand Down