Add the ability to set *both* the old-style (CCTK_REAL)

*and* new-style (CCTK_INT) mask simultaneously -- Frank Loeffler
asked for this, since Whiskey needs it (at least until all of
Cactus is converted to the new style...)


git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinAnalysis/AHFinderDirect/trunk@1015 f88db872-0e4f-0410-b76b-b9085cfa78c5

1 files changed, 10 insertions, 6 deletions

diff --git a/param.ccl b/param.ccl
index eb09922..1ad824d 100644
--- a/param.ccl
+++ b/param.ccl
@@ -395,7 +395,8 @@ string Jacobian_base_file_name "base file name for Jacobian output file(s)"
 # ***** based on each apparent horizon shape *****
 #
 
-boolean set_horizon_mask "should we set a mask grid function for each horizon?"
+boolean set_horizon_mask \
+  "should we set a mask grid function (or functions) for each horizon?"
 {
 } "false"
 
@@ -434,13 +435,16 @@ real mask_radius_offset[5] \
 # * the "new" style is that defined by CactusEinstein/SpaceMask:
 #   the mask is a CCTK_INT grid function, with a specified bit field
 #   set to specified values inside/outside the (adjusted) horizon
+# You can choose to set either (or even both!) of these.
 #
-keyword mask_type "what type of mask should we set?"
+boolean set_old_style_mask \
+  "if we're setting a mask, should we set an old-style (CCTK_REAL) mask gridfn?"
 {
-"old-style (CCTK_REAL)" :: "some CCTK_REAL grid function"
-"new-style (CCTK_INT)"  :: \
-  "some CCTK_INT grid function, using named bit fields via the SpaceMask thorn"
-} "old-style (CCTK_REAL)"
+} "true"
+boolean set_new_style_mask \
+  "if we're setting a mask, should we set an new-style (CCTK_INT) mask gridfn?"
+{
+} "true"
 
 #
 # mask info for  mask_type = "old-style (CCTK_REAL)"