Simplify logic.

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

1 files changed, 10 insertions, 19 deletions

diff --git a/schedule.ccl b/schedule.ccl
index 8ff7f89..0ded8bf 100644
--- a/schedule.ccl
+++ b/schedule.ccl
@@ -3,16 +3,20 @@
 
 
 
-if(CCTK_Equals(metric_type,"static conformal"))
+# Putting in an else here because people want to use conformal_state
+# even if the metric is not "static conformal".  They should still
+# check the metric_type and know they can deal with it, 'though.
+STORAGE: conformal_state
+
+SCHEDULE StaticConformal_InitialiseState at CCTK_BASEGRID
 {
-  STORAGE: conformal_state
+  LANG: C
+} "Set the conformal_state variable to 0"
 
-  SCHEDULE StaticConformal_InitialiseState at CCTK_BASEGRID
-  {
-    LANG: C
-  } "Set the conformal_state variable to 0"
 
 
+if(CCTK_Equals(metric_type,"static conformal"))
+{
   if (conformal_timelevels==1)
   {
 
@@ -56,17 +60,4 @@ if(CCTK_Equals(metric_type,"static conformal"))
     } "Evolve the static conformal factor"
 
   }
-
 }
-else
-{
-# Putting in an else here because people want to use conformal_state
-# even if the metric is not "static conformal".  They should still
-# check the metric_type and know they can deal with it, 'though.
-  STORAGE: conformal_state
-
-  SCHEDULE StaticConformal_InitialiseState at CCTK_BASEGRID
-  {
-    LANG: C
-  } "Set the conformal_state variable to 0"
-}