Schedule the registration routines in WRAGH instead of INITIAL.

Schedule the report routines in META mode.

Schedule the timestep-bookkeeping routines in LEVEL mode.


git-svn-id: http://svn.cactuscode.org/arrangements/CactusNumerical/MoL/trunk@51 578cdeb0-5ea1-4b81-8215-5a3b8777ee0b

1 files changed, 13 insertions, 26 deletions

diff --git a/schedule.ccl b/schedule.ccl
index 69b7730..14dc661 100644
--- a/schedule.ccl
+++ b/schedule.ccl
@@ -76,12 +76,7 @@ schedule MoL_ParamCheck AT ParamCheck
 ###  Allocate the arrays for the GF indexes.  ###
 #################################################
 
-schedule MoL_SetupIndexArrays AT Initial
-{
-  LANG: C
-} "Set up the MoL bookkeeping index arrays"
-
-schedule MoL_SetupIndexArrays AT Recover_Variables
+schedule MoL_SetupIndexArrays AT Wragh
 {
   LANG: C
 } "Set up the MoL bookkeeping index arrays"
@@ -93,16 +88,10 @@ schedule MoL_SetupIndexArrays AT Recover_Variables
 
 if (CCTK_Equals(ODE_Method,"Generic"))
 {
-  schedule MoL_SetupRKCoefficients AT Initial
-  {
-    LANG: C
-    STORAGE: RKAlphaCoefficients
-    STORAGE: RKBetaCoefficients
-  } "Initialize the generic Runge-Kutta coefficients"
-
-  schedule MoL_SetupRKCoefficients AT Recover_Variables
+  schedule MoL_SetupRKCoefficients AT Wragh
   {
     LANG: C
+    OPTIONS: META
     STORAGE: RKAlphaCoefficients
     STORAGE: RKBetaCoefficients
   } "Initialize the generic Runge-Kutta coefficients"
@@ -113,29 +102,25 @@ if (CCTK_Equals(ODE_Method,"Generic"))
 ###  registration functions                   ###
 #################################################
 
-schedule GROUP MoL_Register AT PostInitial 
+schedule GROUP MoL_Register AT Wragh AFTER MoL_SetupIndexArrays
 {
   LANG:C
 } "The group where physics thorns register variables with MoL"
 
-schedule GROUP MoL_Register AT Post_Recover_Variables
+schedule MoL_ReportNumberVariables AT Wragh AFTER MoL_Register
 {
   LANG:C
-} "The group where physics thorns register variables with MoL"
+  OPTIONS:META
+} "Report how many of each type of variable there are"
 
 if (initial_data_is_crap)
 {
-  schedule MoL_FillAllLevels AT PostInitial AFTER MoL_Register
+  schedule MoL_FillAllLevels AT PostInitial
   {
     LANG:C
   } "A bad routine. Fills all previous timelevels with data copied from the current."
 }
 
-schedule MoL_ReportNumberVariables AT PostInitial AFTER MoL_Register
-{
-  LANG:C
-} "Report how many of each type of variable there are"
-
 ######################################################
 ###  The evolution step. This is almost a self     ###
 ###  contained EVOL step with PRE and POST steps   ###
@@ -408,6 +393,7 @@ schedule GROUP MoL_StartStep IN MoL_Evolution
 schedule MoL_SetCounter IN MoL_StartStep 
 {
   LANG: C
+  OPTIONS: LEVEL
 } "Set the counter for the ODE method to loop over"
 
 ########################################################
@@ -421,7 +407,7 @@ schedule MoL_SetCounter IN MoL_StartStep
 schedule MoL_SetTime IN MoL_StartStep 
 {
   LANG: C
-  ###  OPTION: GLOBAL
+  OPTIONS: LEVEL
 } "Ensure the correct time and timestep are used"
 
 #################################################################
@@ -570,8 +556,6 @@ schedule GROUP MoL_PostStep AT PostInitial AFTER MoL_FillAllLevels
 ###  bin so that symmetries are automatically done correctly.  ###
 ###  We may want to change this later as it could be           ###
 ###  expensive, but it's simplest for the moment.              ###
-###  Note that if you compile without Carpet you will get a    ###
-###  warning which you can ignore.                             ###
 ##################################################################
 
 schedule GROUP MoL_PostStep AT PostRestrict
@@ -587,16 +571,19 @@ schedule GROUP MoL_PostStep AT PostRestrict
 schedule MoL_DecrementCounter IN MoL_Step AFTER MoL_Step BEFORE MoL_PostStep
 {
   LANG: C
+  OPTIONS: LEVEL
 } "Alter the counter number"
 
 schedule MoL_ResetTime IN MoL_Step AFTER MoL_DecrementCounter BEFORE MoL_PostStep
 {
   LANG: C
+  OPTIONS: LEVEL
 } "If necessary, change the time"
 
 schedule MoL_ResetDeltaTime IN MoL_Step AFTER MoL_PostStep
 {
   LANG: C
+  OPTIONS: LEVEL
 } "If necessary, change the timestep"
 
 ##################################################