Remove the 3 timelevels from StaticConformal, reverting to just

one. Add the tagstable entry so that this works with CarpetInterp.

Note the the "Evolve" code for 3 timelevels is still in the repository
but will not be compiled.


git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinBase/StaticConformal/trunk@26 0cbbb82d-14ec-4423-a1fb-2ab18257ecaa

1 files changed, 11 insertions, 38 deletions

diff --git a/schedule.ccl b/schedule.ccl
index 0ded8bf..9889015 100644
--- a/schedule.ccl
+++ b/schedule.ccl
@@ -17,47 +17,20 @@ SCHEDULE StaticConformal_InitialiseState at CCTK_BASEGRID
 
 if(CCTK_Equals(metric_type,"static conformal"))
 {
-  if (conformal_timelevels==1)
-  {
-
-    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
+  if(CCTK_Equals(conformal_storage, "factor"))
   {
-
-    if(CCTK_Equals(conformal_storage, "factor"))
-    {
-      STORAGE: confac[3]
-    }
+    STORAGE: confac[1]
+  }
   
-    if(CCTK_Equals(conformal_storage, "factor+derivs"))
-    {
-      STORAGE: confac[3], confac_1derivs[3]
-    }
+  if(CCTK_Equals(conformal_storage, "factor+derivs"))
+  {
+    STORAGE: confac[1], confac_1derivs[1]
+  }
   
-    if(CCTK_Equals(conformal_storage, "factor+derivs+2nd derivs"))
-    {
-      STORAGE: confac[3], confac_1derivs[3], confac_2derivs[3]
-    }
-
-    SCHEDULE StaticConformal_Evolve at CCTK_PRESTEP
-    {
-      LANG: C
-    } "Evolve the static conformal factor"
-
+  if(CCTK_Equals(conformal_storage, "factor+derivs+2nd derivs"))
+  {
+    STORAGE: confac[1], confac_1derivs[1], confac_2derivs[1]
   }
+
 }