diff --git a/libsrc/meshing/delaunay.cpp b/libsrc/meshing/delaunay.cpp index e27e715f..b4827847 100644 --- a/libsrc/meshing/delaunay.cpp +++ b/libsrc/meshing/delaunay.cpp @@ -235,9 +235,11 @@ namespace netgen NgArray & freelist, SphereList & list, IndexSet & insphere, IndexSet & closesphere, Array & newels) { - static Timer t("Meshing3::AddDelaunayPoint");// RegionTimer reg(t); - // static Timer tsearch("addpoint, search"); - // static Timer tinsert("addpoint, insert"); + static Timer t("Meshing3::AddDelaunayPoint", NoTracing, NoTiming); RegionTimer reg(t); + static Timer tsearch("addpoint, search", NoTracing, NoTiming); + static Timer tfind("addpoint, find all tets", NoTracing, NoTiming); + static Timer tnewtets("addpoint, build new tets", NoTracing, NoTiming); + static Timer tinsert("addpoint, insert", NoTracing, NoTiming); /* find any sphere, such that newp is contained in @@ -277,7 +279,7 @@ namespace netgen } */ - // tsearch.Start(); + tsearch.Start(); double minquot{1e20}; tettree.GetFirstIntersecting (newp, newp, [&](const auto pi) @@ -300,7 +302,7 @@ namespace netgen } return false; } ); - // tsearch.Stop(); + tsearch.Stop(); if (cfelind == -1) { @@ -308,6 +310,7 @@ namespace netgen return; } + tfind.Start(); /* insphere: point is in sphere -> delete element closesphere: point is close to sphere -> considered for same center @@ -399,6 +402,8 @@ namespace netgen } } // while (changed) + tfind.Stop(); + tnewtets.Start(); newels.SetSize(0); Element2d face(TRIG); @@ -553,10 +558,11 @@ namespace netgen tpmax.SetToMax (*pp[k]); } tpmax = tpmax + 0.01 * (tpmax - tpmin); - // tinsert.Start(); + tinsert.Start(); tettree.Insert (tpmin, tpmax, nelind); - // tinsert.Stop(); + tinsert.Stop(); } + tnewtets.Stop(); } diff --git a/libsrc/meshing/localh.cpp b/libsrc/meshing/localh.cpp index b03e9eed..ef1b945b 100644 --- a/libsrc/meshing/localh.cpp +++ b/libsrc/meshing/localh.cpp @@ -444,8 +444,8 @@ namespace netgen void LocalH :: FindInnerBoxes (AdFront3 * adfront, int (*testinner)(const Point3d & p1)) { - static int timer = NgProfiler::CreateTimer ("LocalH::FindInnerBoxes"); - NgProfiler::RegionTimer reg (timer); + static Timer timer("LocalH::FindInnerBoxes"); + RegionTimer reg (timer); int nf = adfront->GetNF(); @@ -851,6 +851,7 @@ namespace netgen void LocalH :: GetOuterPoints (NgArray > & points) { + static Timer t("LocalH::GetOuterPoints"); RegionTimer rt(t); for (int i = 0; i < boxes.Size(); i++) if (!boxes[i]->flags.isinner && !boxes[i]->flags.cutboundary) points.Append ( boxes[i] -> PMid());