1 files changed, 49 insertions, 28 deletions
diff --git a/schedule.ccl b/schedule.ccl
index 200f405..61274db 100644
--- a/schedule.ccl
+++ b/schedule.ccl
@@ -61,70 +61,91 @@ else
   } "Set the shift_state variable to 0"
 }
 
-# Initial data for the shift
-
-if(CCTK_Equals(initial_shift, "zero"))
+# Do we have storage for dtlapse?
+if (! CCTK_Equals(initial_dtlapse, "none")) 
 {
-  SCHEDULE ADMBase_ShiftZero in ADMBase_InitialGauge
+  SCHEDULE ADMBase_SetDtLapseStateOn at CCTK_BASEGRID
   {
     LANG: C
-  } "Set the shift to 0 at all points"
+  } "Set the dtlapse_state variable to 1"
 }
-
-# Do we have storage for dtlapse ?
-if (!CCTK_Equals(initial_dtlapse, "none")) 
+else
 {
   STORAGE: dtlapse[1]
+  SCHEDULE ADMBase_SetDtLapseStateOff at CCTK_BASEGRID
+  {
+    LANG: C
+  } "Set the dtlapse_state variable to 0"
+}
 
-  SCHEDULE ADMBase_SetDtlapseStateOn at CCTK_BASEGRID
+# Do we have storage for dtshift?
+if (! CCTK_Equals(initial_dtshift, "none")) 
+{
+  SCHEDULE ADMBase_SetDtShiftStateOn at CCTK_BASEGRID
   {
     LANG: C
-  } "Set the dtlapse_state variable to 1"
+  } "Set the dtshift_state variable to 1"
 }
 else
 {
-  SCHEDULE ADMBase_SetDtlapseStateOff at CCTK_BASEGRID
+  SCHEDULE ADMBase_SetDtShiftStateOff at CCTK_BASEGRID
   {
     LANG: C
-  } "Set the dtlase_state variable to 0"
+  } "Set the dtshift_state variable to 0"
 }
 
-# Initial data for dtlapse
-
-if(CCTK_Equals(initial_dtlapse, "zero"))
+# Initial data for the shift
+if (CCTK_Equals(initial_shift, "zero"))
 {
-  SCHEDULE ADMBase_DtlapseZero in ADMBase_InitialGauge
+  SCHEDULE ADMBase_ShiftZero in ADMBase_InitialGauge
   {
     LANG: C
-  } "Set dtlapse to 0 at all points"
+  } "Set the shift to 0 at all points"
 }
 
-# Do we have storage for dtshift ?
-if (!CCTK_Equals(initial_dtshift, "none")) 
+# Initial data for dtlapse
+if (CCTK_Equals(initial_dtlapse, "zero"))
 {
   STORAGE: dtshift[1]
+  SCHEDULE ADMBase_DtLapseZero in ADMBase_InitialGauge
+  {
+    LANG: C
+  } "Set the dtlapse to 0 at all points"
+}
 
-  SCHEDULE ADMBase_SetDtshiftStateOn at CCTK_BASEGRID
+# Initial data for dtshift
+if (CCTK_Equals(initial_dtshift, "zero"))
+{
+  SCHEDULE ADMBase_DtShiftZero in ADMBase_InitialGauge
   {
     LANG: C
-  } "Set the dtshift_state variable to 1"
+  } "Set the dtshift to 0 at all points"
 }
-else
+
+
+
+if (CCTK_Equals(lapse_evolution_method, "static"))
 {
-  SCHEDULE ADMBase_SetDtshiftStateOff at CCTK_BASEGRID
+  SCHEDULE ADMBase_LapseStatic in CCTK_PRESTEP
   {
     LANG: C
-  } "Set the dtlase_state variable to 0"
+  } "Copy the lapse to the current time level"
 }
 
-# Initial data for dtshift
+if (CCTK_Equals(shift_evolution_method, "static"))
+{
+  SCHEDULE ADMBase_ShiftStatic in CCTK_PRESTEP
+  {
+    LANG: C
+  } "Copy the shift to the current time level"
+}
 
-if(CCTK_Equals(initial_dtshift, "zero"))
+if (CCTK_Equals(evolution_method, "static") || CCTK_Equals(evolution_method, "none"))
 {
-  SCHEDULE ADMBase_DtshiftZero in ADMBase_InitialGauge
+  SCHEDULE ADMBase_Static in CCTK_PRESTEP
   {
     LANG: C
-  } "Set dtshift to 0 at all points"
+  } "Copy the metric and extrinsic curvature to the current time level"
 }
 
 # FIXME: Remove this when symmetries done better