diff options
| author | Erik Schnetter <schnetter@gmail.com> | 2013-08-07 18:33:48 -0400 |
|---|---|---|
| committer | Erik Schnetter <schnetter@gmail.com> | 2013-08-07 18:57:56 -0400 |
| commit | 77e61bb9a06ef271348c96d762935442c7439f0c (patch) | |
| tree | 23a12a75ff19e45f65f71141efa2bf892e4773da /Carpet/CarpetIOBasic | |
| parent | 2dedcb0e7340b0682d530dc26e764408b301e3b8 (diff) | |
Timers: Move all timer-related code into a new thorn Timers
Diffstat (limited to 'Carpet/CarpetIOBasic')
| -rw-r--r-- | Carpet/CarpetIOBasic/interface.ccl | 3 | ||||
| -rw-r--r-- | Carpet/CarpetIOBasic/src/iobasic.cc | 12 |
2 files changed, 8 insertions, 7 deletions
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)) { |