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/CarpetIOScalar | |
| parent | 2dedcb0e7340b0682d530dc26e764408b301e3b8 (diff) | |
Timers: Move all timer-related code into a new thorn Timers
Diffstat (limited to 'Carpet/CarpetIOScalar')
| -rw-r--r-- | Carpet/CarpetIOScalar/interface.ccl | 3 | ||||
| -rw-r--r-- | Carpet/CarpetIOScalar/src/ioscalar.cc | 14 |
2 files changed, 9 insertions, 8 deletions
diff --git a/Carpet/CarpetIOScalar/interface.ccl b/Carpet/CarpetIOScalar/interface.ccl index 8fe7a4359..7aaa3f9d1 100644 --- a/Carpet/CarpetIOScalar/interface.ccl +++ b/Carpet/CarpetIOScalar/interface.ccl @@ -6,10 +6,11 @@ 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 # function to check whether existing output files should be truncated or not CCTK_INT FUNCTION IO_TruncateOutputFiles \ diff --git a/Carpet/CarpetIOScalar/src/ioscalar.cc b/Carpet/CarpetIOScalar/src/ioscalar.cc index e9bba4b30..1cec7b617 100644 --- a/Carpet/CarpetIOScalar/src/ioscalar.cc +++ b/Carpet/CarpetIOScalar/src/ioscalar.cc @@ -9,17 +9,17 @@ #include <string> #include <vector> -#include "cctk.h" -#include "cctk_Arguments.h" -#include "cctk_Functions.h" -#include "cctk_Parameters.h" -#include "util_Network.h" +#include <cctk.h> +#include <cctk_Arguments.h> +#include <cctk_Parameters.h> +#include <util_Network.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" @@ -163,7 +163,7 @@ namespace CarpetIOScalar { int OutputGH (const cGH * const cctkGH) { - static Carpet::Timer timer ("OutputGH"); + static Timers::Timer timer ("OutputGH"); timer.start(); for (int vindex=0; vindex<CCTK_NumVars(); ++vindex) { if (TimeToOutput(cctkGH, vindex)) { |