diff options
| author | Roland Haas <rhaas@tapir.caltech.edu> | 2013-10-31 18:40:33 -0700 |
|---|---|---|
| committer | Roland Haas <rhaas@tapir.caltech.edu> | 2013-10-31 19:06:02 -0700 |
| commit | 15fc3538a066846c30b0525103af56c3d87a4d95 (patch) | |
| tree | f9f401094dfe0cbe5e771c58d9055e85a93a689f | |
| parent | 9c7f841c2afad5ef8a1e1c8294d487f38885a377 (diff) | |
Carpet: use gdata::fence_is_energized to query electric_fence
| -rw-r--r-- | Carpet/Carpet/param.ccl | 4 | ||||
| -rw-r--r-- | Carpet/Carpet/src/CallFunction.cc | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/Carpet/Carpet/param.ccl b/Carpet/Carpet/param.ccl index 9f6e0a250..dca67844b 100644 --- a/Carpet/Carpet/param.ccl +++ b/Carpet/Carpet/param.ccl @@ -606,7 +606,3 @@ BOOLEAN adaptive_stepsize "Allow adaptive timestep sizes" BOOLEAN use_unusedpoints_mask "Turn on storage and usage of 'unusedpoints_mask'" STEERABLE=recover { } "no" - -SHARES: CarpetLib - -USES BOOLEAN electric_fence diff --git a/Carpet/Carpet/src/CallFunction.cc b/Carpet/Carpet/src/CallFunction.cc index 494f2864c..464144f31 100644 --- a/Carpet/Carpet/src/CallFunction.cc +++ b/Carpet/Carpet/src/CallFunction.cc @@ -477,7 +477,7 @@ namespace Carpet { if (is_meta_mode()) return; // meta mode has no accessible variables // enumerating the grid variables is expensive - if (not electric_fence) return; + if (not gdata::fence_is_energized()) return; Timers::Timer timer("FenceCheck"); timer.start(); |