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/CarpetIOBasic/interface.ccl  |  3 ++-
 Carpet/CarpetIOBasic/src/iobasic.cc | 12 ++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

(limited to 'Carpet/CarpetIOBasic')

diff --git a/Carpet/CarpetIOBasic/interface.ccl b/Carpet/CarpetIOBasic/interface.ccl
index 8e1c7a72e..c82e409fa 100644
--- a/Carpet/CarpetIOBasic/interface.ccl
+++ b/Carpet/CarpetIOBasic/interface.ccl
@@ -8,7 +8,8 @@ CCTK_INT last_output_iteration TYPE=scalar
 CCTK_REAL last_output_time TYPE=scalar
 CCTK_INT this_iteration TYPE=scalar
 
+USES INCLUDE HEADER: Timer.hh
+
 USES INCLUDE HEADER: carpet.hh
 USES INCLUDE HEADER: typecase.hh
 USES INCLUDE HEADER: typeprops.hh
-USES INCLUDE HEADER: CarpetTimers.hh
diff --git a/Carpet/CarpetIOBasic/src/iobasic.cc b/Carpet/CarpetIOBasic/src/iobasic.cc
index 78e372ba7..e15b6d9d3 100644
--- a/Carpet/CarpetIOBasic/src/iobasic.cc
+++ b/Carpet/CarpetIOBasic/src/iobasic.cc
@@ -12,16 +12,16 @@
 #include <string>
 #include <vector>
 
-#include "cctk.h"
-#include "cctk_Arguments.h"
-#include "cctk_Functions.h"
-#include "cctk_Parameters.h"
+#include <cctk.h>
+#include <cctk_Arguments.h>
+#include <cctk_Parameters.h>
 
 #include "CactusBase/IOUtil/src/ioGH.h"
 #include "CactusBase/IOUtil/src/ioutil_Utils.h"
 
+#include <Timer.hh>
+
 #include "carpet.hh"
-#include "CarpetTimers.hh"
 
 #include "typeprops.hh"
 
@@ -181,7 +181,7 @@ namespace CarpetIOBasic {
     DECLARE_CCTK_ARGUMENTS;
     DECLARE_CCTK_PARAMETERS;
     
-    static Carpet::Timer timer ("OutputGH");
+    static Timers::Timer timer ("OutputGH");
     timer.start();
     
     if (TimeToOutput (cctkGH)) {
-- 
cgit v1.2.3