Update from Whisky

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

2 files changed, 72 insertions, 31 deletions

diff --git a/par/BenchRNS_Carpet_3level.par b/par/BenchRNS_Carpet_3level.par
index ad54a30..f10365f 100644
--- a/par/BenchRNS_Carpet_3level.par
+++ b/par/BenchRNS_Carpet_3level.par
@@ -16,6 +16,7 @@ ActiveThorns	=  "	time
 			symbase 
 			aeilocalinterp 
 			carpetinterp 
+			loopcontrol
 		   "
 
 #--- Spacetime :-)
@@ -35,6 +36,8 @@ ActiveThorns	=  "	whisky
 			whisky_init_data 
 			whisky_rnsid 
 			hydrobase
+			tmunubase
+			initbase
 			eos_base 
 			eos_polytrope 
 		   "
@@ -71,7 +74,6 @@ carpet::constant_load_per_processor		= "yes"
 #--- performance & infrastructure
 
 carpet::enable_all_storage 			= "no"
-CarpetLib::save_memory_during_regridding 	= "yes"
 
 #--- Carpet prolongation order settings
 
@@ -90,7 +92,7 @@ MoL::initial_data_is_crap		= "yes"
 #--- Grid Setup and carpet parameters
 
 
-carpet::buffer_width 				= 6
+carpet::use_buffer_zones			= yes
 
 driver::ghost_size                      	= 3
 
@@ -132,6 +134,12 @@ bssn_mol::timelevels				=	3
 
 
 HydroBase::timelevels				=	3
+hydrobase::evolution_method			=	"whisky"
+
+TmunuBase::stress_energy_storage		=	yes
+TmunuBase::stress_energy_at_RHS			=	yes
+TmunuBase::timelevels				=	1
+TmunuBase::prolongation_type			=	none
 
 whisky::whisky_rho_central			=	1.61930347e-08
 whisky::riemann_solver				=	"Marquina"
@@ -161,6 +169,7 @@ whisky::initial_atmosphere_factor		=	0.99
 
 ####################### Initial Data #####################################
 
+InitBase::initial_data_setup_method		=	"init_all_levels"
 
 admbase::initial_data				=	"rnsid"
 admbase::initial_lapse				=	"rnsid"
diff --git a/par/whisky.par b/par/whisky.par
index 33f8f12..6ffe6fd 100644
--- a/par/whisky.par
+++ b/par/whisky.par
@@ -1,39 +1,71 @@
-ActiveThorns = "time MoL pugh pughreduce pughslab cartgrid3d ioutil ioascii iobasic boundary einstein hydrobase whisky whisky::whisky_init_data nanchecker eos_base eos_ideal_fluid"
+!DESC "Diagonal shocktube, RK2, Roe, TVD-Minmod, Ideal Gas"
 
-#This is a hack. ghost_size should be the same as whisky::whisky_stencil.
+ActiveThorns = "pugh pughreduce pughslab LocalReduce"
 
-pugh::ghost_size=2
+cactus::cctk_itlast 			= 	5
 
-time::dtfac = 0.25
+driver::ghost_size			=	2
+driver::global_nx 			= 	15
+driver::global_ny 			= 	15
+driver::global_nz 			= 	15
 
-methodoflines::ode_method = "rk2"
+ActiveThorns = "coordbase symbase cartgrid3d boundary"
 
-einstein::evolution_system="none"
-einstein::shift="none"
-einstein::use_conformal = "no"
-einstein::use_conformal_derivs = "no"
-einstein::initial_data="shocktube"
-whisky_init_data::shocktube_type="diagshock"
-whisky_init_data::shock_case="Simple"
+grid::type 				= 	"BySpacing"
+grid::domain 				= 	"full"
+grid::dxyz 				= 	0.5
 
-EOS_Ideal_Fluid::eos_ideal_fluid_gamma=1.66666666666666
-whisky::riemann_solver="Roe"
-whisky::tvd_limiter="minmod"
-whisky::bound="flat"
-whisky::whisky_eos_table="Ideal_Fluid"
+ActiveThorns = "time"
 
-grid::type = "BySpacing"
-grid::domain = "full"
-grid::dxyz = 0.5
+time::dtfac 				= 	0.25
 
-driver::global_nx = 15
-driver::global_ny = 15
-driver::global_nz = 15
+ActiveThorns = "ioutil ioascii iobasic"
 
-cactus::cctk_itlast = 5
+IO::out_fileinfo			=	"none"
+IO::out_dir 				= 	"whisky_test_shock"
 
-IO::outdir = "whisky_shocktube"
-IOBasic::outInfo_every = 1
-IOBasic::outInfo_vars = "HydroBase::rho"
-IOASCII::out1D_every = 1
-IOASCII::out1D_vars = "HydroBase::rhoHydroBase::press HydroBase::eps  HydroBase::vel whisky::dens whisky::tau whisky::scon"
+IOBasic::outInfo_every 			= 	1
+IOBasic::outInfo_vars 			= 	"HydroBase::rho"
+
+IOASCII::out1D_every 			= 	1
+IOASCII::out1D_vars 			= 	"whisky::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel whisky::dens whisky::tau whisky::scon"
+
+ActiveThorns = "nanchecker mol"
+
+methodoflines::ode_method 		= 	"rk2"
+methodoflines::mol_intermediate_steps	=	2
+
+ActiveThorns = "ADMBase StaticConformal SpaceMask CoordGauge ADMMacros ADMCoupling Tmunubase"
+
+TmunuBase::stress_energy_storage	=	yes
+TmunuBase::stress_energy_at_RHS		=	yes
+TmunuBase::timelevels			=	1
+TmunuBase::prolongation_type		=	none
+
+ADMBase::evolution_method		=	"none"
+ADMBase::initial_shift			=	"none"
+ADMBase::metric_type			= 	"physical"
+SpaceMask::use_mask			=	"yes"
+
+ActiveThorns = "eos_base eos_ideal_fluid eos_polytrope"
+
+EOS_Ideal_Fluid::eos_ideal_fluid_gamma	=	1.66666666666666
+
+ActiveThorns = "hydrobase whisky"
+
+hydrobase::timelevels			= 2
+hydrobase::evolution_method       = "whisky"
+
+whisky::riemann_solver			=	"Roe"
+whisky::whisky_eos_type			=	"General"
+whisky::whisky_eos_table		=	"Ideal_Fluid"
+whisky::whisky_stencil			=	2
+whisky::recon_method			=	"tvd"
+whisky::tvd_limiter			=	"minmod"
+whisky::bound				=	"flat"
+
+ActiveThorns = "whisky_init_data"
+
+whisky_init_data::whisky_initial_data	=	"shocktube"
+whisky_init_data::shocktube_type	=	"diagshock"
+whisky_init_data::shock_case		=	"Simple"