diff options
| author | Roland Haas <roland.haas@physics.gatech.edu> | 2012-08-02 08:57:44 -0700 |
|---|---|---|
| committer | Barry Wardell <barry.wardell@gmail.com> | 2012-09-11 18:23:30 +0100 |
| commit | d4e68808498683c6f4c69669b935a6f896102b23 (patch) | |
| tree | 9f25ba883502e444388ec5167e6590a157db35b8 /Carpet/Carpet/src/CarpetParamCheck.cc | |
| parent | 2eb545daa8e07f54aa680d6a24a78895d80c64f9 (diff) | |
Carpet: change defaults of periodic_[xyz] to "yes" to match PUGH
If any of the periodicity parameter are set to "yes" in a parameter file
or checkpoint, Carpet will still abort.
Diffstat (limited to 'Carpet/Carpet/src/CarpetParamCheck.cc')
| -rw-r--r-- | Carpet/Carpet/src/CarpetParamCheck.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Carpet/Carpet/src/CarpetParamCheck.cc b/Carpet/Carpet/src/CarpetParamCheck.cc index cf3d861ed..c02ab02b0 100644 --- a/Carpet/Carpet/src/CarpetParamCheck.cc +++ b/Carpet/Carpet/src/CarpetParamCheck.cc @@ -23,11 +23,11 @@ namespace Carpet { DECLARE_CCTK_ARGUMENTS; DECLARE_CCTK_PARAMETERS; - if (CCTK_ParameterQueryTimesSet ("periodic", "Carpet") - or CCTK_ParameterQueryTimesSet ("periodic_x", "Carpet") - or CCTK_ParameterQueryTimesSet ("periodic_y", "Carpet") - or CCTK_ParameterQueryTimesSet ("periodic_z", "Carpet")) { - CCTK_PARAMWARN ("Some of the parameters \"Carpet::periodic*\" have been set. These parameters are there for compatibility reasons only and must not be used."); + if ((CCTK_ParameterQueryTimesSet ("periodic", "Carpet") and periodic) + or (CCTK_ParameterQueryTimesSet ("periodic_x", "Carpet") and periodic_x) + or (CCTK_ParameterQueryTimesSet ("periodic_y", "Carpet") and periodic_y) + or (CCTK_ParameterQueryTimesSet ("periodic_z", "Carpet") and periodic_z)) { + CCTK_PARAMWARN ("Some of the parameters \"Carpet::periodic*\" have been set to \"yes\". These parameters are there for compatibility reasons only and must not be used."); } if (adaptive_stepsize and max_refinement_levels > 1) { |