1 files changed, 32 insertions, 28 deletions
diff --git a/schedule.ccl b/schedule.ccl
index 526e77d..2004588 100644
--- a/schedule.ccl
+++ b/schedule.ccl
@@ -21,44 +21,48 @@ schedule ADMConstraint_InitSymBound at CCTK_WRAGH
 
 if (constraints_persist)
 {
-  STORAGE: hamiltonian, normalized_hamiltonian, momentum
-  schedule ADMConstraints at CCTK_POSTSTEP
+  if (constraints_timelevels == 1)
   {
-    LANG: Fortran
-  } "Evaluate ADM constraints for use in other routines"
-
-  schedule ADMConstraints_Boundaries at CCTK_POSTSTEP after ADMConstraints
+    STORAGE: hamiltonian[1], normalized_hamiltonian[1], momentum[1]
+  }
+  else if (constraints_timelevels == 2)
   {
-    LANG: Fortran
-    OPTIONS: LEVEL
-  } "Apply boundary conditions to the ADM constraints"
-
-  schedule GROUP ApplyBCs as ADMConstraints_ApplyBCs at CCTK_POSTSTEP after ADMConstraints_Boundaries
+    STORAGE: hamiltonian[2], normalized_hamiltonian[2], momentum[2]
+  }
+  else if (constraints_timelevels == 3)
   {
-    SYNC: hamiltonian, normalized_hamiltonian, momentum
-  } "Apply (symmetry) boundary conditions"
+    STORAGE: hamiltonian[3], normalized_hamiltonian[3], momentum[3]
+  }
+  
+  schedule GROUP ADMConstraintsGroup at CCTK_EVOL after MoL_Evolution
+  {
+  } "Evaluate ADM constraints, and perform symmetry boundary conditions"
+  
+  schedule GROUP ADMConstraintsGroup at CCTK_POSTREGRID
+  {
+  } "Evaluate ADM constraints, and perform symmetry boundary conditions"
 }
 else
 {
   schedule GROUP ADMConstraintsGroup at CCTK_ANALYSIS
   {
-    STORAGE: hamiltonian, normalized_hamiltonian, momentum
+    STORAGE: hamiltonian[1], normalized_hamiltonian[1], momentum[1]
     TRIGGERS: hamiltonian, normalized_hamiltonian, momentum
-    SYNC: hamiltonian, normalized_hamiltonian, momentum
   } "Evaluate ADM constraints, and perform symmetry boundary conditions"
+}
 
-  schedule ADMConstraints in ADMConstraintsGroup
-  {		
-    LANG: Fortran
-  } "Evaluate ADM constraints"
+schedule ADMConstraints in ADMConstraintsGroup
+{		
+  LANG: Fortran
+} "Evaluate ADM constraints"
 
-  schedule ADMConstraints_Boundaries in ADMConstraintsGroup after ADMConstraints
-  {
-    LANG: Fortran
-    OPTIONS: LEVEL
-  } "Apply boundary conditions to the ADM constraints"
+schedule ADMConstraints_Boundaries in ADMConstraintsGroup after ADMConstraints
+{
+  LANG: Fortran
+  OPTIONS: level
+  SYNC: hamiltonian, normalized_hamiltonian, momentum
+} "Select boundary conditions for the ADM constraints"
 
-  schedule GROUP ApplyBCs as ADMConstraints_ApplyBCs in ADMConstraintsGroup after ADMConstraints_Boundaries
-  {
-  } "Apply (symmetry) boundary conditions"
-}
+schedule GROUP ApplyBCs as ADMConstraints_ApplyBCs in ADMConstraintsGroup after ADMConstraints_Boundaries
+{
+} "Apply boundary conditions to the ADM constraints"