ForkMaster/netgen
1
0
Fork 0
mirror of https://github.com/NGSolve/netgen.git synced 2025-01-12 14:10:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

remove small timers

Browse Source
This commit is contained in:
Joachim Schöberl 2019-09-30 19:39:22 +02:00
parent fe95433a87
commit 3e01cac707
2 changed files with 8 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
libsrc/meshing/delaunay.cpp
View File

@ -90,8 +90,8 @@ namespace netgen
void GetFirstIntersecting (const Point<dim> & pmin, const Point<dim> & pmax, void GetFirstIntersecting (const Point<dim> & pmin, const Point<dim> & pmax,
TFunc func=[](auto pi){return false;}) const TFunc func=[](auto pi){return false;}) const
{ {
static Timer timer("BTree::GetIntersecting"); RegionTimer rt(timer); // static Timer timer("BTree::GetIntersecting"); RegionTimer rt(timer);
static Timer timer1("BTree::GetIntersecting-LinearSearch"); // static Timer timer1("BTree::GetIntersecting-LinearSearch");
static Array<const Node*> stack(1000); static Array<const Node*> stack(1000);
static Array<int> dir_stack(1000); static Array<int> dir_stack(1000);
@ -494,14 +494,9 @@ namespace netgen
IndexSet & insphere, IndexSet & closesphere) IndexSet & insphere, IndexSet & closesphere)
{ {
static Timer t("Meshing3::AddDelaunayPoint"); RegionTimer reg(t); static Timer t("Meshing3::AddDelaunayPoint"); RegionTimer reg(t);
static Timer tsearch("addpoint, search"); // static Timer tsearch("addpoint, search");
static Timer tinsert("addpoint, insert"); // static Timer tinsert("addpoint, insert");
static Timer t0("addpoint, 0");
static Timer t1("addpoint, 1");
static Timer t2a("addpoint, 2a");
static Timer t2b("addpoint, 2b");
static Timer t3("addpoint, 3");
/* /*
find any sphere, such that newp is contained in find any sphere, such that newp is contained in
*/ */
@ -540,7 +535,7 @@ namespace netgen
} }
*/ */
tsearch.Start(); // tsearch.Start();
double minquot{1e20}; double minquot{1e20};
tettree.GetFirstIntersecting tettree.GetFirstIntersecting
(newp, newp, [&](const auto pi) (newp, newp, [&](const auto pi)
@ -563,7 +558,7 @@ namespace netgen
} }
return false; return false;
} ); } );
tsearch.Stop(); // tsearch.Stop();
if (cfelind == -1) if (cfelind == -1)
{ {
@ -589,7 +584,6 @@ namespace netgen
bool changed = true; bool changed = true;
int nstarti = 1, starti; int nstarti = 1, starti;
t0.Start();
while (changed) while (changed)
{ {
changed = false; changed = false;
@ -663,8 +657,6 @@ namespace netgen
} }
} // while (changed) } // while (changed)
t0.Stop();
t1.Start();
// NgArray<Element> newels; // NgArray<Element> newels;
static NgArray<DelaunayTet> newels; static NgArray<DelaunayTet> newels;
newels.SetSize(0); newels.SetSize(0);
@ -715,8 +707,6 @@ namespace netgen
} }
} }
t1.Stop();
t2a.Start();
meshnb.ResetFaceHT (10*insphere.GetArray().Size()+1); meshnb.ResetFaceHT (10*insphere.GetArray().Size()+1);
for (auto celind : insphere.GetArray()) for (auto celind : insphere.GetArray())
@ -731,10 +721,6 @@ namespace netgen
freelist.Append (celind); freelist.Append (celind);
} }
t2a.Stop();
t2b.Start();
bool hasclose = false; bool hasclose = false;
for (int ind : closesphere.GetArray()) for (int ind : closesphere.GetArray())
{ {
@ -742,8 +728,7 @@ namespace netgen
fabs (Dist2 (centers.Get (ind), newp) - radi2.Get(ind)) < 1e-8 ) fabs (Dist2 (centers.Get (ind), newp) - radi2.Get(ind)) < 1e-8 )
hasclose = true; hasclose = true;
} }
t2b.Stop();
t3.Start();
/* /*
for (int j = 1; j <= newels.Size(); j++) for (int j = 1; j <= newels.Size(); j++)
{ {
@ -832,7 +817,6 @@ namespace netgen
tettree.Insert (tpmin, tpmax, nelind); tettree.Insert (tpmin, tpmax, nelind);
// tinsert.Stop(); // tinsert.Stop();
} }
t3.Stop();
} }

11
libsrc/meshing/smoothing2.cpp
View File

@ -926,9 +926,6 @@ namespace netgen
*/ */
static Timer tloop("MeshSmooting 2D - loop"); static Timer tloop("MeshSmooting 2D - loop");
static Timer tloop1("MeshSmooting 2D - loop 1");
static Timer tloop2("MeshSmooting 2D - loop 2");
static Timer tloop3("MeshSmooting 2D - loop 3");
tloop.Start(); tloop.Start();
for (int hi = 0; hi < icompress.Size(); hi++) for (int hi = 0; hi < icompress.Size(); hi++)
{ {
@ -947,8 +944,6 @@ namespace netgen
// if (elementsonpoint[pi].Size() == 0) continue; // if (elementsonpoint[pi].Size() == 0) continue;
if (elementsonpoint[hi].Size() == 0) continue; if (elementsonpoint[hi].Size() == 0) continue;
tloop1.Start();
ld.sp1 = mesh[pi]; ld.sp1 = mesh[pi];
@ -972,8 +967,6 @@ namespace netgen
ld.loc_pnts2.SetSize (0); ld.loc_pnts2.SetSize (0);
ld.loc_pnts3.SetSize (0); ld.loc_pnts3.SetSize (0);
tloop1.Stop();
tloop2.Start();
for (int j = 0; j < elementsonpoint[hi].Size(); j++) for (int j = 0; j < elementsonpoint[hi].Size(); j++)
{ {
SurfaceElementIndex sei = elementsonpoint[hi][j]; SurfaceElementIndex sei = elementsonpoint[hi][j];
@ -998,7 +991,6 @@ namespace netgen
} }
} }
tloop2.Stop();
GetNormalVector (ld.surfi, ld.sp1, ld.gi1, ld.normal); GetNormalVector (ld.surfi, ld.sp1, ld.gi1, ld.normal);
ld.t1 = ld.normal.GetNormal (); ld.t1 = ld.normal.GetNormal ();
@ -1028,7 +1020,6 @@ namespace netgen
// NgProfiler::StartTimer (timer2); // NgProfiler::StartTimer (timer2);
tloop3.Start();
if (mixed) if (mixed)
{ {
BFGS (x, surfminfj, par, 1e-6); BFGS (x, surfminfj, par, 1e-6);
@ -1037,7 +1028,7 @@ namespace netgen
{ {
BFGS (x, surfminf, par, 1e-6); BFGS (x, surfminf, par, 1e-6);
} }
tloop3.Stop();
// NgProfiler::StopTimer (timer2); // NgProfiler::StopTimer (timer2);
Point3d origp = mesh[pi]; Point3d origp = mesh[pi];