aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrhaas <rhaas@1bdb13ef-5d69-4035-bb54-08abeb3aa7f1>2011-10-14 04:39:22 +0000
committerrhaas <rhaas@1bdb13ef-5d69-4035-bb54-08abeb3aa7f1>2011-10-14 04:39:22 +0000
commit5071cb9f4057356644bbd2c0aa14444c7dda38b2 (patch)
treebdc975994839ea2b94553a19b35fcee849ce0a72
parent9ff88a06cc593f10ddaaf706df80d1070fd425e6 (diff)
regenerate testsuite data to account for ADMBase rev 62.
New data was created with a patched Curie checkout where only ADMBase was updated to trunk, this this is really the only change. git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinInitialData/TOVSolver/trunk@129 1bdb13ef-5d69-4035-bb54-08abeb3aa7f1
-rw-r--r--test/test_one_boost_max/alp_3D_diagonal.xg4
-rw-r--r--test/test_one_boost_max/alp_maximum.xg2
-rw-r--r--test/test_one_boost_max/alp_norm1.xg2
-rw-r--r--test/test_one_boost_max/alp_norm2.xg2
-rw-r--r--test/test_one_boost_max/alp_x_[16][16].xg4
-rw-r--r--test/test_one_boost_max/alp_y_[16][16].xg4
-rw-r--r--test/test_one_boost_max/alp_z_[16][16].xg4
-rw-r--r--test/test_one_boost_max/dens_3D_diagonal.xg4
-rw-r--r--test/test_one_boost_max/dens_minimum.xg2
-rw-r--r--test/test_one_boost_max/dens_norm1.xg2
-rw-r--r--test/test_one_boost_max/dens_norm2.xg2
-rw-r--r--test/test_one_boost_max/dens_x_[16][16].xg4
-rw-r--r--test/test_one_boost_max/dens_y_[16][16].xg4
-rw-r--r--test/test_one_boost_max/dens_z_[16][16].xg4
-rw-r--r--test/test_one_boost_max/gxx_3D_diagonal.xg4
-rw-r--r--test/test_one_boost_max/gxx_minimum.xg2
-rw-r--r--test/test_one_boost_max/gxx_norm1.xg2
-rw-r--r--test/test_one_boost_max/gxx_norm2.xg2
-rw-r--r--test/test_one_boost_max/gxx_x_[16][16].xg4
-rw-r--r--test/test_one_boost_max/gxx_y_[16][16].xg4
-rw-r--r--test/test_one_boost_max/gxx_z_[16][16].xg4
-rw-r--r--test/test_one_boost_max/gyy_3D_diagonal.xg4
-rw-r--r--test/test_one_boost_max/gyy_minimum.xg2
-rw-r--r--test/test_one_boost_max/gyy_norm1.xg2
-rw-r--r--test/test_one_boost_max/gyy_norm2.xg2
-rw-r--r--test/test_one_boost_max/gyy_x_[16][16].xg4
-rw-r--r--test/test_one_boost_max/gyy_y_[16][16].xg4
-rw-r--r--test/test_one_boost_max/gyy_z_[16][16].xg4
-rw-r--r--test/test_one_boost_max/gzz_3D_diagonal.xg4
-rw-r--r--test/test_one_boost_max/gzz_minimum.xg2
-rw-r--r--test/test_one_boost_max/gzz_norm1.xg2
-rw-r--r--test/test_one_boost_max/gzz_norm2.xg2
-rw-r--r--test/test_one_boost_max/gzz_x_[16][16].xg4
-rw-r--r--test/test_one_boost_max/gzz_y_[16][16].xg4
-rw-r--r--test/test_one_boost_max/gzz_z_[16][16].xg4
-rw-r--r--test/test_one_boost_max/ham_3D_diagonal.xg4
-rw-r--r--test/test_one_boost_max/ham_norm1.xg2
-rw-r--r--test/test_one_boost_max/ham_norm2.xg2
-rw-r--r--test/test_one_boost_max/ham_x_[16][16].xg4
-rw-r--r--test/test_one_boost_max/ham_y_[16][16].xg4
-rw-r--r--test/test_one_boost_max/ham_z_[16][16].xg4
-rw-r--r--test/test_one_boost_max/tau_3D_diagonal.xg4
-rw-r--r--test/test_one_boost_max/tau_x_[16][16].xg4
-rw-r--r--test/test_one_boost_max/tau_y_[16][16].xg4
-rw-r--r--test/test_one_boost_max/tau_z_[16][16].xg4
-rw-r--r--test/test_one_boost_max/test_one_boost_max.par31
-rw-r--r--test/test_one_static_max/alp_3D_diagonal.xg4
-rw-r--r--test/test_one_static_max/alp_maximum.xg2
-rw-r--r--test/test_one_static_max/alp_norm1.xg2
-rw-r--r--test/test_one_static_max/alp_norm2.xg2
-rw-r--r--test/test_one_static_max/alp_x_[16][16].xg4
-rw-r--r--test/test_one_static_max/alp_y_[16][16].xg4
-rw-r--r--test/test_one_static_max/alp_z_[16][16].xg4
-rw-r--r--test/test_one_static_max/dens_3D_diagonal.xg4
-rw-r--r--test/test_one_static_max/dens_minimum.xg2
-rw-r--r--test/test_one_static_max/dens_norm1.xg2
-rw-r--r--test/test_one_static_max/dens_norm2.xg2
-rw-r--r--test/test_one_static_max/dens_x_[16][16].xg4
-rw-r--r--test/test_one_static_max/dens_y_[16][16].xg4
-rw-r--r--test/test_one_static_max/dens_z_[16][16].xg4
-rw-r--r--test/test_one_static_max/gxx_3D_diagonal.xg4
-rw-r--r--test/test_one_static_max/gxx_minimum.xg2
-rw-r--r--test/test_one_static_max/gxx_norm1.xg2
-rw-r--r--test/test_one_static_max/gxx_norm2.xg2
-rw-r--r--test/test_one_static_max/gxx_x_[16][16].xg4
-rw-r--r--test/test_one_static_max/gxx_y_[16][16].xg4
-rw-r--r--test/test_one_static_max/gxx_z_[16][16].xg4
-rw-r--r--test/test_one_static_max/gyy_3D_diagonal.xg4
-rw-r--r--test/test_one_static_max/gyy_minimum.xg2
-rw-r--r--test/test_one_static_max/gyy_norm1.xg2
-rw-r--r--test/test_one_static_max/gyy_norm2.xg2
-rw-r--r--test/test_one_static_max/gyy_x_[16][16].xg4
-rw-r--r--test/test_one_static_max/gyy_y_[16][16].xg4
-rw-r--r--test/test_one_static_max/gyy_z_[16][16].xg4
-rw-r--r--test/test_one_static_max/gzz_3D_diagonal.xg4
-rw-r--r--test/test_one_static_max/gzz_minimum.xg2
-rw-r--r--test/test_one_static_max/gzz_norm1.xg2
-rw-r--r--test/test_one_static_max/gzz_norm2.xg2
-rw-r--r--test/test_one_static_max/gzz_x_[16][16].xg4
-rw-r--r--test/test_one_static_max/gzz_y_[16][16].xg4
-rw-r--r--test/test_one_static_max/gzz_z_[16][16].xg4
-rw-r--r--test/test_one_static_max/ham_3D_diagonal.xg4
-rw-r--r--test/test_one_static_max/ham_minimum.xg2
-rw-r--r--test/test_one_static_max/ham_norm1.xg2
-rw-r--r--test/test_one_static_max/ham_norm2.xg2
-rw-r--r--test/test_one_static_max/ham_x_[16][16].xg4
-rw-r--r--test/test_one_static_max/ham_y_[16][16].xg4
-rw-r--r--test/test_one_static_max/ham_z_[16][16].xg4
-rw-r--r--test/test_one_static_max/tau_3D_diagonal.xg4
-rw-r--r--test/test_one_static_max/tau_x_[16][16].xg4
-rw-r--r--test/test_one_static_max/tau_y_[16][16].xg4
-rw-r--r--test/test_one_static_max/tau_z_[16][16].xg4
-rw-r--r--test/test_one_static_max/test_one_static_max.par32
-rw-r--r--test/test_tov_carpet/alp.maximum.asc2
-rw-r--r--test/test_tov_carpet/alp.norm1.asc2
-rw-r--r--test/test_tov_carpet/alp.norm2.asc2
-rw-r--r--test/test_tov_carpet/dens.minimum.asc2
-rw-r--r--test/test_tov_carpet/dens.norm1.asc2
-rw-r--r--test/test_tov_carpet/dens.norm2.asc2
-rw-r--r--test/test_tov_carpet/eps.norm1.asc2
-rw-r--r--test/test_tov_carpet/gxx.minimum.asc2
-rw-r--r--test/test_tov_carpet/gxx.norm1.asc2
-rw-r--r--test/test_tov_carpet/gxx.norm2.asc2
-rw-r--r--test/test_tov_carpet/gyy.minimum.asc2
-rw-r--r--test/test_tov_carpet/gyy.norm1.asc2
-rw-r--r--test/test_tov_carpet/gyy.norm2.asc2
-rw-r--r--test/test_tov_carpet/gzz.minimum.asc2
-rw-r--r--test/test_tov_carpet/gzz.norm1.asc2
-rw-r--r--test/test_tov_carpet/gzz.norm2.asc2
-rw-r--r--test/test_tov_carpet/ham.minimum.asc2
-rw-r--r--test/test_tov_carpet/ham.norm1.asc2
-rw-r--r--test/test_tov_carpet/ham.norm2.asc2
-rw-r--r--test/test_tov_carpet/press.norm1.asc2
-rw-r--r--test/test_tov_carpet/rho.norm1.asc2
-rw-r--r--test/test_tov_carpet/rho.norm2.asc2
-rw-r--r--test/test_tov_carpet/tau.minimum.asc2
-rw-r--r--test/test_tov_carpet/tau.norm1.asc2
-rw-r--r--test/test_tov_carpet/test_tov_carpet.par29
-rw-r--r--test/test_two_av/alp_3D_diagonal.xg4
-rw-r--r--test/test_two_av/alp_maximum.xg2
-rw-r--r--test/test_two_av/alp_norm1.xg2
-rw-r--r--test/test_two_av/alp_norm2.xg2
-rw-r--r--test/test_two_av/alp_x_[16][16].xg4
-rw-r--r--test/test_two_av/alp_y_[16][16].xg4
-rw-r--r--test/test_two_av/alp_z_[16][16].xg4
-rw-r--r--test/test_two_av/dens_3D_diagonal.xg4
-rw-r--r--test/test_two_av/dens_minimum.xg2
-rw-r--r--test/test_two_av/dens_norm1.xg2
-rw-r--r--test/test_two_av/dens_norm2.xg2
-rw-r--r--test/test_two_av/dens_x_[16][16].xg4
-rw-r--r--test/test_two_av/dens_y_[16][16].xg4
-rw-r--r--test/test_two_av/dens_z_[16][16].xg4
-rw-r--r--test/test_two_av/gxx_3D_diagonal.xg4
-rw-r--r--test/test_two_av/gxx_minimum.xg2
-rw-r--r--test/test_two_av/gxx_norm1.xg2
-rw-r--r--test/test_two_av/gxx_norm2.xg2
-rw-r--r--test/test_two_av/gxx_x_[16][16].xg4
-rw-r--r--test/test_two_av/gxx_y_[16][16].xg4
-rw-r--r--test/test_two_av/gxx_z_[16][16].xg4
-rw-r--r--test/test_two_av/gyy_3D_diagonal.xg4
-rw-r--r--test/test_two_av/gyy_minimum.xg2
-rw-r--r--test/test_two_av/gyy_norm1.xg2
-rw-r--r--test/test_two_av/gyy_norm2.xg2
-rw-r--r--test/test_two_av/gyy_x_[16][16].xg4
-rw-r--r--test/test_two_av/gyy_y_[16][16].xg4
-rw-r--r--test/test_two_av/gyy_z_[16][16].xg4
-rw-r--r--test/test_two_av/gzz_3D_diagonal.xg4
-rw-r--r--test/test_two_av/gzz_minimum.xg2
-rw-r--r--test/test_two_av/gzz_norm1.xg2
-rw-r--r--test/test_two_av/gzz_norm2.xg2
-rw-r--r--test/test_two_av/gzz_x_[16][16].xg4
-rw-r--r--test/test_two_av/gzz_y_[16][16].xg4
-rw-r--r--test/test_two_av/gzz_z_[16][16].xg4
-rw-r--r--test/test_two_av/ham_3D_diagonal.xg50
-rw-r--r--test/test_two_av/ham_minimum.xg2
-rw-r--r--test/test_two_av/ham_norm1.xg2
-rw-r--r--test/test_two_av/ham_norm2.xg2
-rw-r--r--test/test_two_av/ham_x_[16][16].xg28
-rw-r--r--test/test_two_av/ham_y_[16][16].xg46
-rw-r--r--test/test_two_av/ham_z_[16][16].xg52
-rw-r--r--test/test_two_av/tau_3D_diagonal.xg4
-rw-r--r--test/test_two_av/tau_x_[16][16].xg6
-rw-r--r--test/test_two_av/tau_y_[16][16].xg6
-rw-r--r--test/test_two_av/tau_z_[16][16].xg6
-rw-r--r--test/test_two_av/test_two_av.par31
-rw-r--r--test/test_two_max/alp_3D_diagonal.xg4
-rw-r--r--test/test_two_max/alp_maximum.xg2
-rw-r--r--test/test_two_max/alp_norm1.xg2
-rw-r--r--test/test_two_max/alp_norm2.xg2
-rw-r--r--test/test_two_max/alp_x_[16][16].xg4
-rw-r--r--test/test_two_max/alp_y_[16][16].xg4
-rw-r--r--test/test_two_max/alp_z_[16][16].xg4
-rw-r--r--test/test_two_max/dens_3D_diagonal.xg4
-rw-r--r--test/test_two_max/dens_minimum.xg2
-rw-r--r--test/test_two_max/dens_norm1.xg2
-rw-r--r--test/test_two_max/dens_norm2.xg2
-rw-r--r--test/test_two_max/dens_x_[16][16].xg4
-rw-r--r--test/test_two_max/dens_y_[16][16].xg4
-rw-r--r--test/test_two_max/dens_z_[16][16].xg4
-rw-r--r--test/test_two_max/gxx_3D_diagonal.xg4
-rw-r--r--test/test_two_max/gxx_minimum.xg2
-rw-r--r--test/test_two_max/gxx_norm1.xg2
-rw-r--r--test/test_two_max/gxx_norm2.xg2
-rw-r--r--test/test_two_max/gxx_x_[16][16].xg4
-rw-r--r--test/test_two_max/gxx_y_[16][16].xg4
-rw-r--r--test/test_two_max/gxx_z_[16][16].xg4
-rw-r--r--test/test_two_max/gyy_3D_diagonal.xg4
-rw-r--r--test/test_two_max/gyy_minimum.xg2
-rw-r--r--test/test_two_max/gyy_norm1.xg2
-rw-r--r--test/test_two_max/gyy_norm2.xg2
-rw-r--r--test/test_two_max/gyy_x_[16][16].xg4
-rw-r--r--test/test_two_max/gyy_y_[16][16].xg4
-rw-r--r--test/test_two_max/gyy_z_[16][16].xg4
-rw-r--r--test/test_two_max/gzz_3D_diagonal.xg4
-rw-r--r--test/test_two_max/gzz_minimum.xg2
-rw-r--r--test/test_two_max/gzz_norm1.xg2
-rw-r--r--test/test_two_max/gzz_norm2.xg2
-rw-r--r--test/test_two_max/gzz_x_[16][16].xg4
-rw-r--r--test/test_two_max/gzz_y_[16][16].xg4
-rw-r--r--test/test_two_max/gzz_z_[16][16].xg4
-rw-r--r--test/test_two_max/ham_3D_diagonal.xg4
-rw-r--r--test/test_two_max/ham_norm1.xg2
-rw-r--r--test/test_two_max/ham_norm2.xg2
-rw-r--r--test/test_two_max/ham_x_[16][16].xg4
-rw-r--r--test/test_two_max/ham_y_[16][16].xg4
-rw-r--r--test/test_two_max/ham_z_[16][16].xg4
-rw-r--r--test/test_two_max/tau_3D_diagonal.xg4
-rw-r--r--test/test_two_max/tau_x_[16][16].xg4
-rw-r--r--test/test_two_max/tau_y_[16][16].xg4
-rw-r--r--test/test_two_max/tau_z_[16][16].xg4
-rw-r--r--test/test_two_max/test_two_max.par31
211 files changed, 470 insertions, 486 deletions
diff --git a/test/test_one_boost_max/alp_3D_diagonal.xg b/test/test_one_boost_max/alp_3D_diagonal.xg
index 6b7a1e1..f25b8a5 100644
--- a/test/test_one_boost_max/alp_3D_diagonal.xg
+++ b/test/test_one_boost_max/alp_3D_diagonal.xg
@@ -1,7 +1,7 @@
"Time = 0.0000000000e+00
--2.5980762114e+01 9.4752190622e-01
+-2.5980762114e+01 9.4412099317e-01
-2.4356910355e+01 9.4412099317e-01
-2.2733058596e+01 9.4024873237e-01
-2.1109206837e+01 9.3579983855e-01
@@ -33,4 +33,4 @@
2.1110938888e+01 9.3580493679e-01
2.2734790647e+01 9.4025314854e-01
2.4358642406e+01 9.4412485552e-01
-2.5982494164e+01 9.4752531274e-01
+2.5982494164e+01 9.4412485552e-01
diff --git a/test/test_one_boost_max/alp_maximum.xg b/test/test_one_boost_max/alp_maximum.xg
index 938a246..091c401 100644
--- a/test/test_one_boost_max/alp_maximum.xg
+++ b/test/test_one_boost_max/alp_maximum.xg
@@ -1,2 +1,2 @@
"alp v time
-0.0000000000000 0.9475253127427
+0.0000000000000 0.9441248555154
diff --git a/test/test_one_boost_max/alp_norm1.xg b/test/test_one_boost_max/alp_norm1.xg
index 3ddd597..a60e14e 100644
--- a/test/test_one_boost_max/alp_norm1.xg
+++ b/test/test_one_boost_max/alp_norm1.xg
@@ -1,2 +1,2 @@
"alp v time
-0.0000000000000 0.9005424762216
+0.0000000000000 0.9000237676123
diff --git a/test/test_one_boost_max/alp_norm2.xg b/test/test_one_boost_max/alp_norm2.xg
index c8423fb..7e95bd4 100644
--- a/test/test_one_boost_max/alp_norm2.xg
+++ b/test/test_one_boost_max/alp_norm2.xg
@@ -1,2 +1,2 @@
"alp v time
-0.0000000000000 0.9013715518013
+0.0000000000000 0.9008396016357
diff --git a/test/test_one_boost_max/alp_x_[16][16].xg b/test/test_one_boost_max/alp_x_[16][16].xg
index a28fce6..8709984 100644
--- a/test/test_one_boost_max/alp_x_[16][16].xg
+++ b/test/test_one_boost_max/alp_x_[16][16].xg
@@ -1,7 +1,7 @@
"Time = 0.0000000000e+00
--1.5000000000e+01 9.1081830549e-01
+-1.5000000000e+01 9.0515460695e-01
-1.4062468750e+01 9.0515460695e-01
-1.3124937500e+01 8.9872275103e-01
-1.2187406250e+01 8.9135509336e-01
@@ -33,4 +33,4 @@
1.2188406250e+01 8.9136352297e-01
1.3125937500e+01 8.9873007615e-01
1.4063468750e+01 9.0516103124e-01
-1.5001000000e+01 9.1082398546e-01
+1.5001000000e+01 9.0516103124e-01
diff --git a/test/test_one_boost_max/alp_y_[16][16].xg b/test/test_one_boost_max/alp_y_[16][16].xg
index a28fce6..8709984 100644
--- a/test/test_one_boost_max/alp_y_[16][16].xg
+++ b/test/test_one_boost_max/alp_y_[16][16].xg
@@ -1,7 +1,7 @@
"Time = 0.0000000000e+00
--1.5000000000e+01 9.1081830549e-01
+-1.5000000000e+01 9.0515460695e-01
-1.4062468750e+01 9.0515460695e-01
-1.3124937500e+01 8.9872275103e-01
-1.2187406250e+01 8.9135509336e-01
@@ -33,4 +33,4 @@
1.2188406250e+01 8.9136352297e-01
1.3125937500e+01 8.9873007615e-01
1.4063468750e+01 9.0516103124e-01
-1.5001000000e+01 9.1082398546e-01
+1.5001000000e+01 9.0516103124e-01
diff --git a/test/test_one_boost_max/alp_z_[16][16].xg b/test/test_one_boost_max/alp_z_[16][16].xg
index a28fce6..8709984 100644
--- a/test/test_one_boost_max/alp_z_[16][16].xg
+++ b/test/test_one_boost_max/alp_z_[16][16].xg
@@ -1,7 +1,7 @@
"Time = 0.0000000000e+00
--1.5000000000e+01 9.1081830549e-01
+-1.5000000000e+01 9.0515460695e-01
-1.4062468750e+01 9.0515460695e-01
-1.3124937500e+01 8.9872275103e-01
-1.2187406250e+01 8.9135509336e-01
@@ -33,4 +33,4 @@
1.2188406250e+01 8.9136352297e-01
1.3125937500e+01 8.9873007615e-01
1.4063468750e+01 9.0516103124e-01
-1.5001000000e+01 9.1082398546e-01
+1.5001000000e+01 9.0516103124e-01
diff --git a/test/test_one_boost_max/dens_3D_diagonal.xg b/test/test_one_boost_max/dens_3D_diagonal.xg
index fc78da0..a23722e 100644
--- a/test/test_one_boost_max/dens_3D_diagonal.xg
+++ b/test/test_one_boost_max/dens_3D_diagonal.xg
@@ -1,7 +1,7 @@
"Time = 0.0000000000e+00
--2.5980762114e+01 1.1729671931e-07
+-2.5980762114e+01 1.1853326151e-07
-2.4356910355e+01 1.1853326151e-07
-2.2733058596e+01 1.1995974220e-07
-2.1109206837e+01 1.2162343869e-07
@@ -33,4 +33,4 @@
2.1110938888e+01 1.2162151682e-07
2.2734790647e+01 1.1995810398e-07
2.4358642406e+01 1.1853184859e-07
-2.5982494164e+01 1.1729548829e-07
+2.5982494164e+01 1.1853184859e-07
diff --git a/test/test_one_boost_max/dens_minimum.xg b/test/test_one_boost_max/dens_minimum.xg
index 262f5ce..78ab881 100644
--- a/test/test_one_boost_max/dens_minimum.xg
+++ b/test/test_one_boost_max/dens_minimum.xg
@@ -1,2 +1,2 @@
"dens v time
-0.0000000000000 0.0000001172955
+0.0000000000000 0.0000001185318
diff --git a/test/test_one_boost_max/dens_norm1.xg b/test/test_one_boost_max/dens_norm1.xg
index 41651f9..03edcfe 100644
--- a/test/test_one_boost_max/dens_norm1.xg
+++ b/test/test_one_boost_max/dens_norm1.xg
@@ -1,2 +1,2 @@
"dens v time
-0.0000000000000 0.0000583838651
+0.0000000000000 0.0000583840693
diff --git a/test/test_one_boost_max/dens_norm2.xg b/test/test_one_boost_max/dens_norm2.xg
index a616b99..3dfa61b 100644
--- a/test/test_one_boost_max/dens_norm2.xg
+++ b/test/test_one_boost_max/dens_norm2.xg
@@ -1,2 +1,2 @@
"dens v time
-0.0000000000000 0.0003120974921
+0.0000000000000 0.0003120974922
diff --git a/test/test_one_boost_max/dens_x_[16][16].xg b/test/test_one_boost_max/dens_x_[16][16].xg
index 5ceb8bc..6477e5c 100644
--- a/test/test_one_boost_max/dens_x_[16][16].xg
+++ b/test/test_one_boost_max/dens_x_[16][16].xg
@@ -1,7 +1,7 @@
"Time = 0.0000000000e+00
--1.5000000000e+01 1.3148118667e-07
+-1.5000000000e+01 1.3384391219e-07
-1.4062468750e+01 1.3384391219e-07
-1.3124937500e+01 1.3658740323e-07
-1.2187406250e+01 1.3981106180e-07
@@ -33,4 +33,4 @@
1.2188406250e+01 1.3980732310e-07
1.3125937500e+01 1.3658424161e-07
1.4063468750e+01 1.3384120424e-07
-1.5001000000e+01 1.3147884171e-07
+1.5001000000e+01 1.3384120424e-07
diff --git a/test/test_one_boost_max/dens_y_[16][16].xg b/test/test_one_boost_max/dens_y_[16][16].xg
index 5ceb8bc..6477e5c 100644
--- a/test/test_one_boost_max/dens_y_[16][16].xg
+++ b/test/test_one_boost_max/dens_y_[16][16].xg
@@ -1,7 +1,7 @@
"Time = 0.0000000000e+00
--1.5000000000e+01 1.3148118667e-07
+-1.5000000000e+01 1.3384391219e-07
-1.4062468750e+01 1.3384391219e-07
-1.3124937500e+01 1.3658740323e-07
-1.2187406250e+01 1.3981106180e-07
@@ -33,4 +33,4 @@
1.2188406250e+01 1.3980732310e-07
1.3125937500e+01 1.3658424161e-07
1.4063468750e+01 1.3384120424e-07
-1.5001000000e+01 1.3147884171e-07
+1.5001000000e+01 1.3384120424e-07
diff --git a/test/test_one_boost_max/dens_z_[16][16].xg b/test/test_one_boost_max/dens_z_[16][16].xg
index 5ceb8bc..6477e5c 100644
--- a/test/test_one_boost_max/dens_z_[16][16].xg
+++ b/test/test_one_boost_max/dens_z_[16][16].xg
@@ -1,7 +1,7 @@
"Time = 0.0000000000e+00
--1.5000000000e+01 1.3148118667e-07
+-1.5000000000e+01 1.3384391219e-07
-1.4062468750e+01 1.3384391219e-07
-1.3124937500e+01 1.3658740323e-07
-1.2187406250e+01 1.3981106180e-07
@@ -33,4 +33,4 @@
1.2188406250e+01 1.3980732310e-07
1.3125937500e+01 1.3658424161e-07
1.4063468750e+01 1.3384120424e-07
-1.5001000000e+01 1.3147884171e-07
+1.5001000000e+01 1.3384120424e-07
diff --git a/test/test_one_boost_max/gxx_3D_diagonal.xg b/test/test_one_boost_max/gxx_3D_diagonal.xg
index 77d110b..e630f31 100644
--- a/test/test_one_boost_max/gxx_3D_diagonal.xg
+++ b/test/test_one_boost_max/gxx_3D_diagonal.xg
@@ -1,7 +1,7 @@
"Time = 0.0000000000e+00
--2.5980762114e+01 1.1122196840e+00
+-2.5980762114e+01 1.1200226952e+00
-2.4356910355e+01 1.1200226952e+00
-2.2733058596e+01 1.1289906603e+00
-2.1109206837e+01 1.1394051693e+00
@@ -33,4 +33,4 @@
2.1110938888e+01 1.1393931661e+00
2.2734790647e+01 1.1289803816e+00
2.4358642406e+01 1.1200137948e+00
-2.5982494164e+01 1.1122119023e+00
+2.5982494164e+01 1.1200137948e+00
diff --git a/test/test_one_boost_max/gxx_minimum.xg b/test/test_one_boost_max/gxx_minimum.xg
index d352f79..59e00cf 100644
--- a/test/test_one_boost_max/gxx_minimum.xg
+++ b/test/test_one_boost_max/gxx_minimum.xg
@@ -1,2 +1,2 @@
"gxx v time
-0.0000000000000 1.1122119022998
+0.0000000000000 1.1200137947560
diff --git a/test/test_one_boost_max/gxx_norm1.xg b/test/test_one_boost_max/gxx_norm1.xg
index 62092bb..90c5b2d 100644
--- a/test/test_one_boost_max/gxx_norm1.xg
+++ b/test/test_one_boost_max/gxx_norm1.xg
@@ -1,2 +1,2 @@
"gxx v time
-0.0000000000000 1.2317730312624
+0.0000000000000 1.2330322888115
diff --git a/test/test_one_boost_max/gxx_norm2.xg b/test/test_one_boost_max/gxx_norm2.xg
index a545a37..e005d01 100644
--- a/test/test_one_boost_max/gxx_norm2.xg
+++ b/test/test_one_boost_max/gxx_norm2.xg
@@ -1,2 +1,2 @@
"gxx v time
-0.0000000000000 1.2369502262701
+0.0000000000000 1.2381389299857
diff --git a/test/test_one_boost_max/gxx_x_[16][16].xg b/test/test_one_boost_max/gxx_x_[16][16].xg
index d240db0..f7273be 100644
--- a/test/test_one_boost_max/gxx_x_[16][16].xg
+++ b/test/test_one_boost_max/gxx_x_[16][16].xg
@@ -1,7 +1,7 @@
"Time = 0.0000000000e+00
--1.5000000000e+01 1.2001690144e+00
+-1.5000000000e+01 1.2145043693e+00
-1.4062468750e+01 1.2145043693e+00
-1.3124937500e+01 1.2310445381e+00
-1.2187406250e+01 1.2503387456e+00
@@ -33,4 +33,4 @@
1.2188406250e+01 1.2503164552e+00
1.3125937500e+01 1.2310255412e+00
1.4063468750e+01 1.2144879879e+00
-1.5001000000e+01 1.2001547443e+00
+1.5001000000e+01 1.2144879879e+00
diff --git a/test/test_one_boost_max/gxx_y_[16][16].xg b/test/test_one_boost_max/gxx_y_[16][16].xg
index d240db0..f7273be 100644
--- a/test/test_one_boost_max/gxx_y_[16][16].xg
+++ b/test/test_one_boost_max/gxx_y_[16][16].xg
@@ -1,7 +1,7 @@
"Time = 0.0000000000e+00
--1.5000000000e+01 1.2001690144e+00
+-1.5000000000e+01 1.2145043693e+00
-1.4062468750e+01 1.2145043693e+00
-1.3124937500e+01 1.2310445381e+00
-1.2187406250e+01 1.2503387456e+00
@@ -33,4 +33,4 @@
1.2188406250e+01 1.2503164552e+00
1.3125937500e+01 1.2310255412e+00
1.4063468750e+01 1.2144879879e+00
-1.5001000000e+01 1.2001547443e+00
+1.5001000000e+01 1.2144879879e+00
diff --git a/test/test_one_boost_max/gxx_z_[16][16].xg b/test/test_one_boost_max/gxx_z_[16][16].xg
index d240db0..f7273be 100644
--- a/test/test_one_boost_max/gxx_z_[16][16].xg
+++ b/test/test_one_boost_max/gxx_z_[16][16].xg
@@ -1,7 +1,7 @@
"Time = 0.0000000000e+00
--1.5000000000e+01 1.2001690144e+00
+-1.5000000000e+01 1.2145043693e+00
-1.4062468750e+01 1.2145043693e+00
-1.3124937500e+01 1.2310445381e+00
-1.2187406250e+01 1.2503387456e+00
@@ -33,4 +33,4 @@
1.2188406250e+01 1.2503164552e+00
1.3125937500e+01 1.2310255412e+00
1.4063468750e+01 1.2144879879e+00
-1.5001000000e+01 1.2001547443e+00
+1.5001000000e+01 1.2144879879e+00
diff --git a/test/test_one_boost_max/gyy_3D_diagonal.xg b/test/test_one_boost_max/gyy_3D_diagonal.xg
index 77d110b..e630f31 100644
--- a/test/test_one_boost_max/gyy_3D_diagonal.xg
+++ b/test/test_one_boost_max/gyy_3D_diagonal.xg
@@ -1,7 +1,7 @@
"Time = 0.0000000000e+00
--2.5980762114e+01 1.1122196840e+00
+-2.5980762114e+01 1.1200226952e+00
-2.4356910355e+01 1.1200226952e+00
-2.2733058596e+01 1.1289906603e+00
-2.1109206837e+01 1.1394051693e+00
@@ -33,4 +33,4 @@
2.1110938888e+01 1.1393931661e+00
2.2734790647e+01 1.1289803816e+00
2.4358642406e+01 1.1200137948e+00
-2.5982494164e+01 1.1122119023e+00
+2.5982494164e+01 1.1200137948e+00
diff --git a/test/test_one_boost_max/gyy_minimum.xg b/test/test_one_boost_max/gyy_minimum.xg
index c9f44e7..e7b77ae 100644
--- a/test/test_one_boost_max/gyy_minimum.xg
+++ b/test/test_one_boost_max/gyy_minimum.xg
@@ -1,2 +1,2 @@
"gyy v time
-0.0000000000000 1.1122119022998
+0.0000000000000 1.1200137947560
diff --git a/test/test_one_boost_max/gyy_norm1.xg b/test/test_one_boost_max/gyy_norm1.xg
index 04d9d94..0ea9c46 100644
--- a/test/test_one_boost_max/gyy_norm1.xg
+++ b/test/test_one_boost_max/gyy_norm1.xg
@@ -1,2 +1,2 @@
"gyy v time
-0.0000000000000 1.2317730312624
+0.0000000000000 1.2330322888115
diff --git a/test/test_one_boost_max/gyy_norm2.xg b/test/test_one_boost_max/gyy_norm2.xg
index 881b767..7e7de69 100644
--- a/test/test_one_boost_max/gyy_norm2.xg
+++ b/test/test_one_boost_max/gyy_norm2.xg
@@ -1,2 +1,2 @@
"gyy v time
-0.0000000000000 1.2369502262701
+0.0000000000000 1.2381389299857
diff --git a/test/test_one_boost_max/gyy_x_[16][16].xg b/test/test_one_boost_max/gyy_x_[16][16].xg
index d240db0..f7273be 100644
--- a/test/test_one_boost_max/gyy_x_[16][16].xg
+++ b/test/test_one_boost_max/gyy_x_[16][16].xg
@@ -1,7 +1,7 @@
"Time = 0.0000000000e+00
--1.5000000000e+01 1.2001690144e+00
+-1.5000000000e+01 1.2145043693e+00
-1.4062468750e+01 1.2145043693e+00
-1.3124937500e+01 1.2310445381e+00
-1.2187406250e+01 1.2503387456e+00
@@ -33,4 +33,4 @@
1.2188406250e+01 1.2503164552e+00
1.3125937500e+01 1.2310255412e+00
1.4063468750e+01 1.2144879879e+00
-1.5001000000e+01 1.2001547443e+00
+1.5001000000e+01 1.2144879879e+00
diff --git a/test/test_one_boost_max/gyy_y_[16][16].xg b/test/test_one_boost_max/gyy_y_[16][16].xg
index d240db0..f7273be 100644
--- a/test/test_one_boost_max/gyy_y_[16][16].xg
+++ b/test/test_one_boost_max/gyy_y_[16][16].xg
@@ -1,7 +1,7 @@
"Time = 0.0000000000e+00
--1.5000000000e+01 1.2001690144e+00
+-1.5000000000e+01 1.2145043693e+00
-1.4062468750e+01 1.2145043693e+00
-1.3124937500e+01 1.2310445381e+00
-1.2187406250e+01 1.2503387456e+00
@@ -33,4 +33,4 @@
1.2188406250e+01 1.2503164552e+00
1.3125937500e+01 1.2310255412e+00
1.4063468750e+01 1.2144879879e+00
-1.5001000000e+01 1.2001547443e+00
+1.5001000000e+01 1.2144879879e+00
diff --git a/test/test_one_boost_max/gyy_z_[16][16].xg b/test/test_one_boost_max/gyy_z_[16][16].xg
index d240db0..f7273be 100644
--- a/test/test_one_boost_max/gyy_z_[16][16].xg
+++ b/test/test_one_boost_max/gyy_z_[16][16].xg
@@ -1,7 +1,7 @@
"Time = 0.0000000000e+00
--1.5000000000e+01 1.2001690144e+00
+-1.5000000000e+01 1.2145043693e+00
-1.4062468750e+01 1.2145043693e+00
-1.3124937500e+01 1.2310445381e+00
-1.2187406250e+01 1.2503387456e+00
@@ -33,4 +33,4 @@
1.2188406250e+01 1.2503164552e+00
1.3125937500e+01 1.2310255412e+00
1.4063468750e+01 1.2144879879e+00
-1.5001000000e+01 1.2001547443e+00
+1.5001000000e+01 1.2144879879e+00
diff --git a/test/test_one_boost_max/gzz_3D_diagonal.xg b/test/test_one_boost_max/gzz_3D_diagonal.xg
index 77d110b..e630f31 100644
--- a/test/test_one_boost_max/gzz_3D_diagonal.xg
+++ b/test/test_one_boost_max/gzz_3D_diagonal.xg
@@ -1,7 +1,7 @@
"Time = 0.0000000000e+00
--2.5980762114e+01 1.1122196840e+00
+-2.5980762114e+01 1.1200226952e+00
-2.4356910355e+01 1.1200226952e+00
-2.2733058596e+01 1.1289906603e+00
-2.1109206837e+01 1.1394051693e+00
@@ -33,4 +33,4 @@
2.1110938888e+01 1.1393931661e+00
2.2734790647e+01 1.1289803816e+00
2.4358642406e+01 1.1200137948e+00
-2.5982494164e+01 1.1122119023e+00
+2.5982494164e+01 1.1200137948e+00
diff --git a/test/test_one_boost_max/gzz_minimum.xg b/test/test_one_boost_max/gzz_minimum.xg
index d75e3bf..9f630aa 100644
--- a/test/test_one_boost_max/gzz_minimum.xg
+++ b/test/test_one_boost_max/gzz_minimum.xg
@@ -1,2 +1,2 @@
"gzz v time
-0.0000000000000 1.1122119022998
+0.0000000000000 1.1200137947560
diff --git a/test/test_one_boost_max/gzz_norm1.xg b/test/test_one_boost_max/gzz_norm1.xg
index 654b55f..89a64df 100644
--- a/test/test_one_boost_max/gzz_norm1.xg
+++ b/test/test_one_boost_max/gzz_norm1.xg
@@ -1,2 +1,2 @@
"gzz v time
-0.0000000000000 1.2317730312624
+0.0000000000000 1.2330322888115
diff --git a/test/test_one_boost_max/gzz_norm2.xg b/test/test_one_boost_max/gzz_norm2.xg
index 7554017..a3226eb 100644
--- a/test/test_one_boost_max/gzz_norm2.xg
+++ b/test/test_one_boost_max/gzz_norm2.xg
@@ -1,2 +1,2 @@
"gzz v time
-0.0000000000000 1.2369502262701
+0.0000000000000 1.2381389299857
diff --git a/test/test_one_boost_max/gzz_x_[16][16].xg b/test/test_one_boost_max/gzz_x_[16][16].xg
index d240db0..f7273be 100644
--- a/test/test_one_boost_max/gzz_x_[16][16].xg
+++ b/test/test_one_boost_max/gzz_x_[16][16].xg
@@ -1,7 +1,7 @@
"Time = 0.0000000000e+00
--1.5000000000e+01 1.2001690144e+00
+-1.5000000000e+01 1.2145043693e+00
-1.4062468750e+01 1.2145043693e+00
-1.3124937500e+01 1.2310445381e+00
-1.2187406250e+01 1.2503387456e+00
@@ -33,4 +33,4 @@
1.2188406250e+01 1.2503164552e+00
1.3125937500e+01 1.2310255412e+00
1.4063468750e+01 1.2144879879e+00
-1.5001000000e+01 1.2001547443e+00
+1.5001000000e+01 1.2144879879e+00
diff --git a/test/test_one_boost_max/gzz_y_[16][16].xg b/test/test_one_boost_max/gzz_y_[16][16].xg
index d240db0..f7273be 100644
--- a/test/test_one_boost_max/gzz_y_[16][16].xg
+++ b/test/test_one_boost_max/gzz_y_[16][16].xg
@@ -1,7 +1,7 @@
"Time = 0.0000000000e+00
--1.5000000000e+01 1.2001690144e+00
+-1.5000000000e+01 1.2145043693e+00
-1.4062468750e+01 1.2145043693e+00
-1.3124937500e+01 1.2310445381e+00
-1.2187406250e+01 1.2503387456e+00
@@ -33,4 +33,4 @@
1.2188406250e+01 1.2503164552e+00
1.3125937500e+01 1.2310255412e+00
1.4063468750e+01 1.2144879879e+00
-1.5001000000e+01 1.2001547443e+00
+1.5001000000e+01 1.2144879879e+00
diff --git a/test/test_one_boost_max/gzz_z_[16][16].xg b/test/test_one_boost_max/gzz_z_[16][16].xg
index d240db0..f7273be 100644
--- a/test/test_one_boost_max/gzz_z_[16][16].xg
+++ b/test/test_one_boost_max/gzz_z_[16][16].xg
@@ -1,7 +1,7 @@
"Time = 0.0000000000e+00
--1.5000000000e+01 1.2001690144e+00
+-1.5000000000e+01 1.2145043693e+00
-1.4062468750e+01 1.2145043693e+00
-1.3124937500e+01 1.2310445381e+00
-1.2187406250e+01 1.2503387456e+00
@@ -33,4 +33,4 @@
1.2188406250e+01 1.2503164552e+00
1.3125937500e+01 1.2310255412e+00
1.4063468750e+01 1.2144879879e+00
-1.5001000000e+01 1.2001547443e+00
+1.5001000000e+01 1.2144879879e+00
diff --git a/test/test_one_boost_max/ham_3D_diagonal.xg b/test/test_one_boost_max/ham_3D_diagonal.xg
index d753538..0e0b608 100644
--- a/test/test_one_boost_max/ham_3D_diagonal.xg
+++ b/test/test_one_boost_max/ham_3D_diagonal.xg
@@ -2,7 +2,7 @@
"Time = 0.0000000000e+00
-2.5980762114e+01 0.0000000000e+00
--2.4356910355e+01 -3.8646695839e-06
+-2.4356910355e+01 -1.5133331942e-02
-2.2733058596e+01 -3.4024767522e-06
-2.1109206837e+01 -2.7012002566e-06
-1.9485355079e+01 -1.6034050594e-06
@@ -32,5 +32,5 @@
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.4358642406e+01 -1.5131332109e-02
2.5982494164e+01 0.0000000000e+00
diff --git a/test/test_one_boost_max/ham_norm1.xg b/test/test_one_boost_max/ham_norm1.xg
index 5dd8186..2027918 100644
--- a/test/test_one_boost_max/ham_norm1.xg
+++ b/test/test_one_boost_max/ham_norm1.xg
@@ -1,2 +1,2 @@
"ham v time
-0.0000000000000 0.0004257648519
+0.0000000000000 0.0023745214989
diff --git a/test/test_one_boost_max/ham_norm2.xg b/test/test_one_boost_max/ham_norm2.xg
index 07dac25..c293c38 100644
--- a/test/test_one_boost_max/ham_norm2.xg
+++ b/test/test_one_boost_max/ham_norm2.xg
@@ -1,2 +1,2 @@
"ham v time
-0.0000000000000 0.0022606533190
+0.0000000000000 0.0057365285989
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 1ca841f..0438827 100644
--- a/test/test_one_boost_max/ham_x_[16][16].xg
+++ b/test/test_one_boost_max/ham_x_[16][16].xg
@@ -2,7 +2,7 @@
"Time = 0.0000000000e+00
-1.5000000000e+01 0.0000000000e+00
--1.4062468750e+01 -3.0931812092e-05
+-1.4062468750e+01 -2.2306886734e-02
-1.3124937500e+01 -4.1098919458e-05
-1.2187406250e+01 -5.6445568417e-05
-1.1249875000e+01 -8.0323199897e-05
@@ -32,5 +32,5 @@
1.1250875000e+01 -8.0291382228e-05
1.2188406250e+01 -5.6425428124e-05
1.3125937500e+01 -4.1085753715e-05
-1.4063468750e+01 -3.0922960643e-05
+1.4063468750e+01 -2.2304175029e-02
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 1ca841f..0438827 100644
--- a/test/test_one_boost_max/ham_y_[16][16].xg
+++ b/test/test_one_boost_max/ham_y_[16][16].xg
@@ -2,7 +2,7 @@
"Time = 0.0000000000e+00
-1.5000000000e+01 0.0000000000e+00
--1.4062468750e+01 -3.0931812092e-05
+-1.4062468750e+01 -2.2306886734e-02
-1.3124937500e+01 -4.1098919458e-05
-1.2187406250e+01 -5.6445568417e-05
-1.1249875000e+01 -8.0323199897e-05
@@ -32,5 +32,5 @@
1.1250875000e+01 -8.0291382228e-05
1.2188406250e+01 -5.6425428124e-05
1.3125937500e+01 -4.1085753715e-05
-1.4063468750e+01 -3.0922960643e-05
+1.4063468750e+01 -2.2304175029e-02
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 1ca841f..0438827 100644
--- a/test/test_one_boost_max/ham_z_[16][16].xg
+++ b/test/test_one_boost_max/ham_z_[16][16].xg
@@ -2,7 +2,7 @@
"Time = 0.0000000000e+00
-1.5000000000e+01 0.0000000000e+00
--1.4062468750e+01 -3.0931812092e-05
+-1.4062468750e+01 -2.2306886734e-02
-1.3124937500e+01 -4.1098919458e-05
-1.2187406250e+01 -5.6445568417e-05
-1.1249875000e+01 -8.0323199897e-05
@@ -32,5 +32,5 @@
1.1250875000e+01 -8.0291382228e-05
1.2188406250e+01 -5.6425428124e-05
1.3125937500e+01 -4.1085753715e-05
-1.4063468750e+01 -3.0922960643e-05
+1.4063468750e+01 -2.2304175029e-02
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 211f85c..d3137a8 100644
--- a/test/test_one_boost_max/tau_3D_diagonal.xg
+++ b/test/test_one_boost_max/tau_3D_diagonal.xg
@@ -1,7 +1,7 @@
"Time = 0.0000000000e+00
--2.5980762114e+01 1.1729671931e-12
+-2.5980762114e+01 1.1853326151e-12
-2.4356910355e+01 1.1853326151e-12
-2.2733058596e+01 1.1995974220e-12
-2.1109206837e+01 1.2162343870e-12
@@ -33,4 +33,4 @@
2.1110938888e+01 1.2162151682e-12
2.2734790647e+01 1.1995810398e-12
2.4358642406e+01 1.1853184859e-12
-2.5982494164e+01 1.1729548829e-12
+2.5982494164e+01 1.1853184859e-12
diff --git a/test/test_one_boost_max/tau_x_[16][16].xg b/test/test_one_boost_max/tau_x_[16][16].xg
index a3318fa..dcf4306 100644
--- a/test/test_one_boost_max/tau_x_[16][16].xg
+++ b/test/test_one_boost_max/tau_x_[16][16].xg
@@ -1,7 +1,7 @@
"Time = 0.0000000000e+00
--1.5000000000e+01 1.3148118668e-12
+-1.5000000000e+01 1.3384391219e-12
-1.4062468750e+01 1.3384391219e-12
-1.3124937500e+01 1.3658740323e-12
-1.2187406250e+01 1.3981106180e-12
@@ -33,4 +33,4 @@
1.2188406250e+01 1.3980732310e-12
1.3125937500e+01 1.3658424161e-12
1.4063468750e+01 1.3384120425e-12
-1.5001000000e+01 1.3147884171e-12
+1.5001000000e+01 1.3384120425e-12
diff --git a/test/test_one_boost_max/tau_y_[16][16].xg b/test/test_one_boost_max/tau_y_[16][16].xg
index a3318fa..dcf4306 100644
--- a/test/test_one_boost_max/tau_y_[16][16].xg
+++ b/test/test_one_boost_max/tau_y_[16][16].xg
@@ -1,7 +1,7 @@
"Time = 0.0000000000e+00
--1.5000000000e+01 1.3148118668e-12
+-1.5000000000e+01 1.3384391219e-12
-1.4062468750e+01 1.3384391219e-12
-1.3124937500e+01 1.3658740323e-12
-1.2187406250e+01 1.3981106180e-12
@@ -33,4 +33,4 @@
1.2188406250e+01 1.3980732310e-12
1.3125937500e+01 1.3658424161e-12
1.4063468750e+01 1.3384120425e-12
-1.5001000000e+01 1.3147884171e-12
+1.5001000000e+01 1.3384120425e-12
diff --git a/test/test_one_boost_max/tau_z_[16][16].xg b/test/test_one_boost_max/tau_z_[16][16].xg
index a3318fa..dcf4306 100644
--- a/test/test_one_boost_max/tau_z_[16][16].xg
+++ b/test/test_one_boost_max/tau_z_[16][16].xg
@@ -1,7 +1,7 @@
"Time = 0.0000000000e+00
--1.5000000000e+01 1.3148118668e-12
+-1.5000000000e+01 1.3384391219e-12
-1.4062468750e+01 1.3384391219e-12
-1.3124937500e+01 1.3658740323e-12
-1.2187406250e+01 1.3981106180e-12
@@ -33,4 +33,4 @@
1.2188406250e+01 1.3980732310e-12
1.3125937500e+01 1.3658424161e-12
1.4063468750e+01 1.3384120425e-12
-1.5001000000e+01 1.3147884171e-12
+1.5001000000e+01 1.3384120425e-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 6dcde83..d949733 100644
--- a/test/test_one_boost_max/test_one_boost_max.par
+++ b/test/test_one_boost_max/test_one_boost_max.par
@@ -1,4 +1,4 @@
-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"
+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_omni admconstraints Constants LocalReduce TmunuBase InitBase"
TmunuBase::stress_energy_storage = yes
TmunuBase::stress_energy_at_RHS = yes
@@ -24,17 +24,17 @@ 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
+hydrobase::evolution_method = "GRHydro"
+
+GRHydro::riemann_solver = "Marquina"
+GRHydro::GRHydro_eos_type = "Polytype"
+GRHydro::GRHydro_eos_table = "2D_Polytrope"
+GRHydro::recon_method = "ppm"
+GRHydro::GRHydro_stencil = 3
+GRHydro::bound = "none"
+GRHydro::tvd_limiter = "VanLeerMC2"
+GRHydro::rho_abs_min = 1.e-7
+GRHydro::initial_atmosphere_factor = 0.999
ADMBase::initial_data = "tov"
ADMBase::initial_lapse = "tov"
@@ -48,15 +48,12 @@ 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"
+IOBasic::outScalar_vars = "HydroBase::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel GRHydro::dens GRHydro::tau GRHydro::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::out1D_vars = "HydroBase::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel GRHydro::dens GRHydro::tau GRHydro::scon admbase::lapse admbase::metric admbase::curv admconstraints::ham admconstraints::momentum"
IOASCII::out_format = ".10e"
diff --git a/test/test_one_static_max/alp_3D_diagonal.xg b/test/test_one_static_max/alp_3D_diagonal.xg
index 6b7a1e1..f25b8a5 100644
--- a/test/test_one_static_max/alp_3D_diagonal.xg
+++ b/test/test_one_static_max/alp_3D_diagonal.xg
@@ -1,7 +1,7 @@
"Time = 0.0000000000e+00
--2.5980762114e+01 9.4752190622e-01
+-2.5980762114e+01 9.4412099317e-01
-2.4356910355e+01 9.4412099317e-01
-2.2733058596e+01 9.4024873237e-01
-2.1109206837e+01 9.3579983855e-01
@@ -33,4 +33,4 @@
2.1110938888e+01 9.3580493679e-01
2.2734790647e+01 9.4025314854e-01
2.4358642406e+01 9.4412485552e-01
-2.5982494164e+01 9.4752531274e-01
+2.5982494164e+01 9.4412485552e-01
diff --git a/test/test_one_static_max/alp_maximum.xg b/test/test_one_static_max/alp_maximum.xg
index 938a246..091c401 100644
--- a/test/test_one_static_max/alp_maximum.xg
+++ b/test/test_one_static_max/alp_maximum.xg
@@ -1,2 +1,2 @@
"alp v time
-0.0000000000000 0.9475253127427
+0.0000000000000 0.9441248555154
diff --git a/test/test_one_static_max/alp_norm1.xg b/test/test_one_static_max/alp_norm1.xg
index 3ddd597..a60e14e 100644
--- a/test/test_one_static_max/alp_norm1.xg
+++ b/test/test_one_static_max/alp_norm1.xg
@@ -1,2 +1,2 @@
"alp v time
-0.0000000000000 0.9005424762216
+0.0000000000000 0.9000237676123
diff --git a/test/test_one_static_max/alp_norm2.xg b/test/test_one_static_max/alp_norm2.xg
index c8423fb..7e95bd4 100644
--- a/test/test_one_static_max/alp_norm2.xg
+++ b/test/test_one_static_max/alp_norm2.xg
@@ -1,2 +1,2 @@
"alp v time
-0.0000000000000 0.9013715518013
+0.0000000000000 0.9008396016357
diff --git a/test/test_one_static_max/alp_x_[16][16].xg b/test/test_one_static_max/alp_x_[16][16].xg
index a28fce6..8709984 100644
--- a/test/test_one_static_max/alp_x_[16][16].xg
+++ b/test/test_one_static_max/alp_x_[16][16].xg
@@ -1,7 +1,7 @@
"Time = 0.0000000000e+00
--1.5000000000e+01 9.1081830549e-01
+-1.5000000000e+01 9.0515460695e-01
-1.4062468750e+01 9.0515460695e-01
-1.3124937500e+01 8.9872275103e-01
-1.2187406250e+01 8.9135509336e-01
@@ -33,4 +33,4 @@
1.2188406250e+01 8.9136352297e-01
1.3125937500e+01 8.9873007615e-01
1.4063468750e+01 9.0516103124e-01
-1.5001000000e+01 9.1082398546e-01
+1.5001000000e+01 9.0516103124e-01
diff --git a/test/test_one_static_max/alp_y_[16][16].xg b/test/test_one_static_max/alp_y_[16][16].xg
index a28fce6..8709984 100644
--- a/test/test_one_static_max/alp_y_[16][16].xg
+++ b/test/test_one_static_max/alp_y_[16][16].xg
@@ -1,7 +1,7 @@
"Time = 0.0000000000e+00
--1.5000000000e+01 9.1081830549e-01
+-1.5000000000e+01 9.0515460695e-01
-1.4062468750e+01 9.0515460695e-01
-1.3124937500e+01 8.9872275103e-01
-1.2187406250e+01 8.9135509336e-01
@@ -33,4 +33,4 @@
1.2188406250e+01 8.9136352297e-01
1.3125937500e+01 8.9873007615e-01
1.4063468750e+01 9.0516103124e-01
-1.5001000000e+01 9.1082398546e-01
+1.5001000000e+01 9.0516103124e-01
diff --git a/test/test_one_static_max/alp_z_[16][16].xg b/test/test_one_static_max/alp_z_[16][16].xg
index a28fce6..8709984 100644
--- a/test/test_one_static_max/alp_z_[16][16].xg
+++ b/test/test_one_static_max/alp_z_[16][16].xg
@@ -1,7 +1,7 @@
"Time = 0.0000000000e+00
--1.5000000000e+01 9.1081830549e-01
+-1.5000000000e+01 9.0515460695e-01
-1.4062468750e+01 9.0515460695e-01
-1.3124937500e+01 8.9872275103e-01
-1.2187406250e+01 8.9135509336e-01
@@ -33,4 +33,4 @@
1.2188406250e+01 8.9136352297e-01
1.3125937500e+01 8.9873007615e-01
1.4063468750e+01 9.0516103124e-01
-1.5001000000e+01 9.1082398546e-01
+1.5001000000e+01 9.0516103124e-01
diff --git a/test/test_one_static_max/dens_3D_diagonal.xg b/test/test_one_static_max/dens_3D_diagonal.xg
index 3dd5d8d..a13c2f9 100644
--- a/test/test_one_static_max/dens_3D_diagonal.xg
+++ b/test/test_one_static_max/dens_3D_diagonal.xg
@@ -1,7 +1,7 @@
"Time = 0.0000000000e+00
--2.5980762114e+01 1.1729671931e-07
+-2.5980762114e+01 1.1853326151e-07
-2.4356910355e+01 1.1853326151e-07
-2.2733058596e+01 1.1995974220e-07
-2.1109206837e+01 1.2162343869e-07
@@ -33,4 +33,4 @@
2.1110938888e+01 1.2162151682e-07
2.2734790647e+01 1.1995810398e-07
2.4358642406e+01 1.1853184859e-07
-2.5982494164e+01 1.1729548829e-07
+2.5982494164e+01 1.1853184859e-07
diff --git a/test/test_one_static_max/dens_minimum.xg b/test/test_one_static_max/dens_minimum.xg
index 262f5ce..78ab881 100644
--- a/test/test_one_static_max/dens_minimum.xg
+++ b/test/test_one_static_max/dens_minimum.xg
@@ -1,2 +1,2 @@
"dens v time
-0.0000000000000 0.0000001172955
+0.0000000000000 0.0000001185318
diff --git a/test/test_one_static_max/dens_norm1.xg b/test/test_one_static_max/dens_norm1.xg
index d372a99..461ede0 100644
--- a/test/test_one_static_max/dens_norm1.xg
+++ b/test/test_one_static_max/dens_norm1.xg
@@ -1,2 +1,2 @@
"dens v time
-0.0000000000000 0.0000509785489
+0.0000000000000 0.0000509787531
diff --git a/test/test_one_static_max/dens_norm2.xg b/test/test_one_static_max/dens_norm2.xg
index cb2b58b..250a310 100644
--- a/test/test_one_static_max/dens_norm2.xg
+++ b/test/test_one_static_max/dens_norm2.xg
@@ -1,2 +1,2 @@
"dens v time
-0.0000000000000 0.0002699839971
+0.0000000000000 0.0002699839972
diff --git a/test/test_one_static_max/dens_x_[16][16].xg b/test/test_one_static_max/dens_x_[16][16].xg
index 9bb8fee..e4560a6 100644
--- a/test/test_one_static_max/dens_x_[16][16].xg
+++ b/test/test_one_static_max/dens_x_[16][16].xg
@@ -1,7 +1,7 @@
"Time = 0.0000000000e+00
--1.5000000000e+01 1.3148118667e-07
+-1.5000000000e+01 1.3384391219e-07
-1.4062468750e+01 1.3384391219e-07
-1.3124937500e+01 1.3658740323e-07
-1.2187406250e+01 1.3981106180e-07
@@ -33,4 +33,4 @@
1.2188406250e+01 1.3980732310e-07
1.3125937500e+01 1.3658424161e-07
1.4063468750e+01 1.3384120424e-07
-1.5001000000e+01 1.3147884171e-07
+1.5001000000e+01 1.3384120424e-07
diff --git a/test/test_one_static_max/dens_y_[16][16].xg b/test/test_one_static_max/dens_y_[16][16].xg
index 9bb8fee..e4560a6 100644
--- a/test/test_one_static_max/dens_y_[16][16].xg
+++ b/test/test_one_static_max/dens_y_[16][16].xg
@@ -1,7 +1,7 @@
"Time = 0.0000000000e+00
--1.5000000000e+01 1.3148118667e-07
+-1.5000000000e+01 1.3384391219e-07
-1.4062468750e+01 1.3384391219e-07
-1.3124937500e+01 1.3658740323e-07
-1.2187406250e+01 1.3981106180e-07
@@ -33,4 +33,4 @@
1.2188406250e+01 1.3980732310e-07
1.3125937500e+01 1.3658424161e-07
1.4063468750e+01 1.3384120424e-07
-1.5001000000e+01 1.3147884171e-07
+1.5001000000e+01 1.3384120424e-07
diff --git a/test/test_one_static_max/dens_z_[16][16].xg b/test/test_one_static_max/dens_z_[16][16].xg
index 9bb8fee..e4560a6 100644
--- a/test/test_one_static_max/dens_z_[16][16].xg
+++ b/test/test_one_static_max/dens_z_[16][16].xg
@@ -1,7 +1,7 @@
"Time = 0.0000000000e+00
--1.5000000000e+01 1.3148118667e-07
+-1.5000000000e+01 1.3384391219e-07
-1.4062468750e+01 1.3384391219e-07
-1.3124937500e+01 1.3658740323e-07
-1.2187406250e+01 1.3981106180e-07
@@ -33,4 +33,4 @@
1.2188406250e+01 1.3980732310e-07
1.3125937500e+01 1.3658424161e-07
1.4063468750e+01 1.3384120424e-07
-1.5001000000e+01 1.3147884171e-07
+1.5001000000e+01 1.3384120424e-07
diff --git a/test/test_one_static_max/gxx_3D_diagonal.xg b/test/test_one_static_max/gxx_3D_diagonal.xg
index 77d110b..e630f31 100644
--- a/test/test_one_static_max/gxx_3D_diagonal.xg
+++ b/test/test_one_static_max/gxx_3D_diagonal.xg
@@ -1,7 +1,7 @@
"Time = 0.0000000000e+00
--2.5980762114e+01 1.1122196840e+00
+-2.5980762114e+01 1.1200226952e+00
-2.4356910355e+01 1.1200226952e+00
-2.2733058596e+01 1.1289906603e+00
-2.1109206837e+01 1.1394051693e+00
@@ -33,4 +33,4 @@
2.1110938888e+01 1.1393931661e+00
2.2734790647e+01 1.1289803816e+00
2.4358642406e+01 1.1200137948e+00
-2.5982494164e+01 1.1122119023e+00
+2.5982494164e+01 1.1200137948e+00
diff --git a/test/test_one_static_max/gxx_minimum.xg b/test/test_one_static_max/gxx_minimum.xg
index d352f79..59e00cf 100644
--- a/test/test_one_static_max/gxx_minimum.xg
+++ b/test/test_one_static_max/gxx_minimum.xg
@@ -1,2 +1,2 @@
"gxx v time
-0.0000000000000 1.1122119022998
+0.0000000000000 1.1200137947560
diff --git a/test/test_one_static_max/gxx_norm1.xg b/test/test_one_static_max/gxx_norm1.xg
index 62092bb..90c5b2d 100644
--- a/test/test_one_static_max/gxx_norm1.xg
+++ b/test/test_one_static_max/gxx_norm1.xg
@@ -1,2 +1,2 @@
"gxx v time
-0.0000000000000 1.2317730312624
+0.0000000000000 1.2330322888115
diff --git a/test/test_one_static_max/gxx_norm2.xg b/test/test_one_static_max/gxx_norm2.xg
index a545a37..e005d01 100644
--- a/test/test_one_static_max/gxx_norm2.xg
+++ b/test/test_one_static_max/gxx_norm2.xg
@@ -1,2 +1,2 @@
"gxx v time
-0.0000000000000 1.2369502262701
+0.0000000000000 1.2381389299857
diff --git a/test/test_one_static_max/gxx_x_[16][16].xg b/test/test_one_static_max/gxx_x_[16][16].xg
index d240db0..f7273be 100644
--- a/test/test_one_static_max/gxx_x_[16][16].xg
+++ b/test/test_one_static_max/gxx_x_[16][16].xg
@@ -1,7 +1,7 @@
"Time = 0.0000000000e+00
--1.5000000000e+01 1.2001690144e+00
+-1.5000000000e+01 1.2145043693e+00
-1.4062468750e+01 1.2145043693e+00
-1.3124937500e+01 1.2310445381e+00
-1.2187406250e+01 1.2503387456e+00
@@ -33,4 +33,4 @@
1.2188406250e+01 1.2503164552e+00
1.3125937500e+01 1.2310255412e+00
1.4063468750e+01 1.2144879879e+00
-1.5001000000e+01 1.2001547443e+00
+1.5001000000e+01 1.2144879879e+00
diff --git a/test/test_one_static_max/gxx_y_[16][16].xg b/test/test_one_static_max/gxx_y_[16][16].xg
index d240db0..f7273be 100644
--- a/test/test_one_static_max/gxx_y_[16][16].xg
+++ b/test/test_one_static_max/gxx_y_[16][16].xg
@@ -1,7 +1,7 @@
"Time = 0.0000000000e+00
--1.5000000000e+01 1.2001690144e+00
+-1.5000000000e+01 1.2145043693e+00
-1.4062468750e+01 1.2145043693e+00
-1.3124937500e+01 1.2310445381e+00
-1.2187406250e+01 1.2503387456e+00
@@ -33,4 +33,4 @@
1.2188406250e+01 1.2503164552e+00
1.3125937500e+01 1.2310255412e+00
1.4063468750e+01 1.2144879879e+00
-1.5001000000e+01 1.2001547443e+00
+1.5001000000e+01 1.2144879879e+00
diff --git a/test/test_one_static_max/gxx_z_[16][16].xg b/test/test_one_static_max/gxx_z_[16][16].xg
index d240db0..f7273be 100644
--- a/test/test_one_static_max/gxx_z_[16][16].xg
+++ b/test/test_one_static_max/gxx_z_[16][16].xg
@@ -1,7 +1,7 @@
"Time = 0.0000000000e+00
--1.5000000000e+01 1.2001690144e+00
+-1.5000000000e+01 1.2145043693e+00
-1.4062468750e+01 1.2145043693e+00
-1.3124937500e+01 1.2310445381e+00
-1.2187406250e+01 1.2503387456e+00
@@ -33,4 +33,4 @@
1.2188406250e+01 1.2503164552e+00
1.3125937500e+01 1.2310255412e+00
1.4063468750e+01 1.2144879879e+00
-1.5001000000e+01 1.2001547443e+00
+1.5001000000e+01 1.2144879879e+00
diff --git a/test/test_one_static_max/gyy_3D_diagonal.xg b/test/test_one_static_max/gyy_3D_diagonal.xg
index 77d110b..e630f31 100644
--- a/test/test_one_static_max/gyy_3D_diagonal.xg
+++ b/test/test_one_static_max/gyy_3D_diagonal.xg
@@ -1,7 +1,7 @@
"Time = 0.0000000000e+00
--2.5980762114e+01 1.1122196840e+00
+-2.5980762114e+01 1.1200226952e+00
-2.4356910355e+01 1.1200226952e+00
-2.2733058596e+01 1.1289906603e+00
-2.1109206837e+01 1.1394051693e+00
@@ -33,4 +33,4 @@
2.1110938888e+01 1.1393931661e+00
2.2734790647e+01 1.1289803816e+00
2.4358642406e+01 1.1200137948e+00
-2.5982494164e+01 1.1122119023e+00
+2.5982494164e+01 1.1200137948e+00
diff --git a/test/test_one_static_max/gyy_minimum.xg b/test/test_one_static_max/gyy_minimum.xg
index c9f44e7..e7b77ae 100644
--- a/test/test_one_static_max/gyy_minimum.xg
+++ b/test/test_one_static_max/gyy_minimum.xg
@@ -1,2 +1,2 @@
"gyy v time
-0.0000000000000 1.1122119022998
+0.0000000000000 1.1200137947560
diff --git a/test/test_one_static_max/gyy_norm1.xg b/test/test_one_static_max/gyy_norm1.xg
index 04d9d94..0ea9c46 100644
--- a/test/test_one_static_max/gyy_norm1.xg
+++ b/test/test_one_static_max/gyy_norm1.xg
@@ -1,2 +1,2 @@
"gyy v time
-0.0000000000000 1.2317730312624
+0.0000000000000 1.2330322888115
diff --git a/test/test_one_static_max/gyy_norm2.xg b/test/test_one_static_max/gyy_norm2.xg
index 881b767..7e7de69 100644
--- a/test/test_one_static_max/gyy_norm2.xg
+++ b/test/test_one_static_max/gyy_norm2.xg
@@ -1,2 +1,2 @@
"gyy v time
-0.0000000000000 1.2369502262701
+0.0000000000000 1.2381389299857
diff --git a/test/test_one_static_max/gyy_x_[16][16].xg b/test/test_one_static_max/gyy_x_[16][16].xg
index d240db0..f7273be 100644
--- a/test/test_one_static_max/gyy_x_[16][16].xg
+++ b/test/test_one_static_max/gyy_x_[16][16].xg
@@ -1,7 +1,7 @@
"Time = 0.0000000000e+00
--1.5000000000e+01 1.2001690144e+00
+-1.5000000000e+01 1.2145043693e+00
-1.4062468750e+01 1.2145043693e+00
-1.3124937500e+01 1.2310445381e+00
-1.2187406250e+01 1.2503387456e+00
@@ -33,4 +33,4 @@
1.2188406250e+01 1.2503164552e+00
1.3125937500e+01 1.2310255412e+00
1.4063468750e+01 1.2144879879e+00
-1.5001000000e+01 1.2001547443e+00
+1.5001000000e+01 1.2144879879e+00
diff --git a/test/test_one_static_max/gyy_y_[16][16].xg b/test/test_one_static_max/gyy_y_[16][16].xg
index d240db0..f7273be 100644
--- a/test/test_one_static_max/gyy_y_[16][16].xg
+++ b/test/test_one_static_max/gyy_y_[16][16].xg
@@ -1,7 +1,7 @@
"Time = 0.0000000000e+00
--1.5000000000e+01 1.2001690144e+00
+-1.5000000000e+01 1.2145043693e+00
-1.4062468750e+01 1.2145043693e+00
-1.3124937500e+01 1.2310445381e+00
-1.2187406250e+01 1.2503387456e+00
@@ -33,4 +33,4 @@
1.2188406250e+01 1.2503164552e+00
1.3125937500e+01 1.2310255412e+00
1.4063468750e+01 1.2144879879e+00
-1.5001000000e+01 1.2001547443e+00
+1.5001000000e+01 1.2144879879e+00
diff --git a/test/test_one_static_max/gyy_z_[16][16].xg b/test/test_one_static_max/gyy_z_[16][16].xg
index d240db0..f7273be 100644
--- a/test/test_one_static_max/gyy_z_[16][16].xg
+++ b/test/test_one_static_max/gyy_z_[16][16].xg
@@ -1,7 +1,7 @@
"Time = 0.0000000000e+00
--1.5000000000e+01 1.2001690144e+00
+-1.5000000000e+01 1.2145043693e+00
-1.4062468750e+01 1.2145043693e+00
-1.3124937500e+01 1.2310445381e+00
-1.2187406250e+01 1.2503387456e+00
@@ -33,4 +33,4 @@
1.2188406250e+01 1.2503164552e+00
1.3125937500e+01 1.2310255412e+00
1.4063468750e+01 1.2144879879e+00
-1.5001000000e+01 1.2001547443e+00
+1.5001000000e+01 1.2144879879e+00
diff --git a/test/test_one_static_max/gzz_3D_diagonal.xg b/test/test_one_static_max/gzz_3D_diagonal.xg
index 77d110b..e630f31 100644
--- a/test/test_one_static_max/gzz_3D_diagonal.xg
+++ b/test/test_one_static_max/gzz_3D_diagonal.xg
@@ -1,7 +1,7 @@
"Time = 0.0000000000e+00
--2.5980762114e+01 1.1122196840e+00
+-2.5980762114e+01 1.1200226952e+00
-2.4356910355e+01 1.1200226952e+00
-2.2733058596e+01 1.1289906603e+00
-2.1109206837e+01 1.1394051693e+00
@@ -33,4 +33,4 @@
2.1110938888e+01 1.1393931661e+00
2.2734790647e+01 1.1289803816e+00
2.4358642406e+01 1.1200137948e+00
-2.5982494164e+01 1.1122119023e+00
+2.5982494164e+01 1.1200137948e+00
diff --git a/test/test_one_static_max/gzz_minimum.xg b/test/test_one_static_max/gzz_minimum.xg
index d75e3bf..9f630aa 100644
--- a/test/test_one_static_max/gzz_minimum.xg
+++ b/test/test_one_static_max/gzz_minimum.xg
@@ -1,2 +1,2 @@
"gzz v time
-0.0000000000000 1.1122119022998
+0.0000000000000 1.1200137947560
diff --git a/test/test_one_static_max/gzz_norm1.xg b/test/test_one_static_max/gzz_norm1.xg
index 654b55f..89a64df 100644
--- a/test/test_one_static_max/gzz_norm1.xg
+++ b/test/test_one_static_max/gzz_norm1.xg
@@ -1,2 +1,2 @@
"gzz v time
-0.0000000000000 1.2317730312624
+0.0000000000000 1.2330322888115
diff --git a/test/test_one_static_max/gzz_norm2.xg b/test/test_one_static_max/gzz_norm2.xg
index 7554017..a3226eb 100644
--- a/test/test_one_static_max/gzz_norm2.xg
+++ b/test/test_one_static_max/gzz_norm2.xg
@@ -1,2 +1,2 @@
"gzz v time
-0.0000000000000 1.2369502262701
+0.0000000000000 1.2381389299857
diff --git a/test/test_one_static_max/gzz_x_[16][16].xg b/test/test_one_static_max/gzz_x_[16][16].xg
index d240db0..f7273be 100644
--- a/test/test_one_static_max/gzz_x_[16][16].xg
+++ b/test/test_one_static_max/gzz_x_[16][16].xg
@@ -1,7 +1,7 @@
"Time = 0.0000000000e+00
--1.5000000000e+01 1.2001690144e+00
+-1.5000000000e+01 1.2145043693e+00
-1.4062468750e+01 1.2145043693e+00
-1.3124937500e+01 1.2310445381e+00
-1.2187406250e+01 1.2503387456e+00
@@ -33,4 +33,4 @@
1.2188406250e+01 1.2503164552e+00
1.3125937500e+01 1.2310255412e+00
1.4063468750e+01 1.2144879879e+00
-1.5001000000e+01 1.2001547443e+00
+1.5001000000e+01 1.2144879879e+00
diff --git a/test/test_one_static_max/gzz_y_[16][16].xg b/test/test_one_static_max/gzz_y_[16][16].xg
index d240db0..f7273be 100644
--- a/test/test_one_static_max/gzz_y_[16][16].xg
+++ b/test/test_one_static_max/gzz_y_[16][16].xg
@@ -1,7 +1,7 @@
"Time = 0.0000000000e+00
--1.5000000000e+01 1.2001690144e+00
+-1.5000000000e+01 1.2145043693e+00
-1.4062468750e+01 1.2145043693e+00
-1.3124937500e+01 1.2310445381e+00
-1.2187406250e+01 1.2503387456e+00
@@ -33,4 +33,4 @@
1.2188406250e+01 1.2503164552e+00
1.3125937500e+01 1.2310255412e+00
1.4063468750e+01 1.2144879879e+00
-1.5001000000e+01 1.2001547443e+00
+1.5001000000e+01 1.2144879879e+00
diff --git a/test/test_one_static_max/gzz_z_[16][16].xg b/test/test_one_static_max/gzz_z_[16][16].xg
index d240db0..f7273be 100644
--- a/test/test_one_static_max/gzz_z_[16][16].xg
+++ b/test/test_one_static_max/gzz_z_[16][16].xg
@@ -1,7 +1,7 @@
"Time = 0.0000000000e+00
--1.5000000000e+01 1.2001690144e+00
+-1.5000000000e+01 1.2145043693e+00
-1.4062468750e+01 1.2145043693e+00
-1.3124937500e+01 1.2310445381e+00
-1.2187406250e+01 1.2503387456e+00
@@ -33,4 +33,4 @@
1.2188406250e+01 1.2503164552e+00
1.3125937500e+01 1.2310255412e+00
1.4063468750e+01 1.2144879879e+00
-1.5001000000e+01 1.2001547443e+00
+1.5001000000e+01 1.2144879879e+00
diff --git a/test/test_one_static_max/ham_3D_diagonal.xg b/test/test_one_static_max/ham_3D_diagonal.xg
index 2158eae..7158604 100644
--- a/test/test_one_static_max/ham_3D_diagonal.xg
+++ b/test/test_one_static_max/ham_3D_diagonal.xg
@@ -2,7 +2,7 @@
"Time = 0.0000000000e+00
-2.5980762114e+01 0.0000000000e+00
--2.4356910355e+01 -3.8646695839e-06
+-2.4356910355e+01 -1.5133331942e-02
-2.2733058596e+01 -3.4024767522e-06
-2.1109206837e+01 -2.7012002566e-06
-1.9485355079e+01 -1.6034050594e-06
@@ -32,5 +32,5 @@
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.4358642406e+01 -1.5131332109e-02
2.5982494164e+01 0.0000000000e+00
diff --git a/test/test_one_static_max/ham_minimum.xg b/test/test_one_static_max/ham_minimum.xg
index 8d9d069..6f56a05 100644
--- a/test/test_one_static_max/ham_minimum.xg
+++ b/test/test_one_static_max/ham_minimum.xg
@@ -1,2 +1,2 @@
"ham v time
-0.0000000000000 -0.0014208417833
+0.0000000000000 -0.0223068867342
diff --git a/test/test_one_static_max/ham_norm1.xg b/test/test_one_static_max/ham_norm1.xg
index e7164b4..bef18b7 100644
--- a/test/test_one_static_max/ham_norm1.xg
+++ b/test/test_one_static_max/ham_norm1.xg
@@ -1,2 +1,2 @@
"ham v time
-0.0000000000000 0.0000260910737
+0.0000000000000 0.0019748477207
diff --git a/test/test_one_static_max/ham_norm2.xg b/test/test_one_static_max/ham_norm2.xg
index 5b26d1d..4dc895c 100644
--- a/test/test_one_static_max/ham_norm2.xg
+++ b/test/test_one_static_max/ham_norm2.xg
@@ -1,2 +1,2 @@
"ham v time
-0.0000000000000 0.0000862273844
+0.0000000000000 0.0052730107244
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 38e78d3..f0e76e5 100644
--- a/test/test_one_static_max/ham_x_[16][16].xg
+++ b/test/test_one_static_max/ham_x_[16][16].xg
@@ -2,7 +2,7 @@
"Time = 0.0000000000e+00
-1.5000000000e+01 0.0000000000e+00
--1.4062468750e+01 -3.0931812092e-05
+-1.4062468750e+01 -2.2306886734e-02
-1.3124937500e+01 -4.1098919458e-05
-1.2187406250e+01 -5.6445568417e-05
-1.1249875000e+01 -8.0323199897e-05
@@ -32,5 +32,5 @@
1.1250875000e+01 -8.0291382228e-05
1.2188406250e+01 -5.6425428124e-05
1.3125937500e+01 -4.1085753715e-05
-1.4063468750e+01 -3.0922960643e-05
+1.4063468750e+01 -2.2304175029e-02
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 38e78d3..f0e76e5 100644
--- a/test/test_one_static_max/ham_y_[16][16].xg
+++ b/test/test_one_static_max/ham_y_[16][16].xg
@@ -2,7 +2,7 @@
"Time = 0.0000000000e+00
-1.5000000000e+01 0.0000000000e+00
--1.4062468750e+01 -3.0931812092e-05
+-1.4062468750e+01 -2.2306886734e-02
-1.3124937500e+01 -4.1098919458e-05
-1.2187406250e+01 -5.6445568417e-05
-1.1249875000e+01 -8.0323199897e-05
@@ -32,5 +32,5 @@
1.1250875000e+01 -8.0291382228e-05
1.2188406250e+01 -5.6425428124e-05
1.3125937500e+01 -4.1085753715e-05
-1.4063468750e+01 -3.0922960643e-05
+1.4063468750e+01 -2.2304175029e-02
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 493d11f..c748402 100644
--- a/test/test_one_static_max/ham_z_[16][16].xg
+++ b/test/test_one_static_max/ham_z_[16][16].xg
@@ -2,7 +2,7 @@
"Time = 0.0000000000e+00
-1.5000000000e+01 0.0000000000e+00
--1.4062468750e+01 -3.0931812092e-05
+-1.4062468750e+01 -2.2306886734e-02
-1.3124937500e+01 -4.1098919458e-05
-1.2187406250e+01 -5.6445568417e-05
-1.1249875000e+01 -8.0323199897e-05
@@ -32,5 +32,5 @@
1.1250875000e+01 -8.0291382228e-05
1.2188406250e+01 -5.6425428124e-05
1.3125937500e+01 -4.1085753715e-05
-1.4063468750e+01 -3.0922960643e-05
+1.4063468750e+01 -2.2304175029e-02
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 49531ce..112133d 100644
--- a/test/test_one_static_max/tau_3D_diagonal.xg
+++ b/test/test_one_static_max/tau_3D_diagonal.xg
@@ -1,7 +1,7 @@
"Time = 0.0000000000e+00
--2.5980762114e+01 1.1729671931e-12
+-2.5980762114e+01 1.1853326151e-12
-2.4356910355e+01 1.1853326151e-12
-2.2733058596e+01 1.1995974220e-12
-2.1109206837e+01 1.2162343870e-12
@@ -33,4 +33,4 @@
2.1110938888e+01 1.2162151682e-12
2.2734790647e+01 1.1995810398e-12
2.4358642406e+01 1.1853184859e-12
-2.5982494164e+01 1.1729548829e-12
+2.5982494164e+01 1.1853184859e-12
diff --git a/test/test_one_static_max/tau_x_[16][16].xg b/test/test_one_static_max/tau_x_[16][16].xg
index a898cf8..3df894c 100644
--- a/test/test_one_static_max/tau_x_[16][16].xg
+++ b/test/test_one_static_max/tau_x_[16][16].xg
@@ -1,7 +1,7 @@
"Time = 0.0000000000e+00
--1.5000000000e+01 1.3148118668e-12
+-1.5000000000e+01 1.3384391219e-12
-1.4062468750e+01 1.3384391219e-12
-1.3124937500e+01 1.3658740323e-12
-1.2187406250e+01 1.3981106180e-12
@@ -33,4 +33,4 @@
1.2188406250e+01 1.3980732310e-12
1.3125937500e+01 1.3658424161e-12
1.4063468750e+01 1.3384120425e-12
-1.5001000000e+01 1.3147884171e-12
+1.5001000000e+01 1.3384120425e-12
diff --git a/test/test_one_static_max/tau_y_[16][16].xg b/test/test_one_static_max/tau_y_[16][16].xg
index a898cf8..3df894c 100644
--- a/test/test_one_static_max/tau_y_[16][16].xg
+++ b/test/test_one_static_max/tau_y_[16][16].xg
@@ -1,7 +1,7 @@
"Time = 0.0000000000e+00
--1.5000000000e+01 1.3148118668e-12
+-1.5000000000e+01 1.3384391219e-12
-1.4062468750e+01 1.3384391219e-12
-1.3124937500e+01 1.3658740323e-12
-1.2187406250e+01 1.3981106180e-12
@@ -33,4 +33,4 @@
1.2188406250e+01 1.3980732310e-12
1.3125937500e+01 1.3658424161e-12
1.4063468750e+01 1.3384120425e-12
-1.5001000000e+01 1.3147884171e-12
+1.5001000000e+01 1.3384120425e-12
diff --git a/test/test_one_static_max/tau_z_[16][16].xg b/test/test_one_static_max/tau_z_[16][16].xg
index a898cf8..3df894c 100644
--- a/test/test_one_static_max/tau_z_[16][16].xg
+++ b/test/test_one_static_max/tau_z_[16][16].xg
@@ -1,7 +1,7 @@
"Time = 0.0000000000e+00
--1.5000000000e+01 1.3148118668e-12
+-1.5000000000e+01 1.3384391219e-12
-1.4062468750e+01 1.3384391219e-12
-1.3124937500e+01 1.3658740323e-12
-1.2187406250e+01 1.3981106180e-12
@@ -33,4 +33,4 @@
1.2188406250e+01 1.3980732310e-12
1.3125937500e+01 1.3658424161e-12
1.4063468750e+01 1.3384120425e-12
-1.5001000000e+01 1.3147884171e-12
+1.5001000000e+01 1.3384120425e-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 71f54d0..c65b2e7 100644
--- a/test/test_one_static_max/test_one_static_max.par
+++ b/test/test_one_static_max/test_one_static_max.par
@@ -1,4 +1,4 @@
-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"
+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_omni admconstraints Constants LocalReduce TmunuBase InitBase"
TmunuBase::stress_energy_storage = yes
TmunuBase::stress_energy_at_RHS = yes
@@ -24,17 +24,17 @@ 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
+hydrobase::evolution_method = "GRHydro"
+
+GRHydro::riemann_solver = "Marquina"
+GRHydro::GRHydro_eos_type = "Polytype"
+GRHydro::GRHydro_eos_table = "2D_Polytrope"
+GRHydro::recon_method = "ppm"
+GRHydro::GRHydro_stencil = 3
+GRHydro::bound = "none"
+GRHydro::tvd_limiter = "VanLeerMC2"
+GRHydro::rho_abs_min = 1.e-7
+GRHydro::initial_atmosphere_factor = 0.999
ADMBase::initial_data = "tov"
ADMBase::initial_lapse = "tov"
@@ -45,16 +45,12 @@ 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"
+IOBasic::outScalar_vars = "HydroBase::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel GRHydro::dens GRHydro::tau GRHydro::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::out1D_vars = "HydroBase::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel GRHydro::dens GRHydro::tau GRHydro::scon admbase::lapse admbase::metric admbase::curv admconstraints::ham admconstraints::momentum"
IOASCII::out_format = ".10e"
diff --git a/test/test_tov_carpet/alp.maximum.asc b/test/test_tov_carpet/alp.maximum.asc
index cbaca65..839fb28 100644
--- a/test/test_tov_carpet/alp.maximum.asc
+++ b/test/test_tov_carpet/alp.maximum.asc
@@ -1,3 +1,3 @@
# Scalar ASCII output created by CarpetIOScalar
#
-0 0 0.947525312742723
+0 0 0.944124855515427
diff --git a/test/test_tov_carpet/alp.norm1.asc b/test/test_tov_carpet/alp.norm1.asc
index 3e6a7da..036793d 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.897789521466978
+0 0 0.897514966484161
diff --git a/test/test_tov_carpet/alp.norm2.asc b/test/test_tov_carpet/alp.norm2.asc
index a3e6cce..652e851 100644
--- a/test/test_tov_carpet/alp.norm2.asc
+++ b/test/test_tov_carpet/alp.norm2.asc
@@ -1,3 +1,3 @@
# Scalar ASCII output created by CarpetIOScalar
#
-0 0 0.898649483588955
+0 0 0.898367259603676
diff --git a/test/test_tov_carpet/dens.minimum.asc b/test/test_tov_carpet/dens.minimum.asc
index 063197f..a9e5597 100644
--- a/test/test_tov_carpet/dens.minimum.asc
+++ b/test/test_tov_carpet/dens.minimum.asc
@@ -1,3 +1,3 @@
# Scalar ASCII output created by CarpetIOScalar
#
-0 0 1.17295488291616e-07
+0 0 1.18531848592068e-07
diff --git a/test/test_tov_carpet/dens.norm1.asc b/test/test_tov_carpet/dens.norm1.asc
index 2b926ef..db96c2e 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.58966766385468e-05
+0 0 5.58967848891797e-05
diff --git a/test/test_tov_carpet/dens.norm2.asc b/test/test_tov_carpet/dens.norm2.asc
index b6f7ccf..121ba1c 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.00028273785644169
+0 0 0.000282737856490128
diff --git a/test/test_tov_carpet/eps.norm1.asc b/test/test_tov_carpet/eps.norm1.asc
index e67a512..daec44e 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.00257250301402483
+0 0 0.00257250301402448
diff --git a/test/test_tov_carpet/gxx.minimum.asc b/test/test_tov_carpet/gxx.minimum.asc
index 07d2e7c..52749b6 100644
--- a/test/test_tov_carpet/gxx.minimum.asc
+++ b/test/test_tov_carpet/gxx.minimum.asc
@@ -1,3 +1,3 @@
# Scalar ASCII output created by CarpetIOScalar
#
-0 0 1.11221190229983
+0 0 1.12001379475603
diff --git a/test/test_tov_carpet/gxx.norm1.asc b/test/test_tov_carpet/gxx.norm1.asc
index b19bc9a..9f5ac97 100644
--- a/test/test_tov_carpet/gxx.norm1.asc
+++ b/test/test_tov_carpet/gxx.norm1.asc
@@ -1,3 +1,3 @@
# Scalar ASCII output created by CarpetIOScalar
#
-0 0 1.23912233616806
+0 0 1.23978972698723
diff --git a/test/test_tov_carpet/gxx.norm2.asc b/test/test_tov_carpet/gxx.norm2.asc
index 6741578..0d34a94 100644
--- a/test/test_tov_carpet/gxx.norm2.asc
+++ b/test/test_tov_carpet/gxx.norm2.asc
@@ -1,3 +1,3 @@
# Scalar ASCII output created by CarpetIOScalar
#
-0 0 1.24450189905863
+0 0 1.24512884985656
diff --git a/test/test_tov_carpet/gyy.minimum.asc b/test/test_tov_carpet/gyy.minimum.asc
index 07d2e7c..52749b6 100644
--- a/test/test_tov_carpet/gyy.minimum.asc
+++ b/test/test_tov_carpet/gyy.minimum.asc
@@ -1,3 +1,3 @@
# Scalar ASCII output created by CarpetIOScalar
#
-0 0 1.11221190229983
+0 0 1.12001379475603
diff --git a/test/test_tov_carpet/gyy.norm1.asc b/test/test_tov_carpet/gyy.norm1.asc
index b19bc9a..9f5ac97 100644
--- a/test/test_tov_carpet/gyy.norm1.asc
+++ b/test/test_tov_carpet/gyy.norm1.asc
@@ -1,3 +1,3 @@
# Scalar ASCII output created by CarpetIOScalar
#
-0 0 1.23912233616806
+0 0 1.23978972698723
diff --git a/test/test_tov_carpet/gyy.norm2.asc b/test/test_tov_carpet/gyy.norm2.asc
index 6741578..0d34a94 100644
--- a/test/test_tov_carpet/gyy.norm2.asc
+++ b/test/test_tov_carpet/gyy.norm2.asc
@@ -1,3 +1,3 @@
# Scalar ASCII output created by CarpetIOScalar
#
-0 0 1.24450189905863
+0 0 1.24512884985656
diff --git a/test/test_tov_carpet/gzz.minimum.asc b/test/test_tov_carpet/gzz.minimum.asc
index 07d2e7c..52749b6 100644
--- a/test/test_tov_carpet/gzz.minimum.asc
+++ b/test/test_tov_carpet/gzz.minimum.asc
@@ -1,3 +1,3 @@
# Scalar ASCII output created by CarpetIOScalar
#
-0 0 1.11221190229983
+0 0 1.12001379475603
diff --git a/test/test_tov_carpet/gzz.norm1.asc b/test/test_tov_carpet/gzz.norm1.asc
index b19bc9a..9f5ac97 100644
--- a/test/test_tov_carpet/gzz.norm1.asc
+++ b/test/test_tov_carpet/gzz.norm1.asc
@@ -1,3 +1,3 @@
# Scalar ASCII output created by CarpetIOScalar
#
-0 0 1.23912233616806
+0 0 1.23978972698723
diff --git a/test/test_tov_carpet/gzz.norm2.asc b/test/test_tov_carpet/gzz.norm2.asc
index 6741578..0d34a94 100644
--- a/test/test_tov_carpet/gzz.norm2.asc
+++ b/test/test_tov_carpet/gzz.norm2.asc
@@ -1,3 +1,3 @@
# Scalar ASCII output created by CarpetIOScalar
#
-0 0 1.24450189905863
+0 0 1.24512884985656
diff --git a/test/test_tov_carpet/ham.minimum.asc b/test/test_tov_carpet/ham.minimum.asc
index 7507f09..d2384be 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.00142084178325581
+0 0 -0.0223068867342402
diff --git a/test/test_tov_carpet/ham.norm1.asc b/test/test_tov_carpet/ham.norm1.asc
index 0a31e30..1b335ff 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.8614346803879e-05
+0 0 0.00216583564878223
diff --git a/test/test_tov_carpet/ham.norm2.asc b/test/test_tov_carpet/ham.norm2.asc
index c4d7554..cd46471 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.03007078721496e-05
+0 0 0.00552210419490693
diff --git a/test/test_tov_carpet/press.norm1.asc b/test/test_tov_carpet/press.norm1.asc
index f02ad2d..8de9b43 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.43703682817052e-06
+0 0 1.43703682817033e-06
diff --git a/test/test_tov_carpet/rho.norm1.asc b/test/test_tov_carpet/rho.norm1.asc
index 1ad475d..cd3978d 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.57250301402153e-05
+0 0 2.57250301402329e-05
diff --git a/test/test_tov_carpet/rho.norm2.asc b/test/test_tov_carpet/rho.norm2.asc
index 9ee90dd..e1e5cfd 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.000119876470926116
+0 0 0.000119876470926152
diff --git a/test/test_tov_carpet/tau.minimum.asc b/test/test_tov_carpet/tau.minimum.asc
index a546177..159350a 100644
--- a/test/test_tov_carpet/tau.minimum.asc
+++ b/test/test_tov_carpet/tau.minimum.asc
@@ -1,3 +1,3 @@
# Scalar ASCII output created by CarpetIOScalar
#
-0 0 1.1729548829423e-12
+0 0 1.18531848593389e-12
diff --git a/test/test_tov_carpet/tau.norm1.asc b/test/test_tov_carpet/tau.norm1.asc
index bb2dfd5..d80837f 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.36492968891854e-06
+0 0 3.36492969000106e-06
diff --git a/test/test_tov_carpet/test_tov_carpet.par b/test/test_tov_carpet/test_tov_carpet.par
index 1f729c9..ab4c26e 100644
--- a/test/test_tov_carpet/test_tov_carpet.par
+++ b/test/test_tov_carpet/test_tov_carpet.par
@@ -1,5 +1,5 @@
!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"
+ActiveThorns = "time MoL coordbase symbase cartgrid3d ioutil boundary admbase staticconformal spacemask admcoupling coordgauge admmacros hydrobase grhydro grhydro_initdata tovsolver eos_omni admconstraints Constants LocalReduce Carpet CarpetLib CarpetInterp CarpetReduce CarpetIOScalar CarpetIOBasic LoopControl TmunuBase InitBase"
TmunuBase::stress_energy_storage = yes
TmunuBase::stress_energy_at_RHS = yes
@@ -35,17 +35,17 @@ 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
+hydrobase::evolution_method = "GRHydro"
+
+GRHydro::riemann_solver = "Marquina"
+GRHydro::GRHydro_eos_type = "Polytype"
+GRHydro::GRHydro_eos_table = "2D_Polytrope"
+GRHydro::recon_method = "ppm"
+GRHydro::GRHydro_stencil = 3
+GRHydro::bound = "none"
+GRHydro::tvd_limiter = "VanLeerMC2"
+GRHydro::rho_abs_min = 1.e-7
+GRHydro::initial_atmosphere_factor = 0.999
ADMBase::initial_data = "tov"
ADMBase::initial_lapse = "tov"
@@ -56,9 +56,6 @@ 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
@@ -66,5 +63,5 @@ 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_vars = "hydrobase::rho hydrobase::press hydrobase::eps hydrobase::vel GRHydro::dens GRHydro::tau GRHydro::scon admbase::lapse admbase::metric admbase::curv admconstraints::ham admconstraints::momentum HydroBase::w_lorentz"
IOScalar::outScalar_reductions = "minimum maximum norm1 norm2"
diff --git a/test/test_two_av/alp_3D_diagonal.xg b/test/test_two_av/alp_3D_diagonal.xg
index d25ebf4..5653fef 100644
--- a/test/test_two_av/alp_3D_diagonal.xg
+++ b/test/test_two_av/alp_3D_diagonal.xg
@@ -1,7 +1,7 @@
"Time = 0.0000000000e+00
--5.1961524227e+01 9.8222002833e-01
+-5.1961524227e+01 9.8111026468e-01
-4.8713874836e+01 9.8111026468e-01
-4.5466225446e+01 9.7985498519e-01
-4.2218576055e+01 9.7842464150e-01
@@ -33,4 +33,4 @@
4.2220308106e+01 9.7605778514e-01
4.5467957496e+01 9.7778429586e-01
4.8715606887e+01 9.7928521821e-01
-5.1963256278e+01 9.8060053740e-01
+5.1963256278e+01 9.7928521821e-01
diff --git a/test/test_two_av/alp_maximum.xg b/test/test_two_av/alp_maximum.xg
index 5df9977..640b2e1 100644
--- a/test/test_two_av/alp_maximum.xg
+++ b/test/test_two_av/alp_maximum.xg
@@ -1,2 +1,2 @@
"alp v time
-0.0000000000000 0.9822204120003
+0.0000000000000 0.9811107002508
diff --git a/test/test_two_av/alp_norm1.xg b/test/test_two_av/alp_norm1.xg
index 40c048e..c0ca3f1 100644
--- a/test/test_two_av/alp_norm1.xg
+++ b/test/test_two_av/alp_norm1.xg
@@ -1,2 +1,2 @@
"alp v time
-0.0000000000000 0.9654916404697
+0.0000000000000 0.9653017950686
diff --git a/test/test_two_av/alp_norm2.xg b/test/test_two_av/alp_norm2.xg
index 5f321f7..e6116f3 100644
--- a/test/test_two_av/alp_norm2.xg
+++ b/test/test_two_av/alp_norm2.xg
@@ -1,2 +1,2 @@
"alp v time
-0.0000000000000 0.9655740597655
+0.0000000000000 0.9653830328786
diff --git a/test/test_two_av/alp_x_[16][16].xg b/test/test_two_av/alp_x_[16][16].xg
index f60d29a..1a22dde 100644
--- a/test/test_two_av/alp_x_[16][16].xg
+++ b/test/test_two_av/alp_x_[16][16].xg
@@ -1,7 +1,7 @@
"Time = 0.0000000000e+00
--3.0000000000e+01 9.6330133906e-01
+-3.0000000000e+01 9.5949308955e-01
-2.8124968750e+01 9.5949308955e-01
-2.6249937500e+01 9.5458024321e-01
-2.4374906250e+01 9.4833157563e-01
@@ -33,4 +33,4 @@
2.4375906250e+01 9.2738383105e-01
2.6250937500e+01 9.3789115700e-01
2.8125968750e+01 9.4572122214e-01
-3.0001000000e+01 9.5169470249e-01
+3.0001000000e+01 9.4572122214e-01
diff --git a/test/test_two_av/alp_y_[16][16].xg b/test/test_two_av/alp_y_[16][16].xg
index 0c06c39..5e9d668 100644
--- a/test/test_two_av/alp_y_[16][16].xg
+++ b/test/test_two_av/alp_y_[16][16].xg
@@ -1,7 +1,7 @@
"Time = 0.0000000000e+00
--3.0000000000e+01 9.7127431043e-01
+-3.0000000000e+01 9.6979569590e-01
-2.8124968750e+01 9.6979569590e-01
-2.6249937500e+01 9.6818198896e-01
-2.4374906250e+01 9.6641927063e-01
@@ -33,4 +33,4 @@
2.4375906250e+01 9.6642025295e-01
2.6250937500e+01 9.6818288805e-01
2.8125968750e+01 9.6979651928e-01
-3.0001000000e+01 9.7127506536e-01
+3.0001000000e+01 9.6979651928e-01
diff --git a/test/test_two_av/alp_z_[16][16].xg b/test/test_two_av/alp_z_[16][16].xg
index 0c06c39..5e9d668 100644
--- a/test/test_two_av/alp_z_[16][16].xg
+++ b/test/test_two_av/alp_z_[16][16].xg
@@ -1,7 +1,7 @@
"Time = 0.0000000000e+00
--3.0000000000e+01 9.7127431043e-01
+-3.0000000000e+01 9.6979569590e-01
-2.8124968750e+01 9.6979569590e-01
-2.6249937500e+01 9.6818198896e-01
-2.4374906250e+01 9.6641927063e-01
@@ -33,4 +33,4 @@
2.4375906250e+01 9.6642025295e-01
2.6250937500e+01 9.6818288805e-01
2.8125968750e+01 9.6979651928e-01
-3.0001000000e+01 9.7127506536e-01
+3.0001000000e+01 9.6979651928e-01
diff --git a/test/test_two_av/dens_3D_diagonal.xg b/test/test_two_av/dens_3D_diagonal.xg
index 43c48ce..1ce1d94 100644
--- a/test/test_two_av/dens_3D_diagonal.xg
+++ b/test/test_two_av/dens_3D_diagonal.xg
@@ -1,7 +1,7 @@
"Time = 0.0000000000e+00
--5.1961524227e+01 1.0546749454e-07
+-5.1961524227e+01 1.0581769509e-07
-4.8713874836e+01 1.0581769509e-07
-4.5466225446e+01 1.0621510511e-07
-4.2218576055e+01 1.0666961673e-07
@@ -33,4 +33,4 @@
4.2220308106e+01 1.0743873185e-07
4.5467957496e+01 1.0688425071e-07
4.8715606887e+01 1.0640460733e-07
-5.1963256278e+01 1.0598608572e-07
+5.1963256278e+01 1.0640460733e-07
diff --git a/test/test_two_av/dens_minimum.xg b/test/test_two_av/dens_minimum.xg
index 025a784..f2e3720 100644
--- a/test/test_two_av/dens_minimum.xg
+++ b/test/test_two_av/dens_minimum.xg
@@ -1,2 +1,2 @@
"dens v time
-0.0000000000000 0.0000001054674
+0.0000000000000 0.0000001058176
diff --git a/test/test_two_av/dens_norm1.xg b/test/test_two_av/dens_norm1.xg
index eaa8f0f..887d5a7 100644
--- a/test/test_two_av/dens_norm1.xg
+++ b/test/test_two_av/dens_norm1.xg
@@ -1,2 +1,2 @@
"dens v time
-0.0000000000000 0.0000044991884
+0.0000000000000 0.0000044992504
diff --git a/test/test_two_av/dens_norm2.xg b/test/test_two_av/dens_norm2.xg
index f936a8d..37112bf 100644
--- a/test/test_two_av/dens_norm2.xg
+++ b/test/test_two_av/dens_norm2.xg
@@ -1,2 +1,2 @@
"dens v time
-0.0000000000000 0.0000274983523
+0.0000000000000 0.0000274983526
diff --git a/test/test_two_av/dens_x_[16][16].xg b/test/test_two_av/dens_x_[16][16].xg
index 432ac82..3f995fb 100644
--- a/test/test_two_av/dens_x_[16][16].xg
+++ b/test/test_two_av/dens_x_[16][16].xg
@@ -1,7 +1,7 @@
"Time = 0.0000000000e+00
--3.0000000000e+01 1.1159849547e-07
+-3.0000000000e+01 1.1287734457e-07
-2.8124968750e+01 1.1287734457e-07
-2.6249937500e+01 6.2223362030e-06
-2.4374906250e+01 4.0592641553e-05
@@ -33,4 +33,4 @@
2.4375906250e+01 5.7248638962e-05
2.6250937500e+01 1.2060588939e-07
2.8125968750e+01 1.1776120498e-07
-3.0001000000e+01 1.1564336032e-07
+3.0001000000e+01 1.1776120498e-07
diff --git a/test/test_two_av/dens_y_[16][16].xg b/test/test_two_av/dens_y_[16][16].xg
index c8d90aa..b539fc7 100644
--- a/test/test_two_av/dens_y_[16][16].xg
+++ b/test/test_two_av/dens_y_[16][16].xg
@@ -1,7 +1,7 @@
"Time = 0.0000000000e+00
--3.0000000000e+01 1.0897649267e-07
+-3.0000000000e+01 1.0945862009e-07
-2.8124968750e+01 1.0945862009e-07
-2.6249937500e+01 1.0998711960e-07
-2.4374906250e+01 1.1056720688e-07
@@ -33,4 +33,4 @@
2.4375906250e+01 1.1056688280e-07
2.6250937500e+01 1.0998682446e-07
2.8125968750e+01 1.0945835105e-07
-3.0001000000e+01 1.0897624703e-07
+3.0001000000e+01 1.0945835105e-07
diff --git a/test/test_two_av/dens_z_[16][16].xg b/test/test_two_av/dens_z_[16][16].xg
index c8d90aa..b539fc7 100644
--- a/test/test_two_av/dens_z_[16][16].xg
+++ b/test/test_two_av/dens_z_[16][16].xg
@@ -1,7 +1,7 @@
"Time = 0.0000000000e+00
--3.0000000000e+01 1.0897649267e-07
+-3.0000000000e+01 1.0945862009e-07
-2.8124968750e+01 1.0945862009e-07
-2.6249937500e+01 1.0998711960e-07
-2.4374906250e+01 1.1056720688e-07
@@ -33,4 +33,4 @@
2.4375906250e+01 1.1056688280e-07
2.6250937500e+01 1.0998682446e-07
2.8125968750e+01 1.0945835105e-07
-3.0001000000e+01 1.0897624703e-07
+3.0001000000e+01 1.0945835105e-07
diff --git a/test/test_two_av/gxx_3D_diagonal.xg b/test/test_two_av/gxx_3D_diagonal.xg
index 389c018..3d92e4f 100644
--- a/test/test_two_av/gxx_3D_diagonal.xg
+++ b/test/test_two_av/gxx_3D_diagonal.xg
@@ -1,7 +1,7 @@
"Time = 0.0000000000e+00
--5.1961524227e+01 1.0361256365e+00
+-5.1961524227e+01 1.0384179779e+00
-4.8713874836e+01 1.0384179779e+00
-4.5466225446e+01 1.0410162820e+00
-4.2218576055e+01 1.0439839527e+00
@@ -33,4 +33,4 @@
4.2220308106e+01 1.0489962017e+00
4.5467957496e+01 1.0453839100e+00
4.8715606887e+01 1.0422541240e+00
-5.1963256278e+01 1.0395193281e+00
+5.1963256278e+01 1.0422541240e+00
diff --git a/test/test_two_av/gxx_minimum.xg b/test/test_two_av/gxx_minimum.xg
index bf2457d..d2b64c8 100644
--- a/test/test_two_av/gxx_minimum.xg
+++ b/test/test_two_av/gxx_minimum.xg
@@ -1,2 +1,2 @@
"gxx v time
-0.0000000000000 1.0361248449985
+0.0000000000000 1.0384170775439
diff --git a/test/test_two_av/gxx_norm1.xg b/test/test_two_av/gxx_norm1.xg
index 22ab258..959dad9 100644
--- a/test/test_two_av/gxx_norm1.xg
+++ b/test/test_two_av/gxx_norm1.xg
@@ -1,2 +1,2 @@
"gxx v time
-0.0000000000000 1.0716884044630
+0.0000000000000 1.0720896253039
diff --git a/test/test_two_av/gxx_norm2.xg b/test/test_two_av/gxx_norm2.xg
index 6f92156..7557dc2 100644
--- a/test/test_two_av/gxx_norm2.xg
+++ b/test/test_two_av/gxx_norm2.xg
@@ -1,2 +1,2 @@
"gxx v time
-0.0000000000000 1.0720525627879
+0.0000000000000 1.0724488024549
diff --git a/test/test_two_av/gxx_x_[16][16].xg b/test/test_two_av/gxx_x_[16][16].xg
index 6ad5587..6c5c13b 100644
--- a/test/test_two_av/gxx_x_[16][16].xg
+++ b/test/test_two_av/gxx_x_[16][16].xg
@@ -1,7 +1,7 @@
"Time = 0.0000000000e+00
--3.0000000000e+01 1.0759007901e+00
+-3.0000000000e+01 1.0841046055e+00
-2.8124968750e+01 1.0841046055e+00
-2.6249937500e+01 1.0947950161e+00
-2.4374906250e+01 1.1085603816e+00
@@ -33,4 +33,4 @@
2.4375906250e+01 1.1575961264e+00
2.6250937500e+01 1.1330411348e+00
2.8125968750e+01 1.1151539506e+00
-3.0001000000e+01 1.1017434278e+00
+3.0001000000e+01 1.1151539506e+00
diff --git a/test/test_two_av/gxx_y_[16][16].xg b/test/test_two_av/gxx_y_[16][16].xg
index ac4065d..1d37667 100644
--- a/test/test_two_av/gxx_y_[16][16].xg
+++ b/test/test_two_av/gxx_y_[16][16].xg
@@ -1,7 +1,7 @@
"Time = 0.0000000000e+00
--3.0000000000e+01 1.0589819333e+00
+-3.0000000000e+01 1.0621030253e+00
-2.8124968750e+01 1.0621030253e+00
-2.6249937500e+01 1.0655190510e+00
-2.4374906250e+01 1.0692622287e+00
@@ -33,4 +33,4 @@
2.4375906250e+01 1.0692601393e+00
2.6250937500e+01 1.0655171449e+00
2.8125968750e+01 1.0621012849e+00
-3.0001000000e+01 1.0589803419e+00
+3.0001000000e+01 1.0621012849e+00
diff --git a/test/test_two_av/gxx_z_[16][16].xg b/test/test_two_av/gxx_z_[16][16].xg
index ac4065d..1d37667 100644
--- a/test/test_two_av/gxx_z_[16][16].xg
+++ b/test/test_two_av/gxx_z_[16][16].xg
@@ -1,7 +1,7 @@
"Time = 0.0000000000e+00
--3.0000000000e+01 1.0589819333e+00
+-3.0000000000e+01 1.0621030253e+00
-2.8124968750e+01 1.0621030253e+00
-2.6249937500e+01 1.0655190510e+00
-2.4374906250e+01 1.0692622287e+00
@@ -33,4 +33,4 @@
2.4375906250e+01 1.0692601393e+00
2.6250937500e+01 1.0655171449e+00
2.8125968750e+01 1.0621012849e+00
-3.0001000000e+01 1.0589803419e+00
+3.0001000000e+01 1.0621012849e+00
diff --git a/test/test_two_av/gyy_3D_diagonal.xg b/test/test_two_av/gyy_3D_diagonal.xg
index 389c018..3d92e4f 100644
--- a/test/test_two_av/gyy_3D_diagonal.xg
+++ b/test/test_two_av/gyy_3D_diagonal.xg
@@ -1,7 +1,7 @@
"Time = 0.0000000000e+00
--5.1961524227e+01 1.0361256365e+00
+-5.1961524227e+01 1.0384179779e+00
-4.8713874836e+01 1.0384179779e+00
-4.5466225446e+01 1.0410162820e+00
-4.2218576055e+01 1.0439839527e+00
@@ -33,4 +33,4 @@
4.2220308106e+01 1.0489962017e+00
4.5467957496e+01 1.0453839100e+00
4.8715606887e+01 1.0422541240e+00
-5.1963256278e+01 1.0395193281e+00
+5.1963256278e+01 1.0422541240e+00
diff --git a/test/test_two_av/gyy_minimum.xg b/test/test_two_av/gyy_minimum.xg
index 227884a..3028c99 100644
--- a/test/test_two_av/gyy_minimum.xg
+++ b/test/test_two_av/gyy_minimum.xg
@@ -1,2 +1,2 @@
"gyy v time
-0.0000000000000 1.0361248449985
+0.0000000000000 1.0384170775439
diff --git a/test/test_two_av/gyy_norm1.xg b/test/test_two_av/gyy_norm1.xg
index d81ac7d..5b7048a 100644
--- a/test/test_two_av/gyy_norm1.xg
+++ b/test/test_two_av/gyy_norm1.xg
@@ -1,2 +1,2 @@
"gyy v time
-0.0000000000000 1.0716884044630
+0.0000000000000 1.0720896253039
diff --git a/test/test_two_av/gyy_norm2.xg b/test/test_two_av/gyy_norm2.xg
index 1a41ddd..e02fe24 100644
--- a/test/test_two_av/gyy_norm2.xg
+++ b/test/test_two_av/gyy_norm2.xg
@@ -1,2 +1,2 @@
"gyy v time
-0.0000000000000 1.0720525627879
+0.0000000000000 1.0724488024549
diff --git a/test/test_two_av/gyy_x_[16][16].xg b/test/test_two_av/gyy_x_[16][16].xg
index 6ad5587..6c5c13b 100644
--- a/test/test_two_av/gyy_x_[16][16].xg
+++ b/test/test_two_av/gyy_x_[16][16].xg
@@ -1,7 +1,7 @@
"Time = 0.0000000000e+00
--3.0000000000e+01 1.0759007901e+00
+-3.0000000000e+01 1.0841046055e+00
-2.8124968750e+01 1.0841046055e+00
-2.6249937500e+01 1.0947950161e+00
-2.4374906250e+01 1.1085603816e+00
@@ -33,4 +33,4 @@
2.4375906250e+01 1.1575961264e+00
2.6250937500e+01 1.1330411348e+00
2.8125968750e+01 1.1151539506e+00
-3.0001000000e+01 1.1017434278e+00
+3.0001000000e+01 1.1151539506e+00
diff --git a/test/test_two_av/gyy_y_[16][16].xg b/test/test_two_av/gyy_y_[16][16].xg
index ac4065d..1d37667 100644
--- a/test/test_two_av/gyy_y_[16][16].xg
+++ b/test/test_two_av/gyy_y_[16][16].xg
@@ -1,7 +1,7 @@
"Time = 0.0000000000e+00
--3.0000000000e+01 1.0589819333e+00
+-3.0000000000e+01 1.0621030253e+00
-2.8124968750e+01 1.0621030253e+00
-2.6249937500e+01 1.0655190510e+00
-2.4374906250e+01 1.0692622287e+00
@@ -33,4 +33,4 @@
2.4375906250e+01 1.0692601393e+00
2.6250937500e+01 1.0655171449e+00
2.8125968750e+01 1.0621012849e+00
-3.0001000000e+01 1.0589803419e+00
+3.0001000000e+01 1.0621012849e+00
diff --git a/test/test_two_av/gyy_z_[16][16].xg b/test/test_two_av/gyy_z_[16][16].xg
index ac4065d..1d37667 100644
--- a/test/test_two_av/gyy_z_[16][16].xg
+++ b/test/test_two_av/gyy_z_[16][16].xg
@@ -1,7 +1,7 @@
"Time = 0.0000000000e+00
--3.0000000000e+01 1.0589819333e+00
+-3.0000000000e+01 1.0621030253e+00
-2.8124968750e+01 1.0621030253e+00
-2.6249937500e+01 1.0655190510e+00
-2.4374906250e+01 1.0692622287e+00
@@ -33,4 +33,4 @@
2.4375906250e+01 1.0692601393e+00
2.6250937500e+01 1.0655171449e+00
2.8125968750e+01 1.0621012849e+00
-3.0001000000e+01 1.0589803419e+00
+3.0001000000e+01 1.0621012849e+00
diff --git a/test/test_two_av/gzz_3D_diagonal.xg b/test/test_two_av/gzz_3D_diagonal.xg
index 389c018..3d92e4f 100644
--- a/test/test_two_av/gzz_3D_diagonal.xg
+++ b/test/test_two_av/gzz_3D_diagonal.xg
@@ -1,7 +1,7 @@
"Time = 0.0000000000e+00
--5.1961524227e+01 1.0361256365e+00
+-5.1961524227e+01 1.0384179779e+00
-4.8713874836e+01 1.0384179779e+00
-4.5466225446e+01 1.0410162820e+00
-4.2218576055e+01 1.0439839527e+00
@@ -33,4 +33,4 @@
4.2220308106e+01 1.0489962017e+00
4.5467957496e+01 1.0453839100e+00
4.8715606887e+01 1.0422541240e+00
-5.1963256278e+01 1.0395193281e+00
+5.1963256278e+01 1.0422541240e+00
diff --git a/test/test_two_av/gzz_minimum.xg b/test/test_two_av/gzz_minimum.xg
index a0420f9..d4a1127 100644
--- a/test/test_two_av/gzz_minimum.xg
+++ b/test/test_two_av/gzz_minimum.xg
@@ -1,2 +1,2 @@
"gzz v time
-0.0000000000000 1.0361248449985
+0.0000000000000 1.0384170775439
diff --git a/test/test_two_av/gzz_norm1.xg b/test/test_two_av/gzz_norm1.xg
index 86dfd72..cca6ea7 100644
--- a/test/test_two_av/gzz_norm1.xg
+++ b/test/test_two_av/gzz_norm1.xg
@@ -1,2 +1,2 @@
"gzz v time
-0.0000000000000 1.0716884044630
+0.0000000000000 1.0720896253039
diff --git a/test/test_two_av/gzz_norm2.xg b/test/test_two_av/gzz_norm2.xg
index 1d12ace..c9acf88 100644
--- a/test/test_two_av/gzz_norm2.xg
+++ b/test/test_two_av/gzz_norm2.xg
@@ -1,2 +1,2 @@
"gzz v time
-0.0000000000000 1.0720525627879
+0.0000000000000 1.0724488024549
diff --git a/test/test_two_av/gzz_x_[16][16].xg b/test/test_two_av/gzz_x_[16][16].xg
index 6ad5587..6c5c13b 100644
--- a/test/test_two_av/gzz_x_[16][16].xg
+++ b/test/test_two_av/gzz_x_[16][16].xg
@@ -1,7 +1,7 @@
"Time = 0.0000000000e+00
--3.0000000000e+01 1.0759007901e+00
+-3.0000000000e+01 1.0841046055e+00
-2.8124968750e+01 1.0841046055e+00
-2.6249937500e+01 1.0947950161e+00
-2.4374906250e+01 1.1085603816e+00
@@ -33,4 +33,4 @@
2.4375906250e+01 1.1575961264e+00
2.6250937500e+01 1.1330411348e+00
2.8125968750e+01 1.1151539506e+00
-3.0001000000e+01 1.1017434278e+00
+3.0001000000e+01 1.1151539506e+00
diff --git a/test/test_two_av/gzz_y_[16][16].xg b/test/test_two_av/gzz_y_[16][16].xg
index ac4065d..1d37667 100644
--- a/test/test_two_av/gzz_y_[16][16].xg
+++ b/test/test_two_av/gzz_y_[16][16].xg
@@ -1,7 +1,7 @@
"Time = 0.0000000000e+00
--3.0000000000e+01 1.0589819333e+00
+-3.0000000000e+01 1.0621030253e+00
-2.8124968750e+01 1.0621030253e+00
-2.6249937500e+01 1.0655190510e+00
-2.4374906250e+01 1.0692622287e+00
@@ -33,4 +33,4 @@
2.4375906250e+01 1.0692601393e+00
2.6250937500e+01 1.0655171449e+00
2.8125968750e+01 1.0621012849e+00
-3.0001000000e+01 1.0589803419e+00
+3.0001000000e+01 1.0621012849e+00
diff --git a/test/test_two_av/gzz_z_[16][16].xg b/test/test_two_av/gzz_z_[16][16].xg
index ac4065d..1d37667 100644
--- a/test/test_two_av/gzz_z_[16][16].xg
+++ b/test/test_two_av/gzz_z_[16][16].xg
@@ -1,7 +1,7 @@
"Time = 0.0000000000e+00
--3.0000000000e+01 1.0589819333e+00
+-3.0000000000e+01 1.0621030253e+00
-2.8124968750e+01 1.0621030253e+00
-2.6249937500e+01 1.0655190510e+00
-2.4374906250e+01 1.0692622287e+00
@@ -33,4 +33,4 @@
2.4375906250e+01 1.0692601393e+00
2.6250937500e+01 1.0655171449e+00
2.8125968750e+01 1.0621012849e+00
-3.0001000000e+01 1.0589803419e+00
+3.0001000000e+01 1.0621012849e+00
diff --git a/test/test_two_av/ham_3D_diagonal.xg b/test/test_two_av/ham_3D_diagonal.xg
index be75c07..c34eb37 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 -4.6042112134e-06
+-4.8713874836e+01 -1.2890291735e-03
-4.5466225446e+01 -4.4855245482e-06
--4.2218576055e+01 -4.3252267359e-06
--3.8970926664e+01 -4.1067261131e-06
--3.5723277273e+01 -3.8068731613e-06
--3.2475627882e+01 -3.3937093167e-06
--2.9227978492e+01 -2.8208998143e-06
--2.5980329101e+01 -2.0003580847e-06
--2.2732679710e+01 -6.6554668317e-07
--1.9485030319e+01 2.1225224261e-06
--1.6237380928e+01 8.4764387344e-06
+-4.2218576055e+01 -4.3252267356e-06
+-3.8970926664e+01 -4.1067261128e-06
+-3.5723277273e+01 -3.8068731620e-06
+-3.2475627882e+01 -3.3937093153e-06
+-2.9227978492e+01 -2.8208998164e-06
+-2.5980329101e+01 -2.0003580874e-06
+-2.2732679710e+01 -6.6554668252e-07
+-1.9485030319e+01 2.1225224258e-06
+-1.6237380928e+01 8.4764387348e-06
-1.2989731538e+01 1.5827447878e-05
--9.7420821469e+00 1.0866322208e-05
--6.4944327562e+00 -3.0422808668e-05
+-9.7420821469e+00 1.0866322205e-05
+-6.4944327562e+00 -3.0422808671e-05
-3.2467833654e+00 -8.7807528934e-05
8.6602540379e-04 -1.0161714130e-04
3.2485154162e+00 -1.0250862642e-04
-6.4961648070e+00 -5.6838041331e-05
+6.4961648070e+00 -5.6838041330e-05
9.7438141977e+00 1.7192438539e-05
-1.2991463589e+01 3.5644261139e-05
-1.6239112979e+01 1.8001738161e-05
-1.9486762370e+01 5.4451937998e-06
-2.2734411761e+01 5.1629029499e-07
-2.5982061152e+01 -1.4722741385e-06
-2.9229710542e+01 -2.5242103658e-06
-3.2477359933e+01 -3.2049113130e-06
-3.5725009324e+01 -3.6803199995e-06
-3.8972658715e+01 -4.0198966113e-06
-4.2220308106e+01 -4.2647703931e-06
-4.5467957496e+01 -4.4428918022e-06
-4.8715606887e+01 -4.5737690333e-06
+1.2991463589e+01 3.5644261140e-05
+1.6239112979e+01 1.8001738160e-05
+1.9486762370e+01 5.4451938010e-06
+2.2734411761e+01 5.1629029477e-07
+2.5982061152e+01 -1.4722741403e-06
+2.9229710542e+01 -2.5242103676e-06
+3.2477359933e+01 -3.2049113103e-06
+3.5725009324e+01 -3.6803199981e-06
+3.8972658715e+01 -4.0198966116e-06
+4.2220308106e+01 -4.2647703928e-06
+4.5467957496e+01 -4.4428918020e-06
+4.8715606887e+01 -1.5324608368e-03
5.1963256278e+01 0.0000000000e+00
diff --git a/test/test_two_av/ham_minimum.xg b/test/test_two_av/ham_minimum.xg
index bd79c43..8068b9a 100644
--- a/test/test_two_av/ham_minimum.xg
+++ b/test/test_two_av/ham_minimum.xg
@@ -1,2 +1,2 @@
"ham v time
-0.0000000000000 -0.0009564857011
+0.0000000000000 -0.0062553258798
diff --git a/test/test_two_av/ham_norm1.xg b/test/test_two_av/ham_norm1.xg
index a1ae4fc..808c3dc 100644
--- a/test/test_two_av/ham_norm1.xg
+++ b/test/test_two_av/ham_norm1.xg
@@ -1,2 +1,2 @@
"ham v time
-0.0000000000000 0.0000169838802
+0.0000000000000 0.0002065731534
diff --git a/test/test_two_av/ham_norm2.xg b/test/test_two_av/ham_norm2.xg
index 627805b..023317f 100644
--- a/test/test_two_av/ham_norm2.xg
+++ b/test/test_two_av/ham_norm2.xg
@@ -1,2 +1,2 @@
"ham v time
-0.0000000000000 0.0000699966257
+0.0000000000000 0.0005588307312
diff --git a/test/test_two_av/ham_x_[16][16].xg b/test/test_two_av/ham_x_[16][16].xg
index 101efcf..6e678e0 100644
--- a/test/test_two_av/ham_x_[16][16].xg
+++ b/test/test_two_av/ham_x_[16][16].xg
@@ -2,35 +2,35 @@
"Time = 0.0000000000e+00
-3.0000000000e+01 0.0000000000e+00
--2.8124968750e+01 -3.7065410970e-05
--2.6249937500e+01 6.5789105815e-05
+-2.8124968750e+01 -4.0282609023e-03
+-2.6249937500e+01 6.5789105816e-05
-2.4374906250e+01 -1.1242350165e-04
-2.2499875000e+01 -2.3632368513e-04
--2.0624843750e+01 -3.7631197427e-04
+-2.0624843750e+01 -3.7631197426e-04
-1.8749812500e+01 -5.1487047721e-04
-1.6874781250e+01 -6.3008782171e-04
-1.4999750000e+01 -7.0088909164e-04
--1.3124718750e+01 -7.1342911137e-04
--1.1249687500e+01 -6.6503635974e-04
+-1.3124718750e+01 -7.1342911136e-04
+-1.1249687500e+01 -6.6503635973e-04
-9.3746562500e+00 -5.6357108927e-04
-7.4996250000e+00 -4.2362638052e-04
-5.6245937500e+00 -2.6270714465e-04
--3.7495625000e+00 -2.3518014583e-05
+-3.7495625000e+00 -2.3518014580e-05
-1.8745312500e+00 -1.0421044382e-04
5.0000000000e-04 -1.0161714130e-04
1.8755312500e+00 -1.2719754600e-04
-3.7505625000e+00 4.6387122420e-05
+3.7505625000e+00 4.6387122419e-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.1169394323e-04
-2.8125968750e+01 -6.9954017983e-05
+2.8125968750e+01 -6.2553258798e-03
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 6fe9e75..9ac9d11 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 -4.0276130908e-06
+-2.8124968750e+01 -1.5807262235e-03
-2.6249937500e+01 -3.8402412421e-06
-2.4374906250e+01 -3.6149520426e-06
--2.2499875000e+01 -3.3523275207e-06
--2.0624843750e+01 -3.0677068676e-06
--1.8749812500e+01 -2.8125929309e-06
--1.6874781250e+01 -2.7191545827e-06
--1.4999750000e+01 -3.0852704574e-06
--1.3124718750e+01 -4.5171016838e-06
--1.1249687500e+01 -8.1143139150e-06
--9.3746562500e+00 -1.5568489316e-05
+-2.2499875000e+01 -3.3523275225e-06
+-2.0624843750e+01 -3.0677068659e-06
+-1.8749812500e+01 -2.8125929311e-06
+-1.6874781250e+01 -2.7191545840e-06
+-1.4999750000e+01 -3.0852704558e-06
+-1.3124718750e+01 -4.5171016807e-06
+-1.1249687500e+01 -8.1143139156e-06
+-9.3746562500e+00 -1.5568489315e-05
-7.4996250000e+00 -2.8811405194e-05
-5.6245937500e+00 -4.8675773128e-05
-3.7495625000e+00 -7.2597308751e-05
--1.8745312500e+00 -9.3288543433e-05
+-1.8745312500e+00 -9.3288543435e-05
5.0000000000e-04 -1.0161714130e-04
-1.8755312500e+00 -9.3280080456e-05
-3.7505625000e+00 -7.2584580646e-05
-5.6255937500e+00 -4.8663657979e-05
-7.5006250000e+00 -2.8802545080e-05
+1.8755312500e+00 -9.3280080457e-05
+3.7505625000e+00 -7.2584580645e-05
+5.6255937500e+00 -4.8663657978e-05
+7.5006250000e+00 -2.8802545082e-05
9.3756562500e+00 -1.5563128759e-05
-1.1250687500e+01 -8.1115415766e-06
-1.3125718750e+01 -4.5158851092e-06
-1.5000750000e+01 -3.0848637378e-06
-1.6875781250e+01 -2.7191189052e-06
-1.8750812500e+01 -2.8127029714e-06
-2.0625843750e+01 -3.0678579071e-06
-2.2500875000e+01 -3.3524758258e-06
-2.4375906250e+01 -3.6150826036e-06
+1.1250687500e+01 -8.1115415771e-06
+1.3125718750e+01 -4.5158851067e-06
+1.5000750000e+01 -3.0848637381e-06
+1.6875781250e+01 -2.7191189056e-06
+1.8750812500e+01 -2.8127029729e-06
+2.0625843750e+01 -3.0678579062e-06
+2.2500875000e+01 -3.3524758240e-06
+2.4375906250e+01 -3.6150826054e-06
2.6250937500e+01 -3.8403509779e-06
-2.8125968750e+01 -4.0277036197e-06
+2.8125968750e+01 -1.5806560605e-03
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 b70de8f..41d2d24 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 -4.0276130903e-06
--2.6249937500e+01 -3.8402412418e-06
--2.4374906250e+01 -3.6149520428e-06
--2.2499875000e+01 -3.3523275207e-06
--2.0624843750e+01 -3.0677068678e-06
--1.8749812500e+01 -2.8125929309e-06
--1.6874781250e+01 -2.7191545832e-06
--1.4999750000e+01 -3.0852704549e-06
--1.3124718750e+01 -4.5171016838e-06
--1.1249687500e+01 -8.1143139152e-06
+-2.8124968750e+01 -1.5807262235e-03
+-2.6249937500e+01 -3.8402412421e-06
+-2.4374906250e+01 -3.6149520426e-06
+-2.2499875000e+01 -3.3523275212e-06
+-2.0624843750e+01 -3.0677068661e-06
+-1.8749812500e+01 -2.8125929311e-06
+-1.6874781250e+01 -2.7191545836e-06
+-1.4999750000e+01 -3.0852704581e-06
+-1.3124718750e+01 -4.5171016803e-06
+-1.1249687500e+01 -8.1143139158e-06
-9.3746562500e+00 -1.5568489313e-05
--7.4996250000e+00 -2.8811405194e-05
+-7.4996250000e+00 -2.8811405195e-05
-5.6245937500e+00 -4.8675773128e-05
-3.7495625000e+00 -7.2597308751e-05
--1.8745312500e+00 -9.3288543433e-05
+-1.8745312500e+00 -9.3288543435e-05
5.0000000000e-04 -1.0161714130e-04
-1.8755312500e+00 -9.3280080456e-05
-3.7505625000e+00 -7.2584580646e-05
-5.6255937500e+00 -4.8663657979e-05
-7.5006250000e+00 -2.8802545080e-05
+1.8755312500e+00 -9.3280080457e-05
+3.7505625000e+00 -7.2584580645e-05
+5.6255937500e+00 -4.8663657978e-05
+7.5006250000e+00 -2.8802545082e-05
9.3756562500e+00 -1.5563128759e-05
-1.1250687500e+01 -8.1115415766e-06
-1.3125718750e+01 -4.5158851092e-06
-1.5000750000e+01 -3.0848637374e-06
-1.6875781250e+01 -2.7191189054e-06
-1.8750812500e+01 -2.8127029714e-06
-2.0625843750e+01 -3.0678579073e-06
-2.2500875000e+01 -3.3524758258e-06
-2.4375906250e+01 -3.6150826039e-06
-2.6250937500e+01 -3.8403509779e-06
-2.8125968750e+01 -4.0277036197e-06
+1.1250687500e+01 -8.1115415769e-06
+1.3125718750e+01 -4.5158851069e-06
+1.5000750000e+01 -3.0848637378e-06
+1.6875781250e+01 -2.7191189052e-06
+1.8750812500e+01 -2.8127029729e-06
+2.0625843750e+01 -3.0678579064e-06
+2.2500875000e+01 -3.3524758245e-06
+2.4375906250e+01 -3.6150826052e-06
+2.6250937500e+01 -3.8403509793e-06
+2.8125968750e+01 -1.5806560605e-03
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 fa380ad..a01d49b 100644
--- a/test/test_two_av/tau_3D_diagonal.xg
+++ b/test/test_two_av/tau_3D_diagonal.xg
@@ -1,7 +1,7 @@
"Time = 0.0000000000e+00
--5.1961524227e+01 1.0546749455e-12
+-5.1961524227e+01 1.0581769509e-12
-4.8713874836e+01 1.0581769509e-12
-4.5466225446e+01 1.0621510511e-12
-4.2218576055e+01 1.0666961673e-12
@@ -33,4 +33,4 @@
4.2220308106e+01 1.0743873186e-12
4.5467957496e+01 1.0688425071e-12
4.8715606887e+01 1.0640460733e-12
-5.1963256278e+01 1.0598608572e-12
+5.1963256278e+01 1.0640460733e-12
diff --git a/test/test_two_av/tau_x_[16][16].xg b/test/test_two_av/tau_x_[16][16].xg
index 2e0999a..1d30084 100644
--- a/test/test_two_av/tau_x_[16][16].xg
+++ b/test/test_two_av/tau_x_[16][16].xg
@@ -1,7 +1,7 @@
"Time = 0.0000000000e+00
--3.0000000000e+01 1.1159849547e-12
+-3.0000000000e+01 1.1287734457e-12
-2.8124968750e+01 1.1287734457e-12
-2.6249937500e+01 3.3799301763e-09
-2.4374906250e+01 1.4117428520e-07
@@ -16,7 +16,7 @@
-7.4996250000e+00 5.7927814748e-07
-5.6245937500e+00 1.4684701859e-07
-3.7495625000e+00 3.5469856000e-09
--1.8745312500e+00 1.2027544508e-12
+-1.8745312500e+00 1.2027544509e-12
5.0000000000e-04 1.2073042319e-12
1.8755312500e+00 1.2190265289e-12
3.7505625000e+00 1.2396537727e-12
@@ -33,4 +33,4 @@
2.4375906250e+01 2.6314476524e-07
2.6250937500e+01 1.2060588939e-12
2.8125968750e+01 1.1776120498e-12
-3.0001000000e+01 1.1564336032e-12
+3.0001000000e+01 1.1776120498e-12
diff --git a/test/test_two_av/tau_y_[16][16].xg b/test/test_two_av/tau_y_[16][16].xg
index e0906f1..2824bd3 100644
--- a/test/test_two_av/tau_y_[16][16].xg
+++ b/test/test_two_av/tau_y_[16][16].xg
@@ -1,7 +1,7 @@
"Time = 0.0000000000e+00
--3.0000000000e+01 1.0897649268e-12
+-3.0000000000e+01 1.0945862009e-12
-2.8124968750e+01 1.0945862009e-12
-2.6249937500e+01 1.0998711960e-12
-2.4374906250e+01 1.1056720688e-12
@@ -21,7 +21,7 @@
1.8755312500e+00 1.2056100439e-12
3.7505625000e+00 1.2007636165e-12
5.6255937500e+00 1.1933842827e-12
-7.5006250000e+00 1.1842790648e-12
+7.5006250000e+00 1.1842790647e-12
9.3756562500e+00 1.1742406742e-12
1.1250687500e+01 1.1639185046e-12
1.3125718750e+01 1.1537752102e-12
@@ -33,4 +33,4 @@
2.4375906250e+01 1.1056688280e-12
2.6250937500e+01 1.0998682447e-12
2.8125968750e+01 1.0945835105e-12
-3.0001000000e+01 1.0897624704e-12
+3.0001000000e+01 1.0945835105e-12
diff --git a/test/test_two_av/tau_z_[16][16].xg b/test/test_two_av/tau_z_[16][16].xg
index e0906f1..2824bd3 100644
--- a/test/test_two_av/tau_z_[16][16].xg
+++ b/test/test_two_av/tau_z_[16][16].xg
@@ -1,7 +1,7 @@
"Time = 0.0000000000e+00
--3.0000000000e+01 1.0897649268e-12
+-3.0000000000e+01 1.0945862009e-12
-2.8124968750e+01 1.0945862009e-12
-2.6249937500e+01 1.0998711960e-12
-2.4374906250e+01 1.1056720688e-12
@@ -21,7 +21,7 @@
1.8755312500e+00 1.2056100439e-12
3.7505625000e+00 1.2007636165e-12
5.6255937500e+00 1.1933842827e-12
-7.5006250000e+00 1.1842790648e-12
+7.5006250000e+00 1.1842790647e-12
9.3756562500e+00 1.1742406742e-12
1.1250687500e+01 1.1639185046e-12
1.3125718750e+01 1.1537752102e-12
@@ -33,4 +33,4 @@
2.4375906250e+01 1.1056688280e-12
2.6250937500e+01 1.0998682447e-12
2.8125968750e+01 1.0945835105e-12
-3.0001000000e+01 1.0897624704e-12
+3.0001000000e+01 1.0945835105e-12
diff --git a/test/test_two_av/test_two_av.par b/test/test_two_av/test_two_av.par
index c4d95a3..0b5725e 100644
--- a/test/test_two_av/test_two_av.par
+++ b/test/test_two_av/test_two_av.par
@@ -1,4 +1,4 @@
-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"
+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_omni admconstraints constants LocalReduce TmunuBase InitBase"
TmunuBase::stress_energy_storage = yes
TmunuBase::stress_energy_at_RHS = yes
@@ -24,17 +24,17 @@ 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
+hydrobase::evolution_method = "GRHydro"
+
+GRHydro::riemann_solver = "Marquina"
+GRHydro::GRHydro_eos_type = "Polytype"
+GRHydro::GRHydro_eos_table = "2D_Polytrope"
+GRHydro::recon_method = "ppm"
+GRHydro::GRHydro_stencil = 3
+GRHydro::bound = "none"
+GRHydro::tvd_limiter = "VanLeerMC2"
+GRHydro::rho_abs_min = 1.e-7
+GRHydro::initial_atmosphere_factor = 0.999
ADMBase::initial_data = "tov"
ADMBase::initial_lapse = "tov"
@@ -54,16 +54,13 @@ 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"
+IOBasic::outScalar_vars = "HydroBase::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel GRHydro::dens GRHydro::tau GRHydro::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::out1D_vars = "HydroBase::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel GRHydro::dens GRHydro::tau GRHydro::scon admbase::lapse admbase::metric admbase::curv admconstraints::ham admconstraints::momentum"
IOASCII::out_format = ".10e"
diff --git a/test/test_two_max/alp_3D_diagonal.xg b/test/test_two_max/alp_3D_diagonal.xg
index 2dd4813..785c723 100644
--- a/test/test_two_max/alp_3D_diagonal.xg
+++ b/test/test_two_max/alp_3D_diagonal.xg
@@ -1,7 +1,7 @@
"Time = 0.0000000000e+00
--5.1961524227e+01 9.8994292210e-01
+-5.1961524227e+01 9.8940070558e-01
-4.8713874836e+01 9.8940070558e-01
-4.5466225446e+01 9.8879826875e-01
-4.2218576055e+01 9.8812531824e-01
@@ -33,4 +33,4 @@
4.2220308106e+01 9.8265312920e-01
4.5467957496e+01 9.8401358256e-01
4.8715606887e+01 9.8518574283e-01
-5.1963256278e+01 9.8620434757e-01
+5.1963256278e+01 9.8518574283e-01
diff --git a/test/test_two_max/alp_maximum.xg b/test/test_two_max/alp_maximum.xg
index 03d2ddb..edf156f 100644
--- a/test/test_two_max/alp_maximum.xg
+++ b/test/test_two_max/alp_maximum.xg
@@ -1,2 +1,2 @@
"alp v time
-0.0000000000000 0.9899430790594
+0.0000000000000 0.9894008778862
diff --git a/test/test_two_max/alp_norm1.xg b/test/test_two_max/alp_norm1.xg
index f4a2c14..a2116fb 100644
--- a/test/test_two_max/alp_norm1.xg
+++ b/test/test_two_max/alp_norm1.xg
@@ -1,2 +1,2 @@
"alp v time
-0.0000000000000 0.9768312205096
+0.0000000000000 0.9766998634815
diff --git a/test/test_two_max/alp_norm2.xg b/test/test_two_max/alp_norm2.xg
index b3c5418..b21efc6 100644
--- a/test/test_two_max/alp_norm2.xg
+++ b/test/test_two_max/alp_norm2.xg
@@ -1,2 +1,2 @@
"alp v time
-0.0000000000000 0.9768996852287
+0.0000000000000 0.9767679958699
diff --git a/test/test_two_max/alp_x_[16][16].xg b/test/test_two_max/alp_x_[16][16].xg
index cf3fa88..97787f2 100644
--- a/test/test_two_max/alp_x_[16][16].xg
+++ b/test/test_two_max/alp_x_[16][16].xg
@@ -1,7 +1,7 @@
"Time = 0.0000000000e+00
--3.0000000000e+01 9.7677711224e-01
+-3.0000000000e+01 9.7350344639e-01
-2.8124968750e+01 9.7350344639e-01
-2.6249937500e+01 9.6915728628e-01
-2.4374906250e+01 9.6350832995e-01
@@ -33,4 +33,4 @@
2.4375906250e+01 9.3572173098e-01
2.6250937500e+01 9.4593859439e-01
2.8125968750e+01 9.5348158912e-01
-3.0001000000e+01 9.5917741807e-01
+3.0001000000e+01 9.5348158912e-01
diff --git a/test/test_two_max/alp_y_[16][16].xg b/test/test_two_max/alp_y_[16][16].xg
index 38bf9a9..ee07084 100644
--- a/test/test_two_max/alp_y_[16][16].xg
+++ b/test/test_two_max/alp_y_[16][16].xg
@@ -1,7 +1,7 @@
"Time = 0.0000000000e+00
--3.0000000000e+01 9.8153390539e-01
+-3.0000000000e+01 9.8057807514e-01
-2.8124968750e+01 9.8057807514e-01
-2.6249937500e+01 9.7953431218e-01
-2.4374906250e+01 9.7839344467e-01
@@ -33,4 +33,4 @@
2.4375906250e+01 9.7839408067e-01
2.6250937500e+01 9.7953489389e-01
2.8125968750e+01 9.8057860755e-01
-3.0001000000e+01 9.8153439327e-01
+3.0001000000e+01 9.8057860755e-01
diff --git a/test/test_two_max/alp_z_[16][16].xg b/test/test_two_max/alp_z_[16][16].xg
index 38bf9a9..ee07084 100644
--- a/test/test_two_max/alp_z_[16][16].xg
+++ b/test/test_two_max/alp_z_[16][16].xg
@@ -1,7 +1,7 @@
"Time = 0.0000000000e+00
--3.0000000000e+01 9.8153390539e-01
+-3.0000000000e+01 9.8057807514e-01
-2.8124968750e+01 9.8057807514e-01
-2.6249937500e+01 9.7953431218e-01
-2.4374906250e+01 9.7839344467e-01
@@ -33,4 +33,4 @@
2.4375906250e+01 9.7839408067e-01
2.6250937500e+01 9.7953489389e-01
2.8125968750e+01 9.8057860755e-01
-3.0001000000e+01 9.8153439327e-01
+3.0001000000e+01 9.8057860755e-01
diff --git a/test/test_two_max/dens_3D_diagonal.xg b/test/test_two_max/dens_3D_diagonal.xg
index c1adb5b..08b5ede 100644
--- a/test/test_two_max/dens_3D_diagonal.xg
+++ b/test/test_two_max/dens_3D_diagonal.xg
@@ -1,7 +1,7 @@
"Time = 0.0000000000e+00
--5.1961524227e+01 1.0307094459e-07
+-5.1961524227e+01 1.0323961306e-07
-4.8713874836e+01 1.0323961306e-07
-4.5466225446e+01 1.0342739218e-07
-4.2218576055e+01 1.0363762171e-07
@@ -33,4 +33,4 @@
4.2220308106e+01 1.0536576756e-07
4.5467957496e+01 1.0493300931e-07
4.8715606887e+01 1.0456180913e-07
-5.1963256278e+01 1.0424048058e-07
+5.1963256278e+01 1.0456180913e-07
diff --git a/test/test_two_max/dens_minimum.xg b/test/test_two_max/dens_minimum.xg
index b1751e4..2f1dcf2 100644
--- a/test/test_two_max/dens_minimum.xg
+++ b/test/test_two_max/dens_minimum.xg
@@ -1,2 +1,2 @@
"dens v time
-0.0000000000000 0.0000001030709
+0.0000000000000 0.0000001032396
diff --git a/test/test_two_max/dens_norm1.xg b/test/test_two_max/dens_norm1.xg
index 403fca5..f3fc372 100644
--- a/test/test_two_max/dens_norm1.xg
+++ b/test/test_two_max/dens_norm1.xg
@@ -1,2 +1,2 @@
"dens v time
-0.0000000000000 0.0000043228688
+0.0000000000000 0.0000043229112
diff --git a/test/test_two_max/dens_norm2.xg b/test/test_two_max/dens_norm2.xg
index bc11b33..477d1d7 100644
--- a/test/test_two_max/dens_norm2.xg
+++ b/test/test_two_max/dens_norm2.xg
@@ -1,2 +1,2 @@
"dens v time
-0.0000000000000 0.0000265467689
+0.0000000000000 0.0000265467690
diff --git a/test/test_two_max/dens_x_[16][16].xg b/test/test_two_max/dens_x_[16][16].xg
index 01495ba..c432d66 100644
--- a/test/test_two_max/dens_x_[16][16].xg
+++ b/test/test_two_max/dens_x_[16][16].xg
@@ -1,7 +1,7 @@
"Time = 0.0000000000e+00
--3.0000000000e+01 1.0725900154e-07
+-3.0000000000e+01 1.0833097180e-07
-2.8124968750e+01 1.0833097180e-07
-2.6249937500e+01 5.9628207108e-06
-2.4374906250e+01 3.8840535583e-05
@@ -33,4 +33,4 @@
2.4375906250e+01 5.5795445508e-05
2.6250937500e+01 1.1787051582e-07
2.8125968750e+01 1.1516593529e-07
-3.0001000000e+01 1.1317157912e-07
+3.0001000000e+01 1.1516593529e-07
diff --git a/test/test_two_max/dens_y_[16][16].xg b/test/test_two_max/dens_y_[16][16].xg
index d7fcf41..c8ae5f3 100644
--- a/test/test_two_max/dens_y_[16][16].xg
+++ b/test/test_two_max/dens_y_[16][16].xg
@@ -1,7 +1,7 @@
"Time = 0.0000000000e+00
--3.0000000000e+01 1.0572335273e-07
+-3.0000000000e+01 1.0602985590e-07
-2.8124968750e+01 1.0602985590e-07
-2.6249937500e+01 1.0636574103e-07
-2.4374906250e+01 1.0673429552e-07
@@ -33,4 +33,4 @@
2.4375906250e+01 1.0673408965e-07
2.6250937500e+01 1.0636555349e-07
2.8125968750e+01 1.0602968489e-07
-3.0001000000e+01 1.0572319654e-07
+3.0001000000e+01 1.0602968489e-07
diff --git a/test/test_two_max/dens_z_[16][16].xg b/test/test_two_max/dens_z_[16][16].xg
index d7fcf41..c8ae5f3 100644
--- a/test/test_two_max/dens_z_[16][16].xg
+++ b/test/test_two_max/dens_z_[16][16].xg
@@ -1,7 +1,7 @@
"Time = 0.0000000000e+00
--3.0000000000e+01 1.0572335273e-07
+-3.0000000000e+01 1.0602985590e-07
-2.8124968750e+01 1.0602985590e-07
-2.6249937500e+01 1.0636574103e-07
-2.4374906250e+01 1.0673429552e-07
@@ -33,4 +33,4 @@
2.4375906250e+01 1.0673408965e-07
2.6250937500e+01 1.0636555349e-07
2.8125968750e+01 1.0602968489e-07
-3.0001000000e+01 1.0572319654e-07
+3.0001000000e+01 1.0602968489e-07
diff --git a/test/test_two_max/gxx_3D_diagonal.xg b/test/test_two_max/gxx_3D_diagonal.xg
index 334a6fe..4562c31 100644
--- a/test/test_two_max/gxx_3D_diagonal.xg
+++ b/test/test_two_max/gxx_3D_diagonal.xg
@@ -1,7 +1,7 @@
"Time = 0.0000000000e+00
--5.1961524227e+01 1.0203695835e+00
+-5.1961524227e+01 1.0214824562e+00
-4.8713874836e+01 1.0214824562e+00
-4.5466225446e+01 1.0227207082e+00
-4.2218576055e+01 1.0241061137e+00
@@ -33,4 +33,4 @@
4.2220308106e+01 1.0354592771e+00
4.5467957496e+01 1.0326221074e+00
4.8715606887e+01 1.0301854044e+00
-5.1963256278e+01 1.0280737490e+00
+5.1963256278e+01 1.0301854044e+00
diff --git a/test/test_two_max/gxx_minimum.xg b/test/test_two_max/gxx_minimum.xg
index 7e67b28..c92961d 100644
--- a/test/test_two_max/gxx_minimum.xg
+++ b/test/test_two_max/gxx_minimum.xg
@@ -1,2 +1,2 @@
"gxx v time
-0.0000000000000 1.0203692615208
+0.0000000000000 1.0214821023453
diff --git a/test/test_two_max/gxx_norm1.xg b/test/test_two_max/gxx_norm1.xg
index be1ea3e..1b032f7 100644
--- a/test/test_two_max/gxx_norm1.xg
+++ b/test/test_two_max/gxx_norm1.xg
@@ -1,2 +1,2 @@
"gxx v time
-0.0000000000000 1.0480752489697
+0.0000000000000 1.0483520475687
diff --git a/test/test_two_max/gxx_norm2.xg b/test/test_two_max/gxx_norm2.xg
index 6367b8e..5b06724 100644
--- a/test/test_two_max/gxx_norm2.xg
+++ b/test/test_two_max/gxx_norm2.xg
@@ -1,2 +1,2 @@
"gxx v time
-0.0000000000000 1.0483852607726
+0.0000000000000 1.0486605858485
diff --git a/test/test_two_max/gxx_x_[16][16].xg b/test/test_two_max/gxx_x_[16][16].xg
index 86a2f80..0c94faf 100644
--- a/test/test_two_max/gxx_x_[16][16].xg
+++ b/test/test_two_max/gxx_x_[16][16].xg
@@ -1,7 +1,7 @@
"Time = 0.0000000000e+00
--3.0000000000e+01 1.0478259905e+00
+-3.0000000000e+01 1.0547958830e+00
-2.8124968750e+01 1.0547958830e+00
-2.6249937500e+01 1.0641389274e+00
-2.4374906250e+01 1.0764270864e+00
@@ -33,4 +33,4 @@
2.4375906250e+01 1.1395745203e+00
2.6250937500e+01 1.1158439319e+00
2.8125968750e+01 1.0987090268e+00
-3.0001000000e+01 1.0859877269e+00
+3.0001000000e+01 1.0987090268e+00
diff --git a/test/test_two_max/gxx_y_[16][16].xg b/test/test_two_max/gxx_y_[16][16].xg
index 8f8e6a8..e304549 100644
--- a/test/test_two_max/gxx_y_[16][16].xg
+++ b/test/test_two_max/gxx_y_[16][16].xg
@@ -1,7 +1,7 @@
"Time = 0.0000000000e+00
--3.0000000000e+01 1.0378006812e+00
+-3.0000000000e+01 1.0398055092e+00
-2.8124968750e+01 1.0398055092e+00
-2.6249937500e+01 1.0420003066e+00
-2.4374906250e+01 1.0444059210e+00
@@ -33,4 +33,4 @@
2.4375906250e+01 1.0444045781e+00
2.6250937500e+01 1.0419990817e+00
2.8125968750e+01 1.0398043912e+00
-3.0001000000e+01 1.0377996591e+00
+3.0001000000e+01 1.0398043912e+00
diff --git a/test/test_two_max/gxx_z_[16][16].xg b/test/test_two_max/gxx_z_[16][16].xg
index 8f8e6a8..e304549 100644
--- a/test/test_two_max/gxx_z_[16][16].xg
+++ b/test/test_two_max/gxx_z_[16][16].xg
@@ -1,7 +1,7 @@
"Time = 0.0000000000e+00
--3.0000000000e+01 1.0378006812e+00
+-3.0000000000e+01 1.0398055092e+00
-2.8124968750e+01 1.0398055092e+00
-2.6249937500e+01 1.0420003066e+00
-2.4374906250e+01 1.0444059210e+00
@@ -33,4 +33,4 @@
2.4375906250e+01 1.0444045781e+00
2.6250937500e+01 1.0419990817e+00
2.8125968750e+01 1.0398043912e+00
-3.0001000000e+01 1.0377996591e+00
+3.0001000000e+01 1.0398043912e+00
diff --git a/test/test_two_max/gyy_3D_diagonal.xg b/test/test_two_max/gyy_3D_diagonal.xg
index 334a6fe..4562c31 100644
--- a/test/test_two_max/gyy_3D_diagonal.xg
+++ b/test/test_two_max/gyy_3D_diagonal.xg
@@ -1,7 +1,7 @@
"Time = 0.0000000000e+00
--5.1961524227e+01 1.0203695835e+00
+-5.1961524227e+01 1.0214824562e+00
-4.8713874836e+01 1.0214824562e+00
-4.5466225446e+01 1.0227207082e+00
-4.2218576055e+01 1.0241061137e+00
@@ -33,4 +33,4 @@
4.2220308106e+01 1.0354592771e+00
4.5467957496e+01 1.0326221074e+00
4.8715606887e+01 1.0301854044e+00
-5.1963256278e+01 1.0280737490e+00
+5.1963256278e+01 1.0301854044e+00
diff --git a/test/test_two_max/gyy_minimum.xg b/test/test_two_max/gyy_minimum.xg
index 334b967..9b8e397 100644
--- a/test/test_two_max/gyy_minimum.xg
+++ b/test/test_two_max/gyy_minimum.xg
@@ -1,2 +1,2 @@
"gyy v time
-0.0000000000000 1.0203692615208
+0.0000000000000 1.0214821023453
diff --git a/test/test_two_max/gyy_norm1.xg b/test/test_two_max/gyy_norm1.xg
index ddd7552..8f8bddb 100644
--- a/test/test_two_max/gyy_norm1.xg
+++ b/test/test_two_max/gyy_norm1.xg
@@ -1,2 +1,2 @@
"gyy v time
-0.0000000000000 1.0480752489697
+0.0000000000000 1.0483520475687
diff --git a/test/test_two_max/gyy_norm2.xg b/test/test_two_max/gyy_norm2.xg
index 525c63a..c2158f5 100644
--- a/test/test_two_max/gyy_norm2.xg
+++ b/test/test_two_max/gyy_norm2.xg
@@ -1,2 +1,2 @@
"gyy v time
-0.0000000000000 1.0483852607726
+0.0000000000000 1.0486605858485
diff --git a/test/test_two_max/gyy_x_[16][16].xg b/test/test_two_max/gyy_x_[16][16].xg
index 86a2f80..0c94faf 100644
--- a/test/test_two_max/gyy_x_[16][16].xg
+++ b/test/test_two_max/gyy_x_[16][16].xg
@@ -1,7 +1,7 @@
"Time = 0.0000000000e+00
--3.0000000000e+01 1.0478259905e+00
+-3.0000000000e+01 1.0547958830e+00
-2.8124968750e+01 1.0547958830e+00
-2.6249937500e+01 1.0641389274e+00
-2.4374906250e+01 1.0764270864e+00
@@ -33,4 +33,4 @@
2.4375906250e+01 1.1395745203e+00
2.6250937500e+01 1.1158439319e+00
2.8125968750e+01 1.0987090268e+00
-3.0001000000e+01 1.0859877269e+00
+3.0001000000e+01 1.0987090268e+00
diff --git a/test/test_two_max/gyy_y_[16][16].xg b/test/test_two_max/gyy_y_[16][16].xg
index 8f8e6a8..e304549 100644
--- a/test/test_two_max/gyy_y_[16][16].xg
+++ b/test/test_two_max/gyy_y_[16][16].xg
@@ -1,7 +1,7 @@
"Time = 0.0000000000e+00
--3.0000000000e+01 1.0378006812e+00
+-3.0000000000e+01 1.0398055092e+00
-2.8124968750e+01 1.0398055092e+00
-2.6249937500e+01 1.0420003066e+00
-2.4374906250e+01 1.0444059210e+00
@@ -33,4 +33,4 @@
2.4375906250e+01 1.0444045781e+00
2.6250937500e+01 1.0419990817e+00
2.8125968750e+01 1.0398043912e+00
-3.0001000000e+01 1.0377996591e+00
+3.0001000000e+01 1.0398043912e+00
diff --git a/test/test_two_max/gyy_z_[16][16].xg b/test/test_two_max/gyy_z_[16][16].xg
index 8f8e6a8..e304549 100644
--- a/test/test_two_max/gyy_z_[16][16].xg
+++ b/test/test_two_max/gyy_z_[16][16].xg
@@ -1,7 +1,7 @@
"Time = 0.0000000000e+00
--3.0000000000e+01 1.0378006812e+00
+-3.0000000000e+01 1.0398055092e+00
-2.8124968750e+01 1.0398055092e+00
-2.6249937500e+01 1.0420003066e+00
-2.4374906250e+01 1.0444059210e+00
@@ -33,4 +33,4 @@
2.4375906250e+01 1.0444045781e+00
2.6250937500e+01 1.0419990817e+00
2.8125968750e+01 1.0398043912e+00
-3.0001000000e+01 1.0377996591e+00
+3.0001000000e+01 1.0398043912e+00
diff --git a/test/test_two_max/gzz_3D_diagonal.xg b/test/test_two_max/gzz_3D_diagonal.xg
index 334a6fe..4562c31 100644
--- a/test/test_two_max/gzz_3D_diagonal.xg
+++ b/test/test_two_max/gzz_3D_diagonal.xg
@@ -1,7 +1,7 @@
"Time = 0.0000000000e+00
--5.1961524227e+01 1.0203695835e+00
+-5.1961524227e+01 1.0214824562e+00
-4.8713874836e+01 1.0214824562e+00
-4.5466225446e+01 1.0227207082e+00
-4.2218576055e+01 1.0241061137e+00
@@ -33,4 +33,4 @@
4.2220308106e+01 1.0354592771e+00
4.5467957496e+01 1.0326221074e+00
4.8715606887e+01 1.0301854044e+00
-5.1963256278e+01 1.0280737490e+00
+5.1963256278e+01 1.0301854044e+00
diff --git a/test/test_two_max/gzz_minimum.xg b/test/test_two_max/gzz_minimum.xg
index 03560bf..cb2c21b 100644
--- a/test/test_two_max/gzz_minimum.xg
+++ b/test/test_two_max/gzz_minimum.xg
@@ -1,2 +1,2 @@
"gzz v time
-0.0000000000000 1.0203692615208
+0.0000000000000 1.0214821023453
diff --git a/test/test_two_max/gzz_norm1.xg b/test/test_two_max/gzz_norm1.xg
index 02be946..293ed0b 100644
--- a/test/test_two_max/gzz_norm1.xg
+++ b/test/test_two_max/gzz_norm1.xg
@@ -1,2 +1,2 @@
"gzz v time
-0.0000000000000 1.0480752489697
+0.0000000000000 1.0483520475687
diff --git a/test/test_two_max/gzz_norm2.xg b/test/test_two_max/gzz_norm2.xg
index bba1a51..af80357 100644
--- a/test/test_two_max/gzz_norm2.xg
+++ b/test/test_two_max/gzz_norm2.xg
@@ -1,2 +1,2 @@
"gzz v time
-0.0000000000000 1.0483852607726
+0.0000000000000 1.0486605858485
diff --git a/test/test_two_max/gzz_x_[16][16].xg b/test/test_two_max/gzz_x_[16][16].xg
index 86a2f80..0c94faf 100644
--- a/test/test_two_max/gzz_x_[16][16].xg
+++ b/test/test_two_max/gzz_x_[16][16].xg
@@ -1,7 +1,7 @@
"Time = 0.0000000000e+00
--3.0000000000e+01 1.0478259905e+00
+-3.0000000000e+01 1.0547958830e+00
-2.8124968750e+01 1.0547958830e+00
-2.6249937500e+01 1.0641389274e+00
-2.4374906250e+01 1.0764270864e+00
@@ -33,4 +33,4 @@
2.4375906250e+01 1.1395745203e+00
2.6250937500e+01 1.1158439319e+00
2.8125968750e+01 1.0987090268e+00
-3.0001000000e+01 1.0859877269e+00
+3.0001000000e+01 1.0987090268e+00
diff --git a/test/test_two_max/gzz_y_[16][16].xg b/test/test_two_max/gzz_y_[16][16].xg
index 8f8e6a8..e304549 100644
--- a/test/test_two_max/gzz_y_[16][16].xg
+++ b/test/test_two_max/gzz_y_[16][16].xg
@@ -1,7 +1,7 @@
"Time = 0.0000000000e+00
--3.0000000000e+01 1.0378006812e+00
+-3.0000000000e+01 1.0398055092e+00
-2.8124968750e+01 1.0398055092e+00
-2.6249937500e+01 1.0420003066e+00
-2.4374906250e+01 1.0444059210e+00
@@ -33,4 +33,4 @@
2.4375906250e+01 1.0444045781e+00
2.6250937500e+01 1.0419990817e+00
2.8125968750e+01 1.0398043912e+00
-3.0001000000e+01 1.0377996591e+00
+3.0001000000e+01 1.0398043912e+00
diff --git a/test/test_two_max/gzz_z_[16][16].xg b/test/test_two_max/gzz_z_[16][16].xg
index 8f8e6a8..e304549 100644
--- a/test/test_two_max/gzz_z_[16][16].xg
+++ b/test/test_two_max/gzz_z_[16][16].xg
@@ -1,7 +1,7 @@
"Time = 0.0000000000e+00
--3.0000000000e+01 1.0378006812e+00
+-3.0000000000e+01 1.0398055092e+00
-2.8124968750e+01 1.0398055092e+00
-2.6249937500e+01 1.0420003066e+00
-2.4374906250e+01 1.0444059210e+00
@@ -33,4 +33,4 @@
2.4375906250e+01 1.0444045781e+00
2.6250937500e+01 1.0419990817e+00
2.8125968750e+01 1.0398043912e+00
-3.0001000000e+01 1.0377996591e+00
+3.0001000000e+01 1.0398043912e+00
diff --git a/test/test_two_max/ham_3D_diagonal.xg b/test/test_two_max/ham_3D_diagonal.xg
index 8ed13ca..2975f2b 100644
--- a/test/test_two_max/ham_3D_diagonal.xg
+++ b/test/test_two_max/ham_3D_diagonal.xg
@@ -2,7 +2,7 @@
"Time = 0.0000000000e+00
-5.1961524227e+01 0.0000000000e+00
--4.8713874836e+01 -5.0048229271e-06
+-4.8713874836e+01 -6.4381040925e-04
-4.5466225446e+01 -4.9990026282e-06
-4.2218576055e+01 -4.9914220552e-06
-3.8970926664e+01 -4.9815787868e-06
@@ -32,5 +32,5 @@
3.8972658715e+01 -4.7363540646e-06
4.2220308106e+01 -4.8226758757e-06
4.5467957496e+01 -4.8811101852e-06
-4.8715606887e+01 -4.9212616513e-06
+4.8715606887e+01 -1.2169568058e-03
5.1963256278e+01 0.0000000000e+00
diff --git a/test/test_two_max/ham_norm1.xg b/test/test_two_max/ham_norm1.xg
index d9ac17a..95024dc 100644
--- a/test/test_two_max/ham_norm1.xg
+++ b/test/test_two_max/ham_norm1.xg
@@ -1,2 +1,2 @@
"ham v time
-0.0000000000000 0.0000695719259
+0.0000000000000 0.0002051783099
diff --git a/test/test_two_max/ham_norm2.xg b/test/test_two_max/ham_norm2.xg
index 46fd0da..545467e 100644
--- a/test/test_two_max/ham_norm2.xg
+++ b/test/test_two_max/ham_norm2.xg
@@ -1,2 +1,2 @@
"ham v time
-0.0000000000000 0.0004230740662
+0.0000000000000 0.0006138084432
diff --git a/test/test_two_max/ham_x_[16][16].xg b/test/test_two_max/ham_x_[16][16].xg
index e894438..e91fb4b 100644
--- a/test/test_two_max/ham_x_[16][16].xg
+++ b/test/test_two_max/ham_x_[16][16].xg
@@ -2,7 +2,7 @@
"Time = 0.0000000000e+00
-3.0000000000e+01 0.0000000000e+00
--2.8124968750e+01 -4.5441501012e-05
+-2.8124968750e+01 -3.6254029156e-03
-2.6249937500e+01 7.6525096212e-05
-2.4374906250e+01 -2.4501621460e-05
-2.2499875000e+01 -4.5849451346e-05
@@ -32,5 +32,5 @@
2.2500875000e+01 -8.8054616652e-05
2.4375906250e+01 -4.1170598013e-05
2.6250937500e+01 1.0766260443e-04
-2.8125968750e+01 -7.7561123963e-05
+2.8125968750e+01 -6.1204959707e-03
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 8b85c91..2924b8b 100644
--- a/test/test_two_max/ham_y_[16][16].xg
+++ b/test/test_two_max/ham_y_[16][16].xg
@@ -2,7 +2,7 @@
"Time = 0.0000000000e+00
-3.0000000000e+01 0.0000000000e+00
--2.8124968750e+01 -5.1541687430e-06
+-2.8124968750e+01 -1.0612087062e-03
-2.6249937500e+01 -5.1158091755e-06
-2.4374906250e+01 -5.0391690479e-06
-2.2499875000e+01 -4.9035925877e-06
@@ -32,5 +32,5 @@
2.2500875000e+01 -4.9036850355e-06
2.4375906250e+01 -5.0392235136e-06
2.6250937500e+01 -5.1158382552e-06
-2.8125968750e+01 -5.1541818227e-06
+2.8125968750e+01 -1.0611603758e-03
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 451f6b6..710ee86 100644
--- a/test/test_two_max/ham_z_[16][16].xg
+++ b/test/test_two_max/ham_z_[16][16].xg
@@ -2,7 +2,7 @@
"Time = 0.0000000000e+00
-3.0000000000e+01 0.0000000000e+00
--2.8124968750e+01 -5.1541687430e-06
+-2.8124968750e+01 -1.0612087062e-03
-2.6249937500e+01 -5.1158091755e-06
-2.4374906250e+01 -5.0391690479e-06
-2.2499875000e+01 -4.9035925877e-06
@@ -32,5 +32,5 @@
2.2500875000e+01 -4.9036850355e-06
2.4375906250e+01 -5.0392235136e-06
2.6250937500e+01 -5.1158382552e-06
-2.8125968750e+01 -5.1541818227e-06
+2.8125968750e+01 -1.0611603758e-03
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 0d572ef..befc7d5 100644
--- a/test/test_two_max/tau_3D_diagonal.xg
+++ b/test/test_two_max/tau_3D_diagonal.xg
@@ -1,7 +1,7 @@
"Time = 0.0000000000e+00
--5.1961524227e+01 1.0307094459e-12
+-5.1961524227e+01 1.0323961307e-12
-4.8713874836e+01 1.0323961307e-12
-4.5466225446e+01 1.0342739218e-12
-4.2218576055e+01 1.0363762171e-12
@@ -33,4 +33,4 @@
4.2220308106e+01 1.0536576756e-12
4.5467957496e+01 1.0493300932e-12
4.8715606887e+01 1.0456180913e-12
-5.1963256278e+01 1.0424048058e-12
+5.1963256278e+01 1.0456180913e-12
diff --git a/test/test_two_max/tau_x_[16][16].xg b/test/test_two_max/tau_x_[16][16].xg
index 0a22181..52b639b 100644
--- a/test/test_two_max/tau_x_[16][16].xg
+++ b/test/test_two_max/tau_x_[16][16].xg
@@ -1,7 +1,7 @@
"Time = 0.0000000000e+00
--3.0000000000e+01 1.0725900154e-12
+-3.0000000000e+01 1.0833097180e-12
-2.8124968750e+01 1.0833097180e-12
-2.6249937500e+01 3.2389631481e-09
-2.4374906250e+01 1.3508075941e-07
@@ -33,4 +33,4 @@
2.4375906250e+01 2.5590772959e-07
2.6250937500e+01 1.1787051582e-12
2.8125968750e+01 1.1516593529e-12
-3.0001000000e+01 1.1317157912e-12
+3.0001000000e+01 1.1516593529e-12
diff --git a/test/test_two_max/tau_y_[16][16].xg b/test/test_two_max/tau_y_[16][16].xg
index 24663ea..2f69131 100644
--- a/test/test_two_max/tau_y_[16][16].xg
+++ b/test/test_two_max/tau_y_[16][16].xg
@@ -1,7 +1,7 @@
"Time = 0.0000000000e+00
--3.0000000000e+01 1.0572335273e-12
+-3.0000000000e+01 1.0602985591e-12
-2.8124968750e+01 1.0602985591e-12
-2.6249937500e+01 1.0636574104e-12
-2.4374906250e+01 1.0673429552e-12
@@ -33,4 +33,4 @@
2.4375906250e+01 1.0673408965e-12
2.6250937500e+01 1.0636555349e-12
2.8125968750e+01 1.0602968489e-12
-3.0001000000e+01 1.0572319654e-12
+3.0001000000e+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 24663ea..2f69131 100644
--- a/test/test_two_max/tau_z_[16][16].xg
+++ b/test/test_two_max/tau_z_[16][16].xg
@@ -1,7 +1,7 @@
"Time = 0.0000000000e+00
--3.0000000000e+01 1.0572335273e-12
+-3.0000000000e+01 1.0602985591e-12
-2.8124968750e+01 1.0602985591e-12
-2.6249937500e+01 1.0636574104e-12
-2.4374906250e+01 1.0673429552e-12
@@ -33,4 +33,4 @@
2.4375906250e+01 1.0673408965e-12
2.6250937500e+01 1.0636555349e-12
2.8125968750e+01 1.0602968489e-12
-3.0001000000e+01 1.0572319654e-12
+3.0001000000e+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 32efcca..39761a3 100644
--- a/test/test_two_max/test_two_max.par
+++ b/test/test_two_max/test_two_max.par
@@ -1,4 +1,4 @@
-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"
+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_omni admconstraints constants LocalReduce TmunuBase InitBase"
TmunuBase::stress_energy_storage = yes
TmunuBase::stress_energy_at_RHS = yes
@@ -24,17 +24,17 @@ 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
+hydrobase::evolution_method = "GRHydro"
+
+GRHydro::riemann_solver = "Marquina"
+GRHydro::GRHydro_eos_type = "Polytype"
+GRHydro::GRHydro_eos_table = "2D_Polytrope"
+GRHydro::recon_method = "ppm"
+GRHydro::GRHydro_stencil = 3
+GRHydro::bound = "none"
+GRHydro::tvd_limiter = "VanLeerMC2"
+GRHydro::rho_abs_min = 1.e-7
+GRHydro::initial_atmosphere_factor = 0.999
ADMBase::initial_data = "tov"
ADMBase::initial_lapse = "tov"
@@ -54,16 +54,13 @@ 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"
+IOBasic::outScalar_vars = "HydroBase::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel GRHydro::dens GRHydro::tau GRHydro::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::out1D_vars = "HydroBase::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel GRHydro::dens GRHydro::tau GRHydro::scon admbase::lapse admbase::metric admbase::curv admconstraints::ham admconstraints::momentum"
IOASCII::out_format = ".10e"