ForkMaster/netgen
1
0
Fork 0
mirror of https://github.com/NGSolve/netgen.git synced 2024-11-15 02:18:33 +05:00
Code Issues Packages Projects Releases Wiki Activity

something

Browse Source
This commit is contained in:
Matthias Hochsteger 2024-10-03 19:11:07 +02:00
parent 3de8b2f153
commit 9693a42a6a
3 changed files with 43 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
libsrc/meshing/boundarylayer.cpp
View File

@ -462,6 +462,7 @@ BoundaryLayerTool ::BuildSegMap() {
!domains.Test(fd.DomainIn()) && !domains.Test(fd.DomainIn()) &&
!domains.Test(fd.DomainOut())) { !domains.Test(fd.DomainOut())) {
type = 3; type = 3;
// cout << "set is_moved boundary to type 3 for " << segj.si << endl;
is_boundary_moved.SetBit(segj.si); is_boundary_moved.SetBit(segj.si);
} else { } else {
type = 1; type = 1;
@ -679,6 +680,7 @@ void BoundaryLayerTool ::InsertNewElements(
s0.edgenr = segj.edgenr; s0.edgenr = segj.edgenr;
s0.si = segj.si; s0.si = segj.si;
new_segments.Append(s0); new_segments.Append(s0);
if(type==3) new_segments_on_moved_bnd.Append(s0);
for (auto i : Range(par_heights)) { for (auto i : Range(par_heights)) {
Element2d sel(QUAD); Element2d sel(QUAD);
@ -724,6 +726,41 @@ void BoundaryLayerTool ::InsertNewElements(
s3.edgenr = getEdgeNr(segj.edgenr); s3.edgenr = getEdgeNr(segj.edgenr);
s3.si = segj.si; s3.si = segj.si;
new_segments.Append(s3); new_segments.Append(s3);
if(type==3) new_segments_on_moved_bnd.Append(s0);
}
else if (type == 1) {
PointIndex pp1 = segj[1];
PointIndex pp2 = segj[0];
if (in_surface_direction.Test(segj.si)) {
Swap(pp1, pp2);
}
PointIndex p1 = pp1;
PointIndex p2 = pp2;
PointIndex p3, p4;
Segment s0;
s0[0] = p1;
s0[1] = p2;
s0[2] = PointIndex::INVALID;
s0.edgenr = segj.edgenr;
s0.si = segj.si;
new_segments.Append(s0);
if(type==3) new_segments_on_moved_bnd.Append(s0);
for (auto i : Range(par_heights)) {
Element2d sel(QUAD);
p3 = newPoint(pp2, i);
p4 = newPoint(pp1, i);
sel[0] = p1;
sel[1] = p2;
sel[2] = p3;
sel[3] = p4;
for (auto i : Range(4)) {
sel.GeomInfo()[i].u = 0.0;
sel.GeomInfo()[i].v = 0.0;
}
sel.SetIndex(si_map[segj.si]);
new_sels.Append(sel);
new_sels_on_moved_bnd.Append(sel);
} }
} }
} }
@ -950,13 +987,13 @@ void BoundaryLayerTool ::SetDomInOutSides() {
} }
void BoundaryLayerTool ::AddSegments() { void BoundaryLayerTool ::AddSegments() {
if (insert_only_volume_elements) auto & new_segs = insert_only_volume_elements ? new_segments_on_moved_bnd : new_segments;
return; cout << "add new segs " << endl << new_segs << endl;
if (have_single_segments) if (have_single_segments)
MergeAndAddSegments(mesh, segments, new_segments); MergeAndAddSegments(mesh, segments, new_segs);
else { else {
mesh.LineSegments() = segments; mesh.LineSegments() = segments;
for (auto &seg : new_segments) for (auto &seg : new_segs)
mesh.AddSegment(seg); mesh.AddSegment(seg);
} }
} }

2
libsrc/meshing/boundarylayer.hpp
View File

@ -68,7 +68,7 @@ class BoundaryLayerTool
Array<size_t> par_project_boundaries; Array<size_t> par_project_boundaries;
bool have_single_segments; bool have_single_segments;
Array<Segment> segments, new_segments; Array<Segment> segments, new_segments, new_segments_on_moved_bnd;
Array<Element2d, SurfaceElementIndex> new_sels, new_sels_on_moved_bnd; Array<Element2d, SurfaceElementIndex> new_sels, new_sels_on_moved_bnd;
Array<Array<PointIndex>, PointIndex> mapto; Array<Array<PointIndex>, PointIndex> mapto;
Array<PointIndex, PointIndex> mapfrom; Array<PointIndex, PointIndex> mapfrom;

2
libsrc/meshing/boundarylayer_limiter.hpp
View File

@ -459,7 +459,7 @@ struct GrowthVectorLimiter {
ScaleLimit(pi_max_limit, 0.9); ScaleLimit(pi_max_limit, 0.9);
set_points(); set_points();
counter++; counter++;
if (counter > 5) { if (counter > 20) {
break; break;
cerr << "Limit intersecting surface elements: too many " cerr << "Limit intersecting surface elements: too many "
"limitation steps, sels: " "limitation steps, sels: "