update from public Whisky version

git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinInitialData/GRHydro_InitData/trunk@12 ac85fae7-cede-4708-beff-ae01c7fa1c26

2 files changed, 12 insertions, 13 deletions

diff --git a/param.ccl b/param.ccl
index e782674..bf3e928 100644
--- a/param.ccl
+++ b/param.ccl
@@ -5,6 +5,14 @@ shares:HydroBase
 
 USES CCTK_INT timelevels
 
+EXTENDS KEYWORD initial_hydro ""
+{
+  "shocktube"	:: "Shocktube type"
+  "only_atmo"	:: "Set only a low atmosphere"
+  "read_conformal":: "After reading in initial alp, rho and gxx from h5 files, sets the other quantities"
+  "simple_wave" :: "Set initial data from Anile Miller Motta, Phys.Fluids. 26, 1450 (1983)"
+}
+
 shares:ADMBase
 
 EXTENDS KEYWORD initial_data ""
@@ -17,15 +25,6 @@ EXTENDS KEYWORD initial_data ""
 
 private:
 
-KEYWORD whisky_initial_data "Initial data for hydro variables only"
-{
-  "none"	:: "Nothing set here"
-  "shocktube"	:: "Shocktube type"
-  "only_atmo"	:: "Set only a low atmosphere"
-  "read_conformal":: "After reading in initial alp, rho and gxx from h5 files, sets the other quantities"
-  "simple_wave" :: "Set initial data from Anile Miller Motta, Phys.Fluids. 26, 1450 (1983)"
-} "none"
-
 KEYWORD shocktube_type "Diagonal or parallel shock?"
 {
   "diagshock"	:: "Diagonal across all axes"
diff --git a/schedule.ccl b/schedule.ccl
index 36f1461..1503665 100644
--- a/schedule.ccl
+++ b/schedule.ccl
@@ -5,7 +5,7 @@ schedule Whisky_InitData_CheckParameters  AT CCTK_PARAMCHECK
   LANG: C
 } "Check parameters"
 
-if (CCTK_Equals(whisky_initial_data,"shocktube")) {
+if (CCTK_Equals(initial_hydro,"shocktube")) {
   schedule Whisky_shocktube in HydroBase_Initial
   {
     LANG: Fortran
@@ -48,21 +48,21 @@ if (CCTK_Equals(initial_data,"reconstruction_test")) {
   } "Testing the reconstruction"
 }
 
-if (CCTK_Equals(whisky_initial_data,"only_atmo")) {
+if (CCTK_Equals(initial_hydro,"only_atmo")) {
   schedule Whisky_Only_Atmo in HydroBase_Initial
   {
     LANG: Fortran
   } "Only atmosphere as initial data"
 }
 
-if (CCTK_Equals(whisky_initial_data,"read_conformal")) {
+if (CCTK_Equals(initial_hydro,"read_conformal")) {
   schedule Whisky_ReadConformalData in HydroBase_Initial
   {
     LANG: Fortran
   } "Set the missing quantities, after reading in from file initial data from conformally-flat codes (Garching)"
 }
 
-if (CCTK_Equals(whisky_initial_data,"simple_wave")) {
+if (CCTK_Equals(initial_hydro,"simple_wave")) {
   STORAGE: simple_wave_grid_functions
   STORAGE: simple_wave_scalars
   schedule Whisky_SimpleWave in HydroBase_Initial