ForkMaster/netgen
1
0
Fork 0
mirror of https://github.com/NGSolve/netgen.git synced 2025-05-04 17:50:50 +05:00
Code Issues Packages Projects Releases Wiki Activity

Fix missing identifications in boundarylayer generation, some code refactoring

Browse Source
This commit is contained in:
Matthias Hochsteger 2025-04-28 15:30:29 +02:00
parent b43eb033d2
commit f42d0c0be4
1 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
libsrc/meshing/boundarylayer.cpp
View File

@ -879,61 +879,61 @@ void BoundaryLayerTool ::InsertNewElements(
auto p2el = mesh.CreatePoint2ElementTable(); auto p2el = mesh.CreatePoint2ElementTable();
for (SurfaceElementIndex si = 0; si < nse; si++) for (SurfaceElementIndex si = 0; si < nse; si++)
{ {
// copy because surfaceels array will be resized!
const auto sel = mesh[si]; const auto sel = mesh[si];
if (moved_surfaces.Test(sel.GetIndex())) const auto iface = sel.GetIndex();
if (moved_surfaces.Test(iface))
{ {
Array<PointIndex> points(sel.PNums()); const auto np = sel.GetNP();
if (surfacefacs[sel.GetIndex()] > 0) ArrayMem<PointIndex, 4> points(sel.PNums());
if (surfacefacs[iface] > 0)
Swap(points[0], points[2]); Swap(points[0], points[2]);
ArrayMem<int, 4> groups(points.Size()); ArrayMem<int, 4> groups(points.Size());
for (auto i : Range(points)) for (auto i : Range(points))
groups[i] = getClosestGroup(sel[i], si); groups[i] = getClosestGroup(points[i], si);
bool add_volume_element = true; bool add_volume_element = true;
for (auto pi : sel.PNums()) for (auto pi : points)
if (numGroups(pi) > 1) if (numGroups(pi) > 1)
add_volume_element = false; add_volume_element = false;
Element el(2 * np);
el.PNums().Range(np, 2 * np) = points;
auto new_index = new_mat_nrs[iface];
if (new_index == -1)
throw Exception("Boundary " + ToString(iface) + " with name " + mesh.GetBCName(iface - 1) + " extruded, but no new material specified for it!");
el.SetIndex(new_index);
for (auto j : Range(par_heights)) for (auto j : Range(par_heights))
{ {
auto eltype = points.Size() == 3 ? PRISM : HEX; el.PNums().Range(0, np) = el.PNums().Range(np, 2 * np);
Element el(eltype); for (auto i : Range(np))
for (auto i : Range(points)) el[np + i] = newPoint(points[i], j, groups[i]);
el[i] = points[i];
for (auto i : Range(points))
points[i] = newPoint(sel.PNums()[i], j, groups[i]);
if (surfacefacs[sel.GetIndex()] > 0)
Swap(points[0], points[2]);
for (auto i : Range(points))
el[sel.PNums().Size() + i] = points[i];
auto new_index = new_mat_nrs[sel.GetIndex()];
if (new_index == -1)
throw Exception("Boundary " + ToString(sel.GetIndex()) + " with name " + mesh.GetBCName(sel.GetIndex() - 1) + " extruded, but no new material specified for it!");
el.SetIndex(new_mat_nrs[sel.GetIndex()]);
if (add_volume_element) if (add_volume_element)
mesh.AddVolumeElement(el); mesh.AddVolumeElement(el);
else else
{ {
// Let the volume mesher fill the hole with pyramids/tets // Let the volume mesher fill the hole with pyramids/tets
// To insert pyramids, we need close surface identifications on open // To insert pyramids, we need close surface identifications on open quads
// quads for (auto i : Range(np))
for (auto i : Range(points)) if (numGroups(el[i]) == 1)
if (numGroups(sel[i]) == 1)
{ {
auto pi0 = el[i]; auto pi0 = el[i];
auto pi1 = el[i + points.Size()]; auto pi1 = el[np + i];
auto nr = identifications.Get(pi0, pi1); auto nr = identifications.Get(pi0, pi1);
if (nr == 0) if (nr == 0)
identifications.Add(el[i], el[i + points.Size()], identnr); identifications.Add(pi0, pi1, identnr);
} }
} }
} }
Element2d newel = sel; Element2d newel = sel;
for (auto i : Range(points)) for (auto i : Range(np))
newel[i] = newPoint(sel[i], -1, groups[i]); newel[i] = newPoint(points[i], -1, groups[i]);
newel.SetIndex(si_map[sel.GetIndex()]); if (surfacefacs[iface] > 0)
Swap(newel[0], newel[2]); // swap back
newel.SetIndex(si_map[iface]);
new_sels.Append(newel); new_sels.Append(newel);
} }
if (is_boundary_moved.Test(sel.GetIndex())) if (is_boundary_moved.Test(iface))
{ {
auto& sel = mesh[si]; auto& sel = mesh[si];
for (auto& p : sel.PNums()) for (auto& p : sel.PNums())