CarpetMask CarpetReduce: New schedule bin SetupIMask

For consistency reasons, CarpetReduce sets up the reduction mask
(weight function) partly using an integer bit field, partly using a
real-values mask. Introduce separate groups for each.

2 files changed, 12 insertions, 8 deletions

diff --git a/Carpet/CarpetMask/schedule.ccl b/Carpet/CarpetMask/schedule.ccl
index 1b136ff9a..c94d822dc 100644
--- a/Carpet/CarpetMask/schedule.ccl
+++ b/Carpet/CarpetMask/schedule.ccl
@@ -11,13 +11,13 @@ SCHEDULE GROUP MaskBase_SetupMask AT poststep AFTER SphericalSurface_HasBeenSet
 {
 } "Set up the weight function"
 
-SCHEDULE CarpetExcludedSetup IN SetupMask
+SCHEDULE CarpetExcludedSetup IN SetupIMask
 {
   LANG: C
   OPTIONS: global loop-local
 } "Set up the weight function for the excluded regions"
 
-SCHEDULE CarpetSurfaceSetup IN SetupMask
+SCHEDULE CarpetSurfaceSetup IN SetupIMask
 {
   LANG: C
   OPTIONS: global loop-local
diff --git a/Carpet/CarpetReduce/schedule.ccl b/Carpet/CarpetReduce/schedule.ccl
index a0b6614a2..cecc8500a 100644
--- a/Carpet/CarpetReduce/schedule.ccl
+++ b/Carpet/CarpetReduce/schedule.ccl
@@ -50,17 +50,21 @@ SCHEDULE MaskBase_InitMask IN MaskBase_SetupMaskAll AFTER MaskBase_AllocateMask
   OPTIONS: global loop-local
 } "Initialise the weight function"
 
-SCHEDULE GROUP SetupMask IN MaskBase_SetupMaskAll AFTER MaskBase_InitMask
+SCHEDULE GROUP SetupIMask IN MaskBase_SetupMaskAll AFTER MaskBase_InitMask
 {
-} "Set up the weight function (schedule other routines in here)"
+} "Set up the integer weight function (schedule other routines in here)"
 
-SCHEDULE MaskBase_SetMask IN MaskBase_SetupMaskAll AFTER SetupMask
+SCHEDULE MaskBase_SetMask IN MaskBase_SetupMaskAll AFTER SetupIMask
 {
   LANG: C
   OPTIONS: global loop-local
 } "Set the weight function"
 
-SCHEDULE MaskBase_TestMask IN MaskBase_SetupMaskAll AFTER MaskBase_SetMask
+SCHEDULE GROUP SetupMask IN MaskBase_SetupMaskAll AFTER MaskBase_SetMask
+{
+} "Set up the real weight function (schedule other routines in here)"
+
+SCHEDULE MaskBase_TestMask IN MaskBase_SetupMaskAll AFTER SetupMask
 {
   LANG: C
   OPTIONS: global
@@ -69,14 +73,14 @@ SCHEDULE MaskBase_TestMask IN MaskBase_SetupMaskAll AFTER MaskBase_SetMask
 
 
 # Should this move to CoordBase?
-SCHEDULE CoordBase_SetupMask IN SetupMask
+SCHEDULE CoordBase_SetupMask IN SetupIMask
 {
   LANG: C
   OPTIONS: global loop-local
 } "Set up the outer boundaries of the weight function"
 
 # Should this move to CarpetMask?
-SCHEDULE CarpetMaskSetup IN SetupMask
+SCHEDULE CarpetMaskSetup IN SetupIMask
 {
   LANG: C
   OPTIONS: global loop-singlemap