From 6160fd4d2641db3bd79eb5c0450c00c972e83f68 Mon Sep 17 00:00:00 2001 From: Matthias Hochsteger Date: Mon, 7 Oct 2024 15:45:19 +0200 Subject: [PATCH] Cleanup --- libsrc/meshing/improve3.cpp | 8 -------- libsrc/meshing/meshfunc.cpp | 4 ++-- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/libsrc/meshing/improve3.cpp b/libsrc/meshing/improve3.cpp index 1defacc7..573bdeba 100644 --- a/libsrc/meshing/improve3.cpp +++ b/libsrc/meshing/improve3.cpp @@ -1382,20 +1382,12 @@ void MeshOptimize3d :: SwapImprove (const NgBitArray * working_elements) break; auto [pi0, pi1] = edges[i]; - try { double d_badness = SwapImproveEdge (working_elements, elementsonnode, faces, pi0, pi1, true); if(d_badness<0.0) { int index = improvement_counter++; candidate_edges[index] = make_tuple(d_badness, i); } - } - catch(const ngcore::Exception &e) { - cerr << "Error in SwapImproveEdge " << pi0 << '-' << pi1 << endl; - if(debugparam.write_mesh_on_error) - mesh.Save("error_swapimproveedge_" +ToString(pi0) + "_" + ToString(pi1) +".vol"); - throw; - } } }, TasksPerThread (4)); diff --git a/libsrc/meshing/meshfunc.cpp b/libsrc/meshing/meshfunc.cpp index 6622468e..758e692f 100644 --- a/libsrc/meshing/meshfunc.cpp +++ b/libsrc/meshing/meshfunc.cpp @@ -499,7 +499,6 @@ namespace netgen PrintMessage (3, "Call remove problem"); RemoveProblem (mesh, domain); mesh.FindOpenElements(domain); - GetOpenElements( mesh, domain )->Save("open_"+ToString(domain)+"_"+ToString(cntsteps)+".vol"); } else { @@ -553,6 +552,7 @@ namespace netgen for (auto pi : Range(first_new_pi, m.Points().Range().Next())) pmap[pi] = mesh.AddPoint(m[pi]); + for ( auto el : m.VolumeElements() ) { for (auto i : Range(el.GetNP())) @@ -589,7 +589,7 @@ namespace netgen // extern double teterrpow; MESHING3_RESULT MeshVolume (const MeshingParameters & mp, Mesh& mesh3d) { - static Timer t("MeshVolume1"); RegionTimer reg(t); + static Timer t("MeshVolume"); RegionTimer reg(t); mesh3d.Compress(); for (auto bl : mp.boundary_layers)