ForkMaster/netgen
1
0
Fork 0
mirror of https://github.com/NGSolve/netgen.git synced 2024-12-24 21:10:33 +05:00
Code Issues Packages Projects Releases Wiki Activity

csg2d - separate bc numbers

Browse Source
This commit is contained in:
Matthias Hochsteger 2020-09-14 12:13:16 +02:00
parent c7af26771e
commit 10a9decfd2
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libsrc/geom2d/csg2d.cpp
View File

@ -1547,7 +1547,7 @@ shared_ptr<netgen::SplineGeometry2d> CSG2d :: GenerateSplineGeometry()
auto geo = std::make_shared<netgen::SplineGeometry2d>(); auto geo = std::make_shared<netgen::SplineGeometry2d>();
std::map<std::tuple<int,int,int>, Seg> seg_map; std::map<std::tuple<int,int,int>, Seg> seg_map;
std::map<string, int> bcmap; Array<string> bcnames;
Array<int> points; Array<int> points;
// Cut each solid with each other one to add all possible intersection points and have conforming edges from both domains // Cut each solid with each other one to add all possible intersection points and have conforming edges from both domains
@ -1621,6 +1621,7 @@ shared_ptr<netgen::SplineGeometry2d> CSG2d :: GenerateSplineGeometry()
// Generate segments from polygon edges and find left/right domain of each segment // Generate segments from polygon edges and find left/right domain of each segment
int dom = 0; int dom = 0;
int bc = 1;
for(auto & s : solids) for(auto & s : solids)
{ {
dom++; dom++;
@ -1660,11 +1661,11 @@ shared_ptr<netgen::SplineGeometry2d> CSG2d :: GenerateSplineGeometry()
ls.p2 = pi2; ls.p2 = pi2;
ls.weight = weight; ls.weight = weight;
if(bcmap.count(p0.info.bc)==0)
bcmap[p0.info.bc] = bcmap.size()+1;
if(ls.bc==0 || p0.info.bc != BC_DEFAULT) if(ls.bc==0 || p0.info.bc != BC_DEFAULT)
ls.bc = bcmap[p0.info.bc]; {
ls.bc = bc++;
bcnames.Append(p0.info.bc);
}
ls.maxh = min(ls.maxh, p0.info.maxh); ls.maxh = min(ls.maxh, p0.info.maxh);
@ -1685,10 +1686,8 @@ shared_ptr<netgen::SplineGeometry2d> CSG2d :: GenerateSplineGeometry()
dom--; // degenerated solid, use same domain index again dom--; // degenerated solid, use same domain index again
} }
for(auto & [name, bc] : bcmap) for(auto bc : Range(bcnames))
{ geo->SetBCName(bc+1, bcnames[bc]);
geo->SetBCName(bc, name);
}
for(auto const &m : seg_map) for(auto const &m : seg_map)
{ {