merge branch hot_and_MHD_temp_dev into branch at revision r185

git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinEvolve/GRHydro/trunk@186 c83d129a-5a75-4d5a-9c4d-ed3a5855bf45

1 files changed, 23 insertions, 25 deletions

diff --git a/param.ccl b/param.ccl
index ba4a0fa..f7d4f05 100644
--- a/param.ccl
+++ b/param.ccl
@@ -34,6 +34,14 @@ EXTENDS KEYWORD Bvec_evolution_method ""
 {
   "GRHydro" :: "Use GRHydro to evolve the MHD variables"
 }
+EXTENDS KEYWORD Y_e_evolution_method ""
+{
+  "GRHydro" :: "Use GRHydro to evolve Y_e"
+}
+EXTENDS KEYWORD temperature_evolution_method ""
+{
+  "GRHydro" :: "Use GRHydro to evolve temperature and entropy"
+}
 
 #########################################
 ###  PARAMETRES SHARED FROM MoL       ###
@@ -68,13 +76,13 @@ CCTK_INT GRHydro_hydro_excision "Turns excision automatically on in HydroBase" A
 
 CCTK_INT GRHydro_MaxNumEvolvedVars "The maximum number of evolved variables used by GRHydro" ACCUMULATOR-BASE=MethodofLines::MoL_Num_Evolved_Vars
 {
-  5:8		:: "dens scon[3] tau Bvec[3]"
+  5:9		:: "dens scon[3] tau Bvec[3] ye"
 } 5
 
 CCTK_INT GRHydro_MaxNumConstrainedVars "The maximum number of constrained variables used by GRHydro" ACCUMULATOR-BASE=MethodofLines::MoL_Num_Constrained_Vars
 {
-  7:13		:: "A small range, depending on testing or not"
-} 8
+  7:15		:: "A small range, depending on testing or not"
+} 9
  
 CCTK_INT GRHydro_MaxNumSandRVars "The maximum number of save and restore variables used by GRHydro" ACCUMULATOR-BASE=MethodofLines::MoL_Num_SaveAndRestore_Vars
 {
@@ -242,21 +250,6 @@ string GRHydro_eos_table "Name for the Equation of State"
   .*		:: "Can be anything"
 } "Ideal_Fluid"
 
-####################### EOS Omni Parameters ##############################
-
-###int GRHydro_poly_eoskey "eoskey for poly EOS"
-###{
-### 1:*           :: "Must be larger than 0"
-###} 1
-###
-###
-###int GRHydro_eoskey "eoskey determining which EOS to use"
-###{
-###  1           :: "Polytropic EOS"
-###  2           :: "Gamma-Law EOS"
-###  3           :: "Hybrid EOS"
-###  4:*         :: "something else"
-###} 2
 
 real GRHydro_eos_rf_prec "Precision to which root finding should be carried out"
 {
@@ -266,17 +259,11 @@ real GRHydro_eos_rf_prec "Precision to which root finding should be carried out"
 ####################### Other Parameters ##############################
 
 #Parameters controlling conservative <-> primitive change.
-
 int GRHydro_c2p_warnlevel "Warnlevel for Con2Prim warnings" STEERABLE=ALWAYS
 {
   0:1           :: "Either 0 or 1"
 } 0
 
-# This parameter is not used anymore in maintained code: the warnings are produced only for really evolved points.
-int GRHydro_c2p_warn_from_reflevel "Start warning on given refinement level and on higher levels" STEERABLE=ALWAYS
-{
-  0:           :: "Greater or equal to 0"
-} 0
 
 boolean c2p_reset_pressure "If the pressure guess is unphysical should we recompute it?"
 {
@@ -551,4 +538,15 @@ CCTK_REAL ch_dc "The c_h parameter for divergence cleaning"
 CCTK_REAL cp_dc "The c_p parameter for divergence cleaning"
 {
   0:* :: "Any value, but one to 12 is preferred"
-} 1.0
\ No newline at end of file
+} 1.0
+
+############### temporary parameters to be removed once connected issues are fixed.
+
+boolean con2prim_oct_hack "Disregard c2p failures in oct/rotsym90 boundary cells with xyz < 0" STEERABLE=ALWAYS
+{
+} "no"
+
+int GRHydro_c2p_warn_from_reflevel "Start warning on given refinement level and on higher levels" STEERABLE=ALWAYS
+{
+  0:           :: "Greater or equal to 0"
+} 0