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

fix FillCloseSurface for multiple identifications

Browse Source
This commit is contained in:
Matthias Hochsteger 2022-06-09 15:32:17 +02:00
parent c71d142738
commit c6a4f90915
1 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
libsrc/meshing/meshfunc.cpp
View File

@ -201,6 +201,7 @@ namespace netgen
return; return;
NgArray<int, PointIndex::BASE> map; NgArray<int, PointIndex::BASE> map;
std::set<std::tuple<int,int,int>> hex_faces;
for(auto identnr : Range(1,nmax+1)) for(auto identnr : Range(1,nmax+1))
{ {
if(identifications.GetType(identnr) != Identifications::CLOSESURFACES) if(identifications.GetType(identnr) != Identifications::CLOSESURFACES)
@ -211,6 +212,15 @@ namespace netgen
for(auto & sel : mesh.OpenElements()) for(auto & sel : mesh.OpenElements())
{ {
// For quads: check if this open element is already closed by a hex
// this happends when we have identifications in two directions
if(sel.GetNP() == 4)
{
Element2d face = sel;
face.NormalizeNumbering();
if(hex_faces.count({face[0], face[1], face[2]}))
continue;
}
bool is_mapped = true; bool is_mapped = true;
for(auto pi : sel.PNums()) for(auto pi : sel.PNums())
if(!PointIndex(map[pi]).IsValid()) if(!PointIndex(map[pi]).IsValid())
@ -235,23 +245,26 @@ namespace netgen
if(pis.size() < 2*np) if(pis.size() < 2*np)
continue; continue;
bool is_domout = md.domain == mesh.GetFaceDescriptor(sel.GetIndex()).DomainOut();
// check if new element is inside current domain // check if new element is inside current domain
auto p0 = mesh[sel[0]]; auto p0 = mesh[sel[0]];
Vec<3> n = Cross(mesh[sel[1]] - p0, mesh[sel[2]] - p0 ); Vec<3> n = -Cross(mesh[sel[1]] - p0, mesh[sel[2]] - p0 );
n = is_domout ? n : -n;
if(n*(mesh[el[np]]-p0) < 0.0) if(n*(mesh[el[np]]-p0) < 0.0)
continue; continue;
if(is_domout)
el.Invert();
el.SetIndex(md.domain); el.SetIndex(md.domain);
mesh.AddVolumeElement(el); mesh.AddVolumeElement(el);
// TODO: Fix double hexes if(el.NP()==8)
return; {
// remember all adjacent faces of the new hex (to skip corresponding openelements accordingly)
for(auto facei : Range(1,7))
{
Element2d face;
el.GetFace(facei, face);
face.NormalizeNumbering();
hex_faces.insert({face[0], face[1], face[2]});
}
}
} }
} }
} }
@ -579,8 +592,8 @@ namespace netgen
if (md[i].mesh->CheckOverlappingBoundary()) if (md[i].mesh->CheckOverlappingBoundary())
throw NgException ("Stop meshing since boundary mesh is overlapping"); throw NgException ("Stop meshing since boundary mesh is overlapping");
// if(md[i].mesh->GetGeometry()->GetGeomType() == Mesh::GEOM_OCC) if(md[i].mesh->GetGeometry()->GetGeomType() == Mesh::GEOM_OCC)
// FillCloseSurface( md[i] ); FillCloseSurface( md[i] );
CloseOpenQuads( md[i] ); CloseOpenQuads( md[i] );
MeshDomain(md[i]); MeshDomain(md[i]);
}, md.Size()); }, md.Size());