TOVSolver: remove bssn_mol from initial data tests

git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinInitialData/TOVSolver/trunk@108 1bdb13ef-5d69-4035-bb54-08abeb3aa7f1

57 files changed, 703 insertions, 408 deletions

diff --git a/test/test_one_boost_max.par b/test/test_one_boost_max.par
index 847b5c0..6dcde83 100644
--- a/test/test_one_boost_max.par
+++ b/test/test_one_boost_max.par
@@ -1,17 +1,10 @@
-ActiveThorns = "time MoL pugh pughreduce pughslab coordbase symbase cartgrid3d ioutil ioascii iobasic boundary admbase staticconformal spacemask admcoupling coordgauge admmacros hydrobase grhydro grhydro_initdata tovsolver nanchecker eos_base eos_idealfluid eos_polytrope bssn_mol admconstraints Constants LocalReduce TmunuBase InitBase"
+ActiveThorns = "time MoL pugh pughreduce pughslab coordbase symbase cartgrid3d ioutil ioascii iobasic boundary admbase staticconformal spacemask admcoupling coordgauge admmacros hydrobase grhydro grhydro_initdata tovsolver nanchecker eos_base eos_idealfluid eos_polytrope admconstraints Constants LocalReduce TmunuBase InitBase"
 
 TmunuBase::stress_energy_storage	=	yes
 TmunuBase::stress_energy_at_RHS		=	yes
 
 time::dtfac = 0.375
 
-admbase::evolution_method        = "adm_bssn"
-admbase::lapse_evolution_method  = "1+log"
-admbase::shift_evolution_method  = "gamma0"
-
-adm_bssn::bound           = "radiative"
-adm_bssn::harmonic_f      = 2.0
-
 ADMConstraints::constraints_persist	= yes
 admconstraints::bound     = "static"
 
diff --git a/test/test_one_boost_max/ham_3D_diagonal.xg b/test/test_one_boost_max/ham_3D_diagonal.xg
index 6a39b57..d753538 100644
--- a/test/test_one_boost_max/ham_3D_diagonal.xg
+++ b/test/test_one_boost_max/ham_3D_diagonal.xg
@@ -3,16 +3,16 @@
 "Time = 0.0000000000e+00
 -2.5980762114e+01		0.0000000000e+00
 -2.4356910355e+01		-3.8646695839e-06
--2.2733058596e+01		-3.4024767546e-06
--2.1109206837e+01		-2.7012002558e-06
+-2.2733058596e+01		-3.4024767522e-06
+-2.1109206837e+01		-2.7012002566e-06
 -1.9485355079e+01		-1.6034050594e-06
--1.7861503320e+01		1.7863415752e-07
--1.6237651561e+01		3.1976861445e-06
--1.4613799803e+01		8.5802810282e-06
--1.2989948044e+01		1.8791001312e-05
--1.1366096285e+01		3.9712084943e-05
--9.7422445267e+00		8.7006696798e-05
--8.1183927680e+00		6.0710763721e-04
+-1.7861503320e+01		1.7863415530e-07
+-1.6237651561e+01		3.1976861413e-06
+-1.4613799803e+01		8.5802810313e-06
+-1.2989948044e+01		1.8791001313e-05
+-1.1366096285e+01		3.9712084942e-05
+-9.7422445267e+00		8.7006696797e-05
+-8.1183927680e+00		6.0710763719e-04
 -6.4945410093e+00		-2.8998093489e-03
 -4.8706892506e+00		-8.4419428675e-03
 -3.2468374920e+00		-1.7465338281e-02
@@ -22,15 +22,15 @@
 3.2485695428e+00		-1.7454020610e-02
 4.8724213015e+00		-8.4342446808e-03
 6.4962730601e+00		-2.8954789586e-03
-8.1201248188e+00		6.1393474172e-04
-9.7439765775e+00		8.6930516079e-05
-1.1367828336e+01		3.9680047396e-05
-1.2991680095e+01		1.8775952470e-05
-1.4615531854e+01		8.5726177554e-06
-1.6239383612e+01		3.1934980133e-06
-1.7863235371e+01		1.7620509029e-07
-1.9487087130e+01		-1.6048753815e-06
-2.1110938888e+01		-2.7021206010e-06
-2.2734790647e+01		-3.4030783023e-06
-2.4358642406e+01		-3.8650709247e-06
+8.1201248188e+00		6.1393474170e-04
+9.7439765775e+00		8.6930516078e-05
+1.1367828336e+01		3.9680047393e-05
+1.2991680095e+01		1.8775952475e-05
+1.4615531854e+01		8.5726177533e-06
+1.6239383612e+01		3.1934980123e-06
+1.7863235371e+01		1.7620508582e-07
+1.9487087130e+01		-1.6048753758e-06
+2.1110938888e+01		-2.7021205928e-06
+2.2734790647e+01		-3.4030783035e-06
+2.4358642406e+01		-3.8650709283e-06
 2.5982494164e+01		0.0000000000e+00
diff --git a/test/test_one_boost_max/ham_x_[16][16].xg b/test/test_one_boost_max/ham_x_[16][16].xg
index f4cb77c..1ca841f 100644
--- a/test/test_one_boost_max/ham_x_[16][16].xg
+++ b/test/test_one_boost_max/ham_x_[16][16].xg
@@ -2,16 +2,16 @@
 
 "Time = 0.0000000000e+00
 -1.5000000000e+01		0.0000000000e+00
--1.4062468750e+01		-3.0931812089e-05
--1.3124937500e+01		-4.1098919461e-05
--1.2187406250e+01		-5.6445568419e-05
--1.1249875000e+01		-8.0323199902e-05
+-1.4062468750e+01		-3.0931812092e-05
+-1.3124937500e+01		-4.1098919458e-05
+-1.2187406250e+01		-5.6445568417e-05
+-1.1249875000e+01		-8.0323199897e-05
 -1.0312343750e+01		-1.1880169214e-04
--9.3748125000e+00		-1.8341459761e-04
--8.4372812500e+00		-1.6907188375e-05
+-9.3748125000e+00		-1.8341459762e-04
+-8.4372812500e+00		-1.6907188377e-05
 -7.4997500000e+00		-1.0025118770e-03
 -6.5622187500e+00		-2.9435559036e-03
--5.6246875000e+00		-5.6667976073e-03
+-5.6246875000e+00		-5.6667976074e-03
 -4.6871562500e+00		-9.4389981577e-03
 -3.7496250000e+00		-1.4412267437e-02
 -2.8120937500e+00		-2.0423394854e-02
@@ -24,13 +24,13 @@
 3.7506250000e+00		-1.4406340164e-02
 4.6881562500e+00		-9.4343423854e-03
 5.6256875000e+00		-5.6633759714e-03
-6.5632187500e+00		-2.9411263710e-03
+6.5632187500e+00		-2.9411263709e-03
 7.5007500000e+00		-1.0005498763e-03
-8.4382812500e+00		-1.8122568828e-05
+8.4382812500e+00		-1.8122568834e-05
 9.3758125000e+00		-1.8332510831e-04
 1.0313343750e+01		-1.1874949997e-04
 1.1250875000e+01		-8.0291382228e-05
 1.2188406250e+01		-5.6425428124e-05
-1.3125937500e+01		-4.1085753716e-05
-1.4063468750e+01		-3.0922960639e-05
+1.3125937500e+01		-4.1085753715e-05
+1.4063468750e+01		-3.0922960643e-05
 1.5001000000e+01		0.0000000000e+00
diff --git a/test/test_one_boost_max/ham_y_[16][16].xg b/test/test_one_boost_max/ham_y_[16][16].xg
index f4cb77c..1ca841f 100644
--- a/test/test_one_boost_max/ham_y_[16][16].xg
+++ b/test/test_one_boost_max/ham_y_[16][16].xg
@@ -2,16 +2,16 @@
 
 "Time = 0.0000000000e+00
 -1.5000000000e+01		0.0000000000e+00
--1.4062468750e+01		-3.0931812089e-05
--1.3124937500e+01		-4.1098919461e-05
--1.2187406250e+01		-5.6445568419e-05
--1.1249875000e+01		-8.0323199902e-05
+-1.4062468750e+01		-3.0931812092e-05
+-1.3124937500e+01		-4.1098919458e-05
+-1.2187406250e+01		-5.6445568417e-05
+-1.1249875000e+01		-8.0323199897e-05
 -1.0312343750e+01		-1.1880169214e-04
--9.3748125000e+00		-1.8341459761e-04
--8.4372812500e+00		-1.6907188375e-05
+-9.3748125000e+00		-1.8341459762e-04
+-8.4372812500e+00		-1.6907188377e-05
 -7.4997500000e+00		-1.0025118770e-03
 -6.5622187500e+00		-2.9435559036e-03
--5.6246875000e+00		-5.6667976073e-03
+-5.6246875000e+00		-5.6667976074e-03
 -4.6871562500e+00		-9.4389981577e-03
 -3.7496250000e+00		-1.4412267437e-02
 -2.8120937500e+00		-2.0423394854e-02
@@ -24,13 +24,13 @@
 3.7506250000e+00		-1.4406340164e-02
 4.6881562500e+00		-9.4343423854e-03
 5.6256875000e+00		-5.6633759714e-03
-6.5632187500e+00		-2.9411263710e-03
+6.5632187500e+00		-2.9411263709e-03
 7.5007500000e+00		-1.0005498763e-03
-8.4382812500e+00		-1.8122568828e-05
+8.4382812500e+00		-1.8122568834e-05
 9.3758125000e+00		-1.8332510831e-04
 1.0313343750e+01		-1.1874949997e-04
 1.1250875000e+01		-8.0291382228e-05
 1.2188406250e+01		-5.6425428124e-05
-1.3125937500e+01		-4.1085753716e-05
-1.4063468750e+01		-3.0922960639e-05
+1.3125937500e+01		-4.1085753715e-05
+1.4063468750e+01		-3.0922960643e-05
 1.5001000000e+01		0.0000000000e+00
diff --git a/test/test_one_boost_max/ham_z_[16][16].xg b/test/test_one_boost_max/ham_z_[16][16].xg
index f4cb77c..1ca841f 100644
--- a/test/test_one_boost_max/ham_z_[16][16].xg
+++ b/test/test_one_boost_max/ham_z_[16][16].xg
@@ -2,16 +2,16 @@
 
 "Time = 0.0000000000e+00
 -1.5000000000e+01		0.0000000000e+00
--1.4062468750e+01		-3.0931812089e-05
--1.3124937500e+01		-4.1098919461e-05
--1.2187406250e+01		-5.6445568419e-05
--1.1249875000e+01		-8.0323199902e-05
+-1.4062468750e+01		-3.0931812092e-05
+-1.3124937500e+01		-4.1098919458e-05
+-1.2187406250e+01		-5.6445568417e-05
+-1.1249875000e+01		-8.0323199897e-05
 -1.0312343750e+01		-1.1880169214e-04
--9.3748125000e+00		-1.8341459761e-04
--8.4372812500e+00		-1.6907188375e-05
+-9.3748125000e+00		-1.8341459762e-04
+-8.4372812500e+00		-1.6907188377e-05
 -7.4997500000e+00		-1.0025118770e-03
 -6.5622187500e+00		-2.9435559036e-03
--5.6246875000e+00		-5.6667976073e-03
+-5.6246875000e+00		-5.6667976074e-03
 -4.6871562500e+00		-9.4389981577e-03
 -3.7496250000e+00		-1.4412267437e-02
 -2.8120937500e+00		-2.0423394854e-02
@@ -24,13 +24,13 @@
 3.7506250000e+00		-1.4406340164e-02
 4.6881562500e+00		-9.4343423854e-03
 5.6256875000e+00		-5.6633759714e-03
-6.5632187500e+00		-2.9411263710e-03
+6.5632187500e+00		-2.9411263709e-03
 7.5007500000e+00		-1.0005498763e-03
-8.4382812500e+00		-1.8122568828e-05
+8.4382812500e+00		-1.8122568834e-05
 9.3758125000e+00		-1.8332510831e-04
 1.0313343750e+01		-1.1874949997e-04
 1.1250875000e+01		-8.0291382228e-05
 1.2188406250e+01		-5.6425428124e-05
-1.3125937500e+01		-4.1085753716e-05
-1.4063468750e+01		-3.0922960639e-05
+1.3125937500e+01		-4.1085753715e-05
+1.4063468750e+01		-3.0922960643e-05
 1.5001000000e+01		0.0000000000e+00
diff --git a/test/test_one_boost_max/tau_3D_diagonal.xg b/test/test_one_boost_max/tau_3D_diagonal.xg
index 088d49b..211f85c 100644
--- a/test/test_one_boost_max/tau_3D_diagonal.xg
+++ b/test/test_one_boost_max/tau_3D_diagonal.xg
@@ -24,10 +24,10 @@
 6.4962730601e+00		6.8092098073e-05
 8.1201248188e+00		1.1263136591e-07
 9.7439765775e+00		1.5163444739e-12
-1.1367828336e+01		1.4312877246e-12
+1.1367828336e+01		1.4312877247e-12
 1.2991680095e+01		1.3701362326e-12
-1.4615531854e+01		1.3240925515e-12
-1.6239383612e+01		1.2881921812e-12
+1.4615531854e+01		1.3240925516e-12
+1.6239383612e+01		1.2881921813e-12
 1.7863235371e+01		1.2594255934e-12
 1.9487087130e+01		1.2358640296e-12
 2.1110938888e+01		1.2162151682e-12
diff --git a/test/test_one_boost_max/test_one_boost_max.par b/test/test_one_boost_max/test_one_boost_max.par
index e69de29..6dcde83 100644
--- a/test/test_one_boost_max/test_one_boost_max.par
+++ b/test/test_one_boost_max/test_one_boost_max.par
@@ -0,0 +1,62 @@
+ActiveThorns = "time MoL pugh pughreduce pughslab coordbase symbase cartgrid3d ioutil ioascii iobasic boundary admbase staticconformal spacemask admcoupling coordgauge admmacros hydrobase grhydro grhydro_initdata tovsolver nanchecker eos_base eos_idealfluid eos_polytrope admconstraints Constants LocalReduce TmunuBase InitBase"
+
+TmunuBase::stress_energy_storage	=	yes
+TmunuBase::stress_energy_at_RHS		=	yes
+
+time::dtfac = 0.375
+
+ADMConstraints::constraints_persist	= yes
+admconstraints::bound     = "static"
+
+boundary::radpower        = 2
+
+SpaceMask::use_mask = "yes"
+
+grid::type            = "byrange"
+grid::domain          = "full"
+grid::xyzmin          = -15.0
+grid::xyzmax          =  15.001
+driver::ghost_size    =   3
+driver::global_nsize  =  33
+
+cactus::cctk_itlast   =       0
+
+methodoflines::ode_method        = "icn"
+
+hydrobase::timelevels             = 2
+hydrobase::evolution_method       = "whisky"
+
+whisky::riemann_solver            = "Marquina"
+whisky::whisky_eos_type           = "Polytype"
+whisky::whisky_eos_table          = "2D_Polytrope"
+whisky::recon_method              = "ppm"
+whisky::whisky_stencil            = 3
+whisky::bound                     = "none"
+whisky::tvd_limiter               = "VanLeerMC2"
+whisky::rho_abs_min               = 1.e-7
+whisky::initial_atmosphere_factor = 0.999
+
+ADMBase::initial_data  = "tov"
+ADMBase::initial_lapse = "tov"
+ADMBase::initial_shift = "tov"
+
+tovsolver::TOV_Rho_Central[0] = 1.28e-3
+tovsolver::TOV_Gamma[0]       = 2.0
+tovsolver::TOV_K[0]           = 100.0
+tovsolver::TOV_Velocity_x[0]  = 0.1
+tovsolver::TOV_Velocity_y[0]  = 0.2
+tovsolver::TOV_Velocity_z[0]  = 0.3
+tovsolver::TOV_Combine_Method = "maximum"
+
+EOS_Polytrope::eos_gamma            = 2.0
+EOS_Polytrope::eos_k                = 100.0
+
+IO::out_dir			= $parfile
+IO::out_fileinfo="none"
+
+IOBasic::outScalar_every = 1
+IOBasic::outScalar_vars  = "whisky::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel whisky::dens whisky::tau whisky::scon admbase::lapse admbase::metric admbase::curv admconstraints::ham admconstraints::momentum"
+
+IOASCII::out1D_every     = 1
+IOASCII::out1D_vars      = "whisky::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel whisky::dens whisky::tau whisky::scon admbase::lapse admbase::metric admbase::curv admconstraints::ham admconstraints::momentum"
+IOASCII::out_format      = ".10e"
diff --git a/test/test_one_static_max.par b/test/test_one_static_max.par
index aea3cef..71f54d0 100644
--- a/test/test_one_static_max.par
+++ b/test/test_one_static_max.par
@@ -1,17 +1,10 @@
-ActiveThorns = "time MoL pugh pughreduce pughslab coordbase symbase cartgrid3d ioutil ioascii iobasic boundary admbase staticconformal spacemask admcoupling coordgauge admmacros hydrobase grhydro grhydro_initdata tovsolver nanchecker eos_base eos_idealfluid eos_polytrope bssn_mol admconstraints Constants LocalReduce TmunuBase InitBase"
+ActiveThorns = "time MoL pugh pughreduce pughslab coordbase symbase cartgrid3d ioutil ioascii iobasic boundary admbase staticconformal spacemask admcoupling coordgauge admmacros hydrobase grhydro grhydro_initdata tovsolver nanchecker eos_base eos_idealfluid eos_polytrope admconstraints Constants LocalReduce TmunuBase InitBase"
 
 TmunuBase::stress_energy_storage	=	yes
 TmunuBase::stress_energy_at_RHS		=	yes
 
 time::dtfac = 0.375
 
-admbase::evolution_method        = "adm_bssn"
-admbase::lapse_evolution_method  = "1+log"
-admbase::shift_evolution_method  = "gamma0"
-
-adm_bssn::bound           = "radiative"
-adm_bssn::harmonic_f      = 2.0
-
 ADMConstraints::constraints_persist	= yes
 admconstraints::bound     = "static"
 
diff --git a/test/test_one_static_max/ham_3D_diagonal.xg b/test/test_one_static_max/ham_3D_diagonal.xg
index 9c2f745..2158eae 100644
--- a/test/test_one_static_max/ham_3D_diagonal.xg
+++ b/test/test_one_static_max/ham_3D_diagonal.xg
@@ -3,34 +3,34 @@
 "Time = 0.0000000000e+00
 -2.5980762114e+01		0.0000000000e+00
 -2.4356910355e+01		-3.8646695839e-06
--2.2733058596e+01		-3.4024767570e-06
+-2.2733058596e+01		-3.4024767522e-06
 -2.1109206837e+01		-2.7012002566e-06
--1.9485355079e+01		-1.6034050617e-06
--1.7861503320e+01		1.7863415752e-07
--1.6237651561e+01		3.1976861445e-06
--1.4613799803e+01		8.5802810323e-06
--1.2989948044e+01		1.8791001312e-05
--1.1366096285e+01		3.9712084943e-05
--9.7422445267e+00		8.7006696798e-05
--8.1183927680e+00		6.1589700898e-04
--6.4945410093e+00		8.0147961082e-05
--4.8706892506e+00		-6.5166739015e-05
--3.2468374920e+00		-4.5843182600e-04
+-1.9485355079e+01		-1.6034050594e-06
+-1.7861503320e+01		1.7863415530e-07
+-1.6237651561e+01		3.1976861413e-06
+-1.4613799803e+01		8.5802810313e-06
+-1.2989948044e+01		1.8791001313e-05
+-1.1366096285e+01		3.9712084942e-05
+-9.7422445267e+00		8.7006696797e-05
+-8.1183927680e+00		6.1589700896e-04
+-6.4945410093e+00		8.0147961090e-05
+-4.8706892506e+00		-6.5166739023e-05
+-3.2468374920e+00		-4.5843182601e-04
 -1.6229857333e+00		-1.0737542848e-03
 8.6602540378e-04		-1.4208417833e-03
 1.6247177841e+00		-1.0731171951e-03
-3.2485695428e+00		-4.5785403488e-04
-4.8724213015e+00		-6.4902393259e-05
-6.4962730601e+00		8.0217824743e-05
-8.1201248188e+00		6.2047116180e-04
-9.7439765775e+00		8.6930516079e-05
-1.1367828336e+01		3.9680047396e-05
-1.2991680095e+01		1.8775952470e-05
-1.4615531854e+01		8.5726177554e-06
-1.6239383612e+01		3.1934980101e-06
-1.7863235371e+01		1.7620509029e-07
-1.9487087130e+01		-1.6048753815e-06
-2.1110938888e+01		-2.7021205963e-06
-2.2734790647e+01		-3.4030783047e-06
-2.4358642406e+01		-3.8650709296e-06
+3.2485695428e+00		-4.5785403487e-04
+4.8724213015e+00		-6.4902393267e-05
+6.4962730601e+00		8.0217824751e-05
+8.1201248188e+00		6.2047116179e-04
+9.7439765775e+00		8.6930516078e-05
+1.1367828336e+01		3.9680047393e-05
+1.2991680095e+01		1.8775952475e-05
+1.4615531854e+01		8.5726177533e-06
+1.6239383612e+01		3.1934980123e-06
+1.7863235371e+01		1.7620508582e-07
+1.9487087130e+01		-1.6048753758e-06
+2.1110938888e+01		-2.7021205928e-06
+2.2734790647e+01		-3.4030783035e-06
+2.4358642406e+01		-3.8650709283e-06
 2.5982494164e+01		0.0000000000e+00
diff --git a/test/test_one_static_max/ham_maximum.xg b/test/test_one_static_max/ham_maximum.xg
index 8398e1f..ffec591 100644
--- a/test/test_one_static_max/ham_maximum.xg
+++ b/test/test_one_static_max/ham_maximum.xg
@@ -1,2 +1,2 @@
 "ham v time
-0.0000000000000	0.0006310542968
+0.0000000000000	0.0006310542967
diff --git a/test/test_one_static_max/ham_x_[16][16].xg b/test/test_one_static_max/ham_x_[16][16].xg
index 2cb37c1..38e78d3 100644
--- a/test/test_one_static_max/ham_x_[16][16].xg
+++ b/test/test_one_static_max/ham_x_[16][16].xg
@@ -2,35 +2,35 @@
 
 "Time = 0.0000000000e+00
 -1.5000000000e+01		0.0000000000e+00
--1.4062468750e+01		-3.0931812090e-05
--1.3124937500e+01		-4.1098919461e-05
--1.2187406250e+01		-5.6445568419e-05
--1.1249875000e+01		-8.0323199902e-05
+-1.4062468750e+01		-3.0931812092e-05
+-1.3124937500e+01		-4.1098919458e-05
+-1.2187406250e+01		-5.6445568417e-05
+-1.1249875000e+01		-8.0323199897e-05
 -1.0312343750e+01		-1.1880169214e-04
--9.3748125000e+00		-1.8341459761e-04
--8.4372812500e+00		-1.6907188376e-05
+-9.3748125000e+00		-1.8341459762e-04
+-8.4372812500e+00		-1.6907188377e-05
 -7.4997500000e+00		-7.7706104666e-05
--6.5622187500e+00		-1.2803895309e-04
--5.6246875000e+00		-1.6922345771e-04
+-6.5622187500e+00		-1.2803895307e-04
+-5.6246875000e+00		-1.6922345773e-04
 -4.6871562500e+00		-2.5236219763e-04
--3.7496250000e+00		-4.0872794041e-04
--2.8120937500e+00		-6.6238921516e-04
+-3.7496250000e+00		-4.0872794040e-04
+-2.8120937500e+00		-6.6238921515e-04
 -1.8745625000e+00		-9.9201229454e-04
 -9.3703125000e-01		-1.2948317759e-03
 5.0000000000e-04		-1.4208417833e-03
 9.3803125000e-01		-1.2945744648e-03
 1.8755625000e+00		-9.9164850690e-04
 2.8130937500e+00		-6.6206374749e-04
-3.7506250000e+00		-4.0851552564e-04
+3.7506250000e+00		-4.0851552563e-04
 4.6881562500e+00		-2.5223836802e-04
-5.6256875000e+00		-1.6916368299e-04
-6.5632187500e+00		-1.2800811298e-04
-7.5007500000e+00		-7.7415165655e-05
-8.4382812500e+00		-1.8122568829e-05
+5.6256875000e+00		-1.6916368300e-04
+6.5632187500e+00		-1.2800811297e-04
+7.5007500000e+00		-7.7415165649e-05
+8.4382812500e+00		-1.8122568834e-05
 9.3758125000e+00		-1.8332510831e-04
-1.0313343750e+01		-1.1874949996e-04
-1.1250875000e+01		-8.0291382230e-05
+1.0313343750e+01		-1.1874949997e-04
+1.1250875000e+01		-8.0291382228e-05
 1.2188406250e+01		-5.6425428124e-05
-1.3125937500e+01		-4.1085753716e-05
-1.4063468750e+01		-3.0922960639e-05
+1.3125937500e+01		-4.1085753715e-05
+1.4063468750e+01		-3.0922960643e-05
 1.5001000000e+01		0.0000000000e+00
diff --git a/test/test_one_static_max/ham_y_[16][16].xg b/test/test_one_static_max/ham_y_[16][16].xg
index 2cb37c1..38e78d3 100644
--- a/test/test_one_static_max/ham_y_[16][16].xg
+++ b/test/test_one_static_max/ham_y_[16][16].xg
@@ -2,35 +2,35 @@
 
 "Time = 0.0000000000e+00
 -1.5000000000e+01		0.0000000000e+00
--1.4062468750e+01		-3.0931812090e-05
--1.3124937500e+01		-4.1098919461e-05
--1.2187406250e+01		-5.6445568419e-05
--1.1249875000e+01		-8.0323199902e-05
+-1.4062468750e+01		-3.0931812092e-05
+-1.3124937500e+01		-4.1098919458e-05
+-1.2187406250e+01		-5.6445568417e-05
+-1.1249875000e+01		-8.0323199897e-05
 -1.0312343750e+01		-1.1880169214e-04
--9.3748125000e+00		-1.8341459761e-04
--8.4372812500e+00		-1.6907188376e-05
+-9.3748125000e+00		-1.8341459762e-04
+-8.4372812500e+00		-1.6907188377e-05
 -7.4997500000e+00		-7.7706104666e-05
--6.5622187500e+00		-1.2803895309e-04
--5.6246875000e+00		-1.6922345771e-04
+-6.5622187500e+00		-1.2803895307e-04
+-5.6246875000e+00		-1.6922345773e-04
 -4.6871562500e+00		-2.5236219763e-04
--3.7496250000e+00		-4.0872794041e-04
--2.8120937500e+00		-6.6238921516e-04
+-3.7496250000e+00		-4.0872794040e-04
+-2.8120937500e+00		-6.6238921515e-04
 -1.8745625000e+00		-9.9201229454e-04
 -9.3703125000e-01		-1.2948317759e-03
 5.0000000000e-04		-1.4208417833e-03
 9.3803125000e-01		-1.2945744648e-03
 1.8755625000e+00		-9.9164850690e-04
 2.8130937500e+00		-6.6206374749e-04
-3.7506250000e+00		-4.0851552564e-04
+3.7506250000e+00		-4.0851552563e-04
 4.6881562500e+00		-2.5223836802e-04
-5.6256875000e+00		-1.6916368299e-04
-6.5632187500e+00		-1.2800811298e-04
-7.5007500000e+00		-7.7415165655e-05
-8.4382812500e+00		-1.8122568829e-05
+5.6256875000e+00		-1.6916368300e-04
+6.5632187500e+00		-1.2800811297e-04
+7.5007500000e+00		-7.7415165649e-05
+8.4382812500e+00		-1.8122568834e-05
 9.3758125000e+00		-1.8332510831e-04
-1.0313343750e+01		-1.1874949996e-04
-1.1250875000e+01		-8.0291382230e-05
+1.0313343750e+01		-1.1874949997e-04
+1.1250875000e+01		-8.0291382228e-05
 1.2188406250e+01		-5.6425428124e-05
-1.3125937500e+01		-4.1085753716e-05
-1.4063468750e+01		-3.0922960639e-05
+1.3125937500e+01		-4.1085753715e-05
+1.4063468750e+01		-3.0922960643e-05
 1.5001000000e+01		0.0000000000e+00
diff --git a/test/test_one_static_max/ham_z_[16][16].xg b/test/test_one_static_max/ham_z_[16][16].xg
index d313dad..493d11f 100644
--- a/test/test_one_static_max/ham_z_[16][16].xg
+++ b/test/test_one_static_max/ham_z_[16][16].xg
@@ -2,35 +2,35 @@
 
 "Time = 0.0000000000e+00
 -1.5000000000e+01		0.0000000000e+00
--1.4062468750e+01		-3.0931812090e-05
--1.3124937500e+01		-4.1098919461e-05
--1.2187406250e+01		-5.6445568419e-05
--1.1249875000e+01		-8.0323199902e-05
+-1.4062468750e+01		-3.0931812092e-05
+-1.3124937500e+01		-4.1098919458e-05
+-1.2187406250e+01		-5.6445568417e-05
+-1.1249875000e+01		-8.0323199897e-05
 -1.0312343750e+01		-1.1880169214e-04
--9.3748125000e+00		-1.8341459761e-04
--8.4372812500e+00		-1.6907188376e-05
+-9.3748125000e+00		-1.8341459762e-04
+-8.4372812500e+00		-1.6907188377e-05
 -7.4997500000e+00		-7.7706104666e-05
--6.5622187500e+00		-1.2803895309e-04
--5.6246875000e+00		-1.6922345771e-04
+-6.5622187500e+00		-1.2803895307e-04
+-5.6246875000e+00		-1.6922345773e-04
 -4.6871562500e+00		-2.5236219763e-04
--3.7496250000e+00		-4.0872794041e-04
--2.8120937500e+00		-6.6238921516e-04
+-3.7496250000e+00		-4.0872794040e-04
+-2.8120937500e+00		-6.6238921515e-04
 -1.8745625000e+00		-9.9201229454e-04
 -9.3703125000e-01		-1.2948317759e-03
 5.0000000000e-04		-1.4208417833e-03
 9.3803125000e-01		-1.2945744648e-03
 1.8755625000e+00		-9.9164850690e-04
-2.8130937500e+00		-6.6206374750e-04
-3.7506250000e+00		-4.0851552565e-04
+2.8130937500e+00		-6.6206374749e-04
+3.7506250000e+00		-4.0851552564e-04
 4.6881562500e+00		-2.5223836802e-04
-5.6256875000e+00		-1.6916368299e-04
-6.5632187500e+00		-1.2800811298e-04
-7.5007500000e+00		-7.7415165653e-05
-8.4382812500e+00		-1.8122568829e-05
+5.6256875000e+00		-1.6916368300e-04
+6.5632187500e+00		-1.2800811297e-04
+7.5007500000e+00		-7.7415165649e-05
+8.4382812500e+00		-1.8122568834e-05
 9.3758125000e+00		-1.8332510831e-04
-1.0313343750e+01		-1.1874949996e-04
-1.1250875000e+01		-8.0291382230e-05
+1.0313343750e+01		-1.1874949997e-04
+1.1250875000e+01		-8.0291382228e-05
 1.2188406250e+01		-5.6425428124e-05
-1.3125937500e+01		-4.1085753716e-05
-1.4063468750e+01		-3.0922960639e-05
+1.3125937500e+01		-4.1085753715e-05
+1.4063468750e+01		-3.0922960643e-05
 1.5001000000e+01		0.0000000000e+00
diff --git a/test/test_one_static_max/tau_3D_diagonal.xg b/test/test_one_static_max/tau_3D_diagonal.xg
index 29ca213..49531ce 100644
--- a/test/test_one_static_max/tau_3D_diagonal.xg
+++ b/test/test_one_static_max/tau_3D_diagonal.xg
@@ -27,9 +27,9 @@
 1.1367828336e+01		1.4312877247e-12
 1.2991680095e+01		1.3701362326e-12
 1.4615531854e+01		1.3240925516e-12
-1.6239383612e+01		1.2881921812e-12
+1.6239383612e+01		1.2881921813e-12
 1.7863235371e+01		1.2594255934e-12
-1.9487087130e+01		1.2358640295e-12
+1.9487087130e+01		1.2358640296e-12
 2.1110938888e+01		1.2162151682e-12
 2.2734790647e+01		1.1995810398e-12
 2.4358642406e+01		1.1853184859e-12
diff --git a/test/test_one_static_max/test_one_static_max.par b/test/test_one_static_max/test_one_static_max.par
index e69de29..71f54d0 100644
--- a/test/test_one_static_max/test_one_static_max.par
+++ b/test/test_one_static_max/test_one_static_max.par
@@ -0,0 +1,60 @@
+ActiveThorns = "time MoL pugh pughreduce pughslab coordbase symbase cartgrid3d ioutil ioascii iobasic boundary admbase staticconformal spacemask admcoupling coordgauge admmacros hydrobase grhydro grhydro_initdata tovsolver nanchecker eos_base eos_idealfluid eos_polytrope admconstraints Constants LocalReduce TmunuBase InitBase"
+
+TmunuBase::stress_energy_storage	=	yes
+TmunuBase::stress_energy_at_RHS		=	yes
+
+time::dtfac = 0.375
+
+ADMConstraints::constraints_persist	= yes
+admconstraints::bound     = "static"
+
+boundary::radpower        = 2
+
+SpaceMask::use_mask = "yes"
+
+grid::type            = "byrange"
+grid::domain          = "full"
+grid::xyzmin          = -15.0
+grid::xyzmax          =  15.001
+driver::ghost_size    =   3
+driver::global_nsize  =  33
+
+cactus::cctk_itlast   =       0
+
+methodoflines::ode_method        = "icn"
+
+hydrobase::timelevels             = 2
+hydrobase::evolution_method       = "whisky"
+
+whisky::riemann_solver            = "Marquina"
+whisky::whisky_eos_type           = "Polytype"
+whisky::whisky_eos_table          = "2D_Polytrope"
+whisky::recon_method              = "ppm"
+whisky::whisky_stencil            = 3
+whisky::bound                     = "none"
+whisky::tvd_limiter               = "VanLeerMC2"
+whisky::rho_abs_min               = 1.e-7
+whisky::initial_atmosphere_factor = 0.999
+
+ADMBase::initial_data  = "tov"
+ADMBase::initial_lapse = "tov"
+ADMBase::initial_shift = "tov"
+
+tovsolver::TOV_Rho_Central[0] = 1.28e-3
+tovsolver::TOV_Gamma[0]       = 2.0
+tovsolver::TOV_K[0]           = 100.0
+tovsolver::TOV_Combine_Method = "maximum"
+
+EOS_Polytrope::eos_gamma            = 2.0
+EOS_Polytrope::eos_k                = 100.0
+
+
+IO::out_dir			= $parfile
+IO::out_fileinfo="none"
+
+IOBasic::outScalar_every = 1
+IOBasic::outScalar_vars  = "whisky::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel whisky::dens whisky::tau whisky::scon admbase::lapse admbase::metric admbase::curv admconstraints::ham admconstraints::momentum"
+
+IOASCII::out1D_every     = 1
+IOASCII::out1D_vars      = "whisky::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel whisky::dens whisky::tau whisky::scon admbase::lapse admbase::metric admbase::curv admconstraints::ham admconstraints::momentum"
+IOASCII::out_format      = ".10e"
diff --git a/test/test_tov_carpet.par b/test/test_tov_carpet.par
index 28feb64..1f729c9 100644
--- a/test/test_tov_carpet.par
+++ b/test/test_tov_carpet.par
@@ -1,18 +1,11 @@
 !DESC "Carpet unigrid, one TOV" 
-ActiveThorns = "time MoL coordbase symbase cartgrid3d ioutil boundary admbase staticconformal spacemask admcoupling coordgauge admmacros hydrobase grhydro grhydro_initdata tovsolver eos_base eos_idealfluid eos_polytrope bssn_mol admconstraints Constants LocalReduce Carpet CarpetLib CarpetInterp CarpetReduce CarpetIOScalar CarpetIOBasic LoopControl TmunuBase InitBase"
+ActiveThorns = "time MoL coordbase symbase cartgrid3d ioutil boundary admbase staticconformal spacemask admcoupling coordgauge admmacros hydrobase grhydro grhydro_initdata tovsolver eos_base eos_idealfluid eos_polytrope admconstraints Constants LocalReduce Carpet CarpetLib CarpetInterp CarpetReduce CarpetIOScalar CarpetIOBasic LoopControl TmunuBase InitBase"
 
 TmunuBase::stress_energy_storage	=	yes
 TmunuBase::stress_energy_at_RHS		=	yes
 
 time::dtfac = 0.375
 
-admbase::evolution_method        = "adm_bssn"
-admbase::lapse_evolution_method  = "1+log"
-admbase::shift_evolution_method  = "gamma0"
-
-adm_bssn::bound           = "radiative"
-adm_bssn::harmonic_f      = 2.0
-
 ADMConstraints::constraints_persist	= yes
 admconstraints::bound     = "static"
 
diff --git a/test/test_tov_carpet/alp.norm1.asc b/test/test_tov_carpet/alp.norm1.asc
index 60e93d1..3e6a7da 100644
--- a/test/test_tov_carpet/alp.norm1.asc
+++ b/test/test_tov_carpet/alp.norm1.asc
@@ -1,3 +1,3 @@
 # Scalar ASCII output created by CarpetIOScalar
 #
-0 0 0.897789521466977
+0 0 0.897789521466978
diff --git a/test/test_tov_carpet/dens.maximum.asc b/test/test_tov_carpet/dens.maximum.asc
index 1473754..0162f74 100644
--- a/test/test_tov_carpet/dens.maximum.asc
+++ b/test/test_tov_carpet/dens.maximum.asc
@@ -1,3 +1,3 @@
 # Scalar ASCII output created by CarpetIOScalar
 #
-0 0 0.00370720308254276
+0 0 0.00370720308254282
diff --git a/test/test_tov_carpet/dens.norm1.asc b/test/test_tov_carpet/dens.norm1.asc
index 366fc9b..2b926ef 100644
--- a/test/test_tov_carpet/dens.norm1.asc
+++ b/test/test_tov_carpet/dens.norm1.asc
@@ -1,3 +1,3 @@
 # Scalar ASCII output created by CarpetIOScalar
 #
-0 0 5.58966766385466e-05
+0 0 5.58966766385468e-05
diff --git a/test/test_tov_carpet/dens.norm2.asc b/test/test_tov_carpet/dens.norm2.asc
index 7e4c48a..b6f7ccf 100644
--- a/test/test_tov_carpet/dens.norm2.asc
+++ b/test/test_tov_carpet/dens.norm2.asc
@@ -1,3 +1,3 @@
 # Scalar ASCII output created by CarpetIOScalar
 #
-0 0 0.000282737856441687
+0 0 0.00028273785644169
diff --git a/test/test_tov_carpet/eps.norm1.asc b/test/test_tov_carpet/eps.norm1.asc
index 8b13bdb..e67a512 100644
--- a/test/test_tov_carpet/eps.norm1.asc
+++ b/test/test_tov_carpet/eps.norm1.asc
@@ -1,3 +1,3 @@
 # Scalar ASCII output created by CarpetIOScalar
 #
-0 0 0.00257250301402486
+0 0 0.00257250301402483
diff --git a/test/test_tov_carpet/eps.norm2.asc b/test/test_tov_carpet/eps.norm2.asc
index 3f64472..f579a54 100644
--- a/test/test_tov_carpet/eps.norm2.asc
+++ b/test/test_tov_carpet/eps.norm2.asc
@@ -1,3 +1,3 @@
 # Scalar ASCII output created by CarpetIOScalar
 #
-0 0 0.0119876470926153
+0 0 0.0119876470926152
diff --git a/test/test_tov_carpet/gxx.maximum.asc b/test/test_tov_carpet/gxx.maximum.asc
index a1569a7..61da815 100644
--- a/test/test_tov_carpet/gxx.maximum.asc
+++ b/test/test_tov_carpet/gxx.maximum.asc
@@ -1,3 +1,3 @@
 # Scalar ASCII output created by CarpetIOScalar
 #
-0 0 2.03184674723167
+0 0 2.03184674723169
diff --git a/test/test_tov_carpet/gyy.maximum.asc b/test/test_tov_carpet/gyy.maximum.asc
index a1569a7..61da815 100644
--- a/test/test_tov_carpet/gyy.maximum.asc
+++ b/test/test_tov_carpet/gyy.maximum.asc
@@ -1,3 +1,3 @@
 # Scalar ASCII output created by CarpetIOScalar
 #
-0 0 2.03184674723167
+0 0 2.03184674723169
diff --git a/test/test_tov_carpet/gzz.maximum.asc b/test/test_tov_carpet/gzz.maximum.asc
index a1569a7..61da815 100644
--- a/test/test_tov_carpet/gzz.maximum.asc
+++ b/test/test_tov_carpet/gzz.maximum.asc
@@ -1,3 +1,3 @@
 # Scalar ASCII output created by CarpetIOScalar
 #
-0 0 2.03184674723167
+0 0 2.03184674723169
diff --git a/test/test_tov_carpet/ham.maximum.asc b/test/test_tov_carpet/ham.maximum.asc
index b7ac3cf..1eda576 100644
--- a/test/test_tov_carpet/ham.maximum.asc
+++ b/test/test_tov_carpet/ham.maximum.asc
@@ -1,3 +1,3 @@
 # Scalar ASCII output created by CarpetIOScalar
 #
-0 0 0.000631054296761957
+0 0 0.000631054296742902
diff --git a/test/test_tov_carpet/ham.minimum.asc b/test/test_tov_carpet/ham.minimum.asc
index 4503bf5..7507f09 100644
--- a/test/test_tov_carpet/ham.minimum.asc
+++ b/test/test_tov_carpet/ham.minimum.asc
@@ -1,3 +1,3 @@
 # Scalar ASCII output created by CarpetIOScalar
 #
-0 0 -0.00142084178325794
+0 0 -0.00142084178325581
diff --git a/test/test_tov_carpet/ham.norm1.asc b/test/test_tov_carpet/ham.norm1.asc
index 4164da6..0a31e30 100644
--- a/test/test_tov_carpet/ham.norm1.asc
+++ b/test/test_tov_carpet/ham.norm1.asc
@@ -1,3 +1,3 @@
 # Scalar ASCII output created by CarpetIOScalar
 #
-0 0 2.8614346804048e-05
+0 0 2.8614346803879e-05
diff --git a/test/test_tov_carpet/ham.norm2.asc b/test/test_tov_carpet/ham.norm2.asc
index d986332..c4d7554 100644
--- a/test/test_tov_carpet/ham.norm2.asc
+++ b/test/test_tov_carpet/ham.norm2.asc
@@ -1,3 +1,3 @@
 # Scalar ASCII output created by CarpetIOScalar
 #
-0 0 9.03007078729858e-05
+0 0 9.03007078721496e-05
diff --git a/test/test_tov_carpet/press.norm1.asc b/test/test_tov_carpet/press.norm1.asc
index 32cdb8c..f02ad2d 100644
--- a/test/test_tov_carpet/press.norm1.asc
+++ b/test/test_tov_carpet/press.norm1.asc
@@ -1,3 +1,3 @@
 # Scalar ASCII output created by CarpetIOScalar
 #
-0 0 1.43703682817053e-06
+0 0 1.43703682817052e-06
diff --git a/test/test_tov_carpet/press.norm2.asc b/test/test_tov_carpet/press.norm2.asc
index b2a552e..13ba057 100644
--- a/test/test_tov_carpet/press.norm2.asc
+++ b/test/test_tov_carpet/press.norm2.asc
@@ -1,3 +1,3 @@
 # Scalar ASCII output created by CarpetIOScalar
 #
-0 0 9.39372327549451e-06
+0 0 9.39372327549445e-06
diff --git a/test/test_tov_carpet/rho.norm1.asc b/test/test_tov_carpet/rho.norm1.asc
index 22212d3..1ad475d 100644
--- a/test/test_tov_carpet/rho.norm1.asc
+++ b/test/test_tov_carpet/rho.norm1.asc
@@ -1,3 +1,3 @@
 # Scalar ASCII output created by CarpetIOScalar
 #
-0 0 2.57250301402156e-05
+0 0 2.57250301402153e-05
diff --git a/test/test_tov_carpet/rho.norm2.asc b/test/test_tov_carpet/rho.norm2.asc
index d79be01..9ee90dd 100644
--- a/test/test_tov_carpet/rho.norm2.asc
+++ b/test/test_tov_carpet/rho.norm2.asc
@@ -1,3 +1,3 @@
 # Scalar ASCII output created by CarpetIOScalar
 #
-0 0 0.000119876470926117
+0 0 0.000119876470926116
diff --git a/test/test_tov_carpet/tau.maximum.asc b/test/test_tov_carpet/tau.maximum.asc
index d8b80c9..255ff9d 100644
--- a/test/test_tov_carpet/tau.maximum.asc
+++ b/test/test_tov_carpet/tau.maximum.asc
@@ -1,3 +1,3 @@
 # Scalar ASCII output created by CarpetIOScalar
 #
-0 0 0.000474521979125405
+0 0 0.000474521979125413
diff --git a/test/test_tov_carpet/tau.norm1.asc b/test/test_tov_carpet/tau.norm1.asc
index 3ea9af5..bb2dfd5 100644
--- a/test/test_tov_carpet/tau.norm1.asc
+++ b/test/test_tov_carpet/tau.norm1.asc
@@ -1,3 +1,3 @@
 # Scalar ASCII output created by CarpetIOScalar
 #
-0 0 3.36492968891853e-06
+0 0 3.36492968891854e-06
diff --git a/test/test_tov_carpet/tau.norm2.asc b/test/test_tov_carpet/tau.norm2.asc
index 58bb26e..f475624 100644
--- a/test/test_tov_carpet/tau.norm2.asc
+++ b/test/test_tov_carpet/tau.norm2.asc
@@ -1,3 +1,3 @@
 # Scalar ASCII output created by CarpetIOScalar
 #
-0 0 2.38464461967728e-05
+0 0 2.38464461967731e-05
diff --git a/test/test_tov_carpet/test_tov_carpet.par b/test/test_tov_carpet/test_tov_carpet.par
index e69de29..1f729c9 100644
--- a/test/test_tov_carpet/test_tov_carpet.par
+++ b/test/test_tov_carpet/test_tov_carpet.par
@@ -0,0 +1,70 @@
+!DESC "Carpet unigrid, one TOV" 
+ActiveThorns = "time MoL coordbase symbase cartgrid3d ioutil boundary admbase staticconformal spacemask admcoupling coordgauge admmacros hydrobase grhydro grhydro_initdata tovsolver eos_base eos_idealfluid eos_polytrope admconstraints Constants LocalReduce Carpet CarpetLib CarpetInterp CarpetReduce CarpetIOScalar CarpetIOBasic LoopControl TmunuBase InitBase"
+
+TmunuBase::stress_energy_storage	=	yes
+TmunuBase::stress_energy_at_RHS		=	yes
+
+time::dtfac = 0.375
+
+ADMConstraints::constraints_persist	= yes
+admconstraints::bound     = "static"
+
+boundary::radpower        = 2
+
+SpaceMask::use_mask = "yes"
+
+CartGrid3D::type = "coordbase"
+CoordBase::domainsize = minmax
+
+Carpet::domain_from_coordbase = "yes"
+CoordBase::spacing = "numcells"
+CoordBase::xmin =  -15.0
+CoordBase::ymin =  -15.0
+CoordBase::zmin =  -15.0
+CoordBase::xmax =   15.001
+CoordBase::ymax =   15.001
+CoordBase::zmax =   15.001
+CoordBase::ncells_x = 32
+CoordBase::ncells_y = 32
+CoordBase::ncells_z = 32
+
+driver::ghost_size   = 3
+
+cactus::cctk_itlast   =       0
+
+methodoflines::ode_method        = "icn"
+
+hydrobase::timelevels             = 2
+hydrobase::evolution_method       = "whisky"
+
+whisky::riemann_solver            = "Marquina"
+whisky::whisky_eos_type           = "Polytype"
+whisky::whisky_eos_table          = "2D_Polytrope"
+whisky::recon_method              = "ppm"
+whisky::whisky_stencil            = 3
+whisky::bound                     = "none"
+whisky::tvd_limiter               = "VanLeerMC2"
+whisky::rho_abs_min               = 1.e-7
+whisky::initial_atmosphere_factor = 0.999
+
+ADMBase::initial_data  = "tov"
+ADMBase::initial_lapse = "tov"
+ADMBase::initial_shift = "tov"
+
+tovsolver::TOV_Rho_Central[0] = 1.28e-3
+tovsolver::TOV_Gamma[0]       = 2.0
+tovsolver::TOV_K[0]           = 100.0
+tovsolver::TOV_Combine_Method = "maximum"
+
+EOS_Polytrope::eos_gamma            = 2.0
+EOS_Polytrope::eos_k                = 100.0
+
+Carpet::prolongation_order_space  = 3
+Carpet::prolongation_order_time   = 2
+
+IO::out_dir			= $parfile
+IO::out_fileinfo= "none"
+
+IOScalar::outScalar_every = 1
+IOScalar::outScalar_vars  = "hydrobase::rho hydrobase::press hydrobase::eps hydrobase::vel whisky::dens whisky::tau whisky::scon admbase::lapse admbase::metric admbase::curv admconstraints::ham admconstraints::momentum whisky::w_lorentz"
+IOScalar::outScalar_reductions  = "minimum maximum norm1 norm2"
diff --git a/test/test_two_av.par b/test/test_two_av.par
index cd10a61..c4d95a3 100644
--- a/test/test_two_av.par
+++ b/test/test_two_av.par
@@ -1,17 +1,10 @@
-ActiveThorns = "time MoL pugh pughreduce pughslab coordbase symbase cartgrid3d ioutil ioascii iobasic boundary admbase staticconformal spacemask admcoupling coordgauge admmacros hydrobase grhydro grhydro_initdata tovsolver nanchecker eos_base eos_idealfluid eos_polytrope bssn_mol admconstraints constants LocalReduce TmunuBase InitBase"
+ActiveThorns = "time MoL pugh pughreduce pughslab coordbase symbase cartgrid3d ioutil ioascii iobasic boundary admbase staticconformal spacemask admcoupling coordgauge admmacros hydrobase grhydro grhydro_initdata tovsolver nanchecker eos_base eos_idealfluid eos_polytrope admconstraints constants LocalReduce TmunuBase InitBase"
 
 TmunuBase::stress_energy_storage	=	yes
 TmunuBase::stress_energy_at_RHS		=	yes
 
 time::dtfac = 0.375
 
-admbase::evolution_method        = "adm_bssn"
-admbase::lapse_evolution_method  = "1+log"
-admbase::shift_evolution_method  = "gamma0"
-
-adm_bssn::bound           = "radiative"
-adm_bssn::harmonic_f      = 2.0
-
 ADMConstraints::constraints_persist	= yes
 admconstraints::bound     = "static"
 
diff --git a/test/test_two_av/ham_3D_diagonal.xg b/test/test_two_av/ham_3D_diagonal.xg
index 4b9912c..80b6505 100644
--- a/test/test_two_av/ham_3D_diagonal.xg
+++ b/test/test_two_av/ham_3D_diagonal.xg
@@ -2,35 +2,35 @@
 
 "Time = 0.0000000000e+00
 -5.1961524227e+01		0.0000000000e+00
--4.8713874836e+01		-9.6208567568e-06
--4.5466225446e+01		-9.5021700922e-06
--4.2218576055e+01		-9.3418722802e-06
--3.8970926664e+01		-9.1233716571e-06
--3.5723277273e+01		-8.8235187051e-06
--3.2475627882e+01		-8.4103548607e-06
--2.9227978492e+01		-7.8375453576e-06
--2.5980329101e+01		-7.0170036287e-06
--2.2732679710e+01		-5.6821922273e-06
--1.9485030319e+01		-2.8941231175e-06
--1.6237380928e+01		3.4597931905e-06
+-4.8713874836e+01		-9.6208567591e-06
+-4.5466225446e+01		-9.5021700919e-06
+-4.2218576055e+01		-9.3418722794e-06
+-3.8970926664e+01		-9.1233716566e-06
+-3.5723277273e+01		-8.8235187058e-06
+-3.2475627882e+01		-8.4103548591e-06
+-2.9227978492e+01		-7.8375453601e-06
+-2.5980329101e+01		-7.0170036312e-06
+-2.2732679710e+01		-5.6821922263e-06
+-1.9485030319e+01		-2.8941231179e-06
+-1.6237380928e+01		3.4597931911e-06
 -1.2989731538e+01		1.0810802334e-05
--9.7420821469e+00		5.8496766638e-06
--6.4944327562e+00		-3.5439454212e-05
--3.2467833654e+00		-9.2824174477e-05
+-9.7420821469e+00		5.8496766616e-06
+-6.4944327562e+00		-3.5439454215e-05
+-3.2467833654e+00		-9.2824174478e-05
 8.6602540379e-04		-1.0663378684e-04
-3.2485154162e+00		-1.0752527196e-04
-6.4961648070e+00		-6.1854686875e-05
-9.7438141977e+00		1.2175792995e-05
+3.2485154162e+00		-1.0752527197e-04
+6.4961648070e+00		-6.1854686874e-05
+9.7438141977e+00		1.2175792996e-05
 1.2991463589e+01		3.0627615596e-05
-1.6239112979e+01		1.2985092617e-05
-1.9486762370e+01		4.2854825602e-07
-2.2734411761e+01		-4.5003552488e-06
-2.5982061152e+01		-6.4889196824e-06
-2.9229710542e+01		-7.5408559089e-06
-3.2477359933e+01		-8.2215568569e-06
-3.5725009324e+01		-8.6969655430e-06
-3.8972658715e+01		-9.0365421551e-06
+1.6239112979e+01		1.2985092616e-05
+1.9486762370e+01		4.2854825727e-07
+2.2734411761e+01		-4.5003552490e-06
+2.5982061152e+01		-6.4889196841e-06
+2.9229710542e+01		-7.5408559113e-06
+3.2477359933e+01		-8.2215568541e-06
+3.5725009324e+01		-8.6969655419e-06
+3.8972658715e+01		-9.0365421553e-06
 4.2220308106e+01		-9.2814159366e-06
-4.5467957496e+01		-9.4595373467e-06
-4.8715606887e+01		-9.5904145770e-06
+4.5467957496e+01		-9.4595373457e-06
+4.8715606887e+01		-9.5904145780e-06
 5.1963256278e+01		0.0000000000e+00
diff --git a/test/test_two_av/ham_x_[16][16].xg b/test/test_two_av/ham_x_[16][16].xg
index 2804641..c272b08 100644
--- a/test/test_two_av/ham_x_[16][16].xg
+++ b/test/test_two_av/ham_x_[16][16].xg
@@ -3,34 +3,34 @@
 "Time = 0.0000000000e+00
 -3.0000000000e+01		0.0000000000e+00
 -2.8124968750e+01		-4.2082056514e-05
--2.6249937500e+01		6.0762078640e-05
+-2.6249937500e+01		6.0762078641e-05
 -2.4374906250e+01		-1.1748000150e-04
 -2.2499875000e+01		-2.4141421664e-04
 -2.0624843750e+01		-3.8143691285e-04
 -1.8749812500e+01		-5.2002521255e-04
 -1.6874781250e+01		-6.3526286758e-04
--1.4999750000e+01		-7.0607135220e-04
+-1.4999750000e+01		-7.0607135219e-04
 -1.3124718750e+01		-7.1860415345e-04
 -1.1249687500e+01		-6.7019108819e-04
 -9.3746562500e+00		-5.6869601906e-04
--7.4996250000e+00		-4.2871690269e-04
+-7.4996250000e+00		-4.2871690270e-04
 -5.6245937500e+00		-2.6776363588e-04
--3.7495625000e+00		-2.8545034795e-05
+-3.7495625000e+00		-2.8545034791e-05
 -1.8745312500e+00		-1.0922708936e-04
 5.0000000000e-04		-1.0663378684e-04
 1.8755312500e+00		-1.3221419155e-04
-3.7505625000e+00		4.1370476876e-05
+3.7505625000e+00		4.1370476875e-05
 5.6255937500e+00		-2.3335795239e-04
 7.5006250000e+00		-4.3992347983e-04
 9.3756562500e+00		-6.4509496563e-04
-1.1250687500e+01		-8.2579210468e-04
-1.3125718750e+01		-9.4286518878e-04
-1.5000750000e+01		-9.5648570114e-04
-1.6875781250e+01		-8.5507729976e-04
-1.8750812500e+01		-6.7024883547e-04
+1.1250687500e+01		-8.2579210467e-04
+1.3125718750e+01		-9.4286518880e-04
+1.5000750000e+01		-9.5648570113e-04
+1.6875781250e+01		-8.5507729978e-04
+1.8750812500e+01		-6.7024883546e-04
 2.0625843750e+01		-4.5721308716e-04
-2.2500875000e+01		-2.6248913246e-04
+2.2500875000e+01		-2.6248913245e-04
 2.4375906250e+01		-1.0707279652e-04
 2.6250937500e+01		1.0667729769e-04
-2.8125968750e+01		-7.4970663526e-05
+2.8125968750e+01		-7.4970663527e-05
 3.0001000000e+01		0.0000000000e+00
diff --git a/test/test_two_av/ham_y_[16][16].xg b/test/test_two_av/ham_y_[16][16].xg
index 4ee3715..c163f33 100644
--- a/test/test_two_av/ham_y_[16][16].xg
+++ b/test/test_two_av/ham_y_[16][16].xg
@@ -2,35 +2,35 @@
 
 "Time = 0.0000000000e+00
 -3.0000000000e+01		0.0000000000e+00
--2.8124968750e+01		-9.0442586349e-06
--2.6249937500e+01		-8.8568867852e-06
--2.4374906250e+01		-8.6315975865e-06
--2.2499875000e+01		-8.3689730646e-06
--2.0624843750e+01		-8.0843524116e-06
--1.8749812500e+01		-7.8292384741e-06
--1.6874781250e+01		-7.7358001266e-06
--1.4999750000e+01		-8.1019160012e-06
--1.3124718750e+01		-9.5337472273e-06
+-2.8124968750e+01		-9.0442586343e-06
+-2.6249937500e+01		-8.8568867858e-06
+-2.4374906250e+01		-8.6315975864e-06
+-2.2499875000e+01		-8.3689730663e-06
+-2.0624843750e+01		-8.0843524096e-06
+-1.8749812500e+01		-7.8292384749e-06
+-1.6874781250e+01		-7.7358001278e-06
+-1.4999750000e+01		-8.1019159995e-06
+-1.3124718750e+01		-9.5337472245e-06
 -1.1249687500e+01		-1.3130959459e-05
--9.3746562500e+00		-2.0585134860e-05
--7.4996250000e+00		-3.3828050737e-05
--5.6245937500e+00		-5.3692418673e-05
+-9.3746562500e+00		-2.0585134859e-05
+-7.4996250000e+00		-3.3828050738e-05
+-5.6245937500e+00		-5.3692418672e-05
 -3.7495625000e+00		-7.7613954295e-05
--1.8745312500e+00		-9.8305188977e-05
+-1.8745312500e+00		-9.8305188979e-05
 5.0000000000e-04		-1.0663378684e-04
-1.8755312500e+00		-9.8296725999e-05
-3.7505625000e+00		-7.7601226190e-05
-5.6255937500e+00		-5.3680303523e-05
-7.5006250000e+00		-3.3819190624e-05
-9.3756562500e+00		-2.0579774303e-05
-1.1250687500e+01		-1.3128187120e-05
-1.3125718750e+01		-9.5325306538e-06
-1.5000750000e+01		-8.1015092812e-06
-1.6875781250e+01		-7.7357644491e-06
-1.8750812500e+01		-7.8293485152e-06
-2.0625843750e+01		-8.0845034510e-06
-2.2500875000e+01		-8.3691213696e-06
-2.4375906250e+01		-8.6317281479e-06
-2.6250937500e+01		-8.8569965219e-06
-2.8125968750e+01		-9.0443491631e-06
+1.8755312500e+00		-9.8296726001e-05
+3.7505625000e+00		-7.7601226189e-05
+5.6255937500e+00		-5.3680303522e-05
+7.5006250000e+00		-3.3819190626e-05
+9.3756562500e+00		-2.0579774302e-05
+1.1250687500e+01		-1.3128187121e-05
+1.3125718750e+01		-9.5325306505e-06
+1.5000750000e+01		-8.1015092818e-06
+1.6875781250e+01		-7.7357644494e-06
+1.8750812500e+01		-7.8293485167e-06
+2.0625843750e+01		-8.0845034500e-06
+2.2500875000e+01		-8.3691213678e-06
+2.4375906250e+01		-8.6317281492e-06
+2.6250937500e+01		-8.8569965217e-06
+2.8125968750e+01		-9.0443491622e-06
 3.0001000000e+01		0.0000000000e+00
diff --git a/test/test_two_av/ham_z_[16][16].xg b/test/test_two_av/ham_z_[16][16].xg
index e6da518..6bd2206 100644
--- a/test/test_two_av/ham_z_[16][16].xg
+++ b/test/test_two_av/ham_z_[16][16].xg
@@ -2,35 +2,35 @@
 
 "Time = 0.0000000000e+00
 -3.0000000000e+01		0.0000000000e+00
--2.8124968750e+01		-9.0442586344e-06
--2.6249937500e+01		-8.8568867849e-06
--2.4374906250e+01		-8.6315975867e-06
--2.2499875000e+01		-8.3689730646e-06
--2.0624843750e+01		-8.0843524118e-06
--1.8749812500e+01		-7.8292384741e-06
--1.6874781250e+01		-7.7358001269e-06
--1.4999750000e+01		-8.1019159993e-06
--1.3124718750e+01		-9.5337472273e-06
--1.1249687500e+01		-1.3130959459e-05
--9.3746562500e+00		-2.0585134857e-05
+-2.8124968750e+01		-9.0442586332e-06
+-2.6249937500e+01		-8.8568867858e-06
+-2.4374906250e+01		-8.6315975864e-06
+-2.2499875000e+01		-8.3689730649e-06
+-2.0624843750e+01		-8.0843524099e-06
+-1.8749812500e+01		-7.8292384749e-06
+-1.6874781250e+01		-7.7358001274e-06
+-1.4999750000e+01		-8.1019160019e-06
+-1.3124718750e+01		-9.5337472240e-06
+-1.1249687500e+01		-1.3130959460e-05
+-9.3746562500e+00		-2.0585134856e-05
 -7.4996250000e+00		-3.3828050738e-05
--5.6245937500e+00		-5.3692418673e-05
+-5.6245937500e+00		-5.3692418672e-05
 -3.7495625000e+00		-7.7613954295e-05
--1.8745312500e+00		-9.8305188977e-05
+-1.8745312500e+00		-9.8305188979e-05
 5.0000000000e-04		-1.0663378684e-04
-1.8755312500e+00		-9.8296725999e-05
-3.7505625000e+00		-7.7601226190e-05
-5.6255937500e+00		-5.3680303523e-05
-7.5006250000e+00		-3.3819190624e-05
-9.3756562500e+00		-2.0579774303e-05
-1.1250687500e+01		-1.3128187120e-05
-1.3125718750e+01		-9.5325306538e-06
-1.5000750000e+01		-8.1015092807e-06
-1.6875781250e+01		-7.7357644493e-06
-1.8750812500e+01		-7.8293485152e-06
-2.0625843750e+01		-8.0845034512e-06
-2.2500875000e+01		-8.3691213696e-06
-2.4375906250e+01		-8.6317281481e-06
-2.6250937500e+01		-8.8569965219e-06
-2.8125968750e+01		-9.0443491631e-06
+1.8755312500e+00		-9.8296726001e-05
+3.7505625000e+00		-7.7601226189e-05
+5.6255937500e+00		-5.3680303522e-05
+7.5006250000e+00		-3.3819190626e-05
+9.3756562500e+00		-2.0579774302e-05
+1.1250687500e+01		-1.3128187121e-05
+1.3125718750e+01		-9.5325306507e-06
+1.5000750000e+01		-8.1015092816e-06
+1.6875781250e+01		-7.7357644490e-06
+1.8750812500e+01		-7.8293485167e-06
+2.0625843750e+01		-8.0845034502e-06
+2.2500875000e+01		-8.3691213683e-06
+2.4375906250e+01		-8.6317281490e-06
+2.6250937500e+01		-8.8569965231e-06
+2.8125968750e+01		-9.0443491619e-06
 3.0001000000e+01		0.0000000000e+00
diff --git a/test/test_two_av/tau_3D_diagonal.xg b/test/test_two_av/tau_3D_diagonal.xg
index 2e4c6ce..04a370a 100644
--- a/test/test_two_av/tau_3D_diagonal.xg
+++ b/test/test_two_av/tau_3D_diagonal.xg
@@ -2,7 +2,7 @@
 
 "Time = 0.0000000000e+00
 -5.1961524227e+01		4.2102666009e-12
--4.8713874836e+01		4.2242466205e-12
+-4.8713874836e+01		4.2242466206e-12
 -4.5466225446e+01		4.2401112445e-12
 -4.2218576055e+01		4.2582553667e-12
 -3.8970926664e+01		4.2791839736e-12
@@ -13,18 +13,18 @@
 -2.2732679710e+01		4.4552880420e-12
 -1.9485030319e+01		4.5128052639e-12
 -1.6237380928e+01		4.5784048644e-12
--1.2989731538e+01		4.6470189291e-12
+-1.2989731538e+01		4.6470189292e-12
 -9.7420821469e+00		4.7085630796e-12
 -6.4944327562e+00		4.7546415019e-12
 -3.2467833654e+00		4.7883257169e-12
 8.6602540379e-04		4.8195633229e-12
-3.2485154162e+00		4.8500757005e-12
+3.2485154162e+00		4.8500757004e-12
 6.4961648070e+00		4.8657129563e-12
 9.7438141977e+00		4.8455920783e-12
 1.2991463589e+01		4.7851152375e-12
 1.6239112979e+01		4.7020852851e-12
-1.9486762370e+01		4.6172734975e-12
-2.2734411761e+01		4.5416137475e-12
+1.9486762370e+01		4.6172734976e-12
+2.2734411761e+01		4.5416137476e-12
 2.5982061152e+01		4.4778450008e-12
 2.9229710542e+01		4.4250917846e-12
 3.2477359933e+01		4.3814983148e-12
diff --git a/test/test_two_av/tau_x_[16][16].xg b/test/test_two_av/tau_x_[16][16].xg
index d1f5fee..0dccaf7 100644
--- a/test/test_two_av/tau_x_[16][16].xg
+++ b/test/test_two_av/tau_x_[16][16].xg
@@ -16,7 +16,7 @@
 -7.4996250000e+00		5.8096519600e-07
 -5.6245937500e+00		1.4769206987e-07
 -3.7495625000e+00		3.6788221328e-09
--1.8745312500e+00		4.8014005788e-12
+-1.8745312500e+00		4.8014005787e-12
 5.0000000000e-04		4.8195633229e-12
 1.8755312500e+00		4.8663587794e-12
 3.7505625000e+00		4.9487028191e-12
diff --git a/test/test_two_av/tau_y_[16][16].xg b/test/test_two_av/tau_y_[16][16].xg
index 135043a..6380335 100644
--- a/test/test_two_av/tau_y_[16][16].xg
+++ b/test/test_two_av/tau_y_[16][16].xg
@@ -19,13 +19,13 @@
 -1.8745312500e+00		4.8128072414e-12
 5.0000000000e-04		4.8195633229e-12
 1.8755312500e+00		4.8128001176e-12
-3.7505625000e+00		4.7934531603e-12
+3.7505625000e+00		4.7934531602e-12
 5.6255937500e+00		4.7639948302e-12
 7.5006250000e+00		4.7276467635e-12
 9.3756562500e+00		4.6875734682e-12
 1.1250687500e+01		4.6463673261e-12
 1.3125718750e+01		4.6058752543e-12
-1.5000750000e+01		4.5672560357e-12
+1.5000750000e+01		4.5672560356e-12
 1.6875781250e+01		4.5311352454e-12
 1.8750812500e+01		4.4977698905e-12
 2.0625843750e+01		4.4671838834e-12
diff --git a/test/test_two_av/tau_z_[16][16].xg b/test/test_two_av/tau_z_[16][16].xg
index 6dd864b..ec1f1c3 100644
--- a/test/test_two_av/tau_z_[16][16].xg
+++ b/test/test_two_av/tau_z_[16][16].xg
@@ -9,7 +9,7 @@
 -2.0624843750e+01		4.4671994707e-12
 -1.8749812500e+01		4.4977869390e-12
 -1.6874781250e+01		4.5311537855e-12
--1.4999750000e+01		4.5672760029e-12
+-1.4999750000e+01		4.5672760028e-12
 -1.3124718750e+01		4.6058964267e-12
 -1.1249687500e+01		4.6463892433e-12
 -9.3746562500e+00		4.6875953401e-12
@@ -19,13 +19,13 @@
 -1.8745312500e+00		4.8128072414e-12
 5.0000000000e-04		4.8195633229e-12
 1.8755312500e+00		4.8128001176e-12
-3.7505625000e+00		4.7934531603e-12
+3.7505625000e+00		4.7934531602e-12
 5.6255937500e+00		4.7639948302e-12
 7.5006250000e+00		4.7276467635e-12
 9.3756562500e+00		4.6875734682e-12
 1.1250687500e+01		4.6463673261e-12
 1.3125718750e+01		4.6058752543e-12
-1.5000750000e+01		4.5672560357e-12
+1.5000750000e+01		4.5672560356e-12
 1.6875781250e+01		4.5311352454e-12
 1.8750812500e+01		4.4977698905e-12
 2.0625843750e+01		4.4671838834e-12
diff --git a/test/test_two_av/test_two_av.par b/test/test_two_av/test_two_av.par
index e69de29..c4d95a3 100644
--- a/test/test_two_av/test_two_av.par
+++ b/test/test_two_av/test_two_av.par
@@ -0,0 +1,69 @@
+ActiveThorns = "time MoL pugh pughreduce pughslab coordbase symbase cartgrid3d ioutil ioascii iobasic boundary admbase staticconformal spacemask admcoupling coordgauge admmacros hydrobase grhydro grhydro_initdata tovsolver nanchecker eos_base eos_idealfluid eos_polytrope admconstraints constants LocalReduce TmunuBase InitBase"
+
+TmunuBase::stress_energy_storage	=	yes
+TmunuBase::stress_energy_at_RHS		=	yes
+
+time::dtfac = 0.375
+
+ADMConstraints::constraints_persist	= yes
+admconstraints::bound     = "static"
+
+boundary::radpower        = 2
+
+SpaceMask::use_mask = "yes"
+
+grid::type            = "byrange"
+grid::domain          = "full"
+grid::xyzmin          = -30.0
+grid::xyzmax          =  30.001
+driver::ghost_size    =   3
+driver::global_nsize  =  33
+
+cactus::cctk_itlast   =       0
+
+methodoflines::ode_method        = "icn"
+
+hydrobase::timelevels             = 2
+hydrobase::evolution_method       = "whisky"
+
+whisky::riemann_solver            = "Marquina"
+whisky::whisky_eos_type           = "Polytype"
+whisky::whisky_eos_table          = "2D_Polytrope"
+whisky::recon_method              = "ppm"
+whisky::whisky_stencil            = 3
+whisky::bound                     = "none"
+whisky::tvd_limiter               = "VanLeerMC2"
+whisky::rho_abs_min               = 1.e-7
+whisky::initial_atmosphere_factor = 0.999
+
+ADMBase::initial_data  = "tov"
+ADMBase::initial_lapse = "tov"
+ADMBase::initial_shift = "tov"
+
+tovsolver::TOV_Num_TOVs       = 2
+tovsolver::TOV_Num_Radial     = 200000
+tovsolver::TOV_Combine_Method = "average"
+
+tovsolver::TOV_Rho_Central[0] = 0.16e-3
+tovsolver::TOV_Gamma[0]       = 2.0
+tovsolver::TOV_K[0]           = 100.0
+tovsolver::TOV_Position_x[0]  = -15.0
+
+tovsolver::TOV_Rho_Central[1] = 0.32e-3
+tovsolver::TOV_Gamma[1]       = 2.0
+tovsolver::TOV_K[1]           = 100.0
+tovsolver::TOV_Position_x[1]  = 15.0
+
+EOS_Polytrope::eos_gamma            = 2.0
+EOS_Polytrope::eos_k                = 100.0
+
+IO::out_fileinfo="none"
+IO::out_dir			= $parfile
+
+IOBasic::outScalar_every = 1
+IOBasic::outScalar_vars  = "whisky::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel whisky::dens whisky::tau whisky::scon admbase::lapse admbase::metric admbase::curv admconstraints::ham admconstraints::momentum"
+
+IOASCII::out1D_every     = 1
+IOASCII::out1D_vars      = "whisky::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel whisky::dens whisky::tau whisky::scon admbase::lapse admbase::metric admbase::curv admconstraints::ham admconstraints::momentum"
+IOASCII::out_format      = ".10e"
+
diff --git a/test/test_two_max.par b/test/test_two_max.par
index 095ce74..32efcca 100644
--- a/test/test_two_max.par
+++ b/test/test_two_max.par
@@ -1,17 +1,10 @@
-ActiveThorns = "time MoL pugh pughreduce pughslab coordbase symbase cartgrid3d ioutil ioascii iobasic boundary admbase staticconformal spacemask admcoupling coordgauge admmacros hydrobase grhydro grhydro_initdata tovsolver nanchecker eos_base eos_idealfluid eos_polytrope bssn_mol admconstraints constants LocalReduce TmunuBase InitBase"
+ActiveThorns = "time MoL pugh pughreduce pughslab coordbase symbase cartgrid3d ioutil ioascii iobasic boundary admbase staticconformal spacemask admcoupling coordgauge admmacros hydrobase grhydro grhydro_initdata tovsolver nanchecker eos_base eos_idealfluid eos_polytrope admconstraints constants LocalReduce TmunuBase InitBase"
 
 TmunuBase::stress_energy_storage	=	yes
 TmunuBase::stress_energy_at_RHS		=	yes
 
 time::dtfac = 0.375
 
-admbase::evolution_method        = "adm_bssn"
-admbase::lapse_evolution_method  = "1+log"
-admbase::shift_evolution_method  = "gamma0"
-
-adm_bssn::bound           = "radiative"
-adm_bssn::harmonic_f      = 2.0
-
 ADMConstraints::constraints_persist	= yes
 admconstraints::bound     = "static"
 
diff --git a/test/test_two_max/ham_3D_diagonal.xg b/test/test_two_max/ham_3D_diagonal.xg
index 9877834..8ed13ca 100644
--- a/test/test_two_max/ham_3D_diagonal.xg
+++ b/test/test_two_max/ham_3D_diagonal.xg
@@ -2,14 +2,14 @@
 
 "Time = 0.0000000000e+00
 -5.1961524227e+01		0.0000000000e+00
--4.8713874836e+01		-5.0048229254e-06
--4.5466225446e+01		-4.9990026289e-06
--4.2218576055e+01		-4.9914220547e-06
--3.8970926664e+01		-4.9815787886e-06
--3.5723277273e+01		-4.9689503373e-06
--3.2475627882e+01		-4.9532308838e-06
--2.9227978492e+01		-4.9350277400e-06
--2.5980329101e+01		-9.5861976301e-04
+-4.8713874836e+01		-5.0048229271e-06
+-4.5466225446e+01		-4.9990026282e-06
+-4.2218576055e+01		-4.9914220552e-06
+-3.8970926664e+01		-4.9815787868e-06
+-3.5723277273e+01		-4.9689503383e-06
+-3.2475627882e+01		-4.9532308834e-06
+-2.9227978492e+01		-4.9350277411e-06
+-2.5980329101e+01		-9.5861976302e-04
 -2.2732679710e+01		-2.0593721908e-03
 -1.9485030319e+01		-6.3780954888e-04
 -1.6237380928e+01		-8.4791104392e-04
@@ -17,20 +17,20 @@
 -9.7420821469e+00		-7.5429278114e-03
 -6.4944327562e+00		-3.5299418500e-03
 -3.2467833654e+00		-2.2504038509e-05
-8.6602540379e-04		-4.2629723901e-05
+8.6602540379e-04		-4.2629723902e-05
 3.2485154162e+00		-5.8349180585e-05
-6.4961648070e+00		-2.5912620811e-05
-9.7438141977e+00		3.6257757084e-05
-1.2991463589e+01		4.3608582326e-05
+6.4961648070e+00		-2.5912620810e-05
+9.7438141977e+00		3.6257757083e-05
+1.2991463589e+01		4.3608582327e-05
 1.6239112979e+01		1.9000017488e-05
-1.9486762370e+01		3.8120178815e-06
-2.2734411761e+01		-1.6048495076e-06
-2.5982061152e+01		-3.3740274583e-06
-2.9229710542e+01		-4.0608169852e-06
-3.2477359933e+01		-4.4035046632e-06
-3.5725009324e+01		-4.6063347000e-06
-3.8972658715e+01		-4.7363540644e-06
-4.2220308106e+01		-4.8226758762e-06
-4.5467957496e+01		-4.8811101838e-06
-4.8715606887e+01		-4.9212616524e-06
+1.9486762370e+01		3.8120178826e-06
+2.2734411761e+01		-1.6048495071e-06
+2.5982061152e+01		-3.3740274586e-06
+2.9229710542e+01		-4.0608169841e-06
+3.2477359933e+01		-4.4035046618e-06
+3.5725009324e+01		-4.6063346984e-06
+3.8972658715e+01		-4.7363540646e-06
+4.2220308106e+01		-4.8226758757e-06
+4.5467957496e+01		-4.8811101852e-06
+4.8715606887e+01		-4.9212616513e-06
 5.1963256278e+01		0.0000000000e+00
diff --git a/test/test_two_max/ham_x_[16][16].xg b/test/test_two_max/ham_x_[16][16].xg
index 98b46a2..e894438 100644
--- a/test/test_two_max/ham_x_[16][16].xg
+++ b/test/test_two_max/ham_x_[16][16].xg
@@ -2,35 +2,35 @@
 
 "Time = 0.0000000000e+00
 -3.0000000000e+01		0.0000000000e+00
--2.8124968750e+01		-4.5441501013e-05
--2.6249937500e+01		7.6525096207e-05
+-2.8124968750e+01		-4.5441501012e-05
+-2.6249937500e+01		7.6525096212e-05
 -2.4374906250e+01		-2.4501621460e-05
--2.2499875000e+01		-4.5849451343e-05
--2.0624843750e+01		-7.2344275627e-05
--1.8749812500e+01		-9.9668448087e-05
+-2.2499875000e+01		-4.5849451346e-05
+-2.0624843750e+01		-7.2344275626e-05
+-1.8749812500e+01		-9.9668448086e-05
 -1.6874781250e+01		-1.2078890900e-04
 -1.4999750000e+01		-1.2879935671e-04
 -1.3124718750e+01		-1.2078483195e-04
--1.1249687500e+01		-9.9661652197e-05
+-1.1249687500e+01		-9.9661652196e-05
 -9.3746562500e+00		-7.2336849190e-05
--7.4996250000e+00		-4.5842951720e-05
+-7.4996250000e+00		-4.5842951724e-05
 -5.6245937500e+00		-2.1204555874e-03
 -3.7495625000e+00		-7.4850237311e-03
 -1.8745312500e+00		-2.6060943776e-05
-5.0000000000e-04		-4.2629723901e-05
-1.8755312500e+00		-7.7601915491e-05
+5.0000000000e-04		-4.2629723902e-05
+1.8755312500e+00		-7.7601915489e-05
 3.7505625000e+00		1.0838349693e-04
-5.6255937500e+00		-4.1227593113e-05
-7.5006250000e+00		-8.8100087350e-05
+5.6255937500e+00		-4.1227593114e-05
+7.5006250000e+00		-8.8100087351e-05
 9.3756562500e+00		-1.5788915755e-04
 1.1250687500e+01		-2.4559967810e-04
-1.3125718750e+01		-3.2376123785e-04
-1.5000750000e+01		-3.5568662876e-04
-1.6875781250e+01		-3.2371311094e-04
-1.8750812500e+01		-2.4552873122e-04
+1.3125718750e+01		-3.2376123787e-04
+1.5000750000e+01		-3.5568662875e-04
+1.6875781250e+01		-3.2371311096e-04
+1.8750812500e+01		-2.4552873121e-04
 2.0625843750e+01		-1.5782373420e-04
-2.2500875000e+01		-8.8054616653e-05
-2.4375906250e+01		-4.1170598012e-05
+2.2500875000e+01		-8.8054616652e-05
+2.4375906250e+01		-4.1170598013e-05
 2.6250937500e+01		1.0766260443e-04
 2.8125968750e+01		-7.7561123963e-05
 3.0001000000e+01		0.0000000000e+00
diff --git a/test/test_two_max/ham_y_[16][16].xg b/test/test_two_max/ham_y_[16][16].xg
index 84b4be0..8b85c91 100644
--- a/test/test_two_max/ham_y_[16][16].xg
+++ b/test/test_two_max/ham_y_[16][16].xg
@@ -2,35 +2,35 @@
 
 "Time = 0.0000000000e+00
 -3.0000000000e+01		0.0000000000e+00
--2.8124968750e+01		-5.1541687433e-06
--2.6249937500e+01		-5.1158091750e-06
--2.4374906250e+01		-5.0391690482e-06
--2.2499875000e+01		-4.9035925879e-06
--2.0624843750e+01		-4.6827863855e-06
--1.8749812500e+01		-4.3501648320e-06
--1.6874781250e+01		-3.8965050658e-06
--1.4999750000e+01		-3.3734158574e-06
--1.3124718750e+01		-2.9809776906e-06
--1.1249687500e+01		-3.2063884232e-06
--9.3746562500e+00		-4.9557630125e-06
--7.4996250000e+00		-9.4639147168e-06
--5.6245937500e+00		-1.7604823064e-05
+-2.8124968750e+01		-5.1541687430e-06
+-2.6249937500e+01		-5.1158091755e-06
+-2.4374906250e+01		-5.0391690479e-06
+-2.2499875000e+01		-4.9035925877e-06
+-2.0624843750e+01		-4.6827863847e-06
+-1.8749812500e+01		-4.3501648327e-06
+-1.6874781250e+01		-3.8965050666e-06
+-1.4999750000e+01		-3.3734158569e-06
+-1.3124718750e+01		-2.9809776894e-06
+-1.1249687500e+01		-3.2063884244e-06
+-9.3746562500e+00		-4.9557630123e-06
+-7.4996250000e+00		-9.4639147187e-06
+-5.6245937500e+00		-1.7604823063e-05
 -3.7495625000e+00		-2.8497930783e-05
 -1.8745312500e+00		-3.8495446123e-05
-5.0000000000e-04		-4.2629723901e-05
-1.8755312500e+00		-3.8491274295e-05
+5.0000000000e-04		-4.2629723902e-05
+1.8755312500e+00		-3.8491274294e-05
 3.7505625000e+00		-2.8491920135e-05
-5.6255937500e+00		-1.7599551059e-05
-7.5006250000e+00		-9.4605705681e-06
-9.3756562500e+00		-4.9542079946e-06
-1.1250687500e+01		-3.2059625683e-06
-1.3125718750e+01		-2.9810824678e-06
-1.5000750000e+01		-3.3736877821e-06
-1.6875781250e+01		-3.8967746001e-06
-1.8750812500e+01		-4.3503752136e-06
-2.0625843750e+01		-4.6829319004e-06
-2.2500875000e+01		-4.9036850349e-06
-2.4375906250e+01		-5.0392235142e-06
-2.6250937500e+01		-5.1158382553e-06
-2.8125968750e+01		-5.1541818222e-06
+5.6255937500e+00		-1.7599551060e-05
+7.5006250000e+00		-9.4605705694e-06
+9.3756562500e+00		-4.9542079949e-06
+1.1250687500e+01		-3.2059625688e-06
+1.3125718750e+01		-2.9810824665e-06
+1.5000750000e+01		-3.3736877824e-06
+1.6875781250e+01		-3.8967746008e-06
+1.8750812500e+01		-4.3503752142e-06
+2.0625843750e+01		-4.6829318989e-06
+2.2500875000e+01		-4.9036850355e-06
+2.4375906250e+01		-5.0392235136e-06
+2.6250937500e+01		-5.1158382552e-06
+2.8125968750e+01		-5.1541818227e-06
 3.0001000000e+01		0.0000000000e+00
diff --git a/test/test_two_max/ham_z_[16][16].xg b/test/test_two_max/ham_z_[16][16].xg
index cdc7fa9..451f6b6 100644
--- a/test/test_two_max/ham_z_[16][16].xg
+++ b/test/test_two_max/ham_z_[16][16].xg
@@ -2,35 +2,35 @@
 
 "Time = 0.0000000000e+00
 -3.0000000000e+01		0.0000000000e+00
--2.8124968750e+01		-5.1541687437e-06
--2.6249937500e+01		-5.1158091749e-06
--2.4374906250e+01		-5.0391690482e-06
--2.2499875000e+01		-4.9035925879e-06
--2.0624843750e+01		-4.6827863855e-06
--1.8749812500e+01		-4.3501648320e-06
--1.6874781250e+01		-3.8965050656e-06
--1.4999750000e+01		-3.3734158574e-06
--1.3124718750e+01		-2.9809776905e-06
--1.1249687500e+01		-3.2063884234e-06
+-2.8124968750e+01		-5.1541687430e-06
+-2.6249937500e+01		-5.1158091755e-06
+-2.4374906250e+01		-5.0391690479e-06
+-2.2499875000e+01		-4.9035925877e-06
+-2.0624843750e+01		-4.6827863847e-06
+-1.8749812500e+01		-4.3501648327e-06
+-1.6874781250e+01		-3.8965050664e-06
+-1.4999750000e+01		-3.3734158569e-06
+-1.3124718750e+01		-2.9809776894e-06
+-1.1249687500e+01		-3.2063884246e-06
 -9.3746562500e+00		-4.9557630112e-06
--7.4996250000e+00		-9.4639147170e-06
--5.6245937500e+00		-1.7604823064e-05
+-7.4996250000e+00		-9.4639147174e-06
+-5.6245937500e+00		-1.7604823063e-05
 -3.7495625000e+00		-2.8497930783e-05
 -1.8745312500e+00		-3.8495446123e-05
-5.0000000000e-04		-4.2629723901e-05
-1.8755312500e+00		-3.8491274295e-05
+5.0000000000e-04		-4.2629723902e-05
+1.8755312500e+00		-3.8491274294e-05
 3.7505625000e+00		-2.8491920135e-05
-5.6255937500e+00		-1.7599551059e-05
-7.5006250000e+00		-9.4605705681e-06
-9.3756562500e+00		-4.9542079946e-06
-1.1250687500e+01		-3.2059625683e-06
-1.3125718750e+01		-2.9810824678e-06
-1.5000750000e+01		-3.3736877819e-06
-1.6875781250e+01		-3.8967746001e-06
-1.8750812500e+01		-4.3503752136e-06
-2.0625843750e+01		-4.6829319007e-06
-2.2500875000e+01		-4.9036850349e-06
-2.4375906250e+01		-5.0392235142e-06
-2.6250937500e+01		-5.1158382553e-06
-2.8125968750e+01		-5.1541818222e-06
+5.6255937500e+00		-1.7599551060e-05
+7.5006250000e+00		-9.4605705694e-06
+9.3756562500e+00		-4.9542079949e-06
+1.1250687500e+01		-3.2059625688e-06
+1.3125718750e+01		-2.9810824668e-06
+1.5000750000e+01		-3.3736877824e-06
+1.6875781250e+01		-3.8967746006e-06
+1.8750812500e+01		-4.3503752142e-06
+2.0625843750e+01		-4.6829318991e-06
+2.2500875000e+01		-4.9036850355e-06
+2.4375906250e+01		-5.0392235136e-06
+2.6250937500e+01		-5.1158382552e-06
+2.8125968750e+01		-5.1541818227e-06
 3.0001000000e+01		0.0000000000e+00
diff --git a/test/test_two_max/tau_3D_diagonal.xg b/test/test_two_max/tau_3D_diagonal.xg
index f1f73de..0d572ef 100644
--- a/test/test_two_max/tau_3D_diagonal.xg
+++ b/test/test_two_max/tau_3D_diagonal.xg
@@ -22,7 +22,7 @@
 6.4961648070e+00		1.1605890643e-12
 9.7438141977e+00		1.1625604969e-12
 1.2991463589e+01		1.1533333779e-12
-1.6239112979e+01		1.1374850461e-12
+1.6239112979e+01		1.1374850462e-12
 1.9486762370e+01		1.1203541453e-12
 2.2734411761e+01		1.1048265930e-12
 2.5982061152e+01		1.0917246675e-12
diff --git a/test/test_two_max/tau_x_[16][16].xg b/test/test_two_max/tau_x_[16][16].xg
index d8c5537..0a22181 100644
--- a/test/test_two_max/tau_x_[16][16].xg
+++ b/test/test_two_max/tau_x_[16][16].xg
@@ -19,7 +19,7 @@
 -1.8745312500e+00		1.1164144927e-12
 5.0000000000e-04		1.1317296516e-12
 1.8755312500e+00		1.1516777217e-12
-3.7505625000e+00		1.1787306487e-12
+3.7505625000e+00		1.1787306486e-12
 5.6255937500e+00		2.5647094682e-07
 7.5006250000e+00		1.6402329286e-06
 9.3756562500e+00		4.6224928627e-06
diff --git a/test/test_two_max/tau_y_[16][16].xg b/test/test_two_max/tau_y_[16][16].xg
index afe2415..24663ea 100644
--- a/test/test_two_max/tau_y_[16][16].xg
+++ b/test/test_two_max/tau_y_[16][16].xg
@@ -2,7 +2,7 @@
 
 "Time = 0.0000000000e+00
 -3.0000000000e+01		1.0572335273e-12
--2.8124968750e+01		1.0602985590e-12
+-2.8124968750e+01		1.0602985591e-12
 -2.6249937500e+01		1.0636574104e-12
 -2.4374906250e+01		1.0673429552e-12
 -2.2499875000e+01		1.0713892865e-12
@@ -29,7 +29,7 @@
 1.6875781250e+01		1.0859914832e-12
 1.8750812500e+01		1.0806895204e-12
 2.0625843750e+01		1.0758270967e-12
-2.2500875000e+01		1.0713870264e-12
+2.2500875000e+01		1.0713870263e-12
 2.4375906250e+01		1.0673408965e-12
 2.6250937500e+01		1.0636555349e-12
 2.8125968750e+01		1.0602968489e-12
diff --git a/test/test_two_max/tau_z_[16][16].xg b/test/test_two_max/tau_z_[16][16].xg
index 624cdcc..24663ea 100644
--- a/test/test_two_max/tau_z_[16][16].xg
+++ b/test/test_two_max/tau_z_[16][16].xg
@@ -29,7 +29,7 @@
 1.6875781250e+01		1.0859914832e-12
 1.8750812500e+01		1.0806895204e-12
 2.0625843750e+01		1.0758270967e-12
-2.2500875000e+01		1.0713870264e-12
+2.2500875000e+01		1.0713870263e-12
 2.4375906250e+01		1.0673408965e-12
 2.6250937500e+01		1.0636555349e-12
 2.8125968750e+01		1.0602968489e-12
diff --git a/test/test_two_max/test_two_max.par b/test/test_two_max/test_two_max.par
index e69de29..32efcca 100644
--- a/test/test_two_max/test_two_max.par
+++ b/test/test_two_max/test_two_max.par
@@ -0,0 +1,69 @@
+ActiveThorns = "time MoL pugh pughreduce pughslab coordbase symbase cartgrid3d ioutil ioascii iobasic boundary admbase staticconformal spacemask admcoupling coordgauge admmacros hydrobase grhydro grhydro_initdata tovsolver nanchecker eos_base eos_idealfluid eos_polytrope admconstraints constants LocalReduce TmunuBase InitBase"
+
+TmunuBase::stress_energy_storage	=	yes
+TmunuBase::stress_energy_at_RHS		=	yes
+
+time::dtfac = 0.375
+
+ADMConstraints::constraints_persist	= yes
+admconstraints::bound     = "static"
+
+boundary::radpower        = 2
+
+SpaceMask::use_mask = "yes"
+
+grid::type            = "byrange"
+grid::domain          = "full"
+grid::xyzmin          = -30.0
+grid::xyzmax          =  30.001
+driver::ghost_size    =   3
+driver::global_nsize  =  33
+
+cactus::cctk_itlast   =       0
+
+methodoflines::ode_method        = "icn"
+
+hydrobase::timelevels             = 2
+hydrobase::evolution_method       = "whisky"
+
+whisky::riemann_solver            = "Marquina"
+whisky::whisky_eos_type           = "Polytype"
+whisky::whisky_eos_table          = "2D_Polytrope"
+whisky::recon_method              = "ppm"
+whisky::whisky_stencil            = 3
+whisky::bound                     = "none"
+whisky::tvd_limiter               = "VanLeerMC2"
+whisky::rho_abs_min               = 1.e-7
+whisky::initial_atmosphere_factor = 0.999
+
+ADMBase::initial_data  = "tov"
+ADMBase::initial_lapse = "tov"
+ADMBase::initial_shift = "tov"
+
+tovsolver::TOV_Num_TOVs       = 2
+tovsolver::TOV_Num_Radial     = 200000
+tovsolver::TOV_Combine_Method = "maximum"
+
+tovsolver::TOV_Rho_Central[0] = 0.16e-3
+tovsolver::TOV_Gamma[0]       = 2.0
+tovsolver::TOV_K[0]           = 100.0
+tovsolver::TOV_Position_x[0]  = -15.0
+
+tovsolver::TOV_Rho_Central[1] = 0.32e-3
+tovsolver::TOV_Gamma[1]       = 2.0
+tovsolver::TOV_K[1]           = 100.0
+tovsolver::TOV_Position_x[1]  = 15.0
+
+EOS_Polytrope::eos_gamma            = 2.0
+EOS_Polytrope::eos_k                = 100.0
+
+IO::out_fileinfo="none"
+IO::out_dir			= $parfile
+
+IOBasic::outScalar_every = 1
+IOBasic::outScalar_vars  = "whisky::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel whisky::dens whisky::tau whisky::scon admbase::lapse admbase::metric admbase::curv admconstraints::ham admconstraints::momentum"
+
+IOASCII::out1D_every     = 1
+IOASCII::out1D_vars      = "whisky::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel whisky::dens whisky::tau whisky::scon admbase::lapse admbase::metric admbase::curv admconstraints::ham admconstraints::momentum"
+IOASCII::out_format      = ".10e"
+