Simplify and correct atmosphere handling

- This will be taken out of this thorn entirely later,
  this is only a cleanup to prepare this
- This actually also fixes a bug with the atmosphere of
  multiple stars using the average method, thus the
  change to the testsuite
Remove some unused function arguments of internal function



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

44 files changed, 764 insertions, 777 deletions

diff --git a/src/external.inc b/src/external.inc
index 0ab7550..6461c65 100644
--- a/src/external.inc
+++ b/src/external.inc
@@ -85,8 +85,7 @@ CCTK_INT TOV_Set_Rho_ADM(CCTK_POINTER_TO_CONST cctkGH,
                                &(TOV_press_1d[star_i]), &(TOV_phi_1d[star_i]),
                                &(TOV_rbar_1d[star_i]),  &(TOV_r_1d[star_i]),
                                &r_to_star, TOV_Surface[star],
-                               &press, &phi, &r,
-                               0, 1, NULL);
+                               &press, &phi, &r);
     press = (press > 0.0) ? press : 0.0;
     rho = pow(press/TOV_K[star], 1.0/TOV_Gamma[star]);
     eps = (rho > 0.0) ? press/(TOV_Gamma[star] - 1.0) / rho : 0.0;
@@ -156,8 +155,7 @@ CCTK_INT TOV_Set_Momentum_Source(
                                &(TOV_press_1d[star_i]), &(TOV_phi_1d[star_i]),
                                &(TOV_rbar_1d[star_i]),  &(TOV_r_1d[star_i]),
                                &r_to_star, TOV_Surface[star],
-                               &press, &phi, &r,
-                               0, 1, NULL);
+                               &press, &phi, &r);
     rho = pow(press/TOV_K[star], 1.0/TOV_Gamma[star]);
     gxx = r / (r_to_star + 1.0e-30) * r / (r_to_star + 1.0e-30);
     psip = pow(gxx, TOV_Momentum_Psi_Power/4.);
@@ -229,8 +227,7 @@ CCTK_INT TOV_Set_Initial_Guess_for_u(
                                &(TOV_press_1d[star_i]), &(TOV_phi_1d[star_i]),
                                &(TOV_rbar_1d[star_i]),  &(TOV_r_1d[star_i]),
                                &r_to_star, TOV_Surface[star],
-                               &press, &phi, &r,
-                               0, 1, NULL);
+                               &press, &phi, &r);
     rho = pow(press/TOV_K[star], 1.0/TOV_Gamma[star]);
     if (rho>0.0)
       eps = press/(TOV_Gamma[star] - 1.0) / rho;
diff --git a/src/tov.c b/src/tov.c
index 3c82c44..68e3171 100644
--- a/src/tov.c
+++ b/src/tov.c
@@ -332,7 +332,6 @@ void TOV_C_Integrate_RHS(CCTK_ARGUMENTS)
       local_rho = pow(TOV_press_1d[i+1] / TOV_K[star], 1.0 / TOV_Gamma[star]);
 
       /* scan for the surface */
-      /*  if ( (local_rho <= TOV_Atmosphere[star]) ||*/
       if ( (local_rho <= 0.0) ||
            (TOV_press_1d[i+1] <= 0.0) )
       {
@@ -361,8 +360,7 @@ void TOV_C_Integrate_RHS(CCTK_ARGUMENTS)
       /* match to Schwarzschield */
       if (i > TOV_Surface_Index)
       {
-        TOV_press_1d[i] = TOV_K[star] * pow(TOV_Atmosphere[star],
-                                            TOV_Gamma[star]);
+        TOV_press_1d[i] = 0.0;
         TOV_rbar_1d [i] = 0.5 *
                           (sqrt(TOV_r_1d[i]*(TOV_r_1d[i] - 2.0*Surface_Mass)) +
                           TOV_r_1d[i] - Surface_Mass);
@@ -444,10 +442,7 @@ void TOV_C_interp_tov_isotropic(
                                 CCTK_REAL surface,
                                 CCTK_REAL *press_point,
                                 CCTK_REAL *phi_point,
-                                CCTK_REAL *r_point,
-                                CCTK_INT  TOV_warn_small_grid,
-                                CCTK_INT  TOV_zero_atmosphere,
-                                CCTK_REAL *TOV_Atmosphere)
+                                CCTK_REAL *r_point)
 {
   DECLARE_CCTK_PARAMETERS
   CCTK_INT  left_index;
@@ -459,17 +454,8 @@ void TOV_C_interp_tov_isotropic(
     *r=TOV_rbar_1d_local[1];
   if (*r > TOV_rbar_1d_local[TOV_Num_Radial-2])
     {
-      if (TOV_warn_small_grid)
-	CCTK_VWarn(0, __LINE__, __FILE__, CCTK_THORNSTRING,
-                 "Grid not large enough - last point: %.20f.",
-                 TOV_rbar_1d_local[TOV_Num_Radial-1]);
-      else
 	{
-	  if (!TOV_zero_atmosphere)
-	    *press_point= TOV_K[star] * pow(TOV_Atmosphere[star],
-                                        TOV_Gamma[star]);
-	  else
-	    *press_point=0.0;
+	  *press_point= 0.0;
 	  M = 0.5 * TOV_r_1d_local[TOV_Num_Radial-1] *
 	    (1.0 - exp(2.0*TOV_phi_1d_local[TOV_Num_Radial-1]));
 	  *r_point=(2* *r+M)*(2* *r+M)*0.25/ *r;
@@ -495,8 +481,7 @@ void TOV_C_interp_tov_isotropic(
                         h  * TOV_r_1d_local[left_index+1];
   *phi_point   = (1.0 - h) * TOV_phi_1d_local[left_index] +
                         h  * TOV_phi_1d_local[left_index+1];
-  if (!TOV_zero_atmosphere ||
-      (*r_point < surface))
+  if (*r_point < surface)
     *press_point = (1.0 - h) * TOV_press_1d_local[left_index] +
                           h  * TOV_press_1d_local[left_index+1];
   else
@@ -525,7 +510,7 @@ void TOV_C_Exact(CCTK_ARGUMENTS)
 
   CCTK_INT  LSH_MAX_I;
 
-  CCTK_INT i,j,k, i3D, star, star_i;
+  CCTK_INT i,j,k, i3D, star;
   CCTK_REAL *r_to_star;
   CCTK_REAL g_diag, max_g_diag, max_rho, det, sqrt_det;
   CCTK_REAL my_velx, my_vely, my_velz, my_psi4;
@@ -646,7 +631,7 @@ void TOV_C_Exact(CCTK_ARGUMENTS)
                 (y[i3D]-TOV_Position_y[star]) +
                 (z[i3D]-TOV_Position_z[star]) *
                 (z[i3D]-TOV_Position_z[star]) );
-        star_i = star * TOV_Num_Radial;
+        int star_i = star * TOV_Num_Radial;
 
         /* do the actual interpolation */
         TOV_C_interp_tov_isotropic(star,
@@ -654,8 +639,7 @@ void TOV_C_Exact(CCTK_ARGUMENTS)
                                &(TOV_rbar_1d[star_i]), &(TOV_r_1d[star_i]),
                                &(r_to_star[star]), TOV_Surface[star],
                                &(press_point[star]),
-                               &(phi_point[star]), &(r_point[star]),
-                               0, 0, TOV_Atmosphere);
+                               &(phi_point[star]), &(r_point[star]));
 
         /* is some perturbation wanted? */
         if (Perturb[star] == 0)
@@ -668,8 +652,11 @@ void TOV_C_Exact(CCTK_ARGUMENTS)
                              Pert_Amplitude[star] *
                                cos(PI/2.0 * r[i3D] / TOV_R_Surface[star]));
 
-        eps_point[star] = press_point[star] / (TOV_Gamma[star] - 1.0)
-                                            /  rho_point[star];
+        if (rho_point[star] > local_tiny)
+          eps_point[star] = press_point[star] / (TOV_Gamma[star] - 1.0)
+                                              /  rho_point[star];
+        else
+          eps_point[star] = 0.0;
         mu_point[star]  = rho_point[star] * (1.0 + eps_point[star]);
       }
       /* find out from which star we want to have the data */
@@ -679,7 +666,7 @@ void TOV_C_Exact(CCTK_ARGUMENTS)
         star=0;
         max_g_diag = 0.0;
         max_rho = rho_point[0];
-        for (star_i=0; star_i<TOV_Num_TOVs; star_i++)
+        for (int star_i=0; star_i<TOV_Num_TOVs; star_i++)
         {
           g_diag = (r_point[star_i] / (r_to_star[star_i] + 1.0e-30)) *
                    (r_point[star_i] / (r_to_star[star_i] + 1.0e-30));
@@ -786,6 +773,9 @@ void TOV_C_Exact(CCTK_ARGUMENTS)
                                 my_psi4);
 
         rho[i3D] = max_rho;
+        /* Set atmosphere according to chosen star */
+        if(rho[i3D] <= TOV_Atmosphere[star])
+          rho[i3D] = TOV_Atmosphere[star];
         eps[i3D] = eps_point[star];
         press[i3D] = press_point[star];
 
@@ -801,7 +791,7 @@ void TOV_C_Exact(CCTK_ARGUMENTS)
           rho[i3D] = 0.0;
         }
         star=-1;
-        for (star_i=0; star_i<TOV_Num_TOVs; star_i++)
+        for (int star_i=0; star_i<TOV_Num_TOVs; star_i++)
         {
           if (tov_lapse)
             alp[i3D] *= exp(phi_point[star_i]);
@@ -832,9 +822,9 @@ void TOV_C_Exact(CCTK_ARGUMENTS)
             star=star_i;
           }
 
-        if(rho[i3D] <= TOV_Atmosphere[star_i])
+          /* Reset atmosphere according to chosen star */
+          if(rho[i3D] <= TOV_Atmosphere[star_i])
             rho[i3D] = TOV_Atmosphere[star_i];
-
         }
 
         if (TOV_Conformal_Flat_Three_Metric)
diff --git a/test/test_two_av/dens_3D_diagonal.xg b/test/test_two_av/dens_3D_diagonal.xg
index 5131ffd..43c48ce 100644
--- a/test/test_two_av/dens_3D_diagonal.xg
+++ b/test/test_two_av/dens_3D_diagonal.xg
@@ -1,36 +1,36 @@
 
 
 "Time = 0.0000000000e+00
--5.1961524227e+01		2.1072405410e-07
--4.8713874836e+01		2.1142375478e-07
--4.5466225446e+01		2.1221778000e-07
--4.2218576055e+01		2.1312589423e-07
--3.8970926664e+01		2.1417337205e-07
--3.5723277273e+01		2.1539272307e-07
--3.2475627882e+01		2.1682575284e-07
--2.9227978492e+01		2.1852549920e-07
--2.5980329101e+01		2.2055635831e-07
--2.2732679710e+01		2.2298738949e-07
--1.9485030319e+01		2.2586612932e-07
--1.6237380928e+01		2.2914939261e-07
--1.2989731538e+01		2.3258352999e-07
--9.7420821469e+00		2.3566381780e-07
--6.4944327562e+00		2.3797004514e-07
--3.2467833654e+00		2.3965594179e-07
-8.6602540379e-04		2.4121938553e-07
-3.2485154162e+00		2.4274653155e-07
-6.4961648070e+00		2.4352917699e-07
-9.7438141977e+00		2.4252212604e-07
-1.2991463589e+01		2.3949525713e-07
-1.6239112979e+01		2.3533960386e-07
-1.9486762370e+01		2.3109476965e-07
-2.2734411761e+01		2.2730799537e-07
-2.5982061152e+01		2.2411636641e-07
-2.9229710542e+01		2.2147606529e-07
-3.2477359933e+01		2.1929420995e-07
-3.5725009324e+01		2.1747936609e-07
-3.8972658715e+01		2.1595542672e-07
-4.2220308106e+01		2.1466258624e-07
-4.5467957496e+01		2.1355473291e-07
-4.8715606887e+01		2.1259640544e-07
-5.1963256278e+01		2.1176019927e-07
+-5.1961524227e+01		1.0546749454e-07
+-4.8713874836e+01		1.0581769509e-07
+-4.5466225446e+01		1.0621510511e-07
+-4.2218576055e+01		1.0666961673e-07
+-3.8970926664e+01		1.0719387991e-07
+-3.5723277273e+01		1.0780416570e-07
+-3.2475627882e+01		1.0852139782e-07
+-2.9227978492e+01		1.0937212172e-07
+-2.5980329101e+01		1.1038856772e-07
+-2.2732679710e+01		1.1160530005e-07
+-1.9485030319e+01		1.1304611077e-07
+-1.6237380928e+01		1.1468938569e-07
+-1.2989731538e+01		1.1640817317e-07
+-9.7420821469e+00		1.1794985876e-07
+-6.4944327562e+00		1.1910412670e-07
+-3.2467833654e+00		1.1994791881e-07
+8.6602540379e-04		1.2073042319e-07
+3.2485154162e+00		1.2149476054e-07
+6.4961648070e+00		1.2188647497e-07
+9.7438141977e+00		1.2138244547e-07
+1.2991463589e+01		1.1986749606e-07
+1.6239112979e+01		1.1778758952e-07
+1.9486762370e+01		1.1566304787e-07
+2.2734411761e+01		1.1376776545e-07
+2.5982061152e+01		1.1217035356e-07
+2.9229710542e+01		1.1084888153e-07
+3.2477359933e+01		1.0975686184e-07
+3.5725009324e+01		1.0884853158e-07
+3.8972658715e+01		1.0808579916e-07
+4.2220308106e+01		1.0743873185e-07
+4.5467957496e+01		1.0688425071e-07
+4.8715606887e+01		1.0640460733e-07
+5.1963256278e+01		1.0598608572e-07
diff --git a/test/test_two_av/dens_minimum.xg b/test/test_two_av/dens_minimum.xg
index 7019c6d..025a784 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.0000002107238
+0.0000000000000	0.0000001054674
diff --git a/test/test_two_av/dens_norm1.xg b/test/test_two_av/dens_norm1.xg
index b649820..eaa8f0f 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.0000046070808
+0.0000000000000	0.0000044991884
diff --git a/test/test_two_av/dens_norm2.xg b/test/test_two_av/dens_norm2.xg
index 8ad248f..f936a8d 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.0000275060334
+0.0000000000000	0.0000274983523
diff --git a/test/test_two_av/dens_x_[16][16].xg b/test/test_two_av/dens_x_[16][16].xg
index 65bea07..432ac82 100644
--- a/test/test_two_av/dens_x_[16][16].xg
+++ b/test/test_two_av/dens_x_[16][16].xg
@@ -1,25 +1,25 @@
 
 
 "Time = 0.0000000000e+00
--3.0000000000e+01		2.2297379395e-07
--2.8124968750e+01		2.2552893444e-07
--2.6249937500e+01		6.3367727396e-06
--2.4374906250e+01		4.0709243156e-05
--2.2499875000e+01		8.1984193228e-05
--2.0624843750e+01		1.2548484148e-04
--1.8749812500e+01		1.6469577655e-04
--1.6874781250e+01		1.9243942097e-04
--1.4999750000e+01		2.0291500303e-04
--1.3124718750e+01		1.9377206035e-04
--1.1249687500e+01		1.6702881976e-04
--9.3746562500e+00		1.2824433603e-04
--7.4996250000e+00		8.4498250266e-05
--5.6245937500e+00		4.2355532506e-05
--3.7495625000e+00		6.6586249700e-06
--1.8745312500e+00		2.4031033928e-07
-5.0000000000e-04		2.4121938553e-07
-1.8755312500e+00		2.4356150047e-07
-3.7505625000e+00		2.4768282378e-07
+-3.0000000000e+01		1.1159849547e-07
+-2.8124968750e+01		1.1287734457e-07
+-2.6249937500e+01		6.2223362030e-06
+-2.4374906250e+01		4.0592641553e-05
+-2.2499875000e+01		8.1865086991e-05
+-2.0624843750e+01		1.2536316125e-04
+-1.8749812500e+01		1.6457178243e-04
+-1.6874781250e+01		1.9231370043e-04
+-1.4999750000e+01		2.0278838702e-04
+-1.3124718750e+01		1.9364546608e-04
+-1.1249687500e+01		1.6690306268e-04
+-9.3746562500e+00		1.2811996941e-04
+-7.4996250000e+00		8.4375475023e-05
+-5.6245937500e+00		4.2234185629e-05
+-3.7495625000e+00		6.5382251583e-06
+-1.8745312500e+00		1.2027544508e-07
+5.0000000000e-04		1.2073042319e-07
+1.8755312500e+00		1.2190265289e-07
+3.7505625000e+00		1.2396537727e-07
 5.6255937500e+00		5.8548948115e-05
 7.5006250000e+00		1.5003153361e-04
 9.3756562500e+00		2.5588735518e-04
@@ -31,6 +31,6 @@
 2.0625843750e+01		2.5290573054e-04
 2.2500875000e+01		1.4756560089e-04
 2.4375906250e+01		5.7248638962e-05
-2.6250937500e+01		2.4097056699e-07
-2.8125968750e+01		2.3528688755e-07
-3.0001000000e+01		2.3105543392e-07
+2.6250937500e+01		1.2060588939e-07
+2.8125968750e+01		1.1776120498e-07
+3.0001000000e+01		1.1564336032e-07
diff --git a/test/test_two_av/dens_y_[16][16].xg b/test/test_two_av/dens_y_[16][16].xg
index a9889a8..c8d90aa 100644
--- a/test/test_two_av/dens_y_[16][16].xg
+++ b/test/test_two_av/dens_y_[16][16].xg
@@ -1,36 +1,36 @@
 
 
 "Time = 0.0000000000e+00
--3.0000000000e+01		2.1773503236e-07
--2.8124968750e+01		2.1869832294e-07
--2.6249937500e+01		2.1975426496e-07
--2.4374906250e+01		2.2091327935e-07
--2.2499875000e+01		2.2218619083e-07
--2.0624843750e+01		2.2358355709e-07
--1.8749812500e+01		2.2511446141e-07
--1.6874781250e+01		2.2678447375e-07
--1.4999750000e+01		2.2859239253e-07
--1.3124718750e+01		2.3052534668e-07
--1.1249687500e+01		2.3255201418e-07
--9.3746562500e+00		2.3461438138e-07
--7.4996250000e+00		2.3661999016e-07
--5.6245937500e+00		2.3843907275e-07
--3.7495625000e+00		2.3991323535e-07
--1.8745312500e+00		2.4088124331e-07
-5.0000000000e-04		2.4121938553e-07
-1.8755312500e+00		2.4088088677e-07
-3.7505625000e+00		2.3991257058e-07
-5.6255937500e+00		2.3843817969e-07
-7.5006250000e+00		2.3661895713e-07
-9.3756562500e+00		2.3461328670e-07
-1.1250687500e+01		2.3255091722e-07
-1.3125718750e+01		2.3052428700e-07
-1.5000750000e+01		2.2859139318e-07
-1.6875781250e+01		2.2678354581e-07
-1.8750812500e+01		2.2511360813e-07
-2.0625843750e+01		2.2358277695e-07
-2.2500875000e+01		2.2218547969e-07
-2.4375906250e+01		2.2091263183e-07
-2.6250937500e+01		2.1975367528e-07
-2.8125968750e+01		2.1869778540e-07
-3.0001000000e+01		2.1773454158e-07
+-3.0000000000e+01		1.0897649267e-07
+-2.8124968750e+01		1.0945862009e-07
+-2.6249937500e+01		1.0998711960e-07
+-2.4374906250e+01		1.1056720688e-07
+-2.2499875000e+01		1.1120429972e-07
+-2.0624843750e+01		1.1190368223e-07
+-1.8749812500e+01		1.1266990061e-07
+-1.6874781250e+01		1.1350574262e-07
+-1.4999750000e+01		1.1441060687e-07
+-1.3124718750e+01		1.1537805139e-07
+-1.1249687500e+01		1.1639239949e-07
+-9.3746562500e+00		1.1742461531e-07
+-7.4996250000e+00		1.1842842350e-07
+-5.6245937500e+00		1.1933887525e-07
+-3.7495625000e+00		1.2007669437e-07
+-1.8745312500e+00		1.2056118284e-07
+5.0000000000e-04		1.2073042319e-07
+1.8755312500e+00		1.2056100439e-07
+3.7505625000e+00		1.2007636165e-07
+5.6255937500e+00		1.1933842827e-07
+7.5006250000e+00		1.1842790647e-07
+9.3756562500e+00		1.1742406742e-07
+1.1250687500e+01		1.1639185046e-07
+1.3125718750e+01		1.1537752102e-07
+1.5000750000e+01		1.1441010669e-07
+1.6875781250e+01		1.1350527819e-07
+1.8750812500e+01		1.1266947354e-07
+2.0625843750e+01		1.1190329177e-07
+2.2500875000e+01		1.1120394379e-07
+2.4375906250e+01		1.1056688280e-07
+2.6250937500e+01		1.0998682446e-07
+2.8125968750e+01		1.0945835105e-07
+3.0001000000e+01		1.0897624703e-07
diff --git a/test/test_two_av/dens_z_[16][16].xg b/test/test_two_av/dens_z_[16][16].xg
index a9889a8..c8d90aa 100644
--- a/test/test_two_av/dens_z_[16][16].xg
+++ b/test/test_two_av/dens_z_[16][16].xg
@@ -1,36 +1,36 @@
 
 
 "Time = 0.0000000000e+00
--3.0000000000e+01		2.1773503236e-07
--2.8124968750e+01		2.1869832294e-07
--2.6249937500e+01		2.1975426496e-07
--2.4374906250e+01		2.2091327935e-07
--2.2499875000e+01		2.2218619083e-07
--2.0624843750e+01		2.2358355709e-07
--1.8749812500e+01		2.2511446141e-07
--1.6874781250e+01		2.2678447375e-07
--1.4999750000e+01		2.2859239253e-07
--1.3124718750e+01		2.3052534668e-07
--1.1249687500e+01		2.3255201418e-07
--9.3746562500e+00		2.3461438138e-07
--7.4996250000e+00		2.3661999016e-07
--5.6245937500e+00		2.3843907275e-07
--3.7495625000e+00		2.3991323535e-07
--1.8745312500e+00		2.4088124331e-07
-5.0000000000e-04		2.4121938553e-07
-1.8755312500e+00		2.4088088677e-07
-3.7505625000e+00		2.3991257058e-07
-5.6255937500e+00		2.3843817969e-07
-7.5006250000e+00		2.3661895713e-07
-9.3756562500e+00		2.3461328670e-07
-1.1250687500e+01		2.3255091722e-07
-1.3125718750e+01		2.3052428700e-07
-1.5000750000e+01		2.2859139318e-07
-1.6875781250e+01		2.2678354581e-07
-1.8750812500e+01		2.2511360813e-07
-2.0625843750e+01		2.2358277695e-07
-2.2500875000e+01		2.2218547969e-07
-2.4375906250e+01		2.2091263183e-07
-2.6250937500e+01		2.1975367528e-07
-2.8125968750e+01		2.1869778540e-07
-3.0001000000e+01		2.1773454158e-07
+-3.0000000000e+01		1.0897649267e-07
+-2.8124968750e+01		1.0945862009e-07
+-2.6249937500e+01		1.0998711960e-07
+-2.4374906250e+01		1.1056720688e-07
+-2.2499875000e+01		1.1120429972e-07
+-2.0624843750e+01		1.1190368223e-07
+-1.8749812500e+01		1.1266990061e-07
+-1.6874781250e+01		1.1350574262e-07
+-1.4999750000e+01		1.1441060687e-07
+-1.3124718750e+01		1.1537805139e-07
+-1.1249687500e+01		1.1639239949e-07
+-9.3746562500e+00		1.1742461531e-07
+-7.4996250000e+00		1.1842842350e-07
+-5.6245937500e+00		1.1933887525e-07
+-3.7495625000e+00		1.2007669437e-07
+-1.8745312500e+00		1.2056118284e-07
+5.0000000000e-04		1.2073042319e-07
+1.8755312500e+00		1.2056100439e-07
+3.7505625000e+00		1.2007636165e-07
+5.6255937500e+00		1.1933842827e-07
+7.5006250000e+00		1.1842790647e-07
+9.3756562500e+00		1.1742406742e-07
+1.1250687500e+01		1.1639185046e-07
+1.3125718750e+01		1.1537752102e-07
+1.5000750000e+01		1.1441010669e-07
+1.6875781250e+01		1.1350527819e-07
+1.8750812500e+01		1.1266947354e-07
+2.0625843750e+01		1.1190329177e-07
+2.2500875000e+01		1.1120394379e-07
+2.4375906250e+01		1.1056688280e-07
+2.6250937500e+01		1.0998682446e-07
+2.8125968750e+01		1.0945835105e-07
+3.0001000000e+01		1.0897624703e-07
diff --git a/test/test_two_av/eps_3D_diagonal.xg b/test/test_two_av/eps_3D_diagonal.xg
index eebf89b..c46c506 100644
--- a/test/test_two_av/eps_3D_diagonal.xg
+++ b/test/test_two_av/eps_3D_diagonal.xg
@@ -1,36 +1,36 @@
 
 
 "Time = 0.0000000000e+00
--5.1961524227e+01		1.9980000000e-05
--4.8713874836e+01		1.9980000000e-05
--4.5466225446e+01		1.9980000000e-05
--4.2218576055e+01		1.9980000000e-05
--3.8970926664e+01		1.9980000000e-05
--3.5723277273e+01		1.9980000000e-05
--3.2475627882e+01		1.9980000000e-05
--2.9227978492e+01		1.9980000000e-05
--2.5980329101e+01		1.9980000000e-05
--2.2732679710e+01		1.9980000000e-05
--1.9485030319e+01		1.9980000000e-05
--1.6237380928e+01		1.9980000000e-05
--1.2989731538e+01		1.9980000000e-05
--9.7420821469e+00		1.9980000000e-05
--6.4944327562e+00		1.9980000000e-05
--3.2467833654e+00		1.9980000000e-05
-8.6602540379e-04		1.9980000000e-05
-3.2485154162e+00		1.9980000000e-05
-6.4961648070e+00		1.9980000000e-05
-9.7438141977e+00		1.9980000000e-05
-1.2991463589e+01		1.9980000000e-05
-1.6239112979e+01		1.9980000000e-05
-1.9486762370e+01		1.9980000000e-05
-2.2734411761e+01		1.9980000000e-05
-2.5982061152e+01		1.9980000000e-05
-2.9229710542e+01		1.9980000000e-05
-3.2477359933e+01		1.9980000000e-05
-3.5725009324e+01		1.9980000000e-05
-3.8972658715e+01		1.9980000000e-05
-4.2220308106e+01		1.9980000000e-05
-4.5467957496e+01		1.9980000000e-05
-4.8715606887e+01		1.9980000000e-05
-5.1963256278e+01		1.9980000000e-05
+-5.1961524227e+01		1.0000000000e-05
+-4.8713874836e+01		1.0000000000e-05
+-4.5466225446e+01		1.0000000000e-05
+-4.2218576055e+01		1.0000000000e-05
+-3.8970926664e+01		1.0000000000e-05
+-3.5723277273e+01		1.0000000000e-05
+-3.2475627882e+01		1.0000000000e-05
+-2.9227978492e+01		1.0000000000e-05
+-2.5980329101e+01		1.0000000000e-05
+-2.2732679710e+01		1.0000000000e-05
+-1.9485030319e+01		1.0000000000e-05
+-1.6237380928e+01		1.0000000000e-05
+-1.2989731538e+01		1.0000000000e-05
+-9.7420821469e+00		1.0000000000e-05
+-6.4944327562e+00		1.0000000000e-05
+-3.2467833654e+00		1.0000000000e-05
+8.6602540379e-04		1.0000000000e-05
+3.2485154162e+00		1.0000000000e-05
+6.4961648070e+00		1.0000000000e-05
+9.7438141977e+00		1.0000000000e-05
+1.2991463589e+01		1.0000000000e-05
+1.6239112979e+01		1.0000000000e-05
+1.9486762370e+01		1.0000000000e-05
+2.2734411761e+01		1.0000000000e-05
+2.5982061152e+01		1.0000000000e-05
+2.9229710542e+01		1.0000000000e-05
+3.2477359933e+01		1.0000000000e-05
+3.5725009324e+01		1.0000000000e-05
+3.8972658715e+01		1.0000000000e-05
+4.2220308106e+01		1.0000000000e-05
+4.5467957496e+01		1.0000000000e-05
+4.8715606887e+01		1.0000000000e-05
+5.1963256278e+01		1.0000000000e-05
diff --git a/test/test_two_av/eps_minimum.xg b/test/test_two_av/eps_minimum.xg
index 5584c76..186cd48 100644
--- a/test/test_two_av/eps_minimum.xg
+++ b/test/test_two_av/eps_minimum.xg
@@ -1,2 +1,2 @@
 "eps v time
-0.0000000000000	0.0000199800000
+0.0000000000000	0.0000100000000
diff --git a/test/test_two_av/eps_norm1.xg b/test/test_two_av/eps_norm1.xg
index dcb60a0..d321e59 100644
--- a/test/test_two_av/eps_norm1.xg
+++ b/test/test_two_av/eps_norm1.xg
@@ -1,2 +1,2 @@
 "eps v time
-0.0000000000000	0.0003609385846
+0.0000000000000	0.0003511801893
diff --git a/test/test_two_av/eps_norm2.xg b/test/test_two_av/eps_norm2.xg
index ca859a6..730541a 100644
--- a/test/test_two_av/eps_norm2.xg
+++ b/test/test_two_av/eps_norm2.xg
@@ -1,2 +1,2 @@
 "eps v time
-0.0000000000000	0.0020687952699
+0.0000000000000	0.0020680892683
diff --git a/test/test_two_av/eps_x_[16][16].xg b/test/test_two_av/eps_x_[16][16].xg
index 637e9c8..5c7dae3 100644
--- a/test/test_two_av/eps_x_[16][16].xg
+++ b/test/test_two_av/eps_x_[16][16].xg
@@ -1,25 +1,25 @@
 
 
 "Time = 0.0000000000e+00
--3.0000000000e+01		1.9980000000e-05
--2.8124968750e+01		1.9980000000e-05
--2.6249937500e+01		5.5318311366e-04
--2.4374906250e+01		3.4878194734e-03
--2.2499875000e+01		6.8763996451e-03
--2.0624843750e+01		1.0302360124e-02
--1.8749812500e+01		1.3269265192e-02
--1.6874781250e+01		1.5291613446e-02
--1.4999750000e+01		1.6009989861e-02
--1.3124718750e+01		1.5291236331e-02
--1.1249687500e+01		1.3268580110e-02
--9.3746562500e+00		1.0301484949e-02
--7.4996250000e+00		6.8754701330e-03
--5.6245937500e+00		3.4869605252e-03
--3.7495625000e+00		5.5248976318e-04
--1.8745312500e+00		1.9980000000e-05
-5.0000000000e-04		1.9980000000e-05
-1.8755312500e+00		1.9980000000e-05
-3.7505625000e+00		1.9980000000e-05
+-3.0000000000e+01		1.0000000000e-05
+-2.8124968750e+01		1.0000000000e-05
+-2.6249937500e+01		5.4319311366e-04
+-2.4374906250e+01		3.4778294734e-03
+-2.2499875000e+01		6.8664096451e-03
+-2.0624843750e+01		1.0292370124e-02
+-1.8749812500e+01		1.3259275192e-02
+-1.6874781250e+01		1.5281623446e-02
+-1.4999750000e+01		1.5999999861e-02
+-1.3124718750e+01		1.5281246331e-02
+-1.1249687500e+01		1.3258590110e-02
+-9.3746562500e+00		1.0291494949e-02
+-7.4996250000e+00		6.8654801330e-03
+-5.6245937500e+00		3.4769705252e-03
+-3.7495625000e+00		5.4249976318e-04
+-1.8745312500e+00		1.0000000000e-05
+5.0000000000e-04		1.0000000000e-05
+1.8755312500e+00		1.0000000000e-05
+3.7505625000e+00		1.0000000000e-05
 5.6255937500e+00		4.6015032040e-03
 7.5006250000e+00		1.1400117181e-02
 9.3756562500e+00		1.8747944755e-02
@@ -31,6 +31,6 @@
 2.0625843750e+01		1.8742137541e-02
 2.2500875000e+01		1.1394325671e-02
 2.4375906250e+01		4.5965243893e-03
-2.6250937500e+01		1.9980000000e-05
-2.8125968750e+01		1.9980000000e-05
-3.0001000000e+01		1.9980000000e-05
+2.6250937500e+01		1.0000000000e-05
+2.8125968750e+01		1.0000000000e-05
+3.0001000000e+01		1.0000000000e-05
diff --git a/test/test_two_av/eps_y_[16][16].xg b/test/test_two_av/eps_y_[16][16].xg
index 5ff5490..99bf421 100644
--- a/test/test_two_av/eps_y_[16][16].xg
+++ b/test/test_two_av/eps_y_[16][16].xg
@@ -1,36 +1,36 @@
 
 
 "Time = 0.0000000000e+00
--3.0000000000e+01		1.9980000000e-05
--2.8124968750e+01		1.9980000000e-05
--2.6249937500e+01		1.9980000000e-05
--2.4374906250e+01		1.9980000000e-05
--2.2499875000e+01		1.9980000000e-05
--2.0624843750e+01		1.9980000000e-05
--1.8749812500e+01		1.9980000000e-05
--1.6874781250e+01		1.9980000000e-05
--1.4999750000e+01		1.9980000000e-05
--1.3124718750e+01		1.9980000000e-05
--1.1249687500e+01		1.9980000000e-05
--9.3746562500e+00		1.9980000000e-05
--7.4996250000e+00		1.9980000000e-05
--5.6245937500e+00		1.9980000000e-05
--3.7495625000e+00		1.9980000000e-05
--1.8745312500e+00		1.9980000000e-05
-5.0000000000e-04		1.9980000000e-05
-1.8755312500e+00		1.9980000000e-05
-3.7505625000e+00		1.9980000000e-05
-5.6255937500e+00		1.9980000000e-05
-7.5006250000e+00		1.9980000000e-05
-9.3756562500e+00		1.9980000000e-05
-1.1250687500e+01		1.9980000000e-05
-1.3125718750e+01		1.9980000000e-05
-1.5000750000e+01		1.9980000000e-05
-1.6875781250e+01		1.9980000000e-05
-1.8750812500e+01		1.9980000000e-05
-2.0625843750e+01		1.9980000000e-05
-2.2500875000e+01		1.9980000000e-05
-2.4375906250e+01		1.9980000000e-05
-2.6250937500e+01		1.9980000000e-05
-2.8125968750e+01		1.9980000000e-05
-3.0001000000e+01		1.9980000000e-05
+-3.0000000000e+01		1.0000000000e-05
+-2.8124968750e+01		1.0000000000e-05
+-2.6249937500e+01		1.0000000000e-05
+-2.4374906250e+01		1.0000000000e-05
+-2.2499875000e+01		1.0000000000e-05
+-2.0624843750e+01		1.0000000000e-05
+-1.8749812500e+01		1.0000000000e-05
+-1.6874781250e+01		1.0000000000e-05
+-1.4999750000e+01		1.0000000000e-05
+-1.3124718750e+01		1.0000000000e-05
+-1.1249687500e+01		1.0000000000e-05
+-9.3746562500e+00		1.0000000000e-05
+-7.4996250000e+00		1.0000000000e-05
+-5.6245937500e+00		1.0000000000e-05
+-3.7495625000e+00		1.0000000000e-05
+-1.8745312500e+00		1.0000000000e-05
+5.0000000000e-04		1.0000000000e-05
+1.8755312500e+00		1.0000000000e-05
+3.7505625000e+00		1.0000000000e-05
+5.6255937500e+00		1.0000000000e-05
+7.5006250000e+00		1.0000000000e-05
+9.3756562500e+00		1.0000000000e-05
+1.1250687500e+01		1.0000000000e-05
+1.3125718750e+01		1.0000000000e-05
+1.5000750000e+01		1.0000000000e-05
+1.6875781250e+01		1.0000000000e-05
+1.8750812500e+01		1.0000000000e-05
+2.0625843750e+01		1.0000000000e-05
+2.2500875000e+01		1.0000000000e-05
+2.4375906250e+01		1.0000000000e-05
+2.6250937500e+01		1.0000000000e-05
+2.8125968750e+01		1.0000000000e-05
+3.0001000000e+01		1.0000000000e-05
diff --git a/test/test_two_av/eps_z_[16][16].xg b/test/test_two_av/eps_z_[16][16].xg
index 5ff5490..99bf421 100644
--- a/test/test_two_av/eps_z_[16][16].xg
+++ b/test/test_two_av/eps_z_[16][16].xg
@@ -1,36 +1,36 @@
 
 
 "Time = 0.0000000000e+00
--3.0000000000e+01		1.9980000000e-05
--2.8124968750e+01		1.9980000000e-05
--2.6249937500e+01		1.9980000000e-05
--2.4374906250e+01		1.9980000000e-05
--2.2499875000e+01		1.9980000000e-05
--2.0624843750e+01		1.9980000000e-05
--1.8749812500e+01		1.9980000000e-05
--1.6874781250e+01		1.9980000000e-05
--1.4999750000e+01		1.9980000000e-05
--1.3124718750e+01		1.9980000000e-05
--1.1249687500e+01		1.9980000000e-05
--9.3746562500e+00		1.9980000000e-05
--7.4996250000e+00		1.9980000000e-05
--5.6245937500e+00		1.9980000000e-05
--3.7495625000e+00		1.9980000000e-05
--1.8745312500e+00		1.9980000000e-05
-5.0000000000e-04		1.9980000000e-05
-1.8755312500e+00		1.9980000000e-05
-3.7505625000e+00		1.9980000000e-05
-5.6255937500e+00		1.9980000000e-05
-7.5006250000e+00		1.9980000000e-05
-9.3756562500e+00		1.9980000000e-05
-1.1250687500e+01		1.9980000000e-05
-1.3125718750e+01		1.9980000000e-05
-1.5000750000e+01		1.9980000000e-05
-1.6875781250e+01		1.9980000000e-05
-1.8750812500e+01		1.9980000000e-05
-2.0625843750e+01		1.9980000000e-05
-2.2500875000e+01		1.9980000000e-05
-2.4375906250e+01		1.9980000000e-05
-2.6250937500e+01		1.9980000000e-05
-2.8125968750e+01		1.9980000000e-05
-3.0001000000e+01		1.9980000000e-05
+-3.0000000000e+01		1.0000000000e-05
+-2.8124968750e+01		1.0000000000e-05
+-2.6249937500e+01		1.0000000000e-05
+-2.4374906250e+01		1.0000000000e-05
+-2.2499875000e+01		1.0000000000e-05
+-2.0624843750e+01		1.0000000000e-05
+-1.8749812500e+01		1.0000000000e-05
+-1.6874781250e+01		1.0000000000e-05
+-1.4999750000e+01		1.0000000000e-05
+-1.3124718750e+01		1.0000000000e-05
+-1.1249687500e+01		1.0000000000e-05
+-9.3746562500e+00		1.0000000000e-05
+-7.4996250000e+00		1.0000000000e-05
+-5.6245937500e+00		1.0000000000e-05
+-3.7495625000e+00		1.0000000000e-05
+-1.8745312500e+00		1.0000000000e-05
+5.0000000000e-04		1.0000000000e-05
+1.8755312500e+00		1.0000000000e-05
+3.7505625000e+00		1.0000000000e-05
+5.6255937500e+00		1.0000000000e-05
+7.5006250000e+00		1.0000000000e-05
+9.3756562500e+00		1.0000000000e-05
+1.1250687500e+01		1.0000000000e-05
+1.3125718750e+01		1.0000000000e-05
+1.5000750000e+01		1.0000000000e-05
+1.6875781250e+01		1.0000000000e-05
+1.8750812500e+01		1.0000000000e-05
+2.0625843750e+01		1.0000000000e-05
+2.2500875000e+01		1.0000000000e-05
+2.4375906250e+01		1.0000000000e-05
+2.6250937500e+01		1.0000000000e-05
+2.8125968750e+01		1.0000000000e-05
+3.0001000000e+01		1.0000000000e-05
diff --git a/test/test_two_av/ham_3D_diagonal.xg b/test/test_two_av/ham_3D_diagonal.xg
index 80b6505..be75c07 100644
--- a/test/test_two_av/ham_3D_diagonal.xg
+++ b/test/test_two_av/ham_3D_diagonal.xg
@@ -2,35 +2,35 @@
 
 "Time = 0.0000000000e+00
 -5.1961524227e+01		0.0000000000e+00
--4.8713874836e+01		-9.6208567591e-06
--4.5466225446e+01		-9.5021700919e-06
--4.2218576055e+01		-9.3418722794e-06
--3.8970926664e+01		-9.1233716566e-06
--3.5723277273e+01		-8.8235187058e-06
--3.2475627882e+01		-8.4103548591e-06
--2.9227978492e+01		-7.8375453601e-06
--2.5980329101e+01		-7.0170036312e-06
--2.2732679710e+01		-5.6821922263e-06
--1.9485030319e+01		-2.8941231179e-06
--1.6237380928e+01		3.4597931911e-06
--1.2989731538e+01		1.0810802334e-05
--9.7420821469e+00		5.8496766616e-06
--6.4944327562e+00		-3.5439454215e-05
--3.2467833654e+00		-9.2824174478e-05
-8.6602540379e-04		-1.0663378684e-04
-3.2485154162e+00		-1.0752527197e-04
-6.4961648070e+00		-6.1854686874e-05
-9.7438141977e+00		1.2175792996e-05
-1.2991463589e+01		3.0627615596e-05
-1.6239112979e+01		1.2985092616e-05
-1.9486762370e+01		4.2854825727e-07
-2.2734411761e+01		-4.5003552490e-06
-2.5982061152e+01		-6.4889196841e-06
-2.9229710542e+01		-7.5408559113e-06
-3.2477359933e+01		-8.2215568541e-06
-3.5725009324e+01		-8.6969655419e-06
-3.8972658715e+01		-9.0365421553e-06
-4.2220308106e+01		-9.2814159366e-06
-4.5467957496e+01		-9.4595373457e-06
-4.8715606887e+01		-9.5904145780e-06
+-4.8713874836e+01		-4.6042112134e-06
+-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
+-1.2989731538e+01		1.5827447878e-05
+-9.7420821469e+00		1.0866322208e-05
+-6.4944327562e+00		-3.0422808668e-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
+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
 5.1963256278e+01		0.0000000000e+00
diff --git a/test/test_two_av/ham_maximum.xg b/test/test_two_av/ham_maximum.xg
index 866a536..3e14379 100644
--- a/test/test_two_av/ham_maximum.xg
+++ b/test/test_two_av/ham_maximum.xg
@@ -1,2 +1,2 @@
 "ham v time
-0.0000000000000	0.0002853729327
+0.0000000000000	0.0002903895782
diff --git a/test/test_two_av/ham_norm1.xg b/test/test_two_av/ham_norm1.xg
index 0214abd..a1ae4fc 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.0000203846312
+0.0000000000000	0.0000169838802
diff --git a/test/test_two_av/ham_norm2.xg b/test/test_two_av/ham_norm2.xg
index d746ee4..627805b 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.0000706569021
+0.0000000000000	0.0000699966257
diff --git a/test/test_two_av/ham_x_[16][16].xg b/test/test_two_av/ham_x_[16][16].xg
index c272b08..101efcf 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		-4.2082056514e-05
--2.6249937500e+01		6.0762078641e-05
--2.4374906250e+01		-1.1748000150e-04
--2.2499875000e+01		-2.4141421664e-04
--2.0624843750e+01		-3.8143691285e-04
--1.8749812500e+01		-5.2002521255e-04
--1.6874781250e+01		-6.3526286758e-04
--1.4999750000e+01		-7.0607135219e-04
--1.3124718750e+01		-7.1860415345e-04
--1.1249687500e+01		-6.7019108819e-04
--9.3746562500e+00		-5.6869601906e-04
--7.4996250000e+00		-4.2871690270e-04
--5.6245937500e+00		-2.6776363588e-04
--3.7495625000e+00		-2.8545034791e-05
--1.8745312500e+00		-1.0922708936e-04
-5.0000000000e-04		-1.0663378684e-04
-1.8755312500e+00		-1.3221419155e-04
-3.7505625000e+00		4.1370476875e-05
+-2.8124968750e+01		-3.7065410970e-05
+-2.6249937500e+01		6.5789105815e-05
+-2.4374906250e+01		-1.1242350165e-04
+-2.2499875000e+01		-2.3632368513e-04
+-2.0624843750e+01		-3.7631197427e-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
+-9.3746562500e+00		-5.6357108927e-04
+-7.4996250000e+00		-4.2362638052e-04
+-5.6245937500e+00		-2.6270714465e-04
+-3.7495625000e+00		-2.3518014583e-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
 5.6255937500e+00		-2.3335795239e-04
 7.5006250000e+00		-4.3992347983e-04
 9.3756562500e+00		-6.4509496563e-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
+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
 2.0625843750e+01		-4.5721308716e-04
-2.2500875000e+01		-2.6248913245e-04
+2.2500875000e+01		-2.6248913246e-04
 2.4375906250e+01		-1.0707279652e-04
-2.6250937500e+01		1.0667729769e-04
-2.8125968750e+01		-7.4970663527e-05
+2.6250937500e+01		1.1169394323e-04
+2.8125968750e+01		-6.9954017983e-05
 3.0001000000e+01		0.0000000000e+00
diff --git a/test/test_two_av/ham_y_[16][16].xg b/test/test_two_av/ham_y_[16][16].xg
index c163f33..6fe9e75 100644
--- a/test/test_two_av/ham_y_[16][16].xg
+++ b/test/test_two_av/ham_y_[16][16].xg
@@ -2,35 +2,35 @@
 
 "Time = 0.0000000000e+00
 -3.0000000000e+01		0.0000000000e+00
--2.8124968750e+01		-9.0442586343e-06
--2.6249937500e+01		-8.8568867858e-06
--2.4374906250e+01		-8.6315975864e-06
--2.2499875000e+01		-8.3689730663e-06
--2.0624843750e+01		-8.0843524096e-06
--1.8749812500e+01		-7.8292384749e-06
--1.6874781250e+01		-7.7358001278e-06
--1.4999750000e+01		-8.1019159995e-06
--1.3124718750e+01		-9.5337472245e-06
--1.1249687500e+01		-1.3130959459e-05
--9.3746562500e+00		-2.0585134859e-05
--7.4996250000e+00		-3.3828050738e-05
--5.6245937500e+00		-5.3692418672e-05
--3.7495625000e+00		-7.7613954295e-05
--1.8745312500e+00		-9.8305188979e-05
-5.0000000000e-04		-1.0663378684e-04
-1.8755312500e+00		-9.8296726001e-05
-3.7505625000e+00		-7.7601226189e-05
-5.6255937500e+00		-5.3680303522e-05
-7.5006250000e+00		-3.3819190626e-05
-9.3756562500e+00		-2.0579774302e-05
-1.1250687500e+01		-1.3128187121e-05
-1.3125718750e+01		-9.5325306505e-06
-1.5000750000e+01		-8.1015092818e-06
-1.6875781250e+01		-7.7357644494e-06
-1.8750812500e+01		-7.8293485167e-06
-2.0625843750e+01		-8.0845034500e-06
-2.2500875000e+01		-8.3691213678e-06
-2.4375906250e+01		-8.6317281492e-06
-2.6250937500e+01		-8.8569965217e-06
-2.8125968750e+01		-9.0443491622e-06
+-2.8124968750e+01		-4.0276130908e-06
+-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
+-7.4996250000e+00		-2.8811405194e-05
+-5.6245937500e+00		-4.8675773128e-05
+-3.7495625000e+00		-7.2597308751e-05
+-1.8745312500e+00		-9.3288543433e-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
+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
+2.6250937500e+01		-3.8403509779e-06
+2.8125968750e+01		-4.0277036197e-06
 3.0001000000e+01		0.0000000000e+00
diff --git a/test/test_two_av/ham_z_[16][16].xg b/test/test_two_av/ham_z_[16][16].xg
index 6bd2206..b70de8f 100644
--- a/test/test_two_av/ham_z_[16][16].xg
+++ b/test/test_two_av/ham_z_[16][16].xg
@@ -2,35 +2,35 @@
 
 "Time = 0.0000000000e+00
 -3.0000000000e+01		0.0000000000e+00
--2.8124968750e+01		-9.0442586332e-06
--2.6249937500e+01		-8.8568867858e-06
--2.4374906250e+01		-8.6315975864e-06
--2.2499875000e+01		-8.3689730649e-06
--2.0624843750e+01		-8.0843524099e-06
--1.8749812500e+01		-7.8292384749e-06
--1.6874781250e+01		-7.7358001274e-06
--1.4999750000e+01		-8.1019160019e-06
--1.3124718750e+01		-9.5337472240e-06
--1.1249687500e+01		-1.3130959460e-05
--9.3746562500e+00		-2.0585134856e-05
--7.4996250000e+00		-3.3828050738e-05
--5.6245937500e+00		-5.3692418672e-05
--3.7495625000e+00		-7.7613954295e-05
--1.8745312500e+00		-9.8305188979e-05
-5.0000000000e-04		-1.0663378684e-04
-1.8755312500e+00		-9.8296726001e-05
-3.7505625000e+00		-7.7601226189e-05
-5.6255937500e+00		-5.3680303522e-05
-7.5006250000e+00		-3.3819190626e-05
-9.3756562500e+00		-2.0579774302e-05
-1.1250687500e+01		-1.3128187121e-05
-1.3125718750e+01		-9.5325306507e-06
-1.5000750000e+01		-8.1015092816e-06
-1.6875781250e+01		-7.7357644490e-06
-1.8750812500e+01		-7.8293485167e-06
-2.0625843750e+01		-8.0845034502e-06
-2.2500875000e+01		-8.3691213683e-06
-2.4375906250e+01		-8.6317281490e-06
-2.6250937500e+01		-8.8569965231e-06
-2.8125968750e+01		-9.0443491619e-06
+-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
+-9.3746562500e+00		-1.5568489313e-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
+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
+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
 3.0001000000e+01		0.0000000000e+00
diff --git a/test/test_two_av/press_3D_diagonal.xg b/test/test_two_av/press_3D_diagonal.xg
index d288abc..0182a09 100644
--- a/test/test_two_av/press_3D_diagonal.xg
+++ b/test/test_two_av/press_3D_diagonal.xg
@@ -1,36 +1,36 @@
 
 
 "Time = 0.0000000000e+00
--5.1961524227e+01		3.9920040000e-12
--4.8713874836e+01		3.9920040000e-12
--4.5466225446e+01		3.9920040000e-12
--4.2218576055e+01		3.9920040000e-12
--3.8970926664e+01		3.9920040000e-12
--3.5723277273e+01		3.9920040000e-12
--3.2475627882e+01		3.9920040000e-12
--2.9227978492e+01		3.9920040000e-12
--2.5980329101e+01		3.9920040000e-12
--2.2732679710e+01		3.9920040000e-12
--1.9485030319e+01		3.9920040000e-12
--1.6237380928e+01		3.9920040000e-12
--1.2989731538e+01		3.9920040000e-12
--9.7420821469e+00		3.9920040000e-12
--6.4944327562e+00		3.9920040000e-12
--3.2467833654e+00		3.9920040000e-12
-8.6602540379e-04		3.9920040000e-12
-3.2485154162e+00		3.9920040000e-12
-6.4961648070e+00		3.9920040000e-12
-9.7438141977e+00		3.9920040000e-12
-1.2991463589e+01		3.9920040000e-12
-1.6239112979e+01		3.9920040000e-12
-1.9486762370e+01		3.9920040000e-12
-2.2734411761e+01		3.9920040000e-12
-2.5982061152e+01		3.9920040000e-12
-2.9229710542e+01		3.9920040000e-12
-3.2477359933e+01		3.9920040000e-12
-3.5725009324e+01		3.9920040000e-12
-3.8972658715e+01		3.9920040000e-12
-4.2220308106e+01		3.9920040000e-12
-4.5467957496e+01		3.9920040000e-12
-4.8715606887e+01		3.9920040000e-12
-5.1963256278e+01		3.9920040000e-12
+-5.1961524227e+01		1.0000000000e-12
+-4.8713874836e+01		1.0000000000e-12
+-4.5466225446e+01		1.0000000000e-12
+-4.2218576055e+01		1.0000000000e-12
+-3.8970926664e+01		1.0000000000e-12
+-3.5723277273e+01		1.0000000000e-12
+-3.2475627882e+01		1.0000000000e-12
+-2.9227978492e+01		1.0000000000e-12
+-2.5980329101e+01		1.0000000000e-12
+-2.2732679710e+01		1.0000000000e-12
+-1.9485030319e+01		1.0000000000e-12
+-1.6237380928e+01		1.0000000000e-12
+-1.2989731538e+01		1.0000000000e-12
+-9.7420821469e+00		1.0000000000e-12
+-6.4944327562e+00		1.0000000000e-12
+-3.2467833654e+00		1.0000000000e-12
+8.6602540379e-04		1.0000000000e-12
+3.2485154162e+00		1.0000000000e-12
+6.4961648070e+00		1.0000000000e-12
+9.7438141977e+00		1.0000000000e-12
+1.2991463589e+01		1.0000000000e-12
+1.6239112979e+01		1.0000000000e-12
+1.9486762370e+01		1.0000000000e-12
+2.2734411761e+01		1.0000000000e-12
+2.5982061152e+01		1.0000000000e-12
+2.9229710542e+01		1.0000000000e-12
+3.2477359933e+01		1.0000000000e-12
+3.5725009324e+01		1.0000000000e-12
+3.8972658715e+01		1.0000000000e-12
+4.2220308106e+01		1.0000000000e-12
+4.5467957496e+01		1.0000000000e-12
+4.8715606887e+01		1.0000000000e-12
+5.1963256278e+01		1.0000000000e-12
diff --git a/test/test_two_av/press_minimum.xg b/test/test_two_av/press_minimum.xg
index 0c5e5bb..b72c1e3 100644
--- a/test/test_two_av/press_minimum.xg
+++ b/test/test_two_av/press_minimum.xg
@@ -1,2 +1,2 @@
 "press v time
-0.0000000000000	0.0000000000040
+0.0000000000000	0.0000000000010
diff --git a/test/test_two_av/press_norm1.xg b/test/test_two_av/press_norm1.xg
index 59fd1aa..7188723 100644
--- a/test/test_two_av/press_norm1.xg
+++ b/test/test_two_av/press_norm1.xg
@@ -1,2 +1,2 @@
 "press v time
-0.0000000000000	0.0000000427991
+0.0000000000000	0.0000000427699
diff --git a/test/test_two_av/press_norm2.xg b/test/test_two_av/press_norm2.xg
index a7306d2..3853d41 100644
--- a/test/test_two_av/press_norm2.xg
+++ b/test/test_two_av/press_norm2.xg
@@ -1,2 +1,2 @@
 "press v time
-0.0000000000000	0.0000003849230
+0.0000000000000	0.0000003848704
diff --git a/test/test_two_av/press_x_[16][16].xg b/test/test_two_av/press_x_[16][16].xg
index d3f6966..4ee162d 100644
--- a/test/test_two_av/press_x_[16][16].xg
+++ b/test/test_two_av/press_x_[16][16].xg
@@ -1,25 +1,25 @@
 
 
 "Time = 0.0000000000e+00
--3.0000000000e+01		3.9920040000e-12
--2.8124968750e+01		3.9920040000e-12
--2.6249937500e+01		3.0601155723e-09
--2.4374906250e+01		1.2164884679e-07
--2.2499875000e+01		4.7284872079e-07
--2.0624843750e+01		1.0613862412e-06
--1.8749812500e+01		1.7607339874e-06
--1.6874781250e+01		2.3383344179e-06
--1.4999750000e+01		2.5631977534e-06
--1.3124718750e+01		2.3382190853e-06
--1.1249687500e+01		1.7605521815e-06
--9.3746562500e+00		1.0612059215e-06
--7.4996250000e+00		4.7272089550e-07
--5.6245937500e+00		1.2158893704e-07
--3.7495625000e+00		3.0524493842e-09
--1.8745312500e+00		3.9920040000e-12
-5.0000000000e-04		3.9920040000e-12
-1.8755312500e+00		3.9920040000e-12
-3.7505625000e+00		3.9920040000e-12
+-3.0000000000e+01		1.0000000000e-12
+-2.8124968750e+01		1.0000000000e-12
+-2.6249937500e+01		2.9505875872e-09
+-2.4374906250e+01		1.2095297846e-07
+-2.2499875000e+01		4.7147581414e-07
+-2.0624843750e+01		1.0593288276e-06
+-1.8749812500e+01		1.7580837862e-06
+-1.6874781250e+01		2.3352801516e-06
+-1.4999750000e+01		2.5599999554e-06
+-1.3124718750e+01		2.3351648943e-06
+-1.1249687500e+01		1.7579021172e-06
+-9.3746562500e+00		1.0591486828e-06
+-7.4996250000e+00		4.7134817457e-07
+-5.6245937500e+00		1.2089324033e-07
+-3.7495625000e+00		2.9430599305e-09
+-1.8745312500e+00		1.0000000000e-12
+5.0000000000e-04		1.0000000000e-12
+1.8755312500e+00		1.0000000000e-12
+3.7505625000e+00		1.0000000000e-12
 5.6255937500e+00		2.1173831737e-07
 7.5006250000e+00		1.2996267175e-06
 9.3756562500e+00		3.5148543253e-06
@@ -31,6 +31,6 @@
 2.0625843750e+01		3.5126771961e-06
 2.2500875000e+01		1.2983065751e-06
 2.4375906250e+01		2.1128036462e-07
-2.6250937500e+01		3.9920040000e-12
-2.8125968750e+01		3.9920040000e-12
-3.0001000000e+01		3.9920040000e-12
+2.6250937500e+01		1.0000000000e-12
+2.8125968750e+01		1.0000000000e-12
+3.0001000000e+01		1.0000000000e-12
diff --git a/test/test_two_av/press_y_[16][16].xg b/test/test_two_av/press_y_[16][16].xg
index 1fbd0f6..9b8d877 100644
--- a/test/test_two_av/press_y_[16][16].xg
+++ b/test/test_two_av/press_y_[16][16].xg
@@ -1,36 +1,36 @@
 
 
 "Time = 0.0000000000e+00
--3.0000000000e+01		3.9920040000e-12
--2.8124968750e+01		3.9920040000e-12
--2.6249937500e+01		3.9920040000e-12
--2.4374906250e+01		3.9920040000e-12
--2.2499875000e+01		3.9920040000e-12
--2.0624843750e+01		3.9920040000e-12
--1.8749812500e+01		3.9920040000e-12
--1.6874781250e+01		3.9920040000e-12
--1.4999750000e+01		3.9920040000e-12
--1.3124718750e+01		3.9920040000e-12
--1.1249687500e+01		3.9920040000e-12
--9.3746562500e+00		3.9920040000e-12
--7.4996250000e+00		3.9920040000e-12
--5.6245937500e+00		3.9920040000e-12
--3.7495625000e+00		3.9920040000e-12
--1.8745312500e+00		3.9920040000e-12
-5.0000000000e-04		3.9920040000e-12
-1.8755312500e+00		3.9920040000e-12
-3.7505625000e+00		3.9920040000e-12
-5.6255937500e+00		3.9920040000e-12
-7.5006250000e+00		3.9920040000e-12
-9.3756562500e+00		3.9920040000e-12
-1.1250687500e+01		3.9920040000e-12
-1.3125718750e+01		3.9920040000e-12
-1.5000750000e+01		3.9920040000e-12
-1.6875781250e+01		3.9920040000e-12
-1.8750812500e+01		3.9920040000e-12
-2.0625843750e+01		3.9920040000e-12
-2.2500875000e+01		3.9920040000e-12
-2.4375906250e+01		3.9920040000e-12
-2.6250937500e+01		3.9920040000e-12
-2.8125968750e+01		3.9920040000e-12
-3.0001000000e+01		3.9920040000e-12
+-3.0000000000e+01		1.0000000000e-12
+-2.8124968750e+01		1.0000000000e-12
+-2.6249937500e+01		1.0000000000e-12
+-2.4374906250e+01		1.0000000000e-12
+-2.2499875000e+01		1.0000000000e-12
+-2.0624843750e+01		1.0000000000e-12
+-1.8749812500e+01		1.0000000000e-12
+-1.6874781250e+01		1.0000000000e-12
+-1.4999750000e+01		1.0000000000e-12
+-1.3124718750e+01		1.0000000000e-12
+-1.1249687500e+01		1.0000000000e-12
+-9.3746562500e+00		1.0000000000e-12
+-7.4996250000e+00		1.0000000000e-12
+-5.6245937500e+00		1.0000000000e-12
+-3.7495625000e+00		1.0000000000e-12
+-1.8745312500e+00		1.0000000000e-12
+5.0000000000e-04		1.0000000000e-12
+1.8755312500e+00		1.0000000000e-12
+3.7505625000e+00		1.0000000000e-12
+5.6255937500e+00		1.0000000000e-12
+7.5006250000e+00		1.0000000000e-12
+9.3756562500e+00		1.0000000000e-12
+1.1250687500e+01		1.0000000000e-12
+1.3125718750e+01		1.0000000000e-12
+1.5000750000e+01		1.0000000000e-12
+1.6875781250e+01		1.0000000000e-12
+1.8750812500e+01		1.0000000000e-12
+2.0625843750e+01		1.0000000000e-12
+2.2500875000e+01		1.0000000000e-12
+2.4375906250e+01		1.0000000000e-12
+2.6250937500e+01		1.0000000000e-12
+2.8125968750e+01		1.0000000000e-12
+3.0001000000e+01		1.0000000000e-12
diff --git a/test/test_two_av/press_z_[16][16].xg b/test/test_two_av/press_z_[16][16].xg
index 1fbd0f6..9b8d877 100644
--- a/test/test_two_av/press_z_[16][16].xg
+++ b/test/test_two_av/press_z_[16][16].xg
@@ -1,36 +1,36 @@
 
 
 "Time = 0.0000000000e+00
--3.0000000000e+01		3.9920040000e-12
--2.8124968750e+01		3.9920040000e-12
--2.6249937500e+01		3.9920040000e-12
--2.4374906250e+01		3.9920040000e-12
--2.2499875000e+01		3.9920040000e-12
--2.0624843750e+01		3.9920040000e-12
--1.8749812500e+01		3.9920040000e-12
--1.6874781250e+01		3.9920040000e-12
--1.4999750000e+01		3.9920040000e-12
--1.3124718750e+01		3.9920040000e-12
--1.1249687500e+01		3.9920040000e-12
--9.3746562500e+00		3.9920040000e-12
--7.4996250000e+00		3.9920040000e-12
--5.6245937500e+00		3.9920040000e-12
--3.7495625000e+00		3.9920040000e-12
--1.8745312500e+00		3.9920040000e-12
-5.0000000000e-04		3.9920040000e-12
-1.8755312500e+00		3.9920040000e-12
-3.7505625000e+00		3.9920040000e-12
-5.6255937500e+00		3.9920040000e-12
-7.5006250000e+00		3.9920040000e-12
-9.3756562500e+00		3.9920040000e-12
-1.1250687500e+01		3.9920040000e-12
-1.3125718750e+01		3.9920040000e-12
-1.5000750000e+01		3.9920040000e-12
-1.6875781250e+01		3.9920040000e-12
-1.8750812500e+01		3.9920040000e-12
-2.0625843750e+01		3.9920040000e-12
-2.2500875000e+01		3.9920040000e-12
-2.4375906250e+01		3.9920040000e-12
-2.6250937500e+01		3.9920040000e-12
-2.8125968750e+01		3.9920040000e-12
-3.0001000000e+01		3.9920040000e-12
+-3.0000000000e+01		1.0000000000e-12
+-2.8124968750e+01		1.0000000000e-12
+-2.6249937500e+01		1.0000000000e-12
+-2.4374906250e+01		1.0000000000e-12
+-2.2499875000e+01		1.0000000000e-12
+-2.0624843750e+01		1.0000000000e-12
+-1.8749812500e+01		1.0000000000e-12
+-1.6874781250e+01		1.0000000000e-12
+-1.4999750000e+01		1.0000000000e-12
+-1.3124718750e+01		1.0000000000e-12
+-1.1249687500e+01		1.0000000000e-12
+-9.3746562500e+00		1.0000000000e-12
+-7.4996250000e+00		1.0000000000e-12
+-5.6245937500e+00		1.0000000000e-12
+-3.7495625000e+00		1.0000000000e-12
+-1.8745312500e+00		1.0000000000e-12
+5.0000000000e-04		1.0000000000e-12
+1.8755312500e+00		1.0000000000e-12
+3.7505625000e+00		1.0000000000e-12
+5.6255937500e+00		1.0000000000e-12
+7.5006250000e+00		1.0000000000e-12
+9.3756562500e+00		1.0000000000e-12
+1.1250687500e+01		1.0000000000e-12
+1.3125718750e+01		1.0000000000e-12
+1.5000750000e+01		1.0000000000e-12
+1.6875781250e+01		1.0000000000e-12
+1.8750812500e+01		1.0000000000e-12
+2.0625843750e+01		1.0000000000e-12
+2.2500875000e+01		1.0000000000e-12
+2.4375906250e+01		1.0000000000e-12
+2.6250937500e+01		1.0000000000e-12
+2.8125968750e+01		1.0000000000e-12
+3.0001000000e+01		1.0000000000e-12
diff --git a/test/test_two_av/rho_3D_diagonal.xg b/test/test_two_av/rho_3D_diagonal.xg
index 7514b90..47e5dcb 100644
--- a/test/test_two_av/rho_3D_diagonal.xg
+++ b/test/test_two_av/rho_3D_diagonal.xg
@@ -1,36 +1,36 @@
 
 
 "Time = 0.0000000000e+00
--5.1961524227e+01		1.9980000000e-07
--4.8713874836e+01		1.9980000000e-07
--4.5466225446e+01		1.9980000000e-07
--4.2218576055e+01		1.9980000000e-07
--3.8970926664e+01		1.9980000000e-07
--3.5723277273e+01		1.9980000000e-07
--3.2475627882e+01		1.9980000000e-07
--2.9227978492e+01		1.9980000000e-07
--2.5980329101e+01		1.9980000000e-07
--2.2732679710e+01		1.9980000000e-07
--1.9485030319e+01		1.9980000000e-07
--1.6237380928e+01		1.9980000000e-07
--1.2989731538e+01		1.9980000000e-07
--9.7420821469e+00		1.9980000000e-07
--6.4944327562e+00		1.9980000000e-07
--3.2467833654e+00		1.9980000000e-07
-8.6602540379e-04		1.9980000000e-07
-3.2485154162e+00		1.9980000000e-07
-6.4961648070e+00		1.9980000000e-07
-9.7438141977e+00		1.9980000000e-07
-1.2991463589e+01		1.9980000000e-07
-1.6239112979e+01		1.9980000000e-07
-1.9486762370e+01		1.9980000000e-07
-2.2734411761e+01		1.9980000000e-07
-2.5982061152e+01		1.9980000000e-07
-2.9229710542e+01		1.9980000000e-07
-3.2477359933e+01		1.9980000000e-07
-3.5725009324e+01		1.9980000000e-07
-3.8972658715e+01		1.9980000000e-07
-4.2220308106e+01		1.9980000000e-07
-4.5467957496e+01		1.9980000000e-07
-4.8715606887e+01		1.9980000000e-07
-5.1963256278e+01		1.9980000000e-07
+-5.1961524227e+01		1.0000000000e-07
+-4.8713874836e+01		1.0000000000e-07
+-4.5466225446e+01		1.0000000000e-07
+-4.2218576055e+01		1.0000000000e-07
+-3.8970926664e+01		1.0000000000e-07
+-3.5723277273e+01		1.0000000000e-07
+-3.2475627882e+01		1.0000000000e-07
+-2.9227978492e+01		1.0000000000e-07
+-2.5980329101e+01		1.0000000000e-07
+-2.2732679710e+01		1.0000000000e-07
+-1.9485030319e+01		1.0000000000e-07
+-1.6237380928e+01		1.0000000000e-07
+-1.2989731538e+01		1.0000000000e-07
+-9.7420821469e+00		1.0000000000e-07
+-6.4944327562e+00		1.0000000000e-07
+-3.2467833654e+00		1.0000000000e-07
+8.6602540379e-04		1.0000000000e-07
+3.2485154162e+00		1.0000000000e-07
+6.4961648070e+00		1.0000000000e-07
+9.7438141977e+00		1.0000000000e-07
+1.2991463589e+01		1.0000000000e-07
+1.6239112979e+01		1.0000000000e-07
+1.9486762370e+01		1.0000000000e-07
+2.2734411761e+01		1.0000000000e-07
+2.5982061152e+01		1.0000000000e-07
+2.9229710542e+01		1.0000000000e-07
+3.2477359933e+01		1.0000000000e-07
+3.5725009324e+01		1.0000000000e-07
+3.8972658715e+01		1.0000000000e-07
+4.2220308106e+01		1.0000000000e-07
+4.5467957496e+01		1.0000000000e-07
+4.8715606887e+01		1.0000000000e-07
+5.1963256278e+01		1.0000000000e-07
diff --git a/test/test_two_av/rho_minimum.xg b/test/test_two_av/rho_minimum.xg
index 96df11a..23dacb5 100644
--- a/test/test_two_av/rho_minimum.xg
+++ b/test/test_two_av/rho_minimum.xg
@@ -1,2 +1,2 @@
 "rho v time
-0.0000000000000	0.0000001998000
+0.0000000000000	0.0000001000000
diff --git a/test/test_two_av/rho_norm1.xg b/test/test_two_av/rho_norm1.xg
index 1039110..2ea37e8 100644
--- a/test/test_two_av/rho_norm1.xg
+++ b/test/test_two_av/rho_norm1.xg
@@ -1,2 +1,2 @@
 "rho v time
-0.0000000000000	0.0000036093858
+0.0000000000000	0.0000035118019
diff --git a/test/test_two_av/rho_norm2.xg b/test/test_two_av/rho_norm2.xg
index 9d45ce1..67a5fd0 100644
--- a/test/test_two_av/rho_norm2.xg
+++ b/test/test_two_av/rho_norm2.xg
@@ -1,2 +1,2 @@
 "rho v time
-0.0000000000000	0.0000206879527
+0.0000000000000	0.0000206808927
diff --git a/test/test_two_av/rho_x_[16][16].xg b/test/test_two_av/rho_x_[16][16].xg
index 297b9bf..c0eabf8 100644
--- a/test/test_two_av/rho_x_[16][16].xg
+++ b/test/test_two_av/rho_x_[16][16].xg
@@ -1,25 +1,25 @@
 
 
 "Time = 0.0000000000e+00
--3.0000000000e+01		1.9980000000e-07
--2.8124968750e+01		1.9980000000e-07
--2.6249937500e+01		5.5318311366e-06
--2.4374906250e+01		3.4878194734e-05
--2.2499875000e+01		6.8763996451e-05
--2.0624843750e+01		1.0302360124e-04
--1.8749812500e+01		1.3269265192e-04
--1.6874781250e+01		1.5291613446e-04
--1.4999750000e+01		1.6009989861e-04
--1.3124718750e+01		1.5291236331e-04
--1.1249687500e+01		1.3268580110e-04
--9.3746562500e+00		1.0301484949e-04
--7.4996250000e+00		6.8754701330e-05
--5.6245937500e+00		3.4869605252e-05
--3.7495625000e+00		5.5248976318e-06
--1.8745312500e+00		1.9980000000e-07
-5.0000000000e-04		1.9980000000e-07
-1.8755312500e+00		1.9980000000e-07
-3.7505625000e+00		1.9980000000e-07
+-3.0000000000e+01		1.0000000000e-07
+-2.8124968750e+01		1.0000000000e-07
+-2.6249937500e+01		5.4319311366e-06
+-2.4374906250e+01		3.4778294734e-05
+-2.2499875000e+01		6.8664096451e-05
+-2.0624843750e+01		1.0292370124e-04
+-1.8749812500e+01		1.3259275192e-04
+-1.6874781250e+01		1.5281623446e-04
+-1.4999750000e+01		1.5999999861e-04
+-1.3124718750e+01		1.5281246331e-04
+-1.1249687500e+01		1.3258590110e-04
+-9.3746562500e+00		1.0291494949e-04
+-7.4996250000e+00		6.8654801330e-05
+-5.6245937500e+00		3.4769705252e-05
+-3.7495625000e+00		5.4249976318e-06
+-1.8745312500e+00		1.0000000000e-07
+5.0000000000e-04		1.0000000000e-07
+1.8755312500e+00		1.0000000000e-07
+3.7505625000e+00		1.0000000000e-07
 5.6255937500e+00		4.6015032040e-05
 7.5006250000e+00		1.1400117181e-04
 9.3756562500e+00		1.8747944755e-04
@@ -31,6 +31,6 @@
 2.0625843750e+01		1.8742137541e-04
 2.2500875000e+01		1.1394325671e-04
 2.4375906250e+01		4.5965243893e-05
-2.6250937500e+01		1.9980000000e-07
-2.8125968750e+01		1.9980000000e-07
-3.0001000000e+01		1.9980000000e-07
+2.6250937500e+01		1.0000000000e-07
+2.8125968750e+01		1.0000000000e-07
+3.0001000000e+01		1.0000000000e-07
diff --git a/test/test_two_av/rho_y_[16][16].xg b/test/test_two_av/rho_y_[16][16].xg
index 989177d..362f61e 100644
--- a/test/test_two_av/rho_y_[16][16].xg
+++ b/test/test_two_av/rho_y_[16][16].xg
@@ -1,36 +1,36 @@
 
 
 "Time = 0.0000000000e+00
--3.0000000000e+01		1.9980000000e-07
--2.8124968750e+01		1.9980000000e-07
--2.6249937500e+01		1.9980000000e-07
--2.4374906250e+01		1.9980000000e-07
--2.2499875000e+01		1.9980000000e-07
--2.0624843750e+01		1.9980000000e-07
--1.8749812500e+01		1.9980000000e-07
--1.6874781250e+01		1.9980000000e-07
--1.4999750000e+01		1.9980000000e-07
--1.3124718750e+01		1.9980000000e-07
--1.1249687500e+01		1.9980000000e-07
--9.3746562500e+00		1.9980000000e-07
--7.4996250000e+00		1.9980000000e-07
--5.6245937500e+00		1.9980000000e-07
--3.7495625000e+00		1.9980000000e-07
--1.8745312500e+00		1.9980000000e-07
-5.0000000000e-04		1.9980000000e-07
-1.8755312500e+00		1.9980000000e-07
-3.7505625000e+00		1.9980000000e-07
-5.6255937500e+00		1.9980000000e-07
-7.5006250000e+00		1.9980000000e-07
-9.3756562500e+00		1.9980000000e-07
-1.1250687500e+01		1.9980000000e-07
-1.3125718750e+01		1.9980000000e-07
-1.5000750000e+01		1.9980000000e-07
-1.6875781250e+01		1.9980000000e-07
-1.8750812500e+01		1.9980000000e-07
-2.0625843750e+01		1.9980000000e-07
-2.2500875000e+01		1.9980000000e-07
-2.4375906250e+01		1.9980000000e-07
-2.6250937500e+01		1.9980000000e-07
-2.8125968750e+01		1.9980000000e-07
-3.0001000000e+01		1.9980000000e-07
+-3.0000000000e+01		1.0000000000e-07
+-2.8124968750e+01		1.0000000000e-07
+-2.6249937500e+01		1.0000000000e-07
+-2.4374906250e+01		1.0000000000e-07
+-2.2499875000e+01		1.0000000000e-07
+-2.0624843750e+01		1.0000000000e-07
+-1.8749812500e+01		1.0000000000e-07
+-1.6874781250e+01		1.0000000000e-07
+-1.4999750000e+01		1.0000000000e-07
+-1.3124718750e+01		1.0000000000e-07
+-1.1249687500e+01		1.0000000000e-07
+-9.3746562500e+00		1.0000000000e-07
+-7.4996250000e+00		1.0000000000e-07
+-5.6245937500e+00		1.0000000000e-07
+-3.7495625000e+00		1.0000000000e-07
+-1.8745312500e+00		1.0000000000e-07
+5.0000000000e-04		1.0000000000e-07
+1.8755312500e+00		1.0000000000e-07
+3.7505625000e+00		1.0000000000e-07
+5.6255937500e+00		1.0000000000e-07
+7.5006250000e+00		1.0000000000e-07
+9.3756562500e+00		1.0000000000e-07
+1.1250687500e+01		1.0000000000e-07
+1.3125718750e+01		1.0000000000e-07
+1.5000750000e+01		1.0000000000e-07
+1.6875781250e+01		1.0000000000e-07
+1.8750812500e+01		1.0000000000e-07
+2.0625843750e+01		1.0000000000e-07
+2.2500875000e+01		1.0000000000e-07
+2.4375906250e+01		1.0000000000e-07
+2.6250937500e+01		1.0000000000e-07
+2.8125968750e+01		1.0000000000e-07
+3.0001000000e+01		1.0000000000e-07
diff --git a/test/test_two_av/rho_z_[16][16].xg b/test/test_two_av/rho_z_[16][16].xg
index 989177d..362f61e 100644
--- a/test/test_two_av/rho_z_[16][16].xg
+++ b/test/test_two_av/rho_z_[16][16].xg
@@ -1,36 +1,36 @@
 
 
 "Time = 0.0000000000e+00
--3.0000000000e+01		1.9980000000e-07
--2.8124968750e+01		1.9980000000e-07
--2.6249937500e+01		1.9980000000e-07
--2.4374906250e+01		1.9980000000e-07
--2.2499875000e+01		1.9980000000e-07
--2.0624843750e+01		1.9980000000e-07
--1.8749812500e+01		1.9980000000e-07
--1.6874781250e+01		1.9980000000e-07
--1.4999750000e+01		1.9980000000e-07
--1.3124718750e+01		1.9980000000e-07
--1.1249687500e+01		1.9980000000e-07
--9.3746562500e+00		1.9980000000e-07
--7.4996250000e+00		1.9980000000e-07
--5.6245937500e+00		1.9980000000e-07
--3.7495625000e+00		1.9980000000e-07
--1.8745312500e+00		1.9980000000e-07
-5.0000000000e-04		1.9980000000e-07
-1.8755312500e+00		1.9980000000e-07
-3.7505625000e+00		1.9980000000e-07
-5.6255937500e+00		1.9980000000e-07
-7.5006250000e+00		1.9980000000e-07
-9.3756562500e+00		1.9980000000e-07
-1.1250687500e+01		1.9980000000e-07
-1.3125718750e+01		1.9980000000e-07
-1.5000750000e+01		1.9980000000e-07
-1.6875781250e+01		1.9980000000e-07
-1.8750812500e+01		1.9980000000e-07
-2.0625843750e+01		1.9980000000e-07
-2.2500875000e+01		1.9980000000e-07
-2.4375906250e+01		1.9980000000e-07
-2.6250937500e+01		1.9980000000e-07
-2.8125968750e+01		1.9980000000e-07
-3.0001000000e+01		1.9980000000e-07
+-3.0000000000e+01		1.0000000000e-07
+-2.8124968750e+01		1.0000000000e-07
+-2.6249937500e+01		1.0000000000e-07
+-2.4374906250e+01		1.0000000000e-07
+-2.2499875000e+01		1.0000000000e-07
+-2.0624843750e+01		1.0000000000e-07
+-1.8749812500e+01		1.0000000000e-07
+-1.6874781250e+01		1.0000000000e-07
+-1.4999750000e+01		1.0000000000e-07
+-1.3124718750e+01		1.0000000000e-07
+-1.1249687500e+01		1.0000000000e-07
+-9.3746562500e+00		1.0000000000e-07
+-7.4996250000e+00		1.0000000000e-07
+-5.6245937500e+00		1.0000000000e-07
+-3.7495625000e+00		1.0000000000e-07
+-1.8745312500e+00		1.0000000000e-07
+5.0000000000e-04		1.0000000000e-07
+1.8755312500e+00		1.0000000000e-07
+3.7505625000e+00		1.0000000000e-07
+5.6255937500e+00		1.0000000000e-07
+7.5006250000e+00		1.0000000000e-07
+9.3756562500e+00		1.0000000000e-07
+1.1250687500e+01		1.0000000000e-07
+1.3125718750e+01		1.0000000000e-07
+1.5000750000e+01		1.0000000000e-07
+1.6875781250e+01		1.0000000000e-07
+1.8750812500e+01		1.0000000000e-07
+2.0625843750e+01		1.0000000000e-07
+2.2500875000e+01		1.0000000000e-07
+2.4375906250e+01		1.0000000000e-07
+2.6250937500e+01		1.0000000000e-07
+2.8125968750e+01		1.0000000000e-07
+3.0001000000e+01		1.0000000000e-07
diff --git a/test/test_two_av/tau_3D_diagonal.xg b/test/test_two_av/tau_3D_diagonal.xg
index 04a370a..fa380ad 100644
--- a/test/test_two_av/tau_3D_diagonal.xg
+++ b/test/test_two_av/tau_3D_diagonal.xg
@@ -1,36 +1,36 @@
 
 
 "Time = 0.0000000000e+00
--5.1961524227e+01		4.2102666009e-12
--4.8713874836e+01		4.2242466206e-12
--4.5466225446e+01		4.2401112445e-12
--4.2218576055e+01		4.2582553667e-12
--3.8970926664e+01		4.2791839736e-12
--3.5723277273e+01		4.3035466070e-12
--3.2475627882e+01		4.3321785417e-12
--2.9227978492e+01		4.3661394740e-12
--2.5980329101e+01		4.4067160391e-12
--2.2732679710e+01		4.4552880420e-12
--1.9485030319e+01		4.5128052639e-12
--1.6237380928e+01		4.5784048644e-12
--1.2989731538e+01		4.6470189292e-12
--9.7420821469e+00		4.7085630796e-12
--6.4944327562e+00		4.7546415019e-12
--3.2467833654e+00		4.7883257169e-12
-8.6602540379e-04		4.8195633229e-12
-3.2485154162e+00		4.8500757004e-12
-6.4961648070e+00		4.8657129563e-12
-9.7438141977e+00		4.8455920783e-12
-1.2991463589e+01		4.7851152375e-12
-1.6239112979e+01		4.7020852851e-12
-1.9486762370e+01		4.6172734976e-12
-2.2734411761e+01		4.5416137476e-12
-2.5982061152e+01		4.4778450008e-12
-2.9229710542e+01		4.4250917846e-12
-3.2477359933e+01		4.3814983148e-12
-3.5725009324e+01		4.3452377346e-12
-3.8972658715e+01		4.3147894258e-12
-4.2220308106e+01		4.2889584731e-12
-4.5467957496e+01		4.2668235636e-12
-4.8715606887e+01		4.2476761806e-12
-5.1963256278e+01		4.2309687814e-12
+-5.1961524227e+01		1.0546749455e-12
+-4.8713874836e+01		1.0581769509e-12
+-4.5466225446e+01		1.0621510511e-12
+-4.2218576055e+01		1.0666961673e-12
+-3.8970926664e+01		1.0719387991e-12
+-3.5723277273e+01		1.0780416570e-12
+-3.2475627882e+01		1.0852139782e-12
+-2.9227978492e+01		1.0937212172e-12
+-2.5980329101e+01		1.1038856772e-12
+-2.2732679710e+01		1.1160530005e-12
+-1.9485030319e+01		1.1304611077e-12
+-1.6237380928e+01		1.1468938569e-12
+-1.2989731538e+01		1.1640817317e-12
+-9.7420821469e+00		1.1794985876e-12
+-6.4944327562e+00		1.1910412670e-12
+-3.2467833654e+00		1.1994791881e-12
+8.6602540379e-04		1.2073042319e-12
+3.2485154162e+00		1.2149476054e-12
+6.4961648070e+00		1.2188647497e-12
+9.7438141977e+00		1.2138244547e-12
+1.2991463589e+01		1.1986749606e-12
+1.6239112979e+01		1.1778758952e-12
+1.9486762370e+01		1.1566304787e-12
+2.2734411761e+01		1.1376776545e-12
+2.5982061152e+01		1.1217035356e-12
+2.9229710542e+01		1.1084888153e-12
+3.2477359933e+01		1.0975686184e-12
+3.5725009324e+01		1.0884853158e-12
+3.8972658715e+01		1.0808579916e-12
+4.2220308106e+01		1.0743873186e-12
+4.5467957496e+01		1.0688425071e-12
+4.8715606887e+01		1.0640460733e-12
+5.1963256278e+01		1.0598608572e-12
diff --git a/test/test_two_av/tau_minimum.xg b/test/test_two_av/tau_minimum.xg
index 4ee79f7..30bca93 100644
--- a/test/test_two_av/tau_minimum.xg
+++ b/test/test_two_av/tau_minimum.xg
@@ -1,2 +1,2 @@
 "tau v time
-0.0000000000000	0.0000000000042
+0.0000000000000	0.0000000000011
diff --git a/test/test_two_av/tau_norm1.xg b/test/test_two_av/tau_norm1.xg
index e88f03c..098f6ac 100644
--- a/test/test_two_av/tau_norm1.xg
+++ b/test/test_two_av/tau_norm1.xg
@@ -1,2 +1,2 @@
 "tau v time
-0.0000000000000	0.0000000568171
+0.0000000000000	0.0000000567820
diff --git a/test/test_two_av/tau_norm2.xg b/test/test_two_av/tau_norm2.xg
index 7ccf6a5..f2f49c2 100644
--- a/test/test_two_av/tau_norm2.xg
+++ b/test/test_two_av/tau_norm2.xg
@@ -1,2 +1,2 @@
 "tau v time
-0.0000000000000	0.0000005313625
+0.0000000000000	0.0000005313045
diff --git a/test/test_two_av/tau_x_[16][16].xg b/test/test_two_av/tau_x_[16][16].xg
index 0dccaf7..2e0999a 100644
--- a/test/test_two_av/tau_x_[16][16].xg
+++ b/test/test_two_av/tau_x_[16][16].xg
@@ -1,25 +1,25 @@
 
 
 "Time = 0.0000000000e+00
--3.0000000000e+01		4.4550164031e-12
--2.8124968750e+01		4.5060681102e-12
--2.6249937500e+01		3.5053956746e-09
--2.4374906250e+01		1.4198649102e-07
--2.2499875000e+01		5.6375607722e-07
--2.0624843750e+01		1.2927900270e-06
--1.8749812500e+01		2.1853919351e-06
--1.6874781250e+01		2.9427092373e-06
--1.4999750000e+01		3.2486671410e-06
--1.3124718750e+01		2.9630143691e-06
--1.1249687500e+01		2.2162352757e-06
--9.3746562500e+00		1.3211070974e-06
--7.4996250000e+00		5.8096519600e-07
--5.6245937500e+00		1.4769206987e-07
--3.7495625000e+00		3.6788221328e-09
--1.8745312500e+00		4.8014005787e-12
-5.0000000000e-04		4.8195633229e-12
-1.8755312500e+00		4.8663587794e-12
-3.7505625000e+00		4.9487028191e-12
+-3.0000000000e+01		1.1159849547e-12
+-2.8124968750e+01		1.1287734457e-12
+-2.6249937500e+01		3.3799301763e-09
+-2.4374906250e+01		1.4117428520e-07
+-2.2499875000e+01		5.6211922291e-07
+-2.0624843750e+01		1.2902840555e-06
+-1.8749812500e+01		2.1821025522e-06
+-1.6874781250e+01		2.9388655536e-06
+-1.4999750000e+01		3.2446141641e-06
+-1.3124718750e+01		2.9591440680e-06
+-1.1249687500e+01		2.2128992962e-06
+-9.3746562500e+00		1.3185460180e-06
+-7.4996250000e+00		5.7927814748e-07
+-5.6245937500e+00		1.4684701859e-07
+-3.7495625000e+00		3.5469856000e-09
+-1.8745312500e+00		1.2027544508e-12
+5.0000000000e-04		1.2073042319e-12
+1.8755312500e+00		1.2190265289e-12
+3.7505625000e+00		1.2396537727e-12
 5.6255937500e+00		2.6941317234e-07
 7.5006250000e+00		1.7103770640e-06
 9.3756562500e+00		4.7973619983e-06
@@ -31,6 +31,6 @@
 2.0625843750e+01		4.7399939867e-06
 2.2500875000e+01		1.6814105144e-06
 2.4375906250e+01		2.6314476524e-07
-2.6250937500e+01		4.8145919285e-12
-2.8125968750e+01		4.7010320132e-12
-3.0001000000e+01		4.6164875697e-12
+2.6250937500e+01		1.2060588939e-12
+2.8125968750e+01		1.1776120498e-12
+3.0001000000e+01		1.1564336032e-12
diff --git a/test/test_two_av/tau_y_[16][16].xg b/test/test_two_av/tau_y_[16][16].xg
index 6380335..e0906f1 100644
--- a/test/test_two_av/tau_y_[16][16].xg
+++ b/test/test_two_av/tau_y_[16][16].xg
@@ -1,36 +1,36 @@
 
 
 "Time = 0.0000000000e+00
--3.0000000000e+01		4.3503459466e-12
--2.8124968750e+01		4.3695924924e-12
--2.6249937500e+01		4.3906902138e-12
--2.4374906250e+01		4.4138473214e-12
--2.2499875000e+01		4.4392800929e-12
--2.0624843750e+01		4.4671994707e-12
--1.8749812500e+01		4.4977869390e-12
--1.6874781250e+01		4.5311537855e-12
--1.4999750000e+01		4.5672760028e-12
--1.3124718750e+01		4.6058964267e-12
--1.1249687500e+01		4.6463892433e-12
--9.3746562500e+00		4.6875953400e-12
--7.4996250000e+00		4.7276674034e-12
--5.6245937500e+00		4.7640126735e-12
--3.7495625000e+00		4.7934664422e-12
--1.8745312500e+00		4.8128072414e-12
-5.0000000000e-04		4.8195633229e-12
-1.8755312500e+00		4.8128001176e-12
-3.7505625000e+00		4.7934531602e-12
-5.6255937500e+00		4.7639948302e-12
-7.5006250000e+00		4.7276467635e-12
-9.3756562500e+00		4.6875734682e-12
-1.1250687500e+01		4.6463673261e-12
-1.3125718750e+01		4.6058752543e-12
-1.5000750000e+01		4.5672560356e-12
-1.6875781250e+01		4.5311352454e-12
-1.8750812500e+01		4.4977698905e-12
-2.0625843750e+01		4.4671838834e-12
-2.2500875000e+01		4.4392658842e-12
-2.4375906250e+01		4.4138343840e-12
-2.6250937500e+01		4.3906784321e-12
-2.8125968750e+01		4.3695817523e-12
-3.0001000000e+01		4.3503361407e-12
+-3.0000000000e+01		1.0897649268e-12
+-2.8124968750e+01		1.0945862009e-12
+-2.6249937500e+01		1.0998711960e-12
+-2.4374906250e+01		1.1056720688e-12
+-2.2499875000e+01		1.1120429972e-12
+-2.0624843750e+01		1.1190368223e-12
+-1.8749812500e+01		1.1266990061e-12
+-1.6874781250e+01		1.1350574262e-12
+-1.4999750000e+01		1.1441060688e-12
+-1.3124718750e+01		1.1537805140e-12
+-1.1249687500e+01		1.1639239949e-12
+-9.3746562500e+00		1.1742461531e-12
+-7.4996250000e+00		1.1842842350e-12
+-5.6245937500e+00		1.1933887525e-12
+-3.7495625000e+00		1.2007669437e-12
+-1.8745312500e+00		1.2056118284e-12
+5.0000000000e-04		1.2073042319e-12
+1.8755312500e+00		1.2056100439e-12
+3.7505625000e+00		1.2007636165e-12
+5.6255937500e+00		1.1933842827e-12
+7.5006250000e+00		1.1842790648e-12
+9.3756562500e+00		1.1742406742e-12
+1.1250687500e+01		1.1639185046e-12
+1.3125718750e+01		1.1537752102e-12
+1.5000750000e+01		1.1441010670e-12
+1.6875781250e+01		1.1350527819e-12
+1.8750812500e+01		1.1266947354e-12
+2.0625843750e+01		1.1190329177e-12
+2.2500875000e+01		1.1120394379e-12
+2.4375906250e+01		1.1056688280e-12
+2.6250937500e+01		1.0998682447e-12
+2.8125968750e+01		1.0945835105e-12
+3.0001000000e+01		1.0897624704e-12
diff --git a/test/test_two_av/tau_z_[16][16].xg b/test/test_two_av/tau_z_[16][16].xg
index ec1f1c3..e0906f1 100644
--- a/test/test_two_av/tau_z_[16][16].xg
+++ b/test/test_two_av/tau_z_[16][16].xg
@@ -1,36 +1,36 @@
 
 
 "Time = 0.0000000000e+00
--3.0000000000e+01		4.3503459466e-12
--2.8124968750e+01		4.3695924924e-12
--2.6249937500e+01		4.3906902138e-12
--2.4374906250e+01		4.4138473214e-12
--2.2499875000e+01		4.4392800929e-12
--2.0624843750e+01		4.4671994707e-12
--1.8749812500e+01		4.4977869390e-12
--1.6874781250e+01		4.5311537855e-12
--1.4999750000e+01		4.5672760028e-12
--1.3124718750e+01		4.6058964267e-12
--1.1249687500e+01		4.6463892433e-12
--9.3746562500e+00		4.6875953401e-12
--7.4996250000e+00		4.7276674034e-12
--5.6245937500e+00		4.7640126735e-12
--3.7495625000e+00		4.7934664422e-12
--1.8745312500e+00		4.8128072414e-12
-5.0000000000e-04		4.8195633229e-12
-1.8755312500e+00		4.8128001176e-12
-3.7505625000e+00		4.7934531602e-12
-5.6255937500e+00		4.7639948302e-12
-7.5006250000e+00		4.7276467635e-12
-9.3756562500e+00		4.6875734682e-12
-1.1250687500e+01		4.6463673261e-12
-1.3125718750e+01		4.6058752543e-12
-1.5000750000e+01		4.5672560356e-12
-1.6875781250e+01		4.5311352454e-12
-1.8750812500e+01		4.4977698905e-12
-2.0625843750e+01		4.4671838834e-12
-2.2500875000e+01		4.4392658842e-12
-2.4375906250e+01		4.4138343840e-12
-2.6250937500e+01		4.3906784321e-12
-2.8125968750e+01		4.3695817523e-12
-3.0001000000e+01		4.3503361407e-12
+-3.0000000000e+01		1.0897649268e-12
+-2.8124968750e+01		1.0945862009e-12
+-2.6249937500e+01		1.0998711960e-12
+-2.4374906250e+01		1.1056720688e-12
+-2.2499875000e+01		1.1120429972e-12
+-2.0624843750e+01		1.1190368223e-12
+-1.8749812500e+01		1.1266990061e-12
+-1.6874781250e+01		1.1350574262e-12
+-1.4999750000e+01		1.1441060688e-12
+-1.3124718750e+01		1.1537805140e-12
+-1.1249687500e+01		1.1639239949e-12
+-9.3746562500e+00		1.1742461531e-12
+-7.4996250000e+00		1.1842842350e-12
+-5.6245937500e+00		1.1933887525e-12
+-3.7495625000e+00		1.2007669437e-12
+-1.8745312500e+00		1.2056118284e-12
+5.0000000000e-04		1.2073042319e-12
+1.8755312500e+00		1.2056100439e-12
+3.7505625000e+00		1.2007636165e-12
+5.6255937500e+00		1.1933842827e-12
+7.5006250000e+00		1.1842790648e-12
+9.3756562500e+00		1.1742406742e-12
+1.1250687500e+01		1.1639185046e-12
+1.3125718750e+01		1.1537752102e-12
+1.5000750000e+01		1.1441010670e-12
+1.6875781250e+01		1.1350527819e-12
+1.8750812500e+01		1.1266947354e-12
+2.0625843750e+01		1.1190329177e-12
+2.2500875000e+01		1.1120394379e-12
+2.4375906250e+01		1.1056688280e-12
+2.6250937500e+01		1.0998682447e-12
+2.8125968750e+01		1.0945835105e-12
+3.0001000000e+01		1.0897624704e-12