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

bugfix in FillCloseSurface

Browse Source 
- don't add prisms/hexes outside of current domain
- invert them when necessary
This commit is contained in:
mhochsteger@cerbsim.com 2022-01-17 14:59:23 +01:00
parent b6396c15c0
commit fd258a611f
1 changed files with 31 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
libsrc/meshing/meshfunc.cpp
View File

@ -1,3 +1,5 @@
#include <set>
#include <mystdlib.h> #include <mystdlib.h>
#include "meshing.hpp" #include "meshing.hpp"
#include "debugging.hpp" #include "debugging.hpp"
@ -169,8 +171,8 @@ namespace netgen
{ {
static Timer timer("FillCloseSurface"); RegionTimer rtimer(timer); static Timer timer("FillCloseSurface"); RegionTimer rtimer(timer);
auto & mesh = md.mesh; auto & mesh = *md.mesh;
auto & identifications = mesh->GetIdentifications(); auto & identifications = mesh.GetIdentifications();
auto nmax = identifications.GetMaxNr(); auto nmax = identifications.GetMaxNr();
bool have_closesurfaces = false; bool have_closesurfaces = false;
@ -188,7 +190,7 @@ namespace netgen
identifications.GetMap(identnr, map); identifications.GetMap(identnr, map);
for(auto & sel : mesh->SurfaceElements()) for(auto & sel : mesh.SurfaceElements())
{ {
bool is_mapped = true; bool is_mapped = true;
for(auto pi : sel.PNums()) for(auto pi : sel.PNums())
@ -197,28 +199,45 @@ namespace netgen
if(!is_mapped) if(!is_mapped)
continue; continue;
// in case we have symmetric mapping (used in csg), only map in one direction
if(map[map[sel[0]]] == sel[0] && map[sel[0]] < sel[0])
continue;
// insert prism // insert prism/hex
auto np = sel.GetNP(); auto np = sel.GetNP();
Element el(2*np); Element el(2*np);
std::set<int> pis;
for(auto i : Range(np)) for(auto i : Range(np))
{ {
el[i] = sel[i]; el[i] = sel[i];
el[i+np] = map[sel[i]]; el[i+np] = map[sel[i]];
pis.insert(sel[i]);
pis.insert(map[sel[i]]);
} }
// degenerate element (mapped element onto itself, might happend for surface elements connecting two identified faces)
if(pis.size() < 2*np)
continue;
bool is_domout = md.domain == mesh.GetFaceDescriptor(sel.GetIndex()).DomainOut();
// check if new element is inside current domain
auto p0 = mesh[sel[0]];
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)
continue;
if(is_domout)
el.Invert();
el.SetIndex(md.domain); el.SetIndex(md.domain);
mesh->AddVolumeElement(el); mesh.AddVolumeElement(el);
} }
} }
} }
void CloseOpenQuads( MeshingData & md) void CloseOpenQuads( MeshingData & md)
{ {
static Timer t("CloseOpenQuads"); RegionTimer rt(t);
auto & mesh = *md.mesh; auto & mesh = *md.mesh;
auto domain = md.domain; auto domain = md.domain;
MeshingParameters & mp = md.mp; MeshingParameters & mp = md.mp;
@ -277,10 +296,11 @@ namespace netgen
{ {
mesh.GetIdentifications().GetPairs (nr, connectednodes); mesh.GetIdentifications().GetPairs (nr, connectednodes);
for (auto pair : connectednodes) for (auto pair : connectednodes)
{
meshing.AddConnectedPair (pair); meshing.AddConnectedPair (pair);
meshing.AddConnectedPair ({pair[1], pair[0]});
}
} }
// for (auto pair : md.connected_pairs)
// meshing.AddConnectedPair (pair);
for (int i = 1; i <= mesh.GetNOpenElements(); i++) for (int i = 1; i <= mesh.GetNOpenElements(); i++)
{ {
@ -539,7 +559,6 @@ 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");
// TODO: FillCloseSurface is not working with CSG closesurfaces
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] );