1 files changed, 77 insertions, 5 deletions
diff --git a/schedule.ccl b/schedule.ccl
index 61274db..ce70686 100644
--- a/schedule.ccl
+++ b/schedule.ccl
@@ -1,7 +1,83 @@
 # Schedule definitions for thorn ADMBase
 # $Header$
 
-STORAGE: shift_state, dtlapse_state, dtshift_state, metric[1], curv[1], lapse[1]
+STORAGE: shift_state dtlapse_state dtshift_state
+
+if (lapse_timelevels == 1)
+{
+  STORAGE: lapse[1]
+}
+else if (lapse_timelevels == 2)
+{
+  STORAGE: lapse[2]
+}
+else if (lapse_timelevels == 3)
+{
+  STORAGE: lapse[3]
+}
+
+if (! CCTK_Equals(initial_shift, "none"))
+{
+  if (shift_timelevels == 1)
+  {
+    STORAGE: shift[1]
+  }
+  else if (shift_timelevels == 2)
+  {
+    STORAGE: shift[2]
+  }
+  else if (shift_timelevels == 3)
+  {
+    STORAGE: shift[3]
+  }
+}
+
+if (! CCTK_Equals(initial_dtlapse, "none"))
+{
+  if (lapse_timelevels == 1)
+  {
+    STORAGE: dtlapse[1]
+  }
+  else if (lapse_timelevels == 2)
+  {
+    STORAGE: dtlapse[2]
+  }
+  else if (lapse_timelevels == 3)
+  {
+    STORAGE: dtlapse[3]
+  }
+}
+
+if (! CCTK_Equals(initial_dtshift, "none"))
+{
+  if (shift_timelevels == 1)
+  {
+    STORAGE: dtshift[1]
+  }
+  else if (shift_timelevels == 2)
+  {
+    STORAGE: dtshift[2]
+  }
+  else if (shift_timelevels == 3)
+  {
+    STORAGE: dtshift[3]
+  }
+}
+
+if (metric_timelevels == 1)
+{
+  STORAGE: metric[1], curv[1]
+}
+else if (metric_timelevels == 2)
+{
+  STORAGE: metric[2], curv[2]
+}
+else if (metric_timelevels == 3)
+{
+  STORAGE: metric[3], curv[3]
+}
+
+
 
 SCHEDULE ADMBase_ParamCheck at CCTK_PARAMCHECK
 {
@@ -46,8 +122,6 @@ if(CCTK_Equals(initial_lapse, "one"))
 # Do we have storage for the shift ?
 if (!CCTK_Equals(initial_shift, "none")) 
 {
-  STORAGE: shift[1]
-
   SCHEDULE ADMBase_SetShiftStateOn at CCTK_BASEGRID
   {
     LANG: C
@@ -71,7 +145,6 @@ if (! CCTK_Equals(initial_dtlapse, "none"))
 }
 else
 {
-  STORAGE: dtlapse[1]
   SCHEDULE ADMBase_SetDtLapseStateOff at CCTK_BASEGRID
   {
     LANG: C
@@ -106,7 +179,6 @@ if (CCTK_Equals(initial_shift, "zero"))
 # Initial data for dtlapse
 if (CCTK_Equals(initial_dtlapse, "zero"))
 {
-  STORAGE: dtshift[1]
   SCHEDULE ADMBase_DtLapseZero in ADMBase_InitialGauge
   {
     LANG: C