From c22f44617bec695965a024f8e63c76a0b3a87a2d Mon Sep 17 00:00:00 2001 From: Matthias Hochsteger Date: Tue, 10 Sep 2019 16:45:48 +0200 Subject: [PATCH] Separate function SwapImproveEdge(), iterate over list of edges instead of elements and edges per element --- libsrc/meshing/improve3.cpp | 234 +++++++++++++++--------------------- libsrc/meshing/improve3.hpp | 2 + 2 files changed, 101 insertions(+), 135 deletions(-) diff --git a/libsrc/meshing/improve3.cpp b/libsrc/meshing/improve3.cpp index a4ec7c0c..c841081d 100644 --- a/libsrc/meshing/improve3.cpp +++ b/libsrc/meshing/improve3.cpp @@ -891,127 +891,29 @@ void MeshOptimize3d :: SplitImprove (Mesh & mesh, - - -void MeshOptimize3d :: SwapImprove (Mesh & mesh, OPTIMIZEGOAL goal, - const NgBitArray * working_elements) +bool MeshOptimize3d :: SwapImproveEdge (Mesh & mesh, OPTIMIZEGOAL goal, + const NgBitArray * working_elements, + TABLE & elementsonnode, + INDEX_3_HASHTABLE & faces, + PointIndex pi1, PointIndex pi2 + ) { - static Timer t("MeshOptimize3d::SwapImprove"); RegionTimer reg(t); - static Timer tloop("MeshOptimize3d::SwapImprove loop"); - PointIndex pi3(PointIndex::INVALID), pi4(PointIndex::INVALID), pi5(PointIndex::INVALID), pi6(PointIndex::INVALID); - int cnt = 0; + + double bad1, bad2, bad3; Element el21(TET), el22(TET), el31(TET), el32(TET), el33(TET); Element el1(TET), el2(TET), el3(TET), el4(TET); Element el1b(TET), el2b(TET), el3b(TET), el4b(TET); - - double bad1, bad2, bad3; - - int np = mesh.GetNP(); - int ne = mesh.GetNE(); - - // contains at least all elements at node - TABLE elementsonnode(np); - - NgArray hasbothpoints; - - PrintMessage (3, "SwapImprove "); - (*testout) << "\n" << "Start SwapImprove" << endl; - - const char * savetask = multithread.task; - multithread.task = "Swap Improve"; - - // mesh.CalcSurfacesOfNode (); - - INDEX_3_HASHTABLE faces(mesh.GetNOpenElements()/3 + 2); - if (goal == OPT_CONFORM) - { - for (int i = 1; i <= mesh.GetNOpenElements(); i++) - { - const Element2d & hel = mesh.OpenElement(i); - INDEX_3 face(hel[0], hel[1], hel[2]); - face.Sort(); - faces.Set (face, 1); - } - } - - // Calculate total badness - if (goal == OPT_QUALITY) - { - bad1 = CalcTotalBad (mesh.Points(), mesh.VolumeElements()); - (*testout) << "Total badness = " << bad1 << endl; - } - - // find elements on node - for (ElementIndex ei = 0; ei < ne; ei++) - for (PointIndex pi : mesh[ei].PNums()) - elementsonnode.Add (pi, ei); - /* - for (int j = 0; j < mesh[ei].GetNP(); j++) - elementsonnode.Add (mesh[ei][j], ei); - */ - - - // INDEX_2_HASHTABLE edgeused(2 * ne + 5); - INDEX_2_CLOSED_HASHTABLE edgeused(12 * ne + 5); - - tloop.Start(); - for (ElementIndex ei = 0; ei < ne; ei++) - { - if (multithread.terminate) - break; - - if (mp.only3D_domain_nr && mp.only3D_domain_nr != mesh.VolumeElement(ei).GetIndex()) - continue; - - multithread.percent = 100.0 * (ei+1) / ne; - - if ((mesh.ElementType(ei)) == FIXEDELEMENT) - continue; - - if(working_elements && - ei < working_elements->Size() && - !working_elements->Test(ei)) - continue; - - if (mesh[ei].IsDeleted()) - continue; - - if ((goal == OPT_LEGAL) && - mesh.LegalTet (mesh[ei]) && - CalcBad (mesh.Points(), mesh[ei], 0) < 1e3) - continue; - - // int onlybedges = 1; - - for (int j = 0; j < 6; j++) - { - // loop over edges - - const Element & elemi = mesh[ei]; - if (elemi.IsDeleted()) continue; - - int mattyp = elemi.GetIndex(); - - static const int tetedges[6][2] = - { { 0, 1 }, { 0, 2 }, { 0, 3 }, - { 1, 2 }, { 1, 3 }, { 2, 3 } }; - - PointIndex pi1 = elemi[tetedges[j][0]]; - PointIndex pi2 = elemi[tetedges[j][1]]; + ArrayMem hasbothpoints; + bool do_swap = false; if (pi2 < pi1) Swap (pi1, pi2); - if (mesh.BoundaryEdge (pi1, pi2)) continue; + if (mesh.BoundaryEdge (pi1, pi2)) return false; - INDEX_2 i2 (pi1, pi2); - i2.Sort(); - if (edgeused.Used(i2)) continue; - edgeused.Set (i2, 1); - hasbothpoints.SetSize (0); for (int k = 0; k < elementsonnode[pi1].Size(); k++) { @@ -1019,7 +921,7 @@ void MeshOptimize3d :: SwapImprove (Mesh & mesh, OPTIMIZEGOAL goal, ElementIndex elnr = elementsonnode[pi1][k]; const Element & elem = mesh[elnr]; - if (elem.IsDeleted()) continue; + if (elem.IsDeleted()) return false; for (int l = 0; l < elem.GetNP(); l++) { @@ -1039,14 +941,34 @@ void MeshOptimize3d :: SwapImprove (Mesh & mesh, OPTIMIZEGOAL goal, } } - bool puretet = true; for (ElementIndex ei : hasbothpoints) - if (mesh[ei].GetType () != TET) - puretet = false; - - if (!puretet) continue; + { + if (mesh[ei].GetType () != TET) + return false; + + if (mp.only3D_domain_nr && mp.only3D_domain_nr != mesh.VolumeElement(ei).GetIndex()) + return false; + + + if ((mesh.ElementType(ei)) == FIXEDELEMENT) + return false; + + if(working_elements && + ei < working_elements->Size() && + !working_elements->Test(ei)) + return false; + + if (mesh[ei].IsDeleted()) + return false; + + if ((goal == OPT_LEGAL) && + mesh.LegalTet (mesh[ei]) && + CalcBad (mesh.Points(), mesh[ei], 0) < 1e3) + return false; + } int nsuround = hasbothpoints.Size(); + int mattyp = mesh[hasbothpoints[0]].GetIndex(); if ( nsuround == 3 ) { @@ -1175,7 +1097,7 @@ void MeshOptimize3d :: SwapImprove (Mesh & mesh, OPTIMIZEGOAL goal, { // (*mycout) << "3->2 " << flush; // (*testout) << "3->2 conversion" << endl; - cnt++; + do_swap = true; /* @@ -1403,7 +1325,7 @@ void MeshOptimize3d :: SwapImprove (Mesh & mesh, OPTIMIZEGOAL goal, if (swap2 || swap3) { // (*mycout) << "4->4 " << flush; - cnt++; + do_swap = true; // (*testout) << "4->4 conversion" << "\n"; /* (*testout) << "bad1 = " << bad1 @@ -1665,7 +1587,7 @@ void MeshOptimize3d :: SwapImprove (Mesh & mesh, OPTIMIZEGOAL goal, if (bestl != -1) { // (*mycout) << nsuround << "->" << 2 * (nsuround-2) << " " << flush; - cnt++; + do_swap = true; for (int k = bestl+1; k <= nsuround + bestl - 2; k++) { @@ -1715,28 +1637,70 @@ void MeshOptimize3d :: SwapImprove (Mesh & mesh, OPTIMIZEGOAL goal, } } } - } + return do_swap; +} - /* - if (onlybedges) +void MeshOptimize3d :: SwapImprove (Mesh & mesh, OPTIMIZEGOAL goal, + const NgBitArray * working_elements) +{ + static Timer t("MeshOptimize3d::SwapImprove"); RegionTimer reg(t); + static Timer tloop("MeshOptimize3d::SwapImprove loop"); + + int cnt = 0; + + int np = mesh.GetNP(); + int ne = mesh.GetNE(); + + // contains at least all elements at node + TABLE elementsonnode(np); + + NgArray hasbothpoints; + + PrintMessage (3, "SwapImprove "); + (*testout) << "\n" << "Start SwapImprove" << endl; + + const char * savetask = multithread.task; + multithread.task = "Swap Improve"; + + // mesh.CalcSurfacesOfNode (); + + INDEX_3_HASHTABLE faces(mesh.GetNOpenElements()/3 + 2); + if (goal == OPT_CONFORM) + { + for (int i = 1; i <= mesh.GetNOpenElements(); i++) { - (*testout) << "bad tet: " - << volelements.Get(i)[0] - << volelements.Get(i)[1] - << volelements.Get(i)[2] - << volelements.Get(i)[3] << "\n"; - - if (!mesh.LegalTet (volelements.Get(i))) - cerr << "Illegal tet" << "\n"; + const Element2d & hel = mesh.OpenElement(i); + INDEX_3 face(hel[0], hel[1], hel[2]); + face.Sort(); + faces.Set (face, 1); } - */ } - // (*mycout) << endl; + + // Calculate total badness + if (goal == OPT_QUALITY) + { + double bad1 = CalcTotalBad (mesh.Points(), mesh.VolumeElements()); + (*testout) << "Total badness = " << bad1 << endl; + } + + // find elements on node + for (ElementIndex ei = 0; ei < ne; ei++) + for (PointIndex pi : mesh[ei].PNums()) + elementsonnode.Add (pi, ei); + + Array> edges; + BuildEdgeList(mesh, elementsonnode, edges); + + tloop.Start(); + + for (auto [pi1, pi2] : edges) + { + if (multithread.terminate) + break; + cnt += SwapImproveEdge (mesh, goal, working_elements, elementsonnode, faces, pi1, pi2); + } tloop.Stop(); - /* - cout << "edgeused: "; - edgeused.PrintMemInfo(cout); - */ + PrintMessage (5, cnt, " swaps performed"); diff --git a/libsrc/meshing/improve3.hpp b/libsrc/meshing/improve3.hpp index 9c4934fc..798db3d8 100644 --- a/libsrc/meshing/improve3.hpp +++ b/libsrc/meshing/improve3.hpp @@ -26,6 +26,8 @@ public: void CombineImproveSequential (Mesh & mesh, OPTIMIZEGOAL goal = OPT_QUALITY); void SplitImprove (Mesh & mesh, OPTIMIZEGOAL goal = OPT_QUALITY); + + bool SwapImproveEdge (Mesh & mesh, OPTIMIZEGOAL goal, const NgBitArray * working_elements, TABLE & elementsonnode, INDEX_3_HASHTABLE & faces, PointIndex pi1, PointIndex pi2); void SwapImprove (Mesh & mesh, OPTIMIZEGOAL goal = OPT_QUALITY, const NgBitArray * working_elements = NULL); void SwapImproveSurface (Mesh & mesh, OPTIMIZEGOAL goal = OPT_QUALITY,