Revert "Change elementsonnode only when applying optimization"

This reverts commit 6c0171f2c0.
This commit is contained in:
Matthias Hochsteger 2019-09-20 12:46:44 +02:00
parent 6b8867d76a
commit fc1dbc2957

View File

@ -1027,6 +1027,9 @@ bool MeshOptimize3d :: SwapImproveEdge (Mesh & mesh, OPTIMIZEGOAL goal,
el33[3] = pi3; el33[3] = pi3;
el33.SetIndex (mattyp); el33.SetIndex (mattyp);
elementsonnode.Add (pi4, hasbothpoints[1]);
elementsonnode.Add (pi3, hasbothpoints[2]);
bad1 = CalcBad (mesh.Points(), el31, 0) + bad1 = CalcBad (mesh.Points(), el31, 0) +
CalcBad (mesh.Points(), el32, 0) + CalcBad (mesh.Points(), el32, 0) +
CalcBad (mesh.Points(), el33, 0); CalcBad (mesh.Points(), el33, 0);
@ -1118,9 +1121,6 @@ bool MeshOptimize3d :: SwapImproveEdge (Mesh & mesh, OPTIMIZEGOAL goal,
mesh[hasbothpoints[2]][l].Invalidate(); mesh[hasbothpoints[2]][l].Invalidate();
mesh[hasbothpoints[2]].Delete(); mesh[hasbothpoints[2]].Delete();
elementsonnode.Add (pi4, hasbothpoints[1]);
elementsonnode.Add (pi3, hasbothpoints[2]);
for (int k = 0; k < 2; k++) for (int k = 0; k < 2; k++)
for (int l = 0; l < 4; l++) for (int l = 0; l < 4; l++)
elementsonnode.Add (mesh[hasbothpoints[k]][l], hasbothpoints[k]); elementsonnode.Add (mesh[hasbothpoints[k]][l], hasbothpoints[k]);