From 77e61bb9a06ef271348c96d762935442c7439f0c Mon Sep 17 00:00:00 2001
From: Erik Schnetter <schnetter@gmail.com>
Date: Wed, 7 Aug 2013 18:33:48 -0400
Subject: Timers: Move all timer-related code into a new thorn Timers

---
 Carpet/CarpetRegrid2/interface.ccl | 3 ++-
 Carpet/CarpetRegrid2/src/regrid.cc | 7 ++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'Carpet/CarpetRegrid2')

diff --git a/Carpet/CarpetRegrid2/interface.ccl b/Carpet/CarpetRegrid2/interface.ccl
index ee2bb307d..ceeaece5d 100644
--- a/Carpet/CarpetRegrid2/interface.ccl
+++ b/Carpet/CarpetRegrid2/interface.ccl
@@ -2,6 +2,8 @@
 
 IMPLEMENTS: CarpetRegrid2
 
+USES INCLUDE HEADER: Timer.hh
+
 USES INCLUDE HEADER: bbox.hh
 USES INCLUDE HEADER: bboxset.hh
 USES INCLUDE HEADER: defs.hh
@@ -12,7 +14,6 @@ USES INCLUDE HEADER: region.hh
 USES INCLUDE HEADER: vect.hh
 
 USES INCLUDE HEADER: carpet.hh
-USES INCLUDE HEADER: CarpetTimers.hh
 
 
 
diff --git a/Carpet/CarpetRegrid2/src/regrid.cc b/Carpet/CarpetRegrid2/src/regrid.cc
index f43f3f898..983a33496 100644
--- a/Carpet/CarpetRegrid2/src/regrid.cc
+++ b/Carpet/CarpetRegrid2/src/regrid.cc
@@ -11,6 +11,8 @@
 #include <cctk_Arguments.h>
 #include <cctk_Parameters.h>
 
+#include <Timer.hh>
+
 #include <bbox.hh>
 #include <bboxset.hh>
 #include <defs.hh>
@@ -20,7 +22,6 @@
 #include <vect.hh>
 
 #include <carpet.hh>
-#include <CarpetTimers.hh>
 
 #include "amr.hh"
 #include "boundary.hh"
@@ -485,7 +486,7 @@ namespace CarpetRegrid2 {
     DECLARE_CCTK_PARAMETERS;
     
     char const * const where = "CarpetRegrid2::Regrid";
-    static Carpet::Timer timer (where);
+    static Timers::Timer timer (where);
     timer.start();
     
     assert (is_singlemap_mode());
@@ -675,7 +676,7 @@ namespace CarpetRegrid2 {
     DECLARE_CCTK_PARAMETERS;
     
     char const * const where = "CarpetRegrid2::RegridMaps";
-    static Carpet::Timer timer (where);
+    static Timers::Timer timer (where);
     timer.start();
     
     assert (is_level_mode());
-- 
cgit v1.2.3