1 files changed, 65 insertions, 12 deletions
diff --git a/ML_ADM/schedule.ccl b/ML_ADM/schedule.ccl
index 36a4cdd..5dbca42 100644
--- a/ML_ADM/schedule.ccl
+++ b/ML_ADM/schedule.ccl
@@ -16,13 +16,57 @@ STORAGE: ml_metricrhs[1]
 
 STORAGE: ml_shiftrhs[1]
 
-STORAGE: ml_curv[3]
+if (timelevels == 1)
+{
+  STORAGE: ml_curv[1]
+}
+if (timelevels == 2)
+{
+  STORAGE: ml_curv[2]
+}
+if (timelevels == 3)
+{
+  STORAGE: ml_curv[3]
+}
 
-STORAGE: ml_lapse[3]
+if (timelevels == 1)
+{
+  STORAGE: ml_lapse[1]
+}
+if (timelevels == 2)
+{
+  STORAGE: ml_lapse[2]
+}
+if (timelevels == 3)
+{
+  STORAGE: ml_lapse[3]
+}
 
-STORAGE: ml_metric[3]
+if (timelevels == 1)
+{
+  STORAGE: ml_metric[1]
+}
+if (timelevels == 2)
+{
+  STORAGE: ml_metric[2]
+}
+if (timelevels == 3)
+{
+  STORAGE: ml_metric[3]
+}
 
-STORAGE: ml_shift[3]
+if (timelevels == 1)
+{
+  STORAGE: ml_shift[1]
+}
+if (timelevels == 2)
+{
+  STORAGE: ml_shift[2]
+}
+if (timelevels == 3)
+{
+  STORAGE: ml_shift[3]
+}
 
 schedule ML_ADM_Startup at STARTUP
 {
@@ -48,7 +92,6 @@ if (CCTK_EQUALS(my_initial_data, "Minkowski"))
   schedule ML_ADM_Minkowski IN ADMBase_InitialData
   {
     LANG: C
-    
   } "ML_ADM_Minkowski"
 }
 
@@ -58,40 +101,51 @@ if (CCTK_EQUALS(my_initial_data, "ADMBase"))
   schedule ML_ADM_convertFromADMBase AT initial AFTER ADMBase_PostInitial
   {
     LANG: C
-    
   } "ML_ADM_convertFromADMBase"
 }
 
 schedule ML_ADM_RHS IN MoL_CalcRHS
 {
   LANG: C
-  
 } "ML_ADM_RHS"
 
 schedule ML_ADM_RHS AT analysis
 {
   LANG: C
-  
   SYNC: ml_curvrhs
   SYNC: ml_lapserhs
   SYNC: ml_metricrhs
   SYNC: ml_shiftrhs
 } "ML_ADM_RHS"
 
-schedule ML_ADM_convertToADMBase IN MoL_PostStep AFTER ML_ADM_ApplyBCs
+
+if (CCTK_EQUALS(my_boundary_condition, "Minkowski"))
+{
+  schedule ML_ADM_boundary IN MoL_PostStep
+  {
+    LANG: C
+  } "ML_ADM_boundary"
+}
+
+schedule ML_ADM_convertToADMBase IN MoL_PostStep AFTER (ML_ADM_ApplyBCs ML_ADM_boundary)
 {
   LANG: C
-  
 } "ML_ADM_convertToADMBase"
 
 schedule ML_ADM_constraints AT analysis
 {
   LANG: C
-  
   SYNC: Ham
   SYNC: mom
+  TRIGGERS: Ham
+  TRIGGERS: mom
 } "ML_ADM_constraints"
 
+schedule ML_ADM_constraints_boundary AT analysis AFTER ML_ADM_constraints
+{
+  LANG: C
+} "ML_ADM_constraints_boundary"
+
 schedule ML_ADM_ApplyBoundConds in MoL_PostStep
 {
   LANG: C
@@ -111,5 +165,4 @@ schedule ML_ADM_CheckBoundaries at BASEGRID
 schedule group ApplyBCs as ML_ADM_ApplyBCs in MoL_PostStep  after ML_ADM_ApplyBoundConds
 {
   # no language specified
-  
 } "Apply boundary conditions controlled by thorn Boundary"