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

Merge branch 'fix_swapimprove' into 'master'

Browse Source 
Fix SwapImprove

See merge request jschoeberl/netgen!327
This commit is contained in:
Joachim Schöberl 2020-07-15 17:26:40 +00:00
commit dd4110a351
2 changed files with 286 additions and 281 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libsrc/meshing/improve3.cpp
View File

@ -2015,6 +2015,8 @@ double MeshOptimize3d :: SwapImproveEdge (Mesh & mesh, OPTIMIZEGOAL goal,
}
}
bool have_bad_element = false;
for (ElementIndex ei : hasbothpoints)
{
if (mesh[ei].GetType () != TET)
@ -2037,10 +2039,13 @@ double MeshOptimize3d :: SwapImproveEdge (Mesh & mesh, OPTIMIZEGOAL goal,
if ((goal == OPT_LEGAL) &&
mesh.LegalTet (mesh[ei]) &&
CalcBad (mesh.Points(), mesh[ei], 0) < 1e3)
return 0.0;
CalcBad (mesh.Points(), mesh[ei], 0) >= 1e3)
have_bad_element = true;
}
if ((goal == OPT_LEGAL) && !have_bad_element)
return 0.0;
int nsuround = hasbothpoints.Size();
int mattyp = mesh[hasbothpoints[0]].GetIndex();

558
tests/pytest/results.json
View File

File diff suppressed because it is too large Load Diff