rearrange ADMMass group to fix bug while evolution

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

2 files changed, 24 insertions, 16 deletions

diff --git a/interface.ccl b/interface.ccl
index 384c54d..5c5d794 100644
--- a/interface.ccl
+++ b/interface.ccl
@@ -29,14 +29,18 @@ CCTK_REAL ADMMass_Masses[ADMMass_number] type = SCALAR tags='checkpoint="no"'
   ADMMass_VolumeMass
 } "ADMMass Scalars"
 
-CCTK_REAL ADMMass_GFs type = GF Timelevels = 3 tags='Prolongation="none" tensortypealias="Scalar" checkpoint="no"'
+CCTK_REAL ADMMass_GFs_surface type = GF Timelevels = 3 tags='Prolongation="none" tensortypealias="Scalar" checkpoint="no"'
 {
   ADMMass_SurfaceMass_GF
+} "ADMMass gridfunctions for surface integration"
+
+CCTK_REAL ADMMass_GFs_volume type = GF Timelevels = 3 tags='Prolongation="none" tensortypealias="Scalar" checkpoint="no"'
+{
   ADMMass_VolumeMass_pot_x
   ADMMass_VolumeMass_pot_y
   ADMMass_VolumeMass_pot_z
   ADMMass_VolumeMass_GF
-} "ADMMass gridfunctions"
+} "ADMMass gridfunctions for volume integration"
 
 CCTK_REAL  ADMMass_box type = scalar tags='checkpoint="no"'
 {
diff --git a/schedule.ccl b/schedule.ccl
index bd64809..a8a659a 100644
--- a/schedule.ccl
+++ b/schedule.ccl
@@ -9,7 +9,8 @@ STORAGE:ADMMass_Masses
 # specification were only in the ADMMass group, as it was earlier. This will
 # be changed back again, when carpet will be modified.
 ###############################################################################
-STORAGE:ADMMass_GFs[3] 
+STORAGE:ADMMass_GFs_surface[3] 
+STORAGE:ADMMass_GFs_volume[3] 
 
 schedule ADMMass_InitLoopCounter AT INITIAL
 {
@@ -23,12 +24,6 @@ schedule ADMMass_SetLoopCounter AT POSTSTEP AFTER OutsideMask_UpdateMask
   OPTIONS: global
 } "Set the loop counter to the value of the parameter ADMMass:ADMMass_number"
 
-schedule ADMMass_Loop IN ADMMass BEFORE ADMMass_Local
-{
-  LANG: C
-  OPTIONS: global
-} "Decrement loop counter"
-
 ###############################################################################
 # We must schedule the local routines to compute the integrals in
 # global-loop-local (as opposed to local) mode, in order to make sure that the
@@ -37,17 +32,25 @@ schedule ADMMass_Loop IN ADMMass BEFORE ADMMass_Local
 # after all local routines. If we had no such a dependence, we could have
 # scheduled the integral computations simply in local mode.
 ###############################################################################
-schedule GROUP ADMMass AT POSTSTEP AFTER ADMMass_InitLoopCounter WHILE ADMMass::ADMMass_LoopCounter
+schedule GROUP ADMMass AT POSTSTEP AFTER ADMMass_SetLoopCounter WHILE ADMMass::ADMMass_LoopCounter
 {
-  STORAGE:ADMMass_GFs[3]
+  STORAGE:ADMMass_GFs_surface[3]
+  STORAGE:ADMMass_GFs_volume[3]
   STORAGE:ADMMass_box
   STORAGE:grid_spacing_product
 } "ADMMass loop"
 
-schedule ADMMass_Surface IN ADMMass
+schedule ADMMass_Loop IN ADMMass
+{
+  LANG: C
+  OPTIONS: global
+} "Decrement loop counter"
+
+schedule ADMMass_Surface IN ADMMass AFTER ADMMass_Loop
 {
   LANG: C
   OPTIONS: global loop-local
+  SYNC: ADMMass_GFs_surface
 } "Calculate the ADMmass using a surface integral: local routine"
 
 schedule ADMMass_Surface_Global IN ADMMass AFTER ADMMass_Surface
@@ -60,6 +63,7 @@ schedule ADMMass_Surface_Lapse IN ADMMass AFTER ADMMass_Surface_Global
 {
   LANG: C
   OPTIONS: global loop-local
+  SYNC: ADMMass_GFs_surface
 } "Calculate the ADMmass*lapse using a surface integral: local routine"
 
 schedule ADMMass_Surface_Lapse_Global IN ADMMass AFTER ADMMass_Surface_Lapse
@@ -68,16 +72,16 @@ schedule ADMMass_Surface_Lapse_Global IN ADMMass AFTER ADMMass_Surface_Lapse
   OPTIONS: global
 } "Calculate the ADMmass*lapse using a surface integral: global routine"
 
-
-schedule ADMMass_Volume IN ADMMass
+schedule ADMMass_Volume IN ADMMass AFTER ADMMass_Surface_Lapse_Global
 {
   LANG: C
   OPTIONS: global loop-local
-  SYNC: ADMMass_GFs
+  SYNC: ADMMass_GFs_volume
 } "Calculate the ADMmass using a volume integral: local routine"
 
-schedule ADMMass_Volume_Global IN ADMMass  AFTER ADMMass_Volume
+schedule ADMMass_Volume_Global IN ADMMass AFTER ADMMass_Volume
 {
   LANG: C
   OPTIONS: global
 } "Calculate the ADMmass using a volume integral: global routine"
+