1 files changed, 10 insertions, 11 deletions
diff --git a/schedule.ccl b/schedule.ccl
index 8b6f7ce..4fe2d13 100644
--- a/schedule.ccl
+++ b/schedule.ccl
@@ -1,9 +1,8 @@
 # Schedule definitions for thorn Time
-# $Header$
 
 STORAGE: speedvars, couranttemps
 
-schedule Time_Initialise at CCTK_BASEGRID before (Time_Simple, Time_Given)
+schedule Time_Initialise at CCTK_BASEGRID before Time_Simple
 {
   LANG: C
   OPTIONS: global
@@ -11,7 +10,7 @@ schedule Time_Initialise at CCTK_BASEGRID before (Time_Simple, Time_Given)
 
 if (CCTK_Equals (timestep_method, "courant_static"))
 {
-  schedule Time_Simple at CCTK_BASEGRID after SpatialCoordinates
+  schedule Time_Simple at CCTK_BASEGRID as TemporalSpacings after SpatialSpacings
   {
     LANG: C
     OPTIONS: singlemap
@@ -19,37 +18,37 @@ if (CCTK_Equals (timestep_method, "courant_static"))
 }
 else if (CCTK_Equals (timestep_method, "courant_speed"))
 {
-  schedule Time_Courant at CCTK_BASEGRID after SpatialCoordinates
+  schedule Time_Courant at CCTK_BASEGRID as TemporalSpacings after SpatialSpacings
   {
     LANG: C
     OPTIONS: singlemap
   } "Set timestep based on Courant condition (courant_speed)"
 
-   schedule Time_Courant at CCTK_POSTSTEP
+   schedule Time_Courant at CCTK_POSTSTEP as TemporalSpacings after SpatialSpacings
   {
     LANG: C
     OPTIONS: singlemap
   } "Reset timestep each iteration"
 }
-else if (CCTK_Equals (timestep_method, "courant_time"))     
+else if (CCTK_Equals (timestep_method, "courant_time"))
 {
-  schedule Time_Simple at CCTK_BASEGRID after SpatialCoordinates
+  schedule Time_Simple at CCTK_BASEGRID as TemporalSpacings after SpatialSpacings
   {
     LANG: C
     OPTIONS: singlemap
   } "Set timestep based on Courant condition (courant_time)"
 
-   schedule Time_Courant at CCTK_POSTSTEP
+   schedule Time_Courant at CCTK_POSTSTEP as TemporalSpacings after SpatialSpacings
   {
     LANG: C
     OPTIONS: singlemap
   } "Reset timestep each iteration"
 }
-else
+else if (CCTK_Equals (timestep_method, "given"))
 {
-  schedule Time_Given at CCTK_BASEGRID
+  schedule Time_Given at CCTK_BASEGRID as TemporalSpacings after SpatialSpacings
   {
     LANG: C
-    OPTIONS: global
+    OPTIONS: singlemap
   } "Set fixed timestep"
 }