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/CarpetIOHDF5 | |
| parent | 2dedcb0e7340b0682d530dc26e764408b301e3b8 (diff) | |
Timers: Move all timer-related code into a new thorn Timers
Diffstat (limited to 'Carpet/CarpetIOHDF5')
| -rw-r--r-- | Carpet/CarpetIOHDF5/interface.ccl | 3 | ||||
| -rw-r--r-- | Carpet/CarpetIOHDF5/src/CarpetIOHDF5.cc | 14 | ||||
| -rw-r--r-- | Carpet/CarpetIOHDF5/src/OutputSlice.cc | 8 |
3 files changed, 13 insertions, 12 deletions
diff --git a/Carpet/CarpetIOHDF5/interface.ccl b/Carpet/CarpetIOHDF5/interface.ccl index 471ef0ed0..bff837764 100644 --- a/Carpet/CarpetIOHDF5/interface.ccl +++ b/Carpet/CarpetIOHDF5/interface.ccl @@ -4,8 +4,9 @@ IMPLEMENTS: IOHDF5 includes header: CarpetIOHDF5.hh in CarpetIOHDF5.hh +uses include header: Timer.hh + uses include header: carpet.hh -uses include header: CarpetTimers.hh uses include header: defs.hh diff --git a/Carpet/CarpetIOHDF5/src/CarpetIOHDF5.cc b/Carpet/CarpetIOHDF5/src/CarpetIOHDF5.cc index 4379de113..e142c9fac 100644 --- a/Carpet/CarpetIOHDF5/src/CarpetIOHDF5.cc +++ b/Carpet/CarpetIOHDF5/src/CarpetIOHDF5.cc @@ -9,16 +9,16 @@ #include <string> #include <vector> -#include "util_Table.h" -#include "cctk.h" -#include "cctk_Arguments.h" -#include "cctk_Parameters.h" -#include "cctk_Version.h" +#include <cctk.h> +#include <cctk_Arguments.h> +#include <cctk_Parameters.h> +#include <cctk_Version.h> +#include <util_Table.h> #include "CactusBase/IOUtil/src/ioGH.h" #include "CactusBase/IOUtil/src/ioutil_CheckpointRecovery.h" -#include "CarpetTimers.hh" +#include <Timer.hh> #include "CarpetIOHDF5.hh" @@ -562,7 +562,7 @@ static void CheckSteerableParameters (const cGH *const cctkGH, static int OutputGH (const cGH* const cctkGH) { - static Carpet::Timer timer ("OutputGH"); + static Timers::Timer timer ("OutputGH"); timer.start(); for (int vindex = CCTK_NumVars () - 1; vindex >= 0; vindex--) { if (TimeToOutput (cctkGH, vindex)) { diff --git a/Carpet/CarpetIOHDF5/src/OutputSlice.cc b/Carpet/CarpetIOHDF5/src/OutputSlice.cc index 2f67d031b..9a84d1ac3 100644 --- a/Carpet/CarpetIOHDF5/src/OutputSlice.cc +++ b/Carpet/CarpetIOHDF5/src/OutputSlice.cc @@ -8,12 +8,12 @@ #include <map> #include <string> -#include "cctk.h" -#include "util_Table.h" +#include <cctk.h> +#include <util_Table.h> #include "CactusBase/IOUtil/src/ioGH.h" -#include "CarpetTimers.hh" +#include <Timer.hh> #include "typeprops.hh" @@ -234,7 +234,7 @@ namespace CarpetIOHDF5 { 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) { |