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

Small cleanup

Browse Source
This commit is contained in:
Matthias Hochsteger 2019-10-13 12:27:29 +02:00
parent c9e764a32f
commit c1d42ff1e6
1 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
libsrc/meshing/improve2.cpp
View File

@ -597,17 +597,14 @@ namespace netgen
} }
bad1 /= (hasonepi.Size()+hasbothpi.Size()); bad1 /= (hasonepi.Size()+hasbothpi.Size());
MeshPoint p1 = mesh[pi1];
MeshPoint p2 = mesh[pi2];
MeshPoint pnew = p1;
mesh[pi1] = pnew;
mesh[pi2] = pnew;
double bad2 = 0; double bad2 = 0;
for (int k = 0; k < hasonepi.Size(); k++) for (int k = 0; k < hasonepi.Size(); k++)
{ {
Element2d & el = mesh[hasonepi[k]]; Element2d el = mesh[hasonepi[k]];
for (auto i : Range(3))
if(el[i]==pi2)
el[i] = pi1;
double err = double err =
CalcTriangleBadness (mesh[el[0]], mesh[el[1]], mesh[el[2]], CalcTriangleBadness (mesh[el[0]], mesh[el[1]], mesh[el[2]],
nv, -1, loch); nv, -1, loch);
@ -624,17 +621,10 @@ namespace netgen
if ( (normals[el[l]] * nv) < 0.5) if ( (normals[el[l]] * nv) < 0.5)
bad2 += 1e10; bad2 += 1e10;
Element2d el1 = el; illegal2 += 1-mesh.LegalTrig(el);
for (auto i : Range(3))
if(el1[i]==pi2)
el1[i] = pi1;
illegal2 += 1-mesh.LegalTrig(el1);
} }
bad2 /= hasonepi.Size(); bad2 /= hasonepi.Size();
mesh[pi1] = p1;
mesh[pi2] = p2;
if (debugflag) if (debugflag)
{ {
(*testout) << "bad1 = " << bad1 << ", bad2 = " << bad2 << endl; (*testout) << "bad1 = " << bad1 << ", bad2 = " << bad2 << endl;
@ -657,7 +647,6 @@ namespace netgen
(*testout) << "loch = " << loch << endl; (*testout) << "loch = " << loch << endl;
*/ */
mesh[pi1] = pnew;
PointGeomInfo gi; PointGeomInfo gi;
// bool gi_set(false); // bool gi_set(false);