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/CarpetIOASCII/interface.ccl  |  3 ++-
 Carpet/CarpetIOASCII/src/ioascii.cc | 13 +++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'Carpet/CarpetIOASCII')

diff --git a/Carpet/CarpetIOASCII/interface.ccl b/Carpet/CarpetIOASCII/interface.ccl
index 1d377f38c..10ccfceff 100644
--- a/Carpet/CarpetIOASCII/interface.ccl
+++ b/Carpet/CarpetIOASCII/interface.ccl
@@ -2,8 +2,9 @@
 
 IMPLEMENTS: IOASCII
 
+uses include header: Timer.hh
+
 uses include header: carpet.hh
-uses include header: CarpetTimers.hh
 
 uses include header: dist.hh
 
diff --git a/Carpet/CarpetIOASCII/src/ioascii.cc b/Carpet/CarpetIOASCII/src/ioascii.cc
index 9c860eec5..3707b3c25 100644
--- a/Carpet/CarpetIOASCII/src/ioascii.cc
+++ b/Carpet/CarpetIOASCII/src/ioascii.cc
@@ -15,16 +15,17 @@
 #include <string>
 #include <vector>
 
-#include "cctk.h"
-#include "cctk_Parameters.h"
-#include "util_Network.h"
-#include "util_Table.h"
+#include <cctk.h>
+#include <cctk_Parameters.h>
+#include <util_Network.h>
+#include <util_Table.h>
+
+#include <Timer.hh>
 
 #include "CactusBase/IOUtil/src/ioGH.h"
 #include "CactusBase/IOUtil/src/ioutil_Utils.h"
 
 #include "carpet.hh"
-#include "CarpetTimers.hh"
 
 #include "typeprops.hh"
 
@@ -232,7 +233,7 @@ namespace CarpetIOASCII {
   {
     ostringstream timer_name;
     timer_name << "OutputGH<" << outdim << ">";
-    Carpet::Timer timer(timer_name.str());
+    Timers::Timer timer(timer_name.str());
 
     timer.start();
     for (int vi=0; vi<CCTK_NumVars(); ++vi) {
-- 
cgit v1.2.3