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

Merge branch 'fix_occ_bcnames' into 'master'

Browse Source 
Fix boundarynames from occgeo created with global bc map

See merge request jschoeberl/netgen!421
This commit is contained in:
Joachim Schöberl 2021-09-28 12:58:30 +00:00
commit 28a81c11d9
2 changed files with 22 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libsrc/occ/occgenmesh.cpp
View File

@ -598,8 +598,9 @@ namespace netgen
alledgeparams[geomedgenr-1] = params;
}
if(geom.enames.Size() && geom.enames[curr-1] != "")
mesh.SetCD2Name(geomedgenr, geom.enames[curr-1]);
auto name = geom.enames.Size() ? geom.enames[geom.emap.FindIndex(edge)-1] : "";
if(name != "")
mesh.SetCD2Name(geomedgenr, name);
(*testout) << "NP = " << mesh.GetNP() << endl;
//(*testout) << pnums[pnums.Size()-1] << endl;

56
libsrc/occ/occgeom.cpp
View File

@ -54,50 +54,32 @@ namespace netgen
BuildFMap();
CalcBoundingBox();
TopExp_Explorer e, exp1;
for (e.Init(shape, TopAbs_SOLID); e.More(); e.Next())
snames.SetSize(somap.Size());
for(auto i : Range(snames))
snames[i] = "domain_" + ToString(i+1);
for (TopExp_Explorer e(shape, TopAbs_SOLID); e.More(); e.Next())
{
TopoDS_Solid solid = TopoDS::Solid(e.Current());
/*
string name = global_shape_names[solid.TShape()];
if (name == "")
name = string("domain_") + ToString(snames.Size());
snames.Append(name);
*/
if (auto name = global_shape_properties[solid.TShape()].name)
snames.Append(*name);
else
snames.Append(string("domain_") + ToString(snames.Size()));
snames[somap.FindIndex(solid)-1] = *name;
}
for (e.Init(shape, TopAbs_FACE); e.More(); e.Next())
fnames.SetSize(fmap.Size());
for(auto i : Range(fnames))
fnames[i] = "bc_" + ToString(i+1);
for(TopExp_Explorer e(shape, TopAbs_FACE); e.More(); e.Next())
{
TopoDS_Face face = TopoDS::Face(e.Current());
/*
string name = global_shape_names[face.TShape()];
if (name == "")
name = string("bc_") + ToString(fnames.Size());
fnames.Append(name);
*/
if (auto name = global_shape_properties[face.TShape()].name)
fnames.Append(*name);
else
fnames.Append(string("bc_") + ToString(fnames.Size()));
for (exp1.Init(face, TopAbs_EDGE); exp1.More(); exp1.Next())
{
TopoDS_Edge edge = TopoDS::Edge(exp1.Current());
// name = STEP_GetEntityName(edge,&reader);
// cout << "getname = " << name << ", mapname = " << shape_names[edge.TShape()] << endl;
/*
name = global_shape_names[edge.TShape()];
enames.Append(name);
*/
if (auto name = global_shape_properties[edge.TShape()].name)
enames.Append(*name);
else
enames.Append("noname-edge");
}
fnames[fmap.FindIndex(face)-1] = *name;
}
enames.SetSize(emap.Size());
enames = "";
for (TopExp_Explorer e(shape, TopAbs_EDGE); e.More(); e.Next())
{
TopoDS_Edge edge = TopoDS::Edge(e.Current());
if (auto name = global_shape_properties[edge.TShape()].name)
enames[emap.FindIndex(edge)-1] = *name;
}
}