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

SwapImprove2 - delete/add elements instead of replacing them

Browse Source
This commit is contained in:
Matthias Hochsteger 2019-09-29 21:24:45 +02:00
parent 47641c9b2c
commit 8874e41aec
1 changed files with 5 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
libsrc/meshing/improve3.cpp
View File

@ -3570,22 +3570,11 @@ bool MeshOptimize3d :: SwapImprove2 ( Mesh & mesh, OPTIMIZEGOAL goal, ElementInd
el32.flags.illegal_valid = 0; el32.flags.illegal_valid = 0;
el33.flags.illegal_valid = 0; el33.flags.illegal_valid = 0;
mesh[eli1] = el31; mesh[eli1].Delete();
mesh[eli2] = el32; mesh[eli2].Delete();
mesh.AddVolumeElement (el31);
ElementIndex neli = mesh.AddVolumeElement (el32);
mesh.AddVolumeElement (el33); mesh.AddVolumeElement (el33);
/*
// do we need this ?
for (int l = 0; l < 4; l++)
{
elementsonnode.Add (el31[l], eli1);
elementsonnode.Add (el32[l], eli2);
elementsonnode.Add (el33[l], neli);
}
*/
} }
return do_swap; return do_swap;
} }
@ -3660,14 +3649,6 @@ void MeshOptimize3d :: SwapImprove2Sequential (Mesh & mesh, OPTIMIZEGOAL goal)
for (PointIndex pi : myrange) for (PointIndex pi : myrange)
QuickSort(elementsonnode[pi]); QuickSort(elementsonnode[pi]);
}); });
// cout << "new elonnode " << __elementsonnode << endl;
/*
for (ElementIndex ei = 0; ei < ne; ei++)
for (PointIndex pi : mesh[ei].PNums())
elementsonnode.Add (pi, ei);
*/
// cout << "old elonnode " << elementsonnode << endl;
for (SurfaceElementIndex sei = 0; sei < nse; sei++) for (SurfaceElementIndex sei = 0; sei < nse; sei++)
for (int j = 0; j < 3; j++) for (int j = 0; j < 3; j++)
@ -3742,7 +3723,6 @@ void MeshOptimize3d :: SwapImprove2 (Mesh & mesh, OPTIMIZEGOAL goal)
if (goal == OPT_CONFORM) return; if (goal == OPT_CONFORM) return;
// contains at least all elements at node // contains at least all elements at node
// TABLE<ElementIndex, PointIndex::BASE> elementsonnode(np);
TABLE<SurfaceElementIndex, PointIndex::BASE> belementsonnode(np); TABLE<SurfaceElementIndex, PointIndex::BASE> belementsonnode(np);
PrintMessage (3, "SwapImprove2 "); PrintMessage (3, "SwapImprove2 ");
@ -3772,11 +3752,6 @@ void MeshOptimize3d :: SwapImprove2 (Mesh & mesh, OPTIMIZEGOAL goal)
QuickSort(elementsonnode[pi]); QuickSort(elementsonnode[pi]);
}); });
/*
for (ElementIndex ei = 0; ei < ne; ei++)
for (int j = 0; j < mesh[ei].GetNP(); j++)
elementsonnode.Add (mesh[ei][j], ei);
*/
for (SurfaceElementIndex sei = 0; sei < nse; sei++) for (SurfaceElementIndex sei = 0; sei < nse; sei++)
for (int j = 0; j < 3; j++) for (int j = 0; j < 3; j++)
belementsonnode.Add (mesh[sei][j], sei); belementsonnode.Add (mesh[sei][j], sei);