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

Consistent penalty for illegal tets

Browse Source
This commit is contained in:
Matthias Hochsteger 2024-03-06 17:09:37 +01:00
parent 486c7d9bcb
commit 5e2282ea95
2 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
libsrc/meshing/improve3.cpp
View File

@ -288,7 +288,7 @@ double MeshOptimize3d :: CombineImproveEdge (
elem.Touch(); elem.Touch();
if (!mesh.LegalTet(elem)) if (!mesh.LegalTet(elem))
badness_new += 1e4; badness_new += GetLegalPenalty();
} }
} }
@ -543,9 +543,9 @@ double MeshOptimize3d :: SplitImproveEdge (Table<ElementIndex,PointIndex> & elem
if (newel2[l] == pi1) newel2[l] = ptmp; if (newel2[l] == pi1) newel2[l] = ptmp;
} }
if (!mesh.LegalTet (oldel)) bad1 += 1e6; if (!mesh.LegalTet (oldel)) bad1 += GetLegalPenalty();
if (!mesh.LegalTet (newel1)) bad2 += 1e6; if (!mesh.LegalTet (newel1)) bad2 += GetLegalPenalty();
if (!mesh.LegalTet (newel2)) bad2 += 1e6; if (!mesh.LegalTet (newel2)) bad2 += GetLegalPenalty();
} }
d_badness = bad2-bad1; d_badness = bad2-bad1;
@ -819,7 +819,7 @@ double MeshOptimize3d :: SwapImproveEdge (
if (!mesh.LegalTet(el31) || if (!mesh.LegalTet(el31) ||
!mesh.LegalTet(el32) || !mesh.LegalTet(el32) ||
!mesh.LegalTet(el33)) !mesh.LegalTet(el33))
bad1 += 1e4; bad1 += GetLegalPenalty();
el21[0] = pi3; el21[0] = pi3;
el21[1] = pi4; el21[1] = pi4;
@ -841,7 +841,7 @@ double MeshOptimize3d :: SwapImproveEdge (
if (!mesh.LegalTet(el21) || if (!mesh.LegalTet(el21) ||
!mesh.LegalTet(el22)) !mesh.LegalTet(el22))
bad2 += 1e4; bad2 += GetLegalPenalty();
if ((goal == OPT_CONFORM) && NotTooBad(bad1, bad2)) if ((goal == OPT_CONFORM) && NotTooBad(bad1, bad2))
@ -967,7 +967,7 @@ double MeshOptimize3d :: SwapImproveEdge (
!mesh.LegalTet(el2) || !mesh.LegalTet(el2) ||
!mesh.LegalTet(el3) || !mesh.LegalTet(el3) ||
!mesh.LegalTet(el4)) !mesh.LegalTet(el4))
bad1 += 1e4; bad1 += GetLegalPenalty();
} }
el1[0] = pi3; el1[1] = pi5; el1[0] = pi3; el1[1] = pi5;
@ -1002,7 +1002,7 @@ double MeshOptimize3d :: SwapImproveEdge (
!mesh.LegalTet(el2) || !mesh.LegalTet(el2) ||
!mesh.LegalTet(el3) || !mesh.LegalTet(el3) ||
!mesh.LegalTet(el4)) !mesh.LegalTet(el4))
bad2 += 1e4; bad2 += GetLegalPenalty();
} }
@ -1038,7 +1038,7 @@ double MeshOptimize3d :: SwapImproveEdge (
!mesh.LegalTet(el2b) || !mesh.LegalTet(el2b) ||
!mesh.LegalTet(el3b) || !mesh.LegalTet(el3b) ||
!mesh.LegalTet(el4b)) !mesh.LegalTet(el4b))
bad3 += 1e4; bad3 += GetLegalPenalty();
} }
bool swap2, swap3; bool swap2, swap3;
@ -1188,7 +1188,7 @@ double MeshOptimize3d :: SwapImproveEdge (
bad2 += CalcBad (mesh.Points(), hel, 0); bad2 += CalcBad (mesh.Points(), hel, 0);
hel.Touch(); hel.Touch();
if (!mesh.LegalTet(hel)) bad2 += 1e4; if (!mesh.LegalTet(hel)) bad2 += GetLegalPenalty();
hel[2] = suroundpts[k % nsuround]; hel[2] = suroundpts[k % nsuround];
hel[1] = suroundpts[(k+1) % nsuround]; hel[1] = suroundpts[(k+1) % nsuround];
@ -1197,7 +1197,7 @@ double MeshOptimize3d :: SwapImproveEdge (
bad2 += CalcBad (mesh.Points(), hel, 0); bad2 += CalcBad (mesh.Points(), hel, 0);
hel.Touch(); hel.Touch();
if (!mesh.LegalTet(hel)) bad2 += 1e4; if (!mesh.LegalTet(hel)) bad2 += GetLegalPenalty();
} }
// (*testout) << "bad2," << l << " = " << bad2 << endl; // (*testout) << "bad2," << l << " = " << bad2 << endl;
@ -2404,7 +2404,7 @@ double MeshOptimize3d :: SwapImprove2 ( ElementIndex eli1, int face,
if (!mesh.LegalTet(elem) || if (!mesh.LegalTet(elem) ||
!mesh.LegalTet(elem2)) !mesh.LegalTet(elem2))
bad1 += 1e4; bad1 += GetLegalPenalty();
el31.PNum(1) = pi1; el31.PNum(1) = pi1;
@ -2437,7 +2437,7 @@ double MeshOptimize3d :: SwapImprove2 ( ElementIndex eli1, int face,
if (!mesh.LegalTet(el31) || if (!mesh.LegalTet(el31) ||
!mesh.LegalTet(el32) || !mesh.LegalTet(el32) ||
!mesh.LegalTet(el33)) !mesh.LegalTet(el33))
bad2 += 1e4; bad2 += GetLegalPenalty();
d_badness = bad2 - bad1; d_badness = bad2 - bad1;

6
libsrc/meshing/improve3.hpp
View File

@ -70,6 +70,12 @@ public:
return netgen::CalcTotalBad (points, elements, mp); return netgen::CalcTotalBad (points, elements, mp);
} }
double GetLegalPenalty()
{
return goal == OPT_LEGAL ? 1e15 : 1e6;
}
}; };