make testsuites work again (only for development version of whisky so far, like before)

git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinInitialData/TwoPunctures/trunk@96 b2a53a04-0f4f-0410-87ed-f9f25ced00cf

100 files changed, 28 insertions, 26 deletions

diff --git a/test/bhns_eval.par b/test/bhns_eval.par
index a2f3e9a..c26e35d 100644
--- a/test/bhns_eval.par
+++ b/test/bhns_eval.par
@@ -4,7 +4,7 @@ ActiveThorns = "Loopcontrol InitBase Carpet CarpetLib CarpetInterp CarpetReduce
 ActiveThorns = "ADMBase"
 ActiveThorns = "StaticConformal"
 ActiveThorns = "ADMCoupling ADMMacros"
-ActiveThorns = "TmunuBase Constants SpaceMask Whisky"
+ActiveThorns = "TmunuBase Constants SpaceMask Whisky HydroBase"
 ActiveThorns = "Whisky_TOVSolverC eos_base eos_ideal_fluid eos_polytrope"
 ActiveThorns = "TwoPunctures"
 ActiveThorns = "coordgauge boundary"
@@ -70,7 +70,7 @@ whisky::recon_method              = "ppm"
 whisky::rho_abs_min               = 1.e-10
 whisky::initial_atmosphere_factor = 0.1
 #whisky::Whisky_MaxNumSandRVars    = 0
-whisky::timelevels = 3
+hydrobase::timelevels = 3
 
 Whisky_TOVSolverC::TOV_Enforce_Interpolation = "yes"
 Whisky_TOVSolverC::TOV_Num_Radial     = 1000000
@@ -96,9 +96,9 @@ Carpet::init_3_timelevels         = no
 CarpetIOScalar::outScalar_reductions	= "minimum maximum norm1 norm2"
 
 IOScalar::outScalar_every	= 512
-IOScalar::outScalar_vars		= "admbase::metric admbase::curv TwoPunctures::puncture_u whisky::whisky_prim_scalar_var whisky::whisky_prim_vector_var whisky::whisky_cons_scalar_var whisky::whisky_cons_vector_var admbase::lapse admbase::shift"
+IOScalar::outScalar_vars		= "admbase::metric admbase::curv TwoPunctures::puncture_u whisky::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel whisky::dens whisky::tau whisky::scon admbase::lapse admbase::shift"
 IOASCII::out1D_every		= 512
-IOASCII::out1D_vars		= "admbase::metric admbase::curv TwoPunctures::puncture_u whisky::whisky_prim_scalar_var whisky::whisky_prim_vector_var whisky::whisky_cons_scalar_var whisky::whisky_cons_vector_var admbase::lapse admbase::shift"
+IOASCII::out1D_vars		= "admbase::metric admbase::curv TwoPunctures::puncture_u whisky::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel whisky::dens whisky::tau whisky::scon admbase::lapse admbase::shift"
 
 admbase::metric_type		= "physical"
 
diff --git a/test/bhns_eval/bhns_eval.par b/test/bhns_eval/bhns_eval.par
index 069f578..c26e35d 100644
--- a/test/bhns_eval/bhns_eval.par
+++ b/test/bhns_eval/bhns_eval.par
@@ -1,23 +1,23 @@
 ActiveThorns = "Boundary CartGrid3D Time CoordBase SymBase LocalReduce"
-ActiveThorns = "Carpet CarpetLib CarpetInterp CarpetReduce CarpetSlab CarpetIOASCII CarpetIOBasic IOUtil CarpetIOScalar CarpetIOHDF5"
+ActiveThorns = "Loopcontrol InitBase Carpet CarpetLib CarpetInterp CarpetReduce CarpetSlab CarpetIOASCII CarpetIOBasic IOUtil CarpetIOScalar CarpetIOHDF5"
 
 ActiveThorns = "ADMBase"
 ActiveThorns = "StaticConformal"
 ActiveThorns = "ADMCoupling ADMMacros"
-ActiveThorns = "Constants SpaceMask Whisky"
+ActiveThorns = "TmunuBase Constants SpaceMask Whisky HydroBase"
 ActiveThorns = "Whisky_TOVSolverC eos_base eos_ideal_fluid eos_polytrope"
 ActiveThorns = "TwoPunctures"
 ActiveThorns = "coordgauge boundary"
 
+Carpet::init_each_timelevel 		= "no"
+InitBase::initial_data_setup_method	= "init_all_levels"
+
 Cactus::cctk_itlast = 0
 
 Time::dtfac			= 0.25
 
 CoordBase::domainsize = minmax
 
-CarpetLib::save_memory_during_regridding = "yes"
-CarpetLib::use_collective_communication_buffers = "yes"
-
 driver::ghost_size                = 3
 
 Carpet::domain_from_coordbase = "yes"
@@ -70,7 +70,7 @@ whisky::recon_method              = "ppm"
 whisky::rho_abs_min               = 1.e-10
 whisky::initial_atmosphere_factor = 0.1
 #whisky::Whisky_MaxNumSandRVars    = 0
-whisky::timelevels = 3
+hydrobase::timelevels = 3
 
 Whisky_TOVSolverC::TOV_Enforce_Interpolation = "yes"
 Whisky_TOVSolverC::TOV_Num_Radial     = 1000000
@@ -88,16 +88,17 @@ IO::out_fileinfo= "axis labels"
 
 Carpet::max_refinement_levels = 10
 carpet::enable_all_storage        = no
-Carpet::buffer_width              = 6
 Carpet::prolongation_order_space  = 3
 Carpet::prolongation_order_time   = 2
 Carpet::convergence_level         = 0
 Carpet::init_3_timelevels         = no
 
+CarpetIOScalar::outScalar_reductions	= "minimum maximum norm1 norm2"
+
 IOScalar::outScalar_every	= 512
-IOScalar::outScalar_vars		= "admbase::metric admbase::curv TwoPunctures::puncture_u whisky::whisky_prim_scalar_var whisky::whisky_prim_vector_var whisky::whisky_cons_scalar_var whisky::whisky_cons_vector_var admbase::lapse admbase::shift"
+IOScalar::outScalar_vars		= "admbase::metric admbase::curv TwoPunctures::puncture_u whisky::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel whisky::dens whisky::tau whisky::scon admbase::lapse admbase::shift"
 IOASCII::out1D_every		= 512
-IOASCII::out1D_vars		= "admbase::metric admbase::curv TwoPunctures::puncture_u whisky::whisky_prim_scalar_var whisky::whisky_prim_vector_var whisky::whisky_cons_scalar_var whisky::whisky_cons_vector_var admbase::lapse admbase::shift"
+IOASCII::out1D_vars		= "admbase::metric admbase::curv TwoPunctures::puncture_u whisky::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel whisky::dens whisky::tau whisky::scon admbase::lapse admbase::shift"
 
 admbase::metric_type		= "physical"
 
diff --git a/test/bhns_eval/sx.d.asc b/test/bhns_eval/scon[0].d.asc
index cd1a513..cd1a513 100644
--- a/test/bhns_eval/sx.d.asc
+++ b/test/bhns_eval/scon[0].d.asc
diff --git a/test/bhns_eval/sx.maximum.asc b/test/bhns_eval/scon[0].maximum.asc
index b058345..b058345 100644
--- a/test/bhns_eval/sx.maximum.asc
+++ b/test/bhns_eval/scon[0].maximum.asc
diff --git a/test/bhns_eval/sx.minimum.asc b/test/bhns_eval/scon[0].minimum.asc
index b058345..b058345 100644
--- a/test/bhns_eval/sx.minimum.asc
+++ b/test/bhns_eval/scon[0].minimum.asc
diff --git a/test/bhns_eval/sx.norm1.asc b/test/bhns_eval/scon[0].norm1.asc
index b058345..b058345 100644
--- a/test/bhns_eval/sx.norm1.asc
+++ b/test/bhns_eval/scon[0].norm1.asc
diff --git a/test/bhns_eval/sx.norm2.asc b/test/bhns_eval/scon[0].norm2.asc
index b058345..b058345 100644
--- a/test/bhns_eval/sx.norm2.asc
+++ b/test/bhns_eval/scon[0].norm2.asc
diff --git a/test/bhns_eval/sx.x.asc b/test/bhns_eval/scon[0].x.asc
index 316bbec..316bbec 100644
--- a/test/bhns_eval/sx.x.asc
+++ b/test/bhns_eval/scon[0].x.asc
diff --git a/test/bhns_eval/sx.y.asc b/test/bhns_eval/scon[0].y.asc
index aa6b088..aa6b088 100644
--- a/test/bhns_eval/sx.y.asc
+++ b/test/bhns_eval/scon[0].y.asc
diff --git a/test/bhns_eval/sx.z.asc b/test/bhns_eval/scon[0].z.asc
index 13972a4..13972a4 100644
--- a/test/bhns_eval/sx.z.asc
+++ b/test/bhns_eval/scon[0].z.asc
diff --git a/test/bhns_eval/sy.d.asc b/test/bhns_eval/scon[1].d.asc
index b2cd07f..b2cd07f 100644
--- a/test/bhns_eval/sy.d.asc
+++ b/test/bhns_eval/scon[1].d.asc
diff --git a/test/bhns_eval/sy.maximum.asc b/test/bhns_eval/scon[1].maximum.asc
index 91f974a..91f974a 100644
--- a/test/bhns_eval/sy.maximum.asc
+++ b/test/bhns_eval/scon[1].maximum.asc
diff --git a/test/bhns_eval/sy.minimum.asc b/test/bhns_eval/scon[1].minimum.asc
index 91f974a..91f974a 100644
--- a/test/bhns_eval/sy.minimum.asc
+++ b/test/bhns_eval/scon[1].minimum.asc
diff --git a/test/bhns_eval/sy.norm1.asc b/test/bhns_eval/scon[1].norm1.asc
index 91f974a..91f974a 100644
--- a/test/bhns_eval/sy.norm1.asc
+++ b/test/bhns_eval/scon[1].norm1.asc
diff --git a/test/bhns_eval/sy.norm2.asc b/test/bhns_eval/scon[1].norm2.asc
index 91f974a..91f974a 100644
--- a/test/bhns_eval/sy.norm2.asc
+++ b/test/bhns_eval/scon[1].norm2.asc
diff --git a/test/bhns_eval/sy.x.asc b/test/bhns_eval/scon[1].x.asc
index 2ecd912..2ecd912 100644
--- a/test/bhns_eval/sy.x.asc
+++ b/test/bhns_eval/scon[1].x.asc
diff --git a/test/bhns_eval/sy.y.asc b/test/bhns_eval/scon[1].y.asc
index d3f0989..d3f0989 100644
--- a/test/bhns_eval/sy.y.asc
+++ b/test/bhns_eval/scon[1].y.asc
diff --git a/test/bhns_eval/sy.z.asc b/test/bhns_eval/scon[1].z.asc
index d9f9b56..d9f9b56 100644
--- a/test/bhns_eval/sy.z.asc
+++ b/test/bhns_eval/scon[1].z.asc
diff --git a/test/bhns_eval/sz.d.asc b/test/bhns_eval/scon[2].d.asc
index e907f60..e907f60 100644
--- a/test/bhns_eval/sz.d.asc
+++ b/test/bhns_eval/scon[2].d.asc
diff --git a/test/bhns_eval/sz.maximum.asc b/test/bhns_eval/scon[2].maximum.asc
index ab1bc22..ab1bc22 100644
--- a/test/bhns_eval/sz.maximum.asc
+++ b/test/bhns_eval/scon[2].maximum.asc
diff --git a/test/bhns_eval/sz.minimum.asc b/test/bhns_eval/scon[2].minimum.asc
index ab1bc22..ab1bc22 100644
--- a/test/bhns_eval/sz.minimum.asc
+++ b/test/bhns_eval/scon[2].minimum.asc
diff --git a/test/bhns_eval/sz.norm1.asc b/test/bhns_eval/scon[2].norm1.asc
index ab1bc22..ab1bc22 100644
--- a/test/bhns_eval/sz.norm1.asc
+++ b/test/bhns_eval/scon[2].norm1.asc
diff --git a/test/bhns_eval/sz.norm2.asc b/test/bhns_eval/scon[2].norm2.asc
index ab1bc22..ab1bc22 100644
--- a/test/bhns_eval/sz.norm2.asc
+++ b/test/bhns_eval/scon[2].norm2.asc
diff --git a/test/bhns_eval/sz.x.asc b/test/bhns_eval/scon[2].x.asc
index 08d6541..08d6541 100644
--- a/test/bhns_eval/sz.x.asc
+++ b/test/bhns_eval/scon[2].x.asc
diff --git a/test/bhns_eval/sz.y.asc b/test/bhns_eval/scon[2].y.asc
index 5c8356a..5c8356a 100644
--- a/test/bhns_eval/sz.y.asc
+++ b/test/bhns_eval/scon[2].y.asc
diff --git a/test/bhns_eval/sz.z.asc b/test/bhns_eval/scon[2].z.asc
index 2278789..2278789 100644
--- a/test/bhns_eval/sz.z.asc
+++ b/test/bhns_eval/scon[2].z.asc
diff --git a/test/bhns_eval/velx.d.asc b/test/bhns_eval/vel[0].d.asc
index 8af059d..8af059d 100644
--- a/test/bhns_eval/velx.d.asc
+++ b/test/bhns_eval/vel[0].d.asc
diff --git a/test/bhns_eval/velx.maximum.asc b/test/bhns_eval/vel[0].maximum.asc
index 3b6b5e5..3b6b5e5 100644
--- a/test/bhns_eval/velx.maximum.asc
+++ b/test/bhns_eval/vel[0].maximum.asc
diff --git a/test/bhns_eval/velx.minimum.asc b/test/bhns_eval/vel[0].minimum.asc
index 3b6b5e5..3b6b5e5 100644
--- a/test/bhns_eval/velx.minimum.asc
+++ b/test/bhns_eval/vel[0].minimum.asc
diff --git a/test/bhns_eval/velx.norm1.asc b/test/bhns_eval/vel[0].norm1.asc
index 3b6b5e5..3b6b5e5 100644
--- a/test/bhns_eval/velx.norm1.asc
+++ b/test/bhns_eval/vel[0].norm1.asc
diff --git a/test/bhns_eval/velx.norm2.asc b/test/bhns_eval/vel[0].norm2.asc
index 3b6b5e5..3b6b5e5 100644
--- a/test/bhns_eval/velx.norm2.asc
+++ b/test/bhns_eval/vel[0].norm2.asc
diff --git a/test/bhns_eval/velx.x.asc b/test/bhns_eval/vel[0].x.asc
index 2701e4c..2701e4c 100644
--- a/test/bhns_eval/velx.x.asc
+++ b/test/bhns_eval/vel[0].x.asc
diff --git a/test/bhns_eval/velx.y.asc b/test/bhns_eval/vel[0].y.asc
index 8977239..8977239 100644
--- a/test/bhns_eval/velx.y.asc
+++ b/test/bhns_eval/vel[0].y.asc
diff --git a/test/bhns_eval/velx.z.asc b/test/bhns_eval/vel[0].z.asc
index 315fccc..315fccc 100644
--- a/test/bhns_eval/velx.z.asc
+++ b/test/bhns_eval/vel[0].z.asc
diff --git a/test/bhns_eval/vely.d.asc b/test/bhns_eval/vel[1].d.asc
index dcfe4bb..dcfe4bb 100644
--- a/test/bhns_eval/vely.d.asc
+++ b/test/bhns_eval/vel[1].d.asc
diff --git a/test/bhns_eval/vely.maximum.asc b/test/bhns_eval/vel[1].maximum.asc
index 189b739..189b739 100644
--- a/test/bhns_eval/vely.maximum.asc
+++ b/test/bhns_eval/vel[1].maximum.asc
diff --git a/test/bhns_eval/vely.minimum.asc b/test/bhns_eval/vel[1].minimum.asc
index 189b739..189b739 100644
--- a/test/bhns_eval/vely.minimum.asc
+++ b/test/bhns_eval/vel[1].minimum.asc
diff --git a/test/bhns_eval/vely.norm1.asc b/test/bhns_eval/vel[1].norm1.asc
index 189b739..189b739 100644
--- a/test/bhns_eval/vely.norm1.asc
+++ b/test/bhns_eval/vel[1].norm1.asc
diff --git a/test/bhns_eval/vely.norm2.asc b/test/bhns_eval/vel[1].norm2.asc
index 189b739..189b739 100644
--- a/test/bhns_eval/vely.norm2.asc
+++ b/test/bhns_eval/vel[1].norm2.asc
diff --git a/test/bhns_eval/vely.x.asc b/test/bhns_eval/vel[1].x.asc
index 3e3a027..3e3a027 100644
--- a/test/bhns_eval/vely.x.asc
+++ b/test/bhns_eval/vel[1].x.asc
diff --git a/test/bhns_eval/vely.y.asc b/test/bhns_eval/vel[1].y.asc
index 66c936c..66c936c 100644
--- a/test/bhns_eval/vely.y.asc
+++ b/test/bhns_eval/vel[1].y.asc
diff --git a/test/bhns_eval/vely.z.asc b/test/bhns_eval/vel[1].z.asc
index e01fcd6..e01fcd6 100644
--- a/test/bhns_eval/vely.z.asc
+++ b/test/bhns_eval/vel[1].z.asc
diff --git a/test/bhns_eval/velz.d.asc b/test/bhns_eval/vel[2].d.asc
index d239a31..d239a31 100644
--- a/test/bhns_eval/velz.d.asc
+++ b/test/bhns_eval/vel[2].d.asc
diff --git a/test/bhns_eval/velz.maximum.asc b/test/bhns_eval/vel[2].maximum.asc
index 6217851..6217851 100644
--- a/test/bhns_eval/velz.maximum.asc
+++ b/test/bhns_eval/vel[2].maximum.asc
diff --git a/test/bhns_eval/velz.minimum.asc b/test/bhns_eval/vel[2].minimum.asc
index 6217851..6217851 100644
--- a/test/bhns_eval/velz.minimum.asc
+++ b/test/bhns_eval/vel[2].minimum.asc
diff --git a/test/bhns_eval/velz.norm1.asc b/test/bhns_eval/vel[2].norm1.asc
index 6217851..6217851 100644
--- a/test/bhns_eval/velz.norm1.asc
+++ b/test/bhns_eval/vel[2].norm1.asc
diff --git a/test/bhns_eval/velz.norm2.asc b/test/bhns_eval/vel[2].norm2.asc
index 6217851..6217851 100644
--- a/test/bhns_eval/velz.norm2.asc
+++ b/test/bhns_eval/vel[2].norm2.asc
diff --git a/test/bhns_eval/velz.x.asc b/test/bhns_eval/vel[2].x.asc
index e0a8e30..e0a8e30 100644
--- a/test/bhns_eval/velz.x.asc
+++ b/test/bhns_eval/vel[2].x.asc
diff --git a/test/bhns_eval/velz.y.asc b/test/bhns_eval/vel[2].y.asc
index 879b50f..879b50f 100644
--- a/test/bhns_eval/velz.y.asc
+++ b/test/bhns_eval/vel[2].y.asc
diff --git a/test/bhns_eval/velz.z.asc b/test/bhns_eval/vel[2].z.asc
index 564c594..564c594 100644
--- a/test/bhns_eval/velz.z.asc
+++ b/test/bhns_eval/vel[2].z.asc
diff --git a/test/bhns_interp.par b/test/bhns_interp.par
index 269f25b..6ce7f53 100644
--- a/test/bhns_interp.par
+++ b/test/bhns_interp.par
@@ -4,7 +4,7 @@ ActiveThorns = "Loopcontrol InitBase Carpet CarpetLib CarpetInterp CarpetReduce
 ActiveThorns = "ADMBase"
 ActiveThorns = "StaticConformal"
 ActiveThorns = "ADMCoupling ADMMacros"
-ActiveThorns = "TmunuBase Constants SpaceMask Whisky"
+ActiveThorns = "TmunuBase Constants SpaceMask Whisky HydroBase"
 ActiveThorns = "Whisky_TOVSolverC eos_base eos_ideal_fluid eos_polytrope"
 ActiveThorns = "TwoPunctures"
 ActiveThorns = "coordgauge boundary"
@@ -70,7 +70,7 @@ whisky::recon_method              = "ppm"
 whisky::rho_abs_min               = 1.e-10
 whisky::initial_atmosphere_factor = 0.1
 #whisky::Whisky_MaxNumSandRVars    = 0
-whisky::timelevels = 3
+hydrobase::timelevels = 3
 
 Whisky_TOVSolverC::TOV_Enforce_Interpolation = "yes"
 Whisky_TOVSolverC::TOV_Num_Radial     = 1000000
@@ -96,9 +96,9 @@ Carpet::init_3_timelevels         = no
 CarpetIOScalar::outScalar_reductions	= "minimum maximum norm1 norm2"
 
 IOScalar::outScalar_every	= 512
-IOScalar::outScalar_vars		= "admbase::metric admbase::curv TwoPunctures::puncture_u whisky::whisky_prim_scalar_var whisky::whisky_prim_vector_var whisky::whisky_cons_scalar_var whisky::whisky_cons_vector_var admbase::lapse admbase::shift"
+IOScalar::outScalar_vars		= "admbase::metric admbase::curv TwoPunctures::puncture_u whisky::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel whisky::dens whisky::tau whisky::scon admbase::lapse admbase::shift"
 IOASCII::out1D_every		= 512
-IOASCII::out1D_vars		= "admbase::metric admbase::curv TwoPunctures::puncture_u whisky::whisky_prim_scalar_var whisky::whisky_prim_vector_var whisky::whisky_cons_scalar_var whisky::whisky_cons_vector_var admbase::lapse admbase::shift"
+IOASCII::out1D_vars		= "admbase::metric admbase::curv TwoPunctures::puncture_u whisky::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel whisky::dens whisky::tau whisky::scon admbase::lapse admbase::shift"
 
 admbase::metric_type		= "physical"
 
diff --git a/test/bhns_interp/bhns_interp.par b/test/bhns_interp/bhns_interp.par
index f332797..6ce7f53 100644
--- a/test/bhns_interp/bhns_interp.par
+++ b/test/bhns_interp/bhns_interp.par
@@ -1,23 +1,23 @@
 ActiveThorns = "Boundary CartGrid3D Time CoordBase SymBase LocalReduce"
-ActiveThorns = "Carpet CarpetLib CarpetInterp CarpetReduce CarpetSlab CarpetIOASCII CarpetIOBasic IOUtil CarpetIOScalar CarpetIOHDF5"
+ActiveThorns = "Loopcontrol InitBase Carpet CarpetLib CarpetInterp CarpetReduce CarpetSlab CarpetIOASCII CarpetIOBasic IOUtil CarpetIOScalar CarpetIOHDF5"
 
 ActiveThorns = "ADMBase"
 ActiveThorns = "StaticConformal"
 ActiveThorns = "ADMCoupling ADMMacros"
-ActiveThorns = "Constants SpaceMask Whisky"
+ActiveThorns = "TmunuBase Constants SpaceMask Whisky HydroBase"
 ActiveThorns = "Whisky_TOVSolverC eos_base eos_ideal_fluid eos_polytrope"
 ActiveThorns = "TwoPunctures"
 ActiveThorns = "coordgauge boundary"
 
+Carpet::init_each_timelevel 		= "no"
+InitBase::initial_data_setup_method	= "init_all_levels"
+
 Cactus::cctk_itlast = 0
 
 Time::dtfac			= 0.25
 
 CoordBase::domainsize = minmax
 
-CarpetLib::save_memory_during_regridding = "yes"
-CarpetLib::use_collective_communication_buffers = "yes"
-
 driver::ghost_size                = 3
 
 Carpet::domain_from_coordbase = "yes"
@@ -70,7 +70,7 @@ whisky::recon_method              = "ppm"
 whisky::rho_abs_min               = 1.e-10
 whisky::initial_atmosphere_factor = 0.1
 #whisky::Whisky_MaxNumSandRVars    = 0
-whisky::timelevels = 3
+hydrobase::timelevels = 3
 
 Whisky_TOVSolverC::TOV_Enforce_Interpolation = "yes"
 Whisky_TOVSolverC::TOV_Num_Radial     = 1000000
@@ -88,16 +88,17 @@ IO::out_fileinfo= "axis labels"
 
 Carpet::max_refinement_levels = 10
 carpet::enable_all_storage        = no
-Carpet::buffer_width              = 6
 Carpet::prolongation_order_space  = 3
 Carpet::prolongation_order_time   = 2
 Carpet::convergence_level         = 0
 Carpet::init_3_timelevels         = no
 
+CarpetIOScalar::outScalar_reductions	= "minimum maximum norm1 norm2"
+
 IOScalar::outScalar_every	= 512
-IOScalar::outScalar_vars		= "admbase::metric admbase::curv TwoPunctures::puncture_u whisky::whisky_prim_scalar_var whisky::whisky_prim_vector_var whisky::whisky_cons_scalar_var whisky::whisky_cons_vector_var admbase::lapse admbase::shift"
+IOScalar::outScalar_vars		= "admbase::metric admbase::curv TwoPunctures::puncture_u whisky::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel whisky::dens whisky::tau whisky::scon admbase::lapse admbase::shift"
 IOASCII::out1D_every		= 512
-IOASCII::out1D_vars		= "admbase::metric admbase::curv TwoPunctures::puncture_u whisky::whisky_prim_scalar_var whisky::whisky_prim_vector_var whisky::whisky_cons_scalar_var whisky::whisky_cons_vector_var admbase::lapse admbase::shift"
+IOASCII::out1D_vars		= "admbase::metric admbase::curv TwoPunctures::puncture_u whisky::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel whisky::dens whisky::tau whisky::scon admbase::lapse admbase::shift"
 
 admbase::metric_type		= "physical"
 
diff --git a/test/bhns_interp/sx.d.asc b/test/bhns_interp/scon[0].d.asc
index cd1a513..cd1a513 100644
--- a/test/bhns_interp/sx.d.asc
+++ b/test/bhns_interp/scon[0].d.asc
diff --git a/test/bhns_interp/sx.maximum.asc b/test/bhns_interp/scon[0].maximum.asc
index b058345..b058345 100644
--- a/test/bhns_interp/sx.maximum.asc
+++ b/test/bhns_interp/scon[0].maximum.asc
diff --git a/test/bhns_interp/sx.minimum.asc b/test/bhns_interp/scon[0].minimum.asc
index b058345..b058345 100644
--- a/test/bhns_interp/sx.minimum.asc
+++ b/test/bhns_interp/scon[0].minimum.asc
diff --git a/test/bhns_interp/sx.norm1.asc b/test/bhns_interp/scon[0].norm1.asc
index b058345..b058345 100644
--- a/test/bhns_interp/sx.norm1.asc
+++ b/test/bhns_interp/scon[0].norm1.asc
diff --git a/test/bhns_interp/sx.norm2.asc b/test/bhns_interp/scon[0].norm2.asc
index b058345..b058345 100644
--- a/test/bhns_interp/sx.norm2.asc
+++ b/test/bhns_interp/scon[0].norm2.asc
diff --git a/test/bhns_interp/sx.x.asc b/test/bhns_interp/scon[0].x.asc
index 316bbec..316bbec 100644
--- a/test/bhns_interp/sx.x.asc
+++ b/test/bhns_interp/scon[0].x.asc
diff --git a/test/bhns_interp/sx.y.asc b/test/bhns_interp/scon[0].y.asc
index aa6b088..aa6b088 100644
--- a/test/bhns_interp/sx.y.asc
+++ b/test/bhns_interp/scon[0].y.asc
diff --git a/test/bhns_interp/sx.z.asc b/test/bhns_interp/scon[0].z.asc
index 13972a4..13972a4 100644
--- a/test/bhns_interp/sx.z.asc
+++ b/test/bhns_interp/scon[0].z.asc
diff --git a/test/bhns_interp/sy.d.asc b/test/bhns_interp/scon[1].d.asc
index b2cd07f..b2cd07f 100644
--- a/test/bhns_interp/sy.d.asc
+++ b/test/bhns_interp/scon[1].d.asc
diff --git a/test/bhns_interp/sy.maximum.asc b/test/bhns_interp/scon[1].maximum.asc
index 91f974a..91f974a 100644
--- a/test/bhns_interp/sy.maximum.asc
+++ b/test/bhns_interp/scon[1].maximum.asc
diff --git a/test/bhns_interp/sy.minimum.asc b/test/bhns_interp/scon[1].minimum.asc
index 91f974a..91f974a 100644
--- a/test/bhns_interp/sy.minimum.asc
+++ b/test/bhns_interp/scon[1].minimum.asc
diff --git a/test/bhns_interp/sy.norm1.asc b/test/bhns_interp/scon[1].norm1.asc
index 91f974a..91f974a 100644
--- a/test/bhns_interp/sy.norm1.asc
+++ b/test/bhns_interp/scon[1].norm1.asc
diff --git a/test/bhns_interp/sy.norm2.asc b/test/bhns_interp/scon[1].norm2.asc
index 91f974a..91f974a 100644
--- a/test/bhns_interp/sy.norm2.asc
+++ b/test/bhns_interp/scon[1].norm2.asc
diff --git a/test/bhns_interp/sy.x.asc b/test/bhns_interp/scon[1].x.asc
index 2ecd912..2ecd912 100644
--- a/test/bhns_interp/sy.x.asc
+++ b/test/bhns_interp/scon[1].x.asc
diff --git a/test/bhns_interp/sy.y.asc b/test/bhns_interp/scon[1].y.asc
index d3f0989..d3f0989 100644
--- a/test/bhns_interp/sy.y.asc
+++ b/test/bhns_interp/scon[1].y.asc
diff --git a/test/bhns_interp/sy.z.asc b/test/bhns_interp/scon[1].z.asc
index d9f9b56..d9f9b56 100644
--- a/test/bhns_interp/sy.z.asc
+++ b/test/bhns_interp/scon[1].z.asc
diff --git a/test/bhns_interp/sz.d.asc b/test/bhns_interp/scon[2].d.asc
index e907f60..e907f60 100644
--- a/test/bhns_interp/sz.d.asc
+++ b/test/bhns_interp/scon[2].d.asc
diff --git a/test/bhns_interp/sz.maximum.asc b/test/bhns_interp/scon[2].maximum.asc
index ab1bc22..ab1bc22 100644
--- a/test/bhns_interp/sz.maximum.asc
+++ b/test/bhns_interp/scon[2].maximum.asc
diff --git a/test/bhns_interp/sz.minimum.asc b/test/bhns_interp/scon[2].minimum.asc
index ab1bc22..ab1bc22 100644
--- a/test/bhns_interp/sz.minimum.asc
+++ b/test/bhns_interp/scon[2].minimum.asc
diff --git a/test/bhns_interp/sz.norm1.asc b/test/bhns_interp/scon[2].norm1.asc
index ab1bc22..ab1bc22 100644
--- a/test/bhns_interp/sz.norm1.asc
+++ b/test/bhns_interp/scon[2].norm1.asc
diff --git a/test/bhns_interp/sz.norm2.asc b/test/bhns_interp/scon[2].norm2.asc
index ab1bc22..ab1bc22 100644
--- a/test/bhns_interp/sz.norm2.asc
+++ b/test/bhns_interp/scon[2].norm2.asc
diff --git a/test/bhns_interp/sz.x.asc b/test/bhns_interp/scon[2].x.asc
index 08d6541..08d6541 100644
--- a/test/bhns_interp/sz.x.asc
+++ b/test/bhns_interp/scon[2].x.asc
diff --git a/test/bhns_interp/sz.y.asc b/test/bhns_interp/scon[2].y.asc
index 5c8356a..5c8356a 100644
--- a/test/bhns_interp/sz.y.asc
+++ b/test/bhns_interp/scon[2].y.asc
diff --git a/test/bhns_interp/sz.z.asc b/test/bhns_interp/scon[2].z.asc
index 2278789..2278789 100644
--- a/test/bhns_interp/sz.z.asc
+++ b/test/bhns_interp/scon[2].z.asc
diff --git a/test/bhns_interp/velx.d.asc b/test/bhns_interp/vel[0].d.asc
index 8af059d..8af059d 100644
--- a/test/bhns_interp/velx.d.asc
+++ b/test/bhns_interp/vel[0].d.asc
diff --git a/test/bhns_interp/velx.maximum.asc b/test/bhns_interp/vel[0].maximum.asc
index 3b6b5e5..3b6b5e5 100644
--- a/test/bhns_interp/velx.maximum.asc
+++ b/test/bhns_interp/vel[0].maximum.asc
diff --git a/test/bhns_interp/velx.minimum.asc b/test/bhns_interp/vel[0].minimum.asc
index 3b6b5e5..3b6b5e5 100644
--- a/test/bhns_interp/velx.minimum.asc
+++ b/test/bhns_interp/vel[0].minimum.asc
diff --git a/test/bhns_interp/velx.norm1.asc b/test/bhns_interp/vel[0].norm1.asc
index 3b6b5e5..3b6b5e5 100644
--- a/test/bhns_interp/velx.norm1.asc
+++ b/test/bhns_interp/vel[0].norm1.asc
diff --git a/test/bhns_interp/velx.norm2.asc b/test/bhns_interp/vel[0].norm2.asc
index 3b6b5e5..3b6b5e5 100644
--- a/test/bhns_interp/velx.norm2.asc
+++ b/test/bhns_interp/vel[0].norm2.asc
diff --git a/test/bhns_interp/velx.x.asc b/test/bhns_interp/vel[0].x.asc
index 2701e4c..2701e4c 100644
--- a/test/bhns_interp/velx.x.asc
+++ b/test/bhns_interp/vel[0].x.asc
diff --git a/test/bhns_interp/velx.y.asc b/test/bhns_interp/vel[0].y.asc
index 8977239..8977239 100644
--- a/test/bhns_interp/velx.y.asc
+++ b/test/bhns_interp/vel[0].y.asc
diff --git a/test/bhns_interp/velx.z.asc b/test/bhns_interp/vel[0].z.asc
index 315fccc..315fccc 100644
--- a/test/bhns_interp/velx.z.asc
+++ b/test/bhns_interp/vel[0].z.asc
diff --git a/test/bhns_interp/vely.d.asc b/test/bhns_interp/vel[1].d.asc
index dcfe4bb..dcfe4bb 100644
--- a/test/bhns_interp/vely.d.asc
+++ b/test/bhns_interp/vel[1].d.asc
diff --git a/test/bhns_interp/vely.maximum.asc b/test/bhns_interp/vel[1].maximum.asc
index 189b739..189b739 100644
--- a/test/bhns_interp/vely.maximum.asc
+++ b/test/bhns_interp/vel[1].maximum.asc
diff --git a/test/bhns_interp/vely.minimum.asc b/test/bhns_interp/vel[1].minimum.asc
index 189b739..189b739 100644
--- a/test/bhns_interp/vely.minimum.asc
+++ b/test/bhns_interp/vel[1].minimum.asc
diff --git a/test/bhns_interp/vely.norm1.asc b/test/bhns_interp/vel[1].norm1.asc
index 189b739..189b739 100644
--- a/test/bhns_interp/vely.norm1.asc
+++ b/test/bhns_interp/vel[1].norm1.asc
diff --git a/test/bhns_interp/vely.norm2.asc b/test/bhns_interp/vel[1].norm2.asc
index 189b739..189b739 100644
--- a/test/bhns_interp/vely.norm2.asc
+++ b/test/bhns_interp/vel[1].norm2.asc
diff --git a/test/bhns_interp/vely.x.asc b/test/bhns_interp/vel[1].x.asc
index 3e3a027..3e3a027 100644
--- a/test/bhns_interp/vely.x.asc
+++ b/test/bhns_interp/vel[1].x.asc
diff --git a/test/bhns_interp/vely.y.asc b/test/bhns_interp/vel[1].y.asc
index 66c936c..66c936c 100644
--- a/test/bhns_interp/vely.y.asc
+++ b/test/bhns_interp/vel[1].y.asc
diff --git a/test/bhns_interp/vely.z.asc b/test/bhns_interp/vel[1].z.asc
index e01fcd6..e01fcd6 100644
--- a/test/bhns_interp/vely.z.asc
+++ b/test/bhns_interp/vel[1].z.asc
diff --git a/test/bhns_interp/velz.d.asc b/test/bhns_interp/vel[2].d.asc
index d239a31..d239a31 100644
--- a/test/bhns_interp/velz.d.asc
+++ b/test/bhns_interp/vel[2].d.asc
diff --git a/test/bhns_interp/velz.maximum.asc b/test/bhns_interp/vel[2].maximum.asc
index 6217851..6217851 100644
--- a/test/bhns_interp/velz.maximum.asc
+++ b/test/bhns_interp/vel[2].maximum.asc
diff --git a/test/bhns_interp/velz.minimum.asc b/test/bhns_interp/vel[2].minimum.asc
index 6217851..6217851 100644
--- a/test/bhns_interp/velz.minimum.asc
+++ b/test/bhns_interp/vel[2].minimum.asc
diff --git a/test/bhns_interp/velz.norm1.asc b/test/bhns_interp/vel[2].norm1.asc
index 6217851..6217851 100644
--- a/test/bhns_interp/velz.norm1.asc
+++ b/test/bhns_interp/vel[2].norm1.asc
diff --git a/test/bhns_interp/velz.norm2.asc b/test/bhns_interp/vel[2].norm2.asc
index 6217851..6217851 100644
--- a/test/bhns_interp/velz.norm2.asc
+++ b/test/bhns_interp/vel[2].norm2.asc
diff --git a/test/bhns_interp/velz.x.asc b/test/bhns_interp/vel[2].x.asc
index e0a8e30..e0a8e30 100644
--- a/test/bhns_interp/velz.x.asc
+++ b/test/bhns_interp/vel[2].x.asc
diff --git a/test/bhns_interp/velz.y.asc b/test/bhns_interp/vel[2].y.asc
index 879b50f..879b50f 100644
--- a/test/bhns_interp/velz.y.asc
+++ b/test/bhns_interp/vel[2].y.asc
diff --git a/test/bhns_interp/velz.z.asc b/test/bhns_interp/vel[2].z.asc
index 564c594..564c594 100644
--- a/test/bhns_interp/velz.z.asc
+++ b/test/bhns_interp/vel[2].z.asc