Support more than one hierarchy of timers

* Introduce a TimerTree class which contains a pointer to the root and current TimerNodes of that tree
* Adapt TimerNode and Timer classes to use TimerTrees rather than static variables
* Declare a main_timer_tree variable, which is the default tree to use if you don't specify one in Timer timer("timername")

1 files changed, 1 insertions, 2 deletions

diff --git a/Carpet/Carpet/src/Evolve.cc b/Carpet/Carpet/src/Evolve.cc
index 936414d40..aa51efe23 100644
--- a/Carpet/Carpet/src/Evolve.cc
+++ b/Carpet/Carpet/src/Evolve.cc
@@ -97,8 +97,7 @@ namespace Carpet {
             cctkGH->cctk_iteration % output_timer_tree_every == 0 and
             cctkGH->cctk_iteration % do_every == 0)
         {
-          TimerNode *rt = TimerNode::getRootTimer();
-          TimerNode *et = rt->getChildTimer("Evolve");
+          TimerNode *et = main_timer_tree.root->getChildTimer("Evolve");
           et->print(cout, et->getTime(), 0, timer_tree_threshold_percentage, timer_tree_output_precision);
         }
         timer.stop();