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

4 files changed, 16 insertions, 47 deletions

diff --git a/interface.ccl b/interface.ccl
index 47f6b9c..870358e 100644
--- a/interface.ccl
+++ b/interface.ccl
@@ -8,12 +8,12 @@ public:
 
 INT conformal_state type = SCALAR
 
-REAL confac TYPE = GF timelevels = 3 tags='tensortypealias="Scalar" Prolongation="None"'
+REAL confac TYPE = GF timelevels = 1 tags='tensortypealias="Scalar" Prolongation="None" InterpNumTimelevels=1'
 {
   psi
 } "Conformal factor"
 
-REAL confac_1derivs TYPE = GF timelevels = 3  tags='tensortypealias="U" Prolongation="None"'
+REAL confac_1derivs TYPE = GF timelevels = 1  tags='tensortypealias="U" Prolongation="None" InterpNumTimelevels=1'
 {
   psix, psiy, psiz
 } "First spatial derivatives of conformal factor divided by psi"
@@ -24,7 +24,7 @@ REAL confac_1derivs TYPE = GF timelevels = 3  tags='tensortypealias="U" Prolonga
 #  psi_1, psi_2, psi_3
 #} "First spatial derivatives of conformal factor divided by psi"
 
-REAL confac_2derivs TYPE = GF timelevels = 3  tags='tensortypealias="dd_sym" Prolongation="None"'
+REAL confac_2derivs TYPE = GF timelevels = 1  tags='tensortypealias="dd_sym" Prolongation="None" InterpNumTimelevels=1'
 {
   psixx, psixy, psixz, psiyy, psiyz, psizz
 } "Second spatial derivatives of conformal factor divided by psi"
diff --git a/param.ccl b/param.ccl
index 5f18f9d..7bd58c8 100644
--- a/param.ccl
+++ b/param.ccl
@@ -19,8 +19,3 @@ KEYWORD conformal_storage "How much conformal storage do we have ?"
 
 private:
 
-INT conformal_timelevels "Number of active time levels for the conformal factor"
-{
-  1 :: ""
-  3 :: ""
-} 1
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]
   }
+
 }
diff --git a/src/make.code.defn b/src/make.code.defn
index ccbdcf1..6811ecc 100644
--- a/src/make.code.defn
+++ b/src/make.code.defn
@@ -2,7 +2,8 @@
 # $Header$
 
 # Source files in this directory
-SRCS = Initialise.c Evolve.c ConfPhys.c
+SRCS = Initialise.c ConfPhys.c
+#SRCS = Initialise.c Evolve.c ConfPhys.c
 
 # Subdirectories containing source files
 SUBDIRS =