remove SetMask_ResetAll parameter, because non-shrinking masks don't work atm, and schedule SetMask_SphericalSurface also in HydroBase_ExcisionMaskSetup

git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinUtils/SetMask_SphericalSurface/trunk@69 053b05ff-9803-4dc7-a0e4-4b49d75fdb53

3 files changed, 9 insertions, 4 deletions

diff --git a/param.ccl b/param.ccl
index 632eb70..2c55beb 100644
--- a/param.ccl
+++ b/param.ccl
@@ -5,9 +5,9 @@ STRING SetMask_MaskName "Full variable name of the mask to be set"
   ".+" :: "Any full Cactus variable name, GF of type CCTK_BYTE"
 } "HydroBase::hydro_excision_mask"
 
-BOOLEAN SetMask_ResetAll "'yes' (default): Overwrite complete mask, 'no': Only set excision points"
-{
-} "yes"
+#BOOLEAN SetMask_ResetAll "'yes' (default): Overwrite complete mask, 'no': Only set excision points"
+#{
+#} "yes"
 
 CCTK_INT SetMask_SurfaceIndex[10] "Index of spherical surface to use to set mask"
 {
diff --git a/schedule.ccl b/schedule.ccl
index 02c47b9..f927a0f 100644
--- a/schedule.ccl
+++ b/schedule.ccl
@@ -6,3 +6,8 @@ schedule SetMask_SphericalSurface AT CCTK_POSTSTEP after SphericalSurface_HasBee
   options: global loop-local
 } "Set hydro_excision_mask according to spherical surface information"
 
+schedule SetMask_SphericalSurface IN HydroBase_ExcisionMaskSetup after HydroBase_InitExcisionMask
+{
+  LANG: C
+  options: global loop-local
+} "Set hydro_excision_mask according to spherical surface information"
diff --git a/src/SetMask.c b/src/SetMask.c
index cef8aea..c2c5541 100644
--- a/src/SetMask.c
+++ b/src/SetMask.c
@@ -34,7 +34,7 @@ void SetMask_SphericalSurface (CCTK_ARGUMENTS)
           {
             mask[i3D] = HYDRO_EXCISION_EXCISED;
           }
-          else if (SetMask_ResetAll)
+          else// if (SetMask_ResetAll)
           {
             mask[i3D] = HYDRO_EXCISION_NORMAL;
           }