ForkMaster/netgen
1
0
Fork 0
mirror of https://github.com/NGSolve/netgen.git synced 2024-12-26 13:50:33 +05:00
Code Issues Packages Projects Releases Wiki Activity

Use new timers

Browse Source
This commit is contained in:
Matthias Hochsteger 2019-10-04 17:05:40 +02:00
parent b65d63cf11
commit 9f0edf1741
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libsrc/core/taskmanager.hpp
View File

@ -15,6 +15,7 @@
#include "array.hpp" #include "array.hpp"
#include "paje_trace.hpp" #include "paje_trace.hpp"
#include "profiler.hpp"
namespace ngcore namespace ngcore
{ {
@ -1059,6 +1060,7 @@ public:
template <typename Tmask> template <typename Tmask>
int ComputeColoring( FlatArray<int> colors, size_t ndofs, Tmask const & getDofs) int ComputeColoring( FlatArray<int> colors, size_t ndofs, Tmask const & getDofs)
{ {
static Timer timer("ComputeColoring - "+Demangle(typeid(Tmask).name())); RegionTimer rt(timer);
static_assert(sizeof(unsigned int)==4, "Adapt type of mask array"); static_assert(sizeof(unsigned int)==4, "Adapt type of mask array");
auto n = colors.Size(); auto n = colors.Size();

22
libsrc/meshing/improve2.cpp
View File

@ -177,8 +177,8 @@ namespace netgen
else else
PrintMessage (3, "Edgeswapping, topological"); PrintMessage (3, "Edgeswapping, topological");
static int timerstart = NgProfiler::CreateTimer ("EdgeSwapping 2D start"); static Timer timerstart("EdgeSwapping 2D start");
NgProfiler::StartTimer (timerstart); timerstart.Start();
Array<SurfaceElementIndex> seia; Array<SurfaceElementIndex> seia;
bool mixed = false; bool mixed = false;
@ -310,7 +310,7 @@ namespace netgen
for (SurfaceElementIndex sei : seia) for (SurfaceElementIndex sei : seia)
swapped[sei] = false; swapped[sei] = false;
NgProfiler::StopTimer (timerstart); timerstart.Stop();
@ -377,15 +377,15 @@ namespace netgen
} }
static int timer = NgProfiler::CreateTimer ("Combineimprove 2D"); static Timer timer ("Combineimprove 2D");
NgProfiler::RegionTimer reg (timer); RegionTimer reg (timer);
static int timerstart = NgProfiler::CreateTimer ("Combineimprove 2D start"); static Timer timerstart ("Combineimprove 2D start");
NgProfiler::StartTimer (timerstart); timerstart.Start();
static int timerstart1 = NgProfiler::CreateTimer ("Combineimprove 2D start1"); static Timer timerstart1 ("Combineimprove 2D start1");
NgProfiler::StartTimer (timerstart1); timerstart1.Start();
Array<SurfaceElementIndex> seia; Array<SurfaceElementIndex> seia;
@ -416,7 +416,7 @@ namespace netgen
Array<bool,PointIndex> fixed(np); Array<bool,PointIndex> fixed(np);
fixed = false; fixed = false;
NgProfiler::StopTimer (timerstart1); timerstart1.Stop();
/* /*
for (SegmentIndex si = 0; si < mesh.GetNSeg(); si++) for (SegmentIndex si = 0; si < mesh.GetNSeg(); si++)
@ -468,7 +468,7 @@ namespace netgen
} }
} }
NgProfiler::StopTimer (timerstart); timerstart.Stop();
for (int i = 0; i < seia.Size(); i++) for (int i = 0; i < seia.Size(); i++)
{ {