ForkMaster/netgen
1
0
Fork 0
mirror of https://github.com/NGSolve/netgen.git synced 2025-04-13 00:27:28 +05:00
Code Issues Packages Projects Releases Wiki Activity

no testout in bisect

Browse Source
This commit is contained in:
Joachim Schöberl 2016-11-20 18:36:00 +01:00
parent 0d9980aa8d
commit 467d3a01be
1 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
libsrc/meshing/bisect.cpp
View File

@ -1335,8 +1335,8 @@ namespace netgen
newtet2.incorder = 0; newtet2.incorder = 0;
newtet2.order = oldtet.order; newtet2.order = oldtet.order;
*testout << "newtet1 = " << newtet1 << endl; // *testout << "newtet1 = " << newtet1 << endl;
*testout << "newtet2 = " << newtet2 << endl; // *testout << "newtet2 = " << newtet2 << endl;
} }
@ -2619,9 +2619,14 @@ namespace netgen
PushStatus("Mesh bisection"); PushStatus("Mesh bisection");
static int timer = NgProfiler::CreateTimer ("Bisect"); static int timer = NgProfiler::CreateTimer ("Bisect");
static int timer1 = NgProfiler::CreateTimer ("Bisect 1");
static int timer2 = NgProfiler::CreateTimer ("Bisect 2");
static int timer3 = NgProfiler::CreateTimer ("Bisect 3");
static int timer_bisecttet = NgProfiler::CreateTimer ("Bisect tets");
static int timer_bisecttrig = NgProfiler::CreateTimer ("Bisect trigs");
NgProfiler::RegionTimer reg1 (timer); NgProfiler::RegionTimer reg1 (timer);
NgProfiler::StartTimer (timer1);
static int localizetimer = NgProfiler::CreateTimer("localize edgepoints"); static int localizetimer = NgProfiler::CreateTimer("localize edgepoints");
NgProfiler::RegionTimer * loct = new NgProfiler::RegionTimer(localizetimer); NgProfiler::RegionTimer * loct = new NgProfiler::RegionTimer(localizetimer);
@ -3164,11 +3169,13 @@ namespace netgen
//string yn; //string yn;
//cin >> yn; //cin >> yn;
NgProfiler::StopTimer (timer1);
(*testout) << "refine volume elements" << endl; (*testout) << "refine volume elements" << endl;
do do
{ {
// refine volume elements // refine volume elements
NgProfiler::StartTimer (timer_bisecttet);
int nel = mtets.Size(); int nel = mtets.Size();
for (int i = 1; i <= nel; i++) for (int i = 1; i <= nel; i++)
if (mtets.Elem(i).marked) if (mtets.Elem(i).marked)
@ -3209,7 +3216,7 @@ namespace netgen
mesh.mlparentelement.Append (i); mesh.mlparentelement.Append (i);
} }
NgProfiler::StopTimer (timer_bisecttet);
int npr = mprisms.Size(); int npr = mprisms.Size();
for (int i = 1; i <= npr; i++) for (int i = 1; i <= npr; i++)
if (mprisms.Elem(i).marked) if (mprisms.Elem(i).marked)
@ -3311,7 +3318,7 @@ namespace netgen
int nsel = mtris.Size(); int nsel = mtris.Size();
NgProfiler::StartTimer (timer_bisecttrig);
for (int i = 1; i <= nsel; i++) for (int i = 1; i <= nsel; i++)
if (mtris.Elem(i).marked) if (mtris.Elem(i).marked)
{ {
@ -3455,6 +3462,7 @@ namespace netgen
mquads.Append (newquad2); mquads.Append (newquad2);
} }
NgProfiler::StopTimer (timer_bisecttrig);
hangingsurf = hangingsurf =
MarkHangingTris (mtris, cutedges) + MarkHangingTris (mtris, cutedges) +
@ -3570,6 +3578,8 @@ namespace netgen
} }
} }
NgProfiler::StartTimer (timer2);
mtets.SetAllocSize (mtets.Size()); mtets.SetAllocSize (mtets.Size());
mprisms.SetAllocSize (mprisms.Size()); mprisms.SetAllocSize (mprisms.Size());
mids.SetAllocSize (mids.Size()); mids.SetAllocSize (mids.Size());
@ -3948,6 +3958,9 @@ namespace netgen
delete idmaps[i]; delete idmaps[i];
idmaps.DeleteAll(); idmaps.DeleteAll();
NgProfiler::StopTimer (timer2);
NgProfiler::StartTimer (timer3);
mesh.UpdateTopology(opt.task_manager); mesh.UpdateTopology(opt.task_manager);
@ -3969,6 +3982,7 @@ namespace netgen
PrintMessage (1, "Bisection done"); PrintMessage (1, "Bisection done");
PopStatus(); PopStatus();
NgProfiler::StopTimer (timer3);
} }