diff options
author | knarf <knarf@54511f98-0e4f-0410-826e-eb8b393f5a1e> | 2006-04-28 09:22:41 +0000 |
---|---|---|
committer | knarf <knarf@54511f98-0e4f-0410-826e-eb8b393f5a1e> | 2006-04-28 09:22:41 +0000 |
commit | 6863c95702aeb3ca94c58b114a7a9d9efef7d601 (patch) | |
tree | 13dbe21bd024f4e19cb7b65c8ce5ce2bfb95b6c7 /schedule.ccl | |
parent | d3d941dd0aa15adc25f5fab074fd69011be52f79 (diff) |
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
Diffstat (limited to 'schedule.ccl')
-rw-r--r-- | schedule.ccl | 32 |
1 files changed, 18 insertions, 14 deletions
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" + |