Splitted the input up so that the metric, conformal factor, lapse and shift

are read in independently. Also scheduled these routines at CCTK_INITIAL
extending the ADMBase parameter for initial_data, initial_lapse and
initial_shift with "read from file".


git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinAnalysis/EHFinder/trunk@30 2a26948c-0e4f-0410-aee8-f1d3e353619c

1 files changed, 68 insertions, 4 deletions

diff --git a/schedule.ccl b/schedule.ccl
index 89bef40..388ab31 100644
--- a/schedule.ccl
+++ b/schedule.ccl
@@ -16,6 +16,38 @@ schedule EHFinder_ParamCheck at CCTK_PARAMCHECK
 } "Check parameters"
 
 
+if (CCTK_Equals(initial_data,"read from file"))
+{
+  schedule EHFinder_Read_Metric at CCTK_INITIAL
+  {
+    LANG: Fortran
+  } "Read in metric from file"
+}
+
+if (CCTK_Equals(initial_lapse,"read from file"))
+{
+  schedule EHFinder_Read_Lapse at CCTK_INITIAL
+  {
+    LANG: Fortran
+  } "Read in lapse from file"
+}
+
+if (CCTK_Equals(initial_shift,"read from file"))
+{
+  schedule EHFinder_Read_Shift at CCTK_INITIAL
+  {
+    LANG: Fortran
+  } "Read in shift from file"
+}
+
+if (CCTK_Equals(metric_type,"static conformal") && CCTK_Equals(eh_metric_type,"numerical"))
+{
+  schedule EHFinder_Read_Conformal at CCTK_INITIAL
+  {
+    LANG: Fortran
+  } "Read in conformal factor from file"
+}
+
 # Set up the initial level set function
 
 schedule EHFinder_Init at CCTK_POSTINITIAL
@@ -24,12 +56,44 @@ schedule EHFinder_Init at CCTK_POSTINITIAL
   SYNC: level_set
 } "Setup the initial surface"
 
-# Read in the data used in reconstructing the 4-metric
+# Read in the data used in reconstructing the 4-metric if necessary
 
-schedule EHFinder_ReadData at CCTK_PRESTEP
+if (CCTK_Equals(eh_metric_type,"numerical"))
 {
-  LANG: Fortran
-} "Read in metric, lapse and shift and conformal factor"
+  schedule EHFinder_Read_Metric at CCTK_PRESTEP
+  {
+    LANG: Fortran
+  } "Read in metric from file"
+}
+
+if (CCTK_Equals(eh_lapse_type,"numerical"))
+{
+  schedule EHFinder_Read_Lapse at CCTK_PRESTEP
+  {
+    LANG: Fortran
+  } "Read in lapse from file"
+}
+
+if (CCTK_Equals(eh_shift_type,"numerical"))
+{
+  schedule EHFinder_Read_Shift at CCTK_PRESTEP
+  {
+    LANG: Fortran
+  } "Read in shift from file"
+}
+
+if (CCTK_Equals(metric_type,"static conformal") && CCTK_Equals(eh_metric_type,"numerical"))
+{
+  schedule EHFinder_Read_Conformal at CCTK_PRESTEP
+  {
+    LANG: Fortran
+  } "Read in conformal factor from file"
+}
+
+#schedule EHFinder_ReadData at CCTK_PRESTEP
+#{
+#  LANG: Fortran
+#} "Read in metric, lapse and shift and conformal factor"
 
 # Register the level_set function and its right hand side source with MoL