Change parameters for Y_e to be similar to ADMBase and shift

git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinBase/HydroBase/trunk@11 57fe0bb3-ccba-405f-9b23-de0201f165b7

3 files changed, 21 insertions, 9 deletions

diff --git a/param.ccl b/param.ccl
index 573f46c..3ccff24 100755
--- a/param.ccl
+++ b/param.ccl
@@ -19,6 +19,14 @@ STRING prolongation_type "The prolongation operator used by Carpet for HydroBase
   ".*"   :: "Anything else"
 } "ENO"
 
-BOOLEAN use_Y_e "Enable storage for Y_e"
+KEYWORD initial_Y_e "Initial value for Y_e"
 {
-} "no"
+  "none" :: "inactive"
+  "one"  :: "initially set to one"
+} "none"
+
+KEYWORD Y_e_evolution_method "Evolution method for Y_e"
+{
+  "none" :: "Evolution for Y_e is disabled"
+} "none"
+
diff --git a/schedule.ccl b/schedule.ccl
index 312aef2..539efe5 100755
--- a/schedule.ccl
+++ b/schedule.ccl
@@ -11,7 +11,7 @@ if (timelevels == 3)
   STORAGE:press[3]
   STORAGE:eps[3]
   STORAGE:vel[3]
-  if (use_Y_e)
+  if (!CCTK_EQUALS(initial_Y_e, "none"))
   {
     STORAGE:Y_e[3]
   }
@@ -22,7 +22,7 @@ else if (timelevels == 2)
   STORAGE:press[2]
   STORAGE:eps[2]
   STORAGE:vel[2]
-  if (use_Y_e)
+  if (!CCTK_EQUALS(initial_Y_e, "none"))
   {
     STORAGE:Y_e[2]
   }
@@ -33,7 +33,7 @@ else if (timelevels == 1)
   STORAGE:press[1]
   STORAGE:eps[1]
   STORAGE:vel[1]
-  if (use_Y_e)
+  if (!CCTK_EQUALS(initial_Y_e, "none"))
   {
     STORAGE:Y_e[1]
   }
@@ -43,9 +43,13 @@ schedule group HydroBase_Initial AT Initial after ADMBase_InitialData after ADMB
 {
 } "HydroBase initial data group"
 
-###############################
-### Register startup banner ###
-###############################
+if(CCTK_Equals(initial_Y_e, "one"))
+{
+  SCHEDULE HydroBase_Y_e_one in HydroBase_Initial
+  {
+    LANG: C
+  } "Set electron fraction to 1 at all points"
+}
 
 schedule HydroBase_StartUp AT WRAGH
 {
diff --git a/src/make.code.defn b/src/make.code.defn
index 7f86d75..4d8b77f 100755
--- a/src/make.code.defn
+++ b/src/make.code.defn
@@ -1,7 +1,7 @@
 # Main make.code.defn file for thorn HydroBase
 
 # Source files in this directory
-SRCS = StartUp.c
+SRCS = StartUp.c Initialisation.c
 
 # Subdirectories containing source files
 SUBDIRS =