diff options
| -rw-r--r-- | Carpet/CarpetRegrid/param.ccl | 8 | ||||
| -rw-r--r-- | Carpet/CarpetRegrid/src/regrid.cc | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/Carpet/CarpetRegrid/param.ccl b/Carpet/CarpetRegrid/param.ccl index 58ee1938c..eee4144b0 100644 --- a/Carpet/CarpetRegrid/param.ccl +++ b/Carpet/CarpetRegrid/param.ccl @@ -1,5 +1,5 @@ # Parameter definitions for thorn CarpetRegrid -# $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetRegrid/param.ccl,v 1.15 2004/02/05 09:53:15 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetRegrid/param.ccl,v 1.16 2004/02/05 16:11:20 schnetter Exp $ @@ -21,9 +21,9 @@ CCTK_INT regrid_every "Regrid every n time steps" STEERABLE=always KEYWORD activate_levels_on_regrid "Whether to activate or deactivate new levels on regridding" STEERABLE=always { - "none" :: "do not activate or deactivate any levels" - "fixed" :: "activate or deactivate a fixed number of levels" - "activate or deactivate a variable number of levels, determined by a user-specified function. When this parameter is used, the parameters num_new_levels and activate_next must not be set." + "none" :: "Do not activate or deactivate any levels" + "fixed" :: "Activate or deactivate a fixed number of levels" + "function" :: "Activate or deactivate a variable number of levels, determined by a user-specified function. When this option is used, the parameters num_new_levels and activate_next have no effect and should not be set." } "none" CCTK_INT num_new_levels "When regridding, activate this many new levels (if possible). Note that this will steer the parameter refinement_levels." STEERABLE=always diff --git a/Carpet/CarpetRegrid/src/regrid.cc b/Carpet/CarpetRegrid/src/regrid.cc index 8f48e7b99..27cab87c4 100644 --- a/Carpet/CarpetRegrid/src/regrid.cc +++ b/Carpet/CarpetRegrid/src/regrid.cc @@ -13,7 +13,7 @@ #include "regrid.hh" extern "C" { - static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetRegrid/src/regrid.cc,v 1.35 2004/02/05 09:53:15 schnetter Exp $"; + static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetRegrid/src/regrid.cc,v 1.36 2004/02/05 16:11:20 schnetter Exp $"; CCTK_FILEVERSION(Carpet_CarpetRegrid_regrid_cc); } @@ -103,7 +103,7 @@ namespace CarpetRegrid { } - } else if (CCTK_EQUALS(activate_levels_on_regrid, "activate or deactivate a variable number of levels, determined by a user-specified function. When this parameter is used, the parameters num_new_levels and activate_next must not be set.")) { + } else if (CCTK_EQUALS(activate_levels_on_regrid, "function")) { if (! CCTK_IsFunctionAliased("RegridLevel")) { CCTK_WARN (0, "No thorn has provided the function \"RegridLevel\""); |