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

Fix RemoveIllegalElements

Browse Source 
- Only search in relevant domain
- Break if number of illegal elements increases (avoids infinite loop)
  -> This shouldn't actually happen and is just a workaround until the
  optimization routines are fixed
This commit is contained in:
Matthias Hochsteger 2024-10-01 13:28:14 +02:00
parent 40fc4bf0dc
commit b1182e48b8
4 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libsrc/meshing/meshclass.cpp
View File

@ -6739,7 +6739,7 @@ namespace netgen
} }
int Mesh :: MarkIllegalElements () int Mesh :: MarkIllegalElements (int domain)
{ {
if(!boundaryedges) if(!boundaryedges)
BuildBoundaryEdges(); BuildBoundaryEdges();
@ -6749,7 +6749,7 @@ namespace netgen
{ {
int cnt_local = 0; int cnt_local = 0;
for(auto & el : volelements.Range(myrange)) for(auto & el : volelements.Range(myrange))
if (!LegalTet (el)) if ((domain==0 || el.GetIndex() == domain) && !LegalTet (el))
cnt_local++; cnt_local++;
cnt += cnt_local; cnt += cnt_local;
}); });

2
libsrc/meshing/meshclass.hpp
View File

@ -649,7 +649,7 @@ namespace netgen
Marks elements which are dangerous to refine Marks elements which are dangerous to refine
return: number of illegal elements return: number of illegal elements
*/ */
DLL_HEADER int MarkIllegalElements (); DLL_HEADER int MarkIllegalElements (int domain=0);
/// orient surface mesh, for one sub-domain only /// orient surface mesh, for one sub-domain only
DLL_HEADER void SurfaceMeshOrientation (); DLL_HEADER void SurfaceMeshOrientation ();

16
libsrc/meshing/meshfunc.cpp
View File

@ -521,7 +521,7 @@ namespace netgen
throw NgException ("Stop meshing since surface mesh not consistent"); throw NgException ("Stop meshing since surface mesh not consistent");
} }
} }
RemoveIllegalElements (mesh); RemoveIllegalElements (mesh, domain);
} }
void MergeMeshes( Mesh & mesh, Array<MeshingData> & md ) void MergeMeshes( Mesh & mesh, Array<MeshingData> & md )
@ -728,13 +728,10 @@ namespace netgen
void RemoveIllegalElements (Mesh & mesh3d) void RemoveIllegalElements (Mesh & mesh3d, int domain)
{ {
static Timer t("RemoveIllegalElements"); RegionTimer reg(t); static Timer t("RemoveIllegalElements"); RegionTimer reg(t);
int it = 10;
int nillegal, oldn;
// return, if non-pure tet-mesh // return, if non-pure tet-mesh
/* /*
if (!mesh3d.PureTetMesh()) if (!mesh3d.PureTetMesh())
@ -742,12 +739,16 @@ namespace netgen
*/ */
mesh3d.CalcSurfacesOfNode(); mesh3d.CalcSurfacesOfNode();
nillegal = mesh3d.MarkIllegalElements(); int nillegal = mesh3d.MarkIllegalElements(domain);
if(nillegal) if(nillegal)
PrintMessage (1, "Remove Illegal Elements"); PrintMessage (1, "Remove Illegal Elements");
int oldn = nillegal;
int nillegal_min = nillegal;
MeshingParameters dummymp; MeshingParameters dummymp;
MeshOptimize3d optmesh(mesh3d, dummymp, OPT_LEGAL); MeshOptimize3d optmesh(mesh3d, dummymp, OPT_LEGAL);
int it = 10;
while (nillegal && (it--) > 0) while (nillegal && (it--) > 0)
{ {
if (multithread.terminate) if (multithread.terminate)
@ -763,6 +764,9 @@ namespace netgen
oldn = nillegal; oldn = nillegal;
nillegal = mesh3d.MarkIllegalElements(); nillegal = mesh3d.MarkIllegalElements();
nillegal_min = min(nillegal_min, nillegal);
if(nillegal > nillegal_min)
break;
if (oldn != nillegal) if (oldn != nillegal)
it = 10; it = 10;

2
libsrc/meshing/meshfunc.hpp
View File

@ -30,7 +30,7 @@ DLL_HEADER MESHING3_RESULT MeshVolume (const MeshingParameters & mp, Mesh& mesh3
DLL_HEADER MESHING3_RESULT OptimizeVolume (const MeshingParameters & mp, Mesh& mesh3d); DLL_HEADER MESHING3_RESULT OptimizeVolume (const MeshingParameters & mp, Mesh& mesh3d);
// const CSGeometry * geometry = NULL); // const CSGeometry * geometry = NULL);
DLL_HEADER void RemoveIllegalElements (Mesh & mesh3d); DLL_HEADER void RemoveIllegalElements (Mesh & mesh3d, int domain = 0);
enum MESHING_STEP { enum MESHING_STEP {