9 files changed, 175 insertions, 106 deletions
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"
+