Do not use ADMMAcros (C version), since they are bugged (for Carpet). Finish changes that ensure compatibility with Carpet and multiprocessor runs. Not tested extensively.

git-svn-id: http://svn.aei.mpg.de/numrel/AEIThorns/ADMMass/trunk@5 54511f98-0e4f-0410-826e-eb8b393f5a1e

1 files changed, 30 insertions, 14 deletions

diff --git a/schedule.ccl b/schedule.ccl
index 437ebeb..42ebdd0 100644
--- a/schedule.ccl
+++ b/schedule.ccl
@@ -3,50 +3,66 @@
 
 STORAGE:ADMMass_LoopCounterG[1]
 STORAGE:ADMMass_Masses[1]
-STORAGE:ADMMass_GFs[1]
 
-schedule ADMMass_InitLoopCounter AT POSTSTEP AFTER OutsideMask_UpdateMask
+schedule ADMMass_InitLoopCounter AT INITIAL
 {
   LANG: C
   OPTIONS: global
-} "Initialise loop counter"
+} "Initialise the loop counter for ADMMass"
 
-schedule GROUP ADMMass AT POSTSTEP AFTER ADMMass_InitLoopCounter WHILE ADMMass::ADMMass_LoopCounter
+schedule ADMMass_SetLoopCounter AT POSTSTEP AFTER OutsideMask_UpdateMask
 {
-  STORAGE:ADMMass_box
-} "ADMMass loop"
+  LANG: C
+  OPTIONS: global
+} "Set the loop counter to the value of the parameter ADMMass:ADMMass_number"
 
-schedule ADMMass_Loop IN ADMMass
+schedule ADMMass_Loop IN ADMMass BEFORE ADMMass_Local
 {
   LANG: C
   OPTIONS: global
 } "Decrement loop counter"
 
+
+schedule GROUP ADMMass AT POSTSTEP AFTER ADMMass_InitLoopCounter WHILE ADMMass::ADMMass_LoopCounter
+{
+  STORAGE:ADMMass_GFs[3]
+  STORAGE:ADMMass_box
+} "ADMMass loop"
+
 schedule ADMMass_Surface IN ADMMass
 {
   LANG: C
-} "Calculate the ADMmass using a surface integral"
+  OPTIONS: global loop-local
+} "Calculate the ADMmass using a surface integral: local routine"
+
 schedule ADMMass_Surface_Global IN ADMMass AFTER ADMMass_Surface
 {
   LANG: C
   OPTIONS: global
-} "Calculate the ADMmass using a surface integral"
+} "Calculate the ADMmass using a surface integral: global routine"
+
 schedule ADMMass_Surface_Lapse IN ADMMass AFTER ADMMass_Surface_Global
 {
   LANG: C
-} "Calculate the ADMmass using a surface integral"
+  OPTIONS: global loop-local
+} "Calculate the ADMmass*lapse using a surface integral: local routine"
+
 schedule ADMMass_Surface_Lapse_Global IN ADMMass AFTER ADMMass_Surface_Lapse
 {
   LANG: C
   OPTIONS: global
-} "Calculate the ADMmass using a surface integral"
+} "Calculate the ADMmass*lapse using a surface integral: global routine"
+
 
 schedule ADMMass_Volume IN ADMMass
 {
   LANG: C
-} "Calculate the ADMmass using a volume integral"
-schedule ADMMass_Volume_Global IN ADMMass AFTER ADMMass_Volume
+  OPTIONS: global loop-local
+  SYNC: ADMMass_GFs
+} "Calculate the ADMmass using a volume integral: local routine"
+
+schedule ADMMass_Volume_Global IN ADMMass  AFTER ADMMass_Volume
 {
   LANG: C
   OPTIONS: global
-} "Calculate the ADMmass using a volume integral"
+} "Calculate the ADMmass using a volume integral: global routine"