update from public Whisky version

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

1 files changed, 8 insertions, 9 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"