1 files changed, 56 insertions, 7 deletions
diff --git a/schedule.ccl b/schedule.ccl
index abc354a..da09739 100644
--- a/schedule.ccl
+++ b/schedule.ccl
@@ -38,18 +38,67 @@ SCHEDULE ADMAnalysis_CurvCartToSphere AT CCTK_ANALYSIS
   SYNC:spherical_curv
 } "Calculate the spherical ex. curvature in r, theta(q), phi(p)"
 
-SCHEDULE GROUP RicciGroup at CCTK_ANALYSIS
+
+
+if (ricci_persist)
 {
-  STORAGE: ricci_tensor, ricci_scalar, detofg
-  TRIGGERS: ricci_tensor, ricci_scalar
-} "Calculate Ricci tensor, with boundary conditions"
+  if (ricci_timelevels == 1)
+  {
+    STORAGE: ricci_tensor[1], ricci_scalar[1]
+  }
+  else if (ricci_timelevels == 2)
+  {
+    STORAGE: ricci_tensor[2], ricci_scalar[2]
+  }
+  else if (ricci_timelevels == 3)
+  {
+    STORAGE: ricci_tensor[3], ricci_scalar[3]
+  }
+  
+  SCHEDULE GROUP RicciGroup at CCTK_POSTINITIAL after (MoL_PostStep MoL_PostInitial)
+  {
+    STORAGE: detofg
+  } "Calculate Ricci tensor, with boundary conditions"
+  
+  SCHEDULE GROUP RicciGroup at CCTK_EVOL after MoL_Evolution
+  {
+    STORAGE: detofg
+  } "Calculate Ricci tensor, with boundary conditions"
+  
+  SCHEDULE GROUP RicciBoundariesGroup at CCTK_POSTREGRID
+  {
+    STORAGE: detofg
+  } "Set Ricci tensor on the boundary"
+  
+  SCHEDULE GROUP RicciBoundariesGroup at CCTK_POSTRESTRICT
+  {
+  } "Set Ricci tensor on the boundary"
+}
+else
+{
+  SCHEDULE GROUP RicciGroup at CCTK_ANALYSIS
+  {
+    STORAGE: ricci_tensor[1], ricci_scalar[1], detofg
+    TRIGGERS: ricci_tensor, ricci_scalar
+  } "Calculate Ricci tensor, with boundary conditions"
+}
 
 SCHEDULE ADMAnalysis_Ricci in RicciGroup
 {
   LANG: C
+} "Calculate Ricci tensor, with boundary conditions"
+
+schedule GROUP RicciBoundariesGroup in RicciGroup after ADMAnalysis_Ricci
+{
+} "Set Ricci tensor on the boundary"
+
+SCHEDULE ADMAnalysis_Ricci_Boundaries in RicciBoundariesGroup
+{
+  LANG: C
+  OPTIONS: level
   SYNC: ricci_tensor, ricci_scalar
-} "Calculation of the Ricci tensor"
+}  "Select boundary conditions for the Ricci tensor"
 
-SCHEDULE GROUP ApplyBCs as ADMAnalysis_ApplyBCs in RicciGroup after ADMAnalysis_Ricci
+SCHEDULE GROUP ApplyBCs as ADMAnalysis_ApplyBCs in RicciBoundariesGroup after ADMAnalysis_Ricci
 {
-} "Apply boundary conditions"
+} "Apply boundary conditions to the Ricci tensor"