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

occ - consistent ordering of shapes

Browse Source
This commit is contained in:
mhochsteger@cerbsim.com 2021-12-17 10:38:15 +01:00
parent 2d3c0e7186
commit 1e86bc2c59
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libsrc/occ/occgeom.cpp
View File

@ -1108,8 +1108,9 @@ namespace netgen
fsingular = esingular = vsingular = false; fsingular = esingular = vsingular = false;
// Add shapes // Add shapes
for(auto v : GetVertices(shape)) for(auto i1 : Range(1, vmap.Extent()+1))
{ {
auto v = vmap(i1);
auto tshape = v.TShape(); auto tshape = v.TShape();
if(vertex_map.count(tshape)!=0) if(vertex_map.count(tshape)!=0)
continue; continue;
@ -1122,8 +1123,9 @@ namespace netgen
vertices.Append(std::move(occ_vertex)); vertices.Append(std::move(occ_vertex));
} }
for(auto e : GetEdges(shape)) for(auto i1 : Range(1, emap.Extent()+1))
{ {
auto e = emap(i1);
auto tshape = e.TShape(); auto tshape = e.TShape();
auto edge = TopoDS::Edge(e); auto edge = TopoDS::Edge(e);
if(edge_map.count(tshape)!=0) if(edge_map.count(tshape)!=0)
@ -1137,8 +1139,9 @@ namespace netgen
edges.Append(std::move(occ_edge)); edges.Append(std::move(occ_edge));
} }
for(auto f : GetFaces(shape)) for(auto i1 : Range(1, fmap.Extent()+1))
{ {
auto f = fmap(i1);
auto tshape = f.TShape(); auto tshape = f.TShape();
if(face_map.count(tshape)==0) if(face_map.count(tshape)==0)
{ {
@ -1167,8 +1170,9 @@ namespace netgen
} }
for(auto s : GetSolids(shape)) for(auto i1 : Range(1, somap.Extent()+1))
{ {
auto s = somap(i1);
auto tshape = s.TShape(); auto tshape = s.TShape();
int k; int k;
if(solid_map.count(tshape)==0) if(solid_map.count(tshape)==0)