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

Call CalcTotalBad only if testout is active

Browse Source
This commit is contained in:
Matthias Hochsteger 2024-02-23 18:26:07 +01:00
parent 0d481b1104
commit 6be1c57999
1 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
libsrc/meshing/improve3.cpp
View File

@ -339,7 +339,7 @@ void MeshOptimize3d :: CombineImprove ()
UpdateBadness(); UpdateBadness();
if (goal == OPT_QUALITY) if (goal == OPT_QUALITY && testout->good())
{ {
double totalbad = mesh.CalcTotalBad (mp); double totalbad = mesh.CalcTotalBad (mp);
(*testout) << "Total badness = " << totalbad << endl; (*testout) << "Total badness = " << totalbad << endl;
@ -393,7 +393,7 @@ void MeshOptimize3d :: CombineImprove ()
PrintMessage (5, cnt, " elements combined"); PrintMessage (5, cnt, " elements combined");
(*testout) << "CombineImprove done" << "\n"; (*testout) << "CombineImprove done" << "\n";
if (goal == OPT_QUALITY) if (goal == OPT_QUALITY && testout->good())
{ {
double totalbad = mesh.CalcTotalBad (mp); double totalbad = mesh.CalcTotalBad (mp);
(*testout) << "Total badness = " << totalbad << endl; (*testout) << "Total badness = " << totalbad << endl;
@ -591,7 +591,7 @@ void MeshOptimize3d :: SplitImprove ()
UpdateBadness(); UpdateBadness();
if (goal == OPT_QUALITY) if (goal == OPT_QUALITY && testout->good())
{ {
bad = mesh.CalcTotalBad (mp); bad = mesh.CalcTotalBad (mp);
(*testout) << "Total badness = " << bad << endl; (*testout) << "Total badness = " << bad << endl;
@ -646,8 +646,11 @@ void MeshOptimize3d :: SplitImprove ()
if (goal == OPT_QUALITY) if (goal == OPT_QUALITY)
{ {
bad = mesh.CalcTotalBad (mp); if(testout->good())
(*testout) << "Total badness = " << bad << endl; {
bad = mesh.CalcTotalBad (mp);
(*testout) << "Total badness = " << bad << endl;
}
[[maybe_unused]] int cntill = 0; [[maybe_unused]] int cntill = 0;
ne = mesh.GetNE(); ne = mesh.GetNE();
@ -1339,7 +1342,7 @@ void MeshOptimize3d :: SwapImprove (const NgBitArray * working_elements)
} }
// Calculate total badness // Calculate total badness
if (goal == OPT_QUALITY) if (goal == OPT_QUALITY && testout->good())
{ {
double bad1 = mesh.CalcTotalBad (mp); double bad1 = mesh.CalcTotalBad (mp);
(*testout) << "Total badness = " << bad1 << endl; (*testout) << "Total badness = " << bad1 << endl;
@ -2471,8 +2474,11 @@ void MeshOptimize3d :: SwapImprove2 ()
PrintMessage (3, "SwapImprove2 "); PrintMessage (3, "SwapImprove2 ");
(*testout) << "\n" << "Start SwapImprove2" << "\n"; (*testout) << "\n" << "Start SwapImprove2" << "\n";
double bad1 = mesh.CalcTotalBad (mp); if(testout->good())
(*testout) << "Total badness = " << bad1 << endl; {
double bad1 = mesh.CalcTotalBad (mp);
(*testout) << "Total badness = " << bad1 << endl;
}
// find elements on node // find elements on node
@ -2534,9 +2540,12 @@ void MeshOptimize3d :: SwapImprove2 ()
PrintMessage (5, cnt, " swaps performed"); PrintMessage (5, cnt, " swaps performed");
mesh.Compress(); mesh.Compress();
bad1 = mesh.CalcTotalBad (mp); if(testout->good())
(*testout) << "Total badness = " << bad1 << endl; {
(*testout) << "swapimprove2 done" << "\n"; double bad1 = mesh.CalcTotalBad (mp);
(*testout) << "Total badness = " << bad1 << endl;
(*testout) << "swapimprove2 done" << "\n";
}
} }
double MeshOptimize3d :: SplitImprove2Element ( double MeshOptimize3d :: SplitImprove2Element (