1 files changed, 39 insertions, 9 deletions
diff --git a/schedule.ccl b/schedule.ccl
index 750181a..a8a3599 100644
--- a/schedule.ccl
+++ b/schedule.ccl
@@ -13,20 +13,51 @@ if(CCTK_Equals(metric_type,"static conformal"))
   } "Set the conformal_state variable to 0"
 
 
-  if(CCTK_Equals(conformal_storage, "factor"))
+  if (conformal_timelevels==1)
   {
-    STORAGE: staticconformal::confac
-  }
 
-  if(CCTK_Equals(conformal_storage, "factor+derivs"))
+    if(CCTK_Equals(conformal_storage, "factor"))
+    {
+      STORAGE: confac[1]
+    }
+  
+    if(CCTK_Equals(conformal_storage, "factor+derivs"))
+    {
+      STORAGE: confac[1], confac_1derivs[1]
+    }
+  
+    if(CCTK_Equals(conformal_storage, "factor+derivs+2nd derivs"))
+    {
+      STORAGE: confac[1], confac_1derivs[1], confac_2derivs[1]
+    }
+
+  }
+  else
   {
-    STORAGE: staticconformal::confac, staticconformal::confac_1derivs 
+
+    if(CCTK_Equals(conformal_storage, "factor"))
+    {
+      STORAGE: confac[3]
+    }
+  
+    if(CCTK_Equals(conformal_storage, "factor+derivs"))
+    {
+      STORAGE: confac[3], confac_1derivs[3]
+    }
+  
+    if(CCTK_Equals(conformal_storage, "factor+derivs+2nd derivs"))
+    {
+      STORAGE: confac[3], confac_1derivs[3], confac_2derivs[3]
+    }
+
   }
 
-  if(CCTK_Equals(conformal_storage, "factor+derivs+2nd derivs"))
+
+  SCHEDULE StaticConformal_Evolve at CCTK_PRESTEP
   {
-    STORAGE: staticconformal::confac, staticconformal::confac_1derivs, staticconformal::confac_2derivs
-  }
+    LANG: C
+  } "Evolve the static conformal factor"
+
 }
 else
 {
@@ -40,4 +71,3 @@ else
     LANG: C
   } "Set the conformal_state variable to 0"
 }  
-