diff options
author | Erik Schnetter <schnetter@gmail.com> | 2013-03-14 09:58:30 -0400 |
---|---|---|
committer | Erik Schnetter <schnetter@gmail.com> | 2013-03-14 09:58:30 -0400 |
commit | dd002d5066c6e4ef3c14d0a0793bd58c95366d43 (patch) | |
tree | 8ea03a87d80f206b37da8e76765d6eef4dbdc8b1 /Carpet/CycleClock | |
parent | e5643ac74ec9c32b4003f8c4fb90c8b44c527995 (diff) |
CycleClock: Add parameter to disable registering a Cactus clock
Diffstat (limited to 'Carpet/CycleClock')
-rw-r--r-- | Carpet/CycleClock/param.ccl | 4 | ||||
-rw-r--r-- | Carpet/CycleClock/src/clock.cc | 7 |
2 files changed, 10 insertions, 1 deletions
diff --git a/Carpet/CycleClock/param.ccl b/Carpet/CycleClock/param.ccl index 887db2384..c5ddfeca4 100644 --- a/Carpet/CycleClock/param.ccl +++ b/Carpet/CycleClock/param.ccl @@ -1 +1,5 @@ # Parameter definitions for thorn CycleClock + +BOOLEAN register_clock "Register cycle counter as Cactus clock" STEERABLE=recover +{ +} "yes" diff --git a/Carpet/CycleClock/src/clock.cc b/Carpet/CycleClock/src/clock.cc index 26e251ca1..da9a41d09 100644 --- a/Carpet/CycleClock/src/clock.cc +++ b/Carpet/CycleClock/src/clock.cc @@ -1,6 +1,7 @@ #include "cycleclock.h" #include <cctk.h> +#include <cctk_Parameters.h> #include <cmath> @@ -169,8 +170,12 @@ namespace CycleClock { extern "C" int CycleClock_Setup() { + DECLARE_CCTK_PARAMETERS; + measure_tick(); - cycleclock_register(); + if (register_clock) { + cycleclock_register(); + } return 0; } |