aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--param.ccl4
-rw-r--r--schedule.ccl8
-rw-r--r--src/SetGrid.c228
-rw-r--r--src/SetSym.c2
-rw-r--r--src/make.code.defn2
-rw-r--r--test/test_cartoon/ADM_BS_Gx.xl19
-rw-r--r--test/test_cartoon/ADM_BS_Gx.yl6
-rw-r--r--test/test_cartoon/ADM_BS_Gx.zl35
-rw-r--r--test/test_cartoon/ADM_BS_Gx_max.tl3
-rw-r--r--test/test_cartoon/ADM_BS_Gx_min.tl3
-rw-r--r--test/test_cartoon/ADM_BS_Gx_nm1.tl3
-rw-r--r--test/test_cartoon/ADM_BS_Gx_nm2.tl3
-rw-r--r--test/test_cartoon/ADM_BS_Gy.xl19
-rw-r--r--test/test_cartoon/ADM_BS_Gy.yl6
-rw-r--r--test/test_cartoon/ADM_BS_Gy.zl35
-rw-r--r--test/test_cartoon/ADM_BS_Gy_max.tl3
-rw-r--r--test/test_cartoon/ADM_BS_Gy_min.tl3
-rw-r--r--test/test_cartoon/ADM_BS_Gy_nm1.tl3
-rw-r--r--test/test_cartoon/ADM_BS_Gy_nm2.tl3
-rw-r--r--test/test_cartoon/ADM_BS_Gz.xl19
-rw-r--r--test/test_cartoon/ADM_BS_Gz.yl6
-rw-r--r--test/test_cartoon/ADM_BS_Gz.zl35
-rw-r--r--test/test_cartoon/ADM_BS_Gz_max.tl3
-rw-r--r--test/test_cartoon/ADM_BS_Gz_min.tl3
-rw-r--r--test/test_cartoon/ADM_BS_Gz_nm1.tl3
-rw-r--r--test/test_cartoon/ADM_BS_Gz_nm2.tl3
-rw-r--r--test/test_cartoon/ADM_BS_K.xl19
-rw-r--r--test/test_cartoon/ADM_BS_K.yl6
-rw-r--r--test/test_cartoon/ADM_BS_K.zl35
-rw-r--r--test/test_cartoon/ADM_BS_K_max.tl3
-rw-r--r--test/test_cartoon/ADM_BS_K_min.tl3
-rw-r--r--test/test_cartoon/ADM_BS_K_nm1.tl3
-rw-r--r--test/test_cartoon/ADM_BS_K_nm2.tl3
-rw-r--r--test/test_cartoon/ADM_BS_gxx.xl19
-rw-r--r--test/test_cartoon/ADM_BS_gxx.yl6
-rw-r--r--test/test_cartoon/ADM_BS_gxx.zl35
-rw-r--r--test/test_cartoon/ADM_BS_gxx_max.tl3
-rw-r--r--test/test_cartoon/ADM_BS_gxx_min.tl3
-rw-r--r--test/test_cartoon/ADM_BS_gxx_nm1.tl3
-rw-r--r--test/test_cartoon/ADM_BS_gxx_nm2.tl3
-rw-r--r--test/test_cartoon/ADM_BS_phi.xl19
-rw-r--r--test/test_cartoon/ADM_BS_phi.yl6
-rw-r--r--test/test_cartoon/ADM_BS_phi.zl35
-rw-r--r--test/test_cartoon/ADM_BS_phi_max.tl3
-rw-r--r--test/test_cartoon/ADM_BS_phi_min.tl3
-rw-r--r--test/test_cartoon/ADM_BS_phi_nm1.tl3
-rw-r--r--test/test_cartoon/ADM_BS_phi_nm2.tl3
-rw-r--r--test/test_cartoon/ahf.gauss438
-rw-r--r--test/test_cartoon/ahf_area.tl3
-rw-r--r--test/test_cartoon/ahf_asymx.tl3
-rw-r--r--test/test_cartoon/ahf_asymy.tl3
-rw-r--r--test/test_cartoon/ahf_asymz.tl3
-rw-r--r--test/test_cartoon/ahf_circ_eq.tl3
-rw-r--r--test/test_cartoon/ahf_coeff.alm21
-rw-r--r--test/test_cartoon/ahf_mass.tl3
-rw-r--r--test/test_cartoon/ahf_meri_p1.tl3
-rw-r--r--test/test_cartoon/ahf_meri_p2.tl3
-rw-r--r--test/test_cartoon/ahf_rad.tl3
-rw-r--r--test/test_cartoon/alp.xl19
-rw-r--r--test/test_cartoon/alp.yl6
-rw-r--r--test/test_cartoon/alp.zl35
-rw-r--r--test/test_cartoon/alp_max.tl3
-rw-r--r--test/test_cartoon/alp_min.tl3
-rw-r--r--test/test_cartoon/alp_nm1.tl3
-rw-r--r--test/test_cartoon/alp_nm2.tl3
-rw-r--r--test/test_cartoon/grr.xl19
-rw-r--r--test/test_cartoon/grr.yl6
-rw-r--r--test/test_cartoon/grr.zl35
-rw-r--r--test/test_cartoon/grr_max.tl3
-rw-r--r--test/test_cartoon/grr_min.tl3
-rw-r--r--test/test_cartoon/grr_nm1.tl3
-rw-r--r--test/test_cartoon/grr_nm2.tl3
-rw-r--r--test/test_cartoon/gxx.xl19
-rw-r--r--test/test_cartoon/gxx.yl6
-rw-r--r--test/test_cartoon/gxx.zl35
-rw-r--r--test/test_cartoon/gxx_max.tl3
-rw-r--r--test/test_cartoon/gxx_min.tl3
-rw-r--r--test/test_cartoon/gxx_nm1.tl3
-rw-r--r--test/test_cartoon/gxx_nm2.tl3
-rw-r--r--test/test_cartoon/gxy.xl19
-rw-r--r--test/test_cartoon/gxy.yl6
-rw-r--r--test/test_cartoon/gxy.zl35
-rw-r--r--test/test_cartoon/gxy_max.tl3
-rw-r--r--test/test_cartoon/gxy_min.tl3
-rw-r--r--test/test_cartoon/gxy_nm1.tl3
-rw-r--r--test/test_cartoon/gxy_nm2.tl3
-rw-r--r--test/test_cartoon/gxz.xl19
-rw-r--r--test/test_cartoon/gxz.yl6
-rw-r--r--test/test_cartoon/gxz.zl35
-rw-r--r--test/test_cartoon/gxz_max.tl3
-rw-r--r--test/test_cartoon/gxz_min.tl3
-rw-r--r--test/test_cartoon/gxz_nm1.tl3
-rw-r--r--test/test_cartoon/gxz_nm2.tl3
-rw-r--r--test/test_cartoon/gyy.xl19
-rw-r--r--test/test_cartoon/gyy.yl6
-rw-r--r--test/test_cartoon/gyy.zl35
-rw-r--r--test/test_cartoon/gyy_max.tl3
-rw-r--r--test/test_cartoon/gyy_min.tl3
-rw-r--r--test/test_cartoon/gyy_nm1.tl3
-rw-r--r--test/test_cartoon/gyy_nm2.tl3
-rw-r--r--test/test_cartoon/gyz.xl19
-rw-r--r--test/test_cartoon/gyz.yl6
-rw-r--r--test/test_cartoon/gyz.zl35
-rw-r--r--test/test_cartoon/gyz_max.tl3
-rw-r--r--test/test_cartoon/gyz_min.tl3
-rw-r--r--test/test_cartoon/gyz_nm1.tl3
-rw-r--r--test/test_cartoon/gyz_nm2.tl3
-rw-r--r--test/test_cartoon/gzz.xl19
-rw-r--r--test/test_cartoon/gzz.yl6
-rw-r--r--test/test_cartoon/gzz.zl35
-rw-r--r--test/test_cartoon/gzz_max.tl3
-rw-r--r--test/test_cartoon/gzz_min.tl3
-rw-r--r--test/test_cartoon/gzz_nm1.tl3
-rw-r--r--test/test_cartoon/gzz_nm2.tl3
-rw-r--r--test/test_cartoon/ham.xl19
-rw-r--r--test/test_cartoon/ham.yl6
-rw-r--r--test/test_cartoon/ham.zl35
-rw-r--r--test/test_cartoon/ham_max.tl3
-rw-r--r--test/test_cartoon/ham_min.tl3
-rw-r--r--test/test_cartoon/ham_nm1.tl3
-rw-r--r--test/test_cartoon/ham_nm2.tl3
-rw-r--r--test/test_cartoon/momx.xl19
-rw-r--r--test/test_cartoon/momx.yl6
-rw-r--r--test/test_cartoon/momx.zl35
-rw-r--r--test/test_cartoon/momx_max.tl3
-rw-r--r--test/test_cartoon/momx_min.tl3
-rw-r--r--test/test_cartoon/momx_nm1.tl3
-rw-r--r--test/test_cartoon/momx_nm2.tl3
-rw-r--r--test/test_cartoon/momy.xl19
-rw-r--r--test/test_cartoon/momy.yl6
-rw-r--r--test/test_cartoon/momy.zl35
-rw-r--r--test/test_cartoon/momy_max.tl3
-rw-r--r--test/test_cartoon/momy_min.tl3
-rw-r--r--test/test_cartoon/momy_nm1.tl3
-rw-r--r--test/test_cartoon/momy_nm2.tl3
-rw-r--r--test/test_cartoon/momz.xl19
-rw-r--r--test/test_cartoon/momz.yl6
-rw-r--r--test/test_cartoon/momz.zl35
-rw-r--r--test/test_cartoon/momz_max.tl3
-rw-r--r--test/test_cartoon/momz_min.tl3
-rw-r--r--test/test_cartoon/momz_nm1.tl3
-rw-r--r--test/test_cartoon/momz_nm2.tl3
-rw-r--r--test/test_cartoon/trK.xl19
-rw-r--r--test/test_cartoon/trK.yl6
-rw-r--r--test/test_cartoon/trK.zl35
-rw-r--r--test/test_cartoon/trK_max.tl3
-rw-r--r--test/test_cartoon/trK_min.tl3
-rw-r--r--test/test_cartoon/trK_nm1.tl3
-rw-r--r--test/test_cartoon/trK_nm2.tl3
-rw-r--r--test/test_cartoon_1.par90
-rw-r--r--test/test_cartoon_2.par (renamed from test/test_cartoon.par)20
151 files changed, 343 insertions, 1865 deletions
diff --git a/param.ccl b/param.ccl
index bbf8c3a..f334526 100644
--- a/param.ccl
+++ b/param.ccl
@@ -19,3 +19,7 @@ INT order "Cartoon's interpolation order"
{
1:5 :: "From linear to fifth order."
} 4
+
+BOOLEAN allow_grid_resize "Allow grid to be resized in a cartoon-compatible way"
+{
+} "no" \ No newline at end of file
diff --git a/schedule.ccl b/schedule.ccl
index 7011caa..5e0e224 100644
--- a/schedule.ccl
+++ b/schedule.ccl
@@ -3,6 +3,14 @@
if (cartoon_active)
{
+# if (allow_grid_resize)
+# {
+ schedule Cartoon2D_SetGrid at CCTK_RECOVER_PARAMETERS
+ {
+ LANG: C
+ } "Adjust grid sizes"
+# }
+
schedule Cartoon2D_CheckParameters at CCTK_PARAMCHECK
{
LANG: C
diff --git a/src/SetGrid.c b/src/SetGrid.c
new file mode 100644
index 0000000..dd8a7fe
--- /dev/null
+++ b/src/SetGrid.c
@@ -0,0 +1,228 @@
+/*@@
+ @file SetGrid.c
+ @date April 2002
+ @author Denis Pollney
+ @desc
+ Reset the grid sizes before they are set by CartGrid3D, so
+ that they have sensible cartoon-compatible values.
+ @enddesc
+ @@*/
+
+#include <string.h>
+
+#include "cctk.h"
+#include "cctk_Parameter.h"
+#include "cctk_Parameters.h"
+
+static const char
+*rcsid = "$Id$";
+
+ /*@@
+ @routine Cartoon_SetGrid
+ @date April 2002
+ @author Denis Pollney
+ @desc
+ Resets the grid dimensions in a cartoon-compatible way if
+ the user has specified grid::type="byspacing".
+
+ Generally, "byspacing" would put the z-axis in the middle
+ of the x range. However, for cartoon, it is required to
+ be at the edge of the range with only some zombie-zones
+ extending across. This routine ensures that this is the
+ case, by fixing the x range and re-specifying nx so that
+ the dx value which was specified by the user is unchanged.
+ The y range is reset to be a width of 1 plus space for the
+ zombie points.
+
+ In the process, a couple of other parameters such as
+ grid::bitant_plane and grid::avoid_originy are also checked
+ to ensure that they are cartoon-compatible.
+
+ If the grid type is specified to be "byrange", then this
+ routine does nothing and it is up to the user to choose
+ appropriate ranges for what they want to do.
+
+ Note that this routine currently needs to be scheduled at
+ CCTK_RECOVER_PARAMETERS, because this is the only place where
+ it is still possible to modify non-steerable parameters.
+ @enddesc
+ @@*/
+void
+Cartoon2D_SetGrid(void)
+{
+ DECLARE_CCTK_PARAMETERS
+
+ int* s = NULL;
+ int* p_type = NULL;
+ int* nx = NULL;
+ int* ny = NULL;
+ int* nz = NULL;
+ int* ghost_z = NULL;
+ double* dx = NULL;
+ double* dy = NULL;
+ double* dz = NULL;
+ int cartoon_ny;
+ int ierr;
+ char p_val[80];
+ char* domain;
+ char* plane;
+ char* avoid_y0;
+ double xmin, xmax, ymin, ymax, zmin, zmax;
+
+
+ /*
+ * Determine the y ghostzone size.
+ */
+ s = (int*) CCTK_ParameterGet("ghost_size_y", "pugh", p_type);
+ if (s == NULL)
+ CCTK_WARN(0, "pugh::ghost_size_y must be set explicitly");
+
+ cartoon_ny = 2 * (*s) + 1;
+
+ /*
+ * Get the x,y,z grid sizes.
+ */
+ nx = (int*) CCTK_ParameterGet("global_nsize", "pugh", p_type);
+ if ((nx == NULL) || (*nx == -1))
+ {
+ nx = (int*) CCTK_ParameterGet("global_nx", "pugh", p_type);
+ if ((nx==NULL) || (*nx == -1))
+ CCTK_WARN(0, "Couldn't determine global_nx");
+
+ ny = (int*) CCTK_ParameterGet("global_ny", "pugh", p_type);
+ if ((ny == NULL) || (*ny == -1))
+ CCTK_WARN(0, "Couldn't determine global_nx");
+
+ nz = (int*) CCTK_ParameterGet("global_nz", "pugh", p_type);
+ if ((nz == NULL) || (*nz == -1))
+ CCTK_WARN(0, "Couldn't determine global_nz");
+ }
+ else
+ {
+ ny = nx;
+ nz = nx;
+ }
+
+ /*
+ * Reset the y grid size to be one layer thick, plus twice the ghostzone
+ * size.
+ */
+ if (*ny != cartoon_ny)
+ {
+ CCTK_VInfo(CCTK_THORNSTRING, "Resetting pugh::global_ny to %d\n",
+ cartoon_ny);
+ sprintf(p_val, "%d\0", cartoon_ny);
+ CCTK_ParameterSet("global_ny", "pugh", p_val);
+ }
+
+
+ /*
+ * Reset the grid sizes if the user has specified a "byspacing" grid.
+ */
+ if (strcmp(CCTK_ParameterValString("type", "cartgrid3d"), "byrange"))
+ {
+ /*
+ * We need to set the grid spacings explicitly, so from now on
+ * consider the grid to be 'byrange'.
+ */
+ CCTK_ParameterSet("type", "cartgrid3d", "byrange");
+
+ /*
+ * Get the x,y,z grid spacing.
+ */
+ dx = (double*) CCTK_ParameterGet("dxyz", "cartgrid3d", p_type);
+ if (dx == NULL)
+ {
+ dx = (double*) CCTK_ParameterGet("dx", "cartgrid3d", p_type);
+ dy = (double*) CCTK_ParameterGet("dy", "cartgrid3d", p_type);
+ dz = (double*) CCTK_ParameterGet("dz", "cartgrid3d", p_type);
+
+ if (dx == NULL)
+ CCTK_WARN(0, "Couldn't determine dx value");
+ if (dy == NULL)
+ CCTK_WARN(0, "Couldn't determine dy value");
+ if (dz == NULL)
+ CCTK_WARN(0, "Couldn't determine dz value");
+ }
+ else
+ {
+ dy = dx;
+ dz = dx;
+ }
+
+ /*
+ * Set the x grid dimensions.
+ */
+ *nx += (*s + 1);
+ xmin = -((*s)-0.5) * (*dx);
+ xmax = xmin + (*nx-1) * (*dx);
+
+ CCTK_VInfo(CCTK_THORNSTRING, "Setting x-range to [%f, %f]", xmin, xmax);
+
+ sprintf(p_val, "%f\0", xmin);
+ ierr = CCTK_ParameterSet("xmin", "cartgrid3d", p_val);
+ sprintf(p_val, "%f\0", xmax);
+ ierr = CCTK_ParameterSet("xmax", "cartgrid3d", p_val);
+
+ /*
+ * Set the y grid dimensions.
+ */
+ avoid_y0 = CCTK_ParameterValString("avoid_originy", "cartgrid3d");
+ if (strcmp(avoid_y0, "no"))
+ CCTK_WARN(0, "Cartoon2D requires grid::avoid_originy=\"no\"");
+
+ ymax = (*s) * (*dy);
+ ymin = -ymax;
+
+ CCTK_VInfo(CCTK_THORNSTRING, "Setting y-range to [%f, %f]", ymin, ymax);
+
+ sprintf(p_val, "%f\0", ymin);
+ ierr = CCTK_ParameterSet("ymin", "cartgrid3d", p_val);
+ sprintf(p_val, "%f\0", ymax);
+ ierr = CCTK_ParameterSet("ymax", "cartgrid3d", p_val);
+
+ /*
+ * Set the z grid dimensions for bitant mode.
+ */
+
+ domain = CCTK_ParameterValString("domain", "cartgrid3d");
+ if (!strcmp(domain, "bitant"))
+ {
+ plane = CCTK_ParameterValString("bitant_plane", "cartgrid3d");
+ if (strcmp(plane, "xy"))
+ CCTK_WARN(0, "Cartoon2D requires grid::bitant_plane=\"xy\"");
+
+ ghost_z = (int*) CCTK_ParameterGet("ghost_size", "pugh", p_type);
+ if ((ghost_z == NULL) || (*ghost_z < 0))
+ ghost_z = (int*) CCTK_ParameterGet("ghost_size_z", "pugh", p_type);
+
+ (*nz) += 1;
+ zmax = (*nz-0.5) * (*dz);
+ zmin = -zmax;
+
+ if ((ghost_z != NULL) && (*ghost_z > 0))
+ (*nz) += (*ghost_z);
+ }
+
+ else if (!strcmp(domain, "full"))
+ {
+ (*nz) += 2;
+ zmax = (*nz-1) * (*dz)/2;
+ zmin = -zmax;
+ }
+
+ else
+ {
+ CCTK_VWarn(0, __LINE__, __FILE__, CCTK_THORNSTRING,
+ "Cartoon2D is unable to handle grid::domain=\"%s\"",
+ domain);
+ }
+
+ CCTK_VInfo(CCTK_THORNSTRING, "Setting z-range to [%f,%f]", zmin, zmax);
+
+ sprintf(p_val, "%f\0", zmin);
+ ierr = CCTK_ParameterSet("zmin", "cartgrid3d", p_val);
+ sprintf(p_val, "%f\0", zmax);
+ ierr = CCTK_ParameterSet("zmax", "cartgrid3d", p_val);
+ }
+}
diff --git a/src/SetSym.c b/src/SetSym.c
index c4b6cb1..423b0b0 100644
--- a/src/SetSym.c
+++ b/src/SetSym.c
@@ -21,7 +21,7 @@ static const char
*rcsid = "$Id$";
/*@@
- @routine Cartoon_IgnoreSym
+ @routine Cartoon_ResetSym
@date October 2001
@author Denis Pollney
@desc
diff --git a/src/make.code.defn b/src/make.code.defn
index 1777124..b277a29 100644
--- a/src/make.code.defn
+++ b/src/make.code.defn
@@ -2,7 +2,7 @@
# $Header$
# Source files in this directory
-SRCS = CheckParameters.c Cartoon2DBC.c interpolate.c SetSym.c
+SRCS = CheckParameters.c Cartoon2DBC.c interpolate.c SetSym.c SetGrid.c
# Subdirectories containing source files
SUBDIRS =
diff --git a/test/test_cartoon/ADM_BS_Gx.xl b/test/test_cartoon/ADM_BS_Gx.xl
deleted file mode 100644
index 9017626..0000000
--- a/test/test_cartoon/ADM_BS_Gx.xl
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-"Time = 0.0000000000000
--0.3000000000000 0.0000000000000
--0.1000000000000 0.0000000000000
-0.1000000000000 0.0000000000000
-0.3000000000000 0.0000000000000
-0.5000000000000 0.0000000000000
-0.7000000000000 0.0000000000000
-0.9000000000000 0.0000000000000
-1.1000000000000 0.0000000000000
-1.3000000000000 0.0000000000000
-1.5000000000000 0.0000000000000
-1.7000000000000 0.0000000000000
-1.9000000000000 0.0000000000000
-2.1000000000000 0.0000000000000
-2.3000000000000 0.0000000000000
-2.5000000000000 0.0000000000000
-2.7000000000000 0.0000000000000
diff --git a/test/test_cartoon/ADM_BS_Gx.yl b/test/test_cartoon/ADM_BS_Gx.yl
deleted file mode 100644
index a68962e..0000000
--- a/test/test_cartoon/ADM_BS_Gx.yl
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-"Time = 0.0000000000000
--0.2000000000000 0.0000000000000
-0.0000000000000 0.0000000000000
-0.2000000000000 0.0000000000000
diff --git a/test/test_cartoon/ADM_BS_Gx.zl b/test/test_cartoon/ADM_BS_Gx.zl
deleted file mode 100644
index 7173a3f..0000000
--- a/test/test_cartoon/ADM_BS_Gx.zl
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-"Time = 0.0000000000000
--3.1000000000000 0.0000000000000
--2.9000000000000 0.0000000000000
--2.7000000000000 0.0000000000000
--2.5000000000000 0.0000000000000
--2.3000000000000 0.0000000000000
--2.1000000000000 0.0000000000000
--1.9000000000000 0.0000000000000
--1.7000000000000 0.0000000000000
--1.5000000000000 0.0000000000000
--1.3000000000000 0.0000000000000
--1.1000000000000 0.0000000000000
--0.9000000000000 0.0000000000000
--0.7000000000000 0.0000000000000
--0.5000000000000 0.0000000000000
--0.3000000000000 0.0000000000000
--0.1000000000000 0.0000000000000
-0.1000000000000 0.0000000000000
-0.3000000000000 0.0000000000000
-0.5000000000000 0.0000000000000
-0.7000000000000 0.0000000000000
-0.9000000000000 0.0000000000000
-1.1000000000000 0.0000000000000
-1.3000000000000 0.0000000000000
-1.5000000000000 0.0000000000000
-1.7000000000000 0.0000000000000
-1.9000000000000 0.0000000000000
-2.1000000000000 0.0000000000000
-2.3000000000000 0.0000000000000
-2.5000000000000 0.0000000000000
-2.7000000000000 0.0000000000000
-2.9000000000000 0.0000000000000
-3.1000000000000 0.0000000000000
diff --git a/test/test_cartoon/ADM_BS_Gx_max.tl b/test/test_cartoon/ADM_BS_Gx_max.tl
deleted file mode 100644
index 37a6d90..0000000
--- a/test/test_cartoon/ADM_BS_Gx_max.tl
+++ /dev/null
@@ -1,3 +0,0 @@
-"ADM_BS_Gx v time
-0.0000000000000 0.0000000000000
-0.0500000000000 0.0000000000000
diff --git a/test/test_cartoon/ADM_BS_Gx_min.tl b/test/test_cartoon/ADM_BS_Gx_min.tl
deleted file mode 100644
index 37a6d90..0000000
--- a/test/test_cartoon/ADM_BS_Gx_min.tl
+++ /dev/null
@@ -1,3 +0,0 @@
-"ADM_BS_Gx v time
-0.0000000000000 0.0000000000000
-0.0500000000000 0.0000000000000
diff --git a/test/test_cartoon/ADM_BS_Gx_nm1.tl b/test/test_cartoon/ADM_BS_Gx_nm1.tl
deleted file mode 100644
index 37a6d90..0000000
--- a/test/test_cartoon/ADM_BS_Gx_nm1.tl
+++ /dev/null
@@ -1,3 +0,0 @@
-"ADM_BS_Gx v time
-0.0000000000000 0.0000000000000
-0.0500000000000 0.0000000000000
diff --git a/test/test_cartoon/ADM_BS_Gx_nm2.tl b/test/test_cartoon/ADM_BS_Gx_nm2.tl
deleted file mode 100644
index 37a6d90..0000000
--- a/test/test_cartoon/ADM_BS_Gx_nm2.tl
+++ /dev/null
@@ -1,3 +0,0 @@
-"ADM_BS_Gx v time
-0.0000000000000 0.0000000000000
-0.0500000000000 0.0000000000000
diff --git a/test/test_cartoon/ADM_BS_Gy.xl b/test/test_cartoon/ADM_BS_Gy.xl
deleted file mode 100644
index 9017626..0000000
--- a/test/test_cartoon/ADM_BS_Gy.xl
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-"Time = 0.0000000000000
--0.3000000000000 0.0000000000000
--0.1000000000000 0.0000000000000
-0.1000000000000 0.0000000000000
-0.3000000000000 0.0000000000000
-0.5000000000000 0.0000000000000
-0.7000000000000 0.0000000000000
-0.9000000000000 0.0000000000000
-1.1000000000000 0.0000000000000
-1.3000000000000 0.0000000000000
-1.5000000000000 0.0000000000000
-1.7000000000000 0.0000000000000
-1.9000000000000 0.0000000000000
-2.1000000000000 0.0000000000000
-2.3000000000000 0.0000000000000
-2.5000000000000 0.0000000000000
-2.7000000000000 0.0000000000000
diff --git a/test/test_cartoon/ADM_BS_Gy.yl b/test/test_cartoon/ADM_BS_Gy.yl
deleted file mode 100644
index a68962e..0000000
--- a/test/test_cartoon/ADM_BS_Gy.yl
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-"Time = 0.0000000000000
--0.2000000000000 0.0000000000000
-0.0000000000000 0.0000000000000
-0.2000000000000 0.0000000000000
diff --git a/test/test_cartoon/ADM_BS_Gy.zl b/test/test_cartoon/ADM_BS_Gy.zl
deleted file mode 100644
index 7173a3f..0000000
--- a/test/test_cartoon/ADM_BS_Gy.zl
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-"Time = 0.0000000000000
--3.1000000000000 0.0000000000000
--2.9000000000000 0.0000000000000
--2.7000000000000 0.0000000000000
--2.5000000000000 0.0000000000000
--2.3000000000000 0.0000000000000
--2.1000000000000 0.0000000000000
--1.9000000000000 0.0000000000000
--1.7000000000000 0.0000000000000
--1.5000000000000 0.0000000000000
--1.3000000000000 0.0000000000000
--1.1000000000000 0.0000000000000
--0.9000000000000 0.0000000000000
--0.7000000000000 0.0000000000000
--0.5000000000000 0.0000000000000
--0.3000000000000 0.0000000000000
--0.1000000000000 0.0000000000000
-0.1000000000000 0.0000000000000
-0.3000000000000 0.0000000000000
-0.5000000000000 0.0000000000000
-0.7000000000000 0.0000000000000
-0.9000000000000 0.0000000000000
-1.1000000000000 0.0000000000000
-1.3000000000000 0.0000000000000
-1.5000000000000 0.0000000000000
-1.7000000000000 0.0000000000000
-1.9000000000000 0.0000000000000
-2.1000000000000 0.0000000000000
-2.3000000000000 0.0000000000000
-2.5000000000000 0.0000000000000
-2.7000000000000 0.0000000000000
-2.9000000000000 0.0000000000000
-3.1000000000000 0.0000000000000
diff --git a/test/test_cartoon/ADM_BS_Gy_max.tl b/test/test_cartoon/ADM_BS_Gy_max.tl
deleted file mode 100644
index 1a2925b..0000000
--- a/test/test_cartoon/ADM_BS_Gy_max.tl
+++ /dev/null
@@ -1,3 +0,0 @@
-"ADM_BS_Gy v time
-0.0000000000000 0.0000000000000
-0.0500000000000 0.0000000000000
diff --git a/test/test_cartoon/ADM_BS_Gy_min.tl b/test/test_cartoon/ADM_BS_Gy_min.tl
deleted file mode 100644
index 1a2925b..0000000
--- a/test/test_cartoon/ADM_BS_Gy_min.tl
+++ /dev/null
@@ -1,3 +0,0 @@
-"ADM_BS_Gy v time
-0.0000000000000 0.0000000000000
-0.0500000000000 0.0000000000000
diff --git a/test/test_cartoon/ADM_BS_Gy_nm1.tl b/test/test_cartoon/ADM_BS_Gy_nm1.tl
deleted file mode 100644
index 1a2925b..0000000
--- a/test/test_cartoon/ADM_BS_Gy_nm1.tl
+++ /dev/null
@@ -1,3 +0,0 @@
-"ADM_BS_Gy v time
-0.0000000000000 0.0000000000000
-0.0500000000000 0.0000000000000
diff --git a/test/test_cartoon/ADM_BS_Gy_nm2.tl b/test/test_cartoon/ADM_BS_Gy_nm2.tl
deleted file mode 100644
index 1a2925b..0000000
--- a/test/test_cartoon/ADM_BS_Gy_nm2.tl
+++ /dev/null
@@ -1,3 +0,0 @@
-"ADM_BS_Gy v time
-0.0000000000000 0.0000000000000
-0.0500000000000 0.0000000000000
diff --git a/test/test_cartoon/ADM_BS_Gz.xl b/test/test_cartoon/ADM_BS_Gz.xl
deleted file mode 100644
index 9017626..0000000
--- a/test/test_cartoon/ADM_BS_Gz.xl
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-"Time = 0.0000000000000
--0.3000000000000 0.0000000000000
--0.1000000000000 0.0000000000000
-0.1000000000000 0.0000000000000
-0.3000000000000 0.0000000000000
-0.5000000000000 0.0000000000000
-0.7000000000000 0.0000000000000
-0.9000000000000 0.0000000000000
-1.1000000000000 0.0000000000000
-1.3000000000000 0.0000000000000
-1.5000000000000 0.0000000000000
-1.7000000000000 0.0000000000000
-1.9000000000000 0.0000000000000
-2.1000000000000 0.0000000000000
-2.3000000000000 0.0000000000000
-2.5000000000000 0.0000000000000
-2.7000000000000 0.0000000000000
diff --git a/test/test_cartoon/ADM_BS_Gz.yl b/test/test_cartoon/ADM_BS_Gz.yl
deleted file mode 100644
index a68962e..0000000
--- a/test/test_cartoon/ADM_BS_Gz.yl
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-"Time = 0.0000000000000
--0.2000000000000 0.0000000000000
-0.0000000000000 0.0000000000000
-0.2000000000000 0.0000000000000
diff --git a/test/test_cartoon/ADM_BS_Gz.zl b/test/test_cartoon/ADM_BS_Gz.zl
deleted file mode 100644
index 7173a3f..0000000
--- a/test/test_cartoon/ADM_BS_Gz.zl
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-"Time = 0.0000000000000
--3.1000000000000 0.0000000000000
--2.9000000000000 0.0000000000000
--2.7000000000000 0.0000000000000
--2.5000000000000 0.0000000000000
--2.3000000000000 0.0000000000000
--2.1000000000000 0.0000000000000
--1.9000000000000 0.0000000000000
--1.7000000000000 0.0000000000000
--1.5000000000000 0.0000000000000
--1.3000000000000 0.0000000000000
--1.1000000000000 0.0000000000000
--0.9000000000000 0.0000000000000
--0.7000000000000 0.0000000000000
--0.5000000000000 0.0000000000000
--0.3000000000000 0.0000000000000
--0.1000000000000 0.0000000000000
-0.1000000000000 0.0000000000000
-0.3000000000000 0.0000000000000
-0.5000000000000 0.0000000000000
-0.7000000000000 0.0000000000000
-0.9000000000000 0.0000000000000
-1.1000000000000 0.0000000000000
-1.3000000000000 0.0000000000000
-1.5000000000000 0.0000000000000
-1.7000000000000 0.0000000000000
-1.9000000000000 0.0000000000000
-2.1000000000000 0.0000000000000
-2.3000000000000 0.0000000000000
-2.5000000000000 0.0000000000000
-2.7000000000000 0.0000000000000
-2.9000000000000 0.0000000000000
-3.1000000000000 0.0000000000000
diff --git a/test/test_cartoon/ADM_BS_Gz_max.tl b/test/test_cartoon/ADM_BS_Gz_max.tl
deleted file mode 100644
index eb73186..0000000
--- a/test/test_cartoon/ADM_BS_Gz_max.tl
+++ /dev/null
@@ -1,3 +0,0 @@
-"ADM_BS_Gz v time
-0.0000000000000 0.0000000000000
-0.0500000000000 0.0000000000000
diff --git a/test/test_cartoon/ADM_BS_Gz_min.tl b/test/test_cartoon/ADM_BS_Gz_min.tl
deleted file mode 100644
index eb73186..0000000
--- a/test/test_cartoon/ADM_BS_Gz_min.tl
+++ /dev/null
@@ -1,3 +0,0 @@
-"ADM_BS_Gz v time
-0.0000000000000 0.0000000000000
-0.0500000000000 0.0000000000000
diff --git a/test/test_cartoon/ADM_BS_Gz_nm1.tl b/test/test_cartoon/ADM_BS_Gz_nm1.tl
deleted file mode 100644
index eb73186..0000000
--- a/test/test_cartoon/ADM_BS_Gz_nm1.tl
+++ /dev/null
@@ -1,3 +0,0 @@
-"ADM_BS_Gz v time
-0.0000000000000 0.0000000000000
-0.0500000000000 0.0000000000000
diff --git a/test/test_cartoon/ADM_BS_Gz_nm2.tl b/test/test_cartoon/ADM_BS_Gz_nm2.tl
deleted file mode 100644
index eb73186..0000000
--- a/test/test_cartoon/ADM_BS_Gz_nm2.tl
+++ /dev/null
@@ -1,3 +0,0 @@
-"ADM_BS_Gz v time
-0.0000000000000 0.0000000000000
-0.0500000000000 0.0000000000000
diff --git a/test/test_cartoon/ADM_BS_K.xl b/test/test_cartoon/ADM_BS_K.xl
deleted file mode 100644
index 9017626..0000000
--- a/test/test_cartoon/ADM_BS_K.xl
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-"Time = 0.0000000000000
--0.3000000000000 0.0000000000000
--0.1000000000000 0.0000000000000
-0.1000000000000 0.0000000000000
-0.3000000000000 0.0000000000000
-0.5000000000000 0.0000000000000
-0.7000000000000 0.0000000000000
-0.9000000000000 0.0000000000000
-1.1000000000000 0.0000000000000
-1.3000000000000 0.0000000000000
-1.5000000000000 0.0000000000000
-1.7000000000000 0.0000000000000
-1.9000000000000 0.0000000000000
-2.1000000000000 0.0000000000000
-2.3000000000000 0.0000000000000
-2.5000000000000 0.0000000000000
-2.7000000000000 0.0000000000000
diff --git a/test/test_cartoon/ADM_BS_K.yl b/test/test_cartoon/ADM_BS_K.yl
deleted file mode 100644
index a68962e..0000000
--- a/test/test_cartoon/ADM_BS_K.yl
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-"Time = 0.0000000000000
--0.2000000000000 0.0000000000000
-0.0000000000000 0.0000000000000
-0.2000000000000 0.0000000000000
diff --git a/test/test_cartoon/ADM_BS_K.zl b/test/test_cartoon/ADM_BS_K.zl
deleted file mode 100644
index 7173a3f..0000000
--- a/test/test_cartoon/ADM_BS_K.zl
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-"Time = 0.0000000000000
--3.1000000000000 0.0000000000000
--2.9000000000000 0.0000000000000
--2.7000000000000 0.0000000000000
--2.5000000000000 0.0000000000000
--2.3000000000000 0.0000000000000
--2.1000000000000 0.0000000000000
--1.9000000000000 0.0000000000000
--1.7000000000000 0.0000000000000
--1.5000000000000 0.0000000000000
--1.3000000000000 0.0000000000000
--1.1000000000000 0.0000000000000
--0.9000000000000 0.0000000000000
--0.7000000000000 0.0000000000000
--0.5000000000000 0.0000000000000
--0.3000000000000 0.0000000000000
--0.1000000000000 0.0000000000000
-0.1000000000000 0.0000000000000
-0.3000000000000 0.0000000000000
-0.5000000000000 0.0000000000000
-0.7000000000000 0.0000000000000
-0.9000000000000 0.0000000000000
-1.1000000000000 0.0000000000000
-1.3000000000000 0.0000000000000
-1.5000000000000 0.0000000000000
-1.7000000000000 0.0000000000000
-1.9000000000000 0.0000000000000
-2.1000000000000 0.0000000000000
-2.3000000000000 0.0000000000000
-2.5000000000000 0.0000000000000
-2.7000000000000 0.0000000000000
-2.9000000000000 0.0000000000000
-3.1000000000000 0.0000000000000
diff --git a/test/test_cartoon/ADM_BS_K_max.tl b/test/test_cartoon/ADM_BS_K_max.tl
deleted file mode 100644
index 47bc86b..0000000
--- a/test/test_cartoon/ADM_BS_K_max.tl
+++ /dev/null
@@ -1,3 +0,0 @@
-"ADM_BS_K v time
-0.0000000000000 0.0000000000000
-0.0500000000000 0.0000000000000
diff --git a/test/test_cartoon/ADM_BS_K_min.tl b/test/test_cartoon/ADM_BS_K_min.tl
deleted file mode 100644
index 47bc86b..0000000
--- a/test/test_cartoon/ADM_BS_K_min.tl
+++ /dev/null
@@ -1,3 +0,0 @@
-"ADM_BS_K v time
-0.0000000000000 0.0000000000000
-0.0500000000000 0.0000000000000
diff --git a/test/test_cartoon/ADM_BS_K_nm1.tl b/test/test_cartoon/ADM_BS_K_nm1.tl
deleted file mode 100644
index 47bc86b..0000000
--- a/test/test_cartoon/ADM_BS_K_nm1.tl
+++ /dev/null
@@ -1,3 +0,0 @@
-"ADM_BS_K v time
-0.0000000000000 0.0000000000000
-0.0500000000000 0.0000000000000
diff --git a/test/test_cartoon/ADM_BS_K_nm2.tl b/test/test_cartoon/ADM_BS_K_nm2.tl
deleted file mode 100644
index 47bc86b..0000000
--- a/test/test_cartoon/ADM_BS_K_nm2.tl
+++ /dev/null
@@ -1,3 +0,0 @@
-"ADM_BS_K v time
-0.0000000000000 0.0000000000000
-0.0500000000000 0.0000000000000
diff --git a/test/test_cartoon/ADM_BS_gxx.xl b/test/test_cartoon/ADM_BS_gxx.xl
deleted file mode 100644
index 95949b2..0000000
--- a/test/test_cartoon/ADM_BS_gxx.xl
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-"Time = 0.0000000000000
--0.3000000000000 1.0000000000000
--0.1000000000000 1.0000000000000
-0.1000000000000 1.0000000000000
-0.3000000000000 1.0000000000000
-0.5000000000000 1.0000000000000
-0.7000000000000 1.0000000000000
-0.9000000000000 1.0000000000000
-1.1000000000000 1.0000000000000
-1.3000000000000 1.0000000000000
-1.5000000000000 1.0000000000000
-1.7000000000000 1.0000000000000
-1.9000000000000 1.0000000000000
-2.1000000000000 1.0000000000000
-2.3000000000000 1.0000000000000
-2.5000000000000 1.0000000000000
-2.7000000000000 1.0000000000000
diff --git a/test/test_cartoon/ADM_BS_gxx.yl b/test/test_cartoon/ADM_BS_gxx.yl
deleted file mode 100644
index 03bbfaa..0000000
--- a/test/test_cartoon/ADM_BS_gxx.yl
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-"Time = 0.0000000000000
--0.2000000000000 1.0000000000000
-0.0000000000000 1.0000000000000
-0.2000000000000 1.0000000000000
diff --git a/test/test_cartoon/ADM_BS_gxx.zl b/test/test_cartoon/ADM_BS_gxx.zl
deleted file mode 100644
index 0eabaae..0000000
--- a/test/test_cartoon/ADM_BS_gxx.zl
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-"Time = 0.0000000000000
--3.1000000000000 1.0000000000000
--2.9000000000000 1.0000000000000
--2.7000000000000 1.0000000000000
--2.5000000000000 1.0000000000000
--2.3000000000000 1.0000000000000
--2.1000000000000 1.0000000000000
--1.9000000000000 1.0000000000000
--1.7000000000000 1.0000000000000
--1.5000000000000 1.0000000000000
--1.3000000000000 1.0000000000000
--1.1000000000000 1.0000000000000
--0.9000000000000 1.0000000000000
--0.7000000000000 1.0000000000000
--0.5000000000000 1.0000000000000
--0.3000000000000 1.0000000000000
--0.1000000000000 1.0000000000000
-0.1000000000000 1.0000000000000
-0.3000000000000 1.0000000000000
-0.5000000000000 1.0000000000000
-0.7000000000000 1.0000000000000
-0.9000000000000 1.0000000000000
-1.1000000000000 1.0000000000000
-1.3000000000000 1.0000000000000
-1.5000000000000 1.0000000000000
-1.7000000000000 1.0000000000000
-1.9000000000000 1.0000000000000
-2.1000000000000 1.0000000000000
-2.3000000000000 1.0000000000000
-2.5000000000000 1.0000000000000
-2.7000000000000 1.0000000000000
-2.9000000000000 1.0000000000000
-3.1000000000000 1.0000000000000
diff --git a/test/test_cartoon/ADM_BS_gxx_max.tl b/test/test_cartoon/ADM_BS_gxx_max.tl
deleted file mode 100644
index e1b95de..0000000
--- a/test/test_cartoon/ADM_BS_gxx_max.tl
+++ /dev/null
@@ -1,3 +0,0 @@
-"ADM_BS_gxx v time
-0.0000000000000 1.0000000000000
-0.0500000000000 1.0000000000000
diff --git a/test/test_cartoon/ADM_BS_gxx_min.tl b/test/test_cartoon/ADM_BS_gxx_min.tl
deleted file mode 100644
index e1b95de..0000000
--- a/test/test_cartoon/ADM_BS_gxx_min.tl
+++ /dev/null
@@ -1,3 +0,0 @@
-"ADM_BS_gxx v time
-0.0000000000000 1.0000000000000
-0.0500000000000 1.0000000000000
diff --git a/test/test_cartoon/ADM_BS_gxx_nm1.tl b/test/test_cartoon/ADM_BS_gxx_nm1.tl
deleted file mode 100644
index e1b95de..0000000
--- a/test/test_cartoon/ADM_BS_gxx_nm1.tl
+++ /dev/null
@@ -1,3 +0,0 @@
-"ADM_BS_gxx v time
-0.0000000000000 1.0000000000000
-0.0500000000000 1.0000000000000
diff --git a/test/test_cartoon/ADM_BS_gxx_nm2.tl b/test/test_cartoon/ADM_BS_gxx_nm2.tl
deleted file mode 100644
index e1b95de..0000000
--- a/test/test_cartoon/ADM_BS_gxx_nm2.tl
+++ /dev/null
@@ -1,3 +0,0 @@
-"ADM_BS_gxx v time
-0.0000000000000 1.0000000000000
-0.0500000000000 1.0000000000000
diff --git a/test/test_cartoon/ADM_BS_phi.xl b/test/test_cartoon/ADM_BS_phi.xl
deleted file mode 100644
index 9017626..0000000
--- a/test/test_cartoon/ADM_BS_phi.xl
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-"Time = 0.0000000000000
--0.3000000000000 0.0000000000000
--0.1000000000000 0.0000000000000
-0.1000000000000 0.0000000000000
-0.3000000000000 0.0000000000000
-0.5000000000000 0.0000000000000
-0.7000000000000 0.0000000000000
-0.9000000000000 0.0000000000000
-1.1000000000000 0.0000000000000
-1.3000000000000 0.0000000000000
-1.5000000000000 0.0000000000000
-1.7000000000000 0.0000000000000
-1.9000000000000 0.0000000000000
-2.1000000000000 0.0000000000000
-2.3000000000000 0.0000000000000
-2.5000000000000 0.0000000000000
-2.7000000000000 0.0000000000000
diff --git a/test/test_cartoon/ADM_BS_phi.yl b/test/test_cartoon/ADM_BS_phi.yl
deleted file mode 100644
index a68962e..0000000
--- a/test/test_cartoon/ADM_BS_phi.yl
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-"Time = 0.0000000000000
--0.2000000000000 0.0000000000000
-0.0000000000000 0.0000000000000
-0.2000000000000 0.0000000000000
diff --git a/test/test_cartoon/ADM_BS_phi.zl b/test/test_cartoon/ADM_BS_phi.zl
deleted file mode 100644
index 7173a3f..0000000
--- a/test/test_cartoon/ADM_BS_phi.zl
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-"Time = 0.0000000000000
--3.1000000000000 0.0000000000000
--2.9000000000000 0.0000000000000
--2.7000000000000 0.0000000000000
--2.5000000000000 0.0000000000000
--2.3000000000000 0.0000000000000
--2.1000000000000 0.0000000000000
--1.9000000000000 0.0000000000000
--1.7000000000000 0.0000000000000
--1.5000000000000 0.0000000000000
--1.3000000000000 0.0000000000000
--1.1000000000000 0.0000000000000
--0.9000000000000 0.0000000000000
--0.7000000000000 0.0000000000000
--0.5000000000000 0.0000000000000
--0.3000000000000 0.0000000000000
--0.1000000000000 0.0000000000000
-0.1000000000000 0.0000000000000
-0.3000000000000 0.0000000000000
-0.5000000000000 0.0000000000000
-0.7000000000000 0.0000000000000
-0.9000000000000 0.0000000000000
-1.1000000000000 0.0000000000000
-1.3000000000000 0.0000000000000
-1.5000000000000 0.0000000000000
-1.7000000000000 0.0000000000000
-1.9000000000000 0.0000000000000
-2.1000000000000 0.0000000000000
-2.3000000000000 0.0000000000000
-2.5000000000000 0.0000000000000
-2.7000000000000 0.0000000000000
-2.9000000000000 0.0000000000000
-3.1000000000000 0.0000000000000
diff --git a/test/test_cartoon/ADM_BS_phi_max.tl b/test/test_cartoon/ADM_BS_phi_max.tl
deleted file mode 100644
index 4249897..0000000
--- a/test/test_cartoon/ADM_BS_phi_max.tl
+++ /dev/null
@@ -1,3 +0,0 @@
-"ADM_BS_phi v time
-0.0000000000000 0.0000000000000
-0.0500000000000 0.0000000000000
diff --git a/test/test_cartoon/ADM_BS_phi_min.tl b/test/test_cartoon/ADM_BS_phi_min.tl
deleted file mode 100644
index 4249897..0000000
--- a/test/test_cartoon/ADM_BS_phi_min.tl
+++ /dev/null
@@ -1,3 +0,0 @@
-"ADM_BS_phi v time
-0.0000000000000 0.0000000000000
-0.0500000000000 0.0000000000000
diff --git a/test/test_cartoon/ADM_BS_phi_nm1.tl b/test/test_cartoon/ADM_BS_phi_nm1.tl
deleted file mode 100644
index 4249897..0000000
--- a/test/test_cartoon/ADM_BS_phi_nm1.tl
+++ /dev/null
@@ -1,3 +0,0 @@
-"ADM_BS_phi v time
-0.0000000000000 0.0000000000000
-0.0500000000000 0.0000000000000
diff --git a/test/test_cartoon/ADM_BS_phi_nm2.tl b/test/test_cartoon/ADM_BS_phi_nm2.tl
deleted file mode 100644
index 4249897..0000000
--- a/test/test_cartoon/ADM_BS_phi_nm2.tl
+++ /dev/null
@@ -1,3 +0,0 @@
-"ADM_BS_phi v time
-0.0000000000000 0.0000000000000
-0.0500000000000 0.0000000000000
diff --git a/test/test_cartoon/ahf.gauss b/test/test_cartoon/ahf.gauss
deleted file mode 100644
index d31b25c..0000000
--- a/test/test_cartoon/ahf.gauss
+++ /dev/null
@@ -1,438 +0,0 @@
-# GAUSSIAN CURVATURE
-#
-# The data is written in a loop as:
-#
- # do i=1,ntheta
- # do j=1,nphi
-# write gaussian(i,j)
-# end do
-# end do
-#
-# theta and phi are subdivided uniformly
-# according to symmetries:
-#
-# phi=[0,2 pi] (refx=refy=.false.)
-# phi=[0,pi] (refx=.false., refy=.true.)
-# phi=[0,pi/2] (refx=refy=.true.)
-#
-# theta=[0,pi] (refz=.false.)
-# theta=[0,pi/2] (refz=.true.)
-#
-# refx = T
-# refy = T
-# refz = T
-#
-# ntheta = 101
-# nphi = 2
-
-# Time step 0
-# Time 0.000E+00
-# Call 1
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
-
-# Time step 1
-# Time 5.000E-02
-# Call 2
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
- NaN
diff --git a/test/test_cartoon/ahf_area.tl b/test/test_cartoon/ahf_area.tl
deleted file mode 100644
index 87221c5..0000000
--- a/test/test_cartoon/ahf_area.tl
+++ /dev/null
@@ -1,3 +0,0 @@
-" Horizon area
- 0.000000E+00 2.042046E+02
- 5.000000E-02 2.043018E+02
diff --git a/test/test_cartoon/ahf_asymx.tl b/test/test_cartoon/ahf_asymx.tl
deleted file mode 100644
index 7299cb9..0000000
--- a/test/test_cartoon/ahf_asymx.tl
+++ /dev/null
@@ -1,3 +0,0 @@
-" Asymmetries on x reflection
- 0.000000E+00 0.000000E+00
- 5.000000E-02 0.000000E+00
diff --git a/test/test_cartoon/ahf_asymy.tl b/test/test_cartoon/ahf_asymy.tl
deleted file mode 100644
index 1ed4588..0000000
--- a/test/test_cartoon/ahf_asymy.tl
+++ /dev/null
@@ -1,3 +0,0 @@
-" Asymmetries on y reflection
- 0.000000E+00 0.000000E+00
- 5.000000E-02 0.000000E+00
diff --git a/test/test_cartoon/ahf_asymz.tl b/test/test_cartoon/ahf_asymz.tl
deleted file mode 100644
index a88d7f8..0000000
--- a/test/test_cartoon/ahf_asymz.tl
+++ /dev/null
@@ -1,3 +0,0 @@
-" Asymmetries on z reflection
- 0.000000E+00 0.000000E+00
- 5.000000E-02 0.000000E+00
diff --git a/test/test_cartoon/ahf_circ_eq.tl b/test/test_cartoon/ahf_circ_eq.tl
deleted file mode 100644
index 846eef3..0000000
--- a/test/test_cartoon/ahf_circ_eq.tl
+++ /dev/null
@@ -1,3 +0,0 @@
-" Equatorial circumference
- 0.000000E+00 0.000000E+00
- 5.000000E-02 0.000000E+00
diff --git a/test/test_cartoon/ahf_coeff.alm b/test/test_cartoon/ahf_coeff.alm
deleted file mode 100644
index d7f17da..0000000
--- a/test/test_cartoon/ahf_coeff.alm
+++ /dev/null
@@ -1,21 +0,0 @@
-# Radial coefficients
-#
-# Time step 0
-# Time 0.000000E+00
-# Call 1
-# Surface found: Outer horizon?
-# centered on: 0.000000E+00 0.000000E+00 0.000000E+00
-#
-# a_lm l m
-#
- 1.107585E+00 0 0
-
-# Time step 1
-# Time 5.000000E-02
-# Call 2
-# Surface found: Outer horizon?
-# centered on: 0.000000E+00 0.000000E+00 0.000000E+00
-#
-# a_lm l m
-#
- 1.118800E+00 0 0
diff --git a/test/test_cartoon/ahf_mass.tl b/test/test_cartoon/ahf_mass.tl
deleted file mode 100644
index d6be400..0000000
--- a/test/test_cartoon/ahf_mass.tl
+++ /dev/null
@@ -1,3 +0,0 @@
-" Horizon mass
- 0.000000E+00 2.015570E+00
- 5.000000E-02 2.016049E+00
diff --git a/test/test_cartoon/ahf_meri_p1.tl b/test/test_cartoon/ahf_meri_p1.tl
deleted file mode 100644
index dff90e6..0000000
--- a/test/test_cartoon/ahf_meri_p1.tl
+++ /dev/null
@@ -1,3 +0,0 @@
-" Length of meridian, phi=0
- 0.000000E+00 2.532199E+01
- 5.000000E-02 2.532882E+01
diff --git a/test/test_cartoon/ahf_meri_p2.tl b/test/test_cartoon/ahf_meri_p2.tl
deleted file mode 100644
index 2ec482d..0000000
--- a/test/test_cartoon/ahf_meri_p2.tl
+++ /dev/null
@@ -1,3 +0,0 @@
-" Length of meridian, phi=pi/2
- 0.000000E+00 2.532199E+01
- 5.000000E-02 2.532882E+01
diff --git a/test/test_cartoon/ahf_rad.tl b/test/test_cartoon/ahf_rad.tl
deleted file mode 100644
index 1492806..0000000
--- a/test/test_cartoon/ahf_rad.tl
+++ /dev/null
@@ -1,3 +0,0 @@
-" Horizon radius
- 0.000000E+00 1.107585E+00
- 5.000000E-02 1.118800E+00
diff --git a/test/test_cartoon/alp.xl b/test/test_cartoon/alp.xl
deleted file mode 100644
index 95949b2..0000000
--- a/test/test_cartoon/alp.xl
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-"Time = 0.0000000000000
--0.3000000000000 1.0000000000000
--0.1000000000000 1.0000000000000
-0.1000000000000 1.0000000000000
-0.3000000000000 1.0000000000000
-0.5000000000000 1.0000000000000
-0.7000000000000 1.0000000000000
-0.9000000000000 1.0000000000000
-1.1000000000000 1.0000000000000
-1.3000000000000 1.0000000000000
-1.5000000000000 1.0000000000000
-1.7000000000000 1.0000000000000
-1.9000000000000 1.0000000000000
-2.1000000000000 1.0000000000000
-2.3000000000000 1.0000000000000
-2.5000000000000 1.0000000000000
-2.7000000000000 1.0000000000000
diff --git a/test/test_cartoon/alp.yl b/test/test_cartoon/alp.yl
deleted file mode 100644
index 03bbfaa..0000000
--- a/test/test_cartoon/alp.yl
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-"Time = 0.0000000000000
--0.2000000000000 1.0000000000000
-0.0000000000000 1.0000000000000
-0.2000000000000 1.0000000000000
diff --git a/test/test_cartoon/alp.zl b/test/test_cartoon/alp.zl
deleted file mode 100644
index 0eabaae..0000000
--- a/test/test_cartoon/alp.zl
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-"Time = 0.0000000000000
--3.1000000000000 1.0000000000000
--2.9000000000000 1.0000000000000
--2.7000000000000 1.0000000000000
--2.5000000000000 1.0000000000000
--2.3000000000000 1.0000000000000
--2.1000000000000 1.0000000000000
--1.9000000000000 1.0000000000000
--1.7000000000000 1.0000000000000
--1.5000000000000 1.0000000000000
--1.3000000000000 1.0000000000000
--1.1000000000000 1.0000000000000
--0.9000000000000 1.0000000000000
--0.7000000000000 1.0000000000000
--0.5000000000000 1.0000000000000
--0.3000000000000 1.0000000000000
--0.1000000000000 1.0000000000000
-0.1000000000000 1.0000000000000
-0.3000000000000 1.0000000000000
-0.5000000000000 1.0000000000000
-0.7000000000000 1.0000000000000
-0.9000000000000 1.0000000000000
-1.1000000000000 1.0000000000000
-1.3000000000000 1.0000000000000
-1.5000000000000 1.0000000000000
-1.7000000000000 1.0000000000000
-1.9000000000000 1.0000000000000
-2.1000000000000 1.0000000000000
-2.3000000000000 1.0000000000000
-2.5000000000000 1.0000000000000
-2.7000000000000 1.0000000000000
-2.9000000000000 1.0000000000000
-3.1000000000000 1.0000000000000
diff --git a/test/test_cartoon/alp_max.tl b/test/test_cartoon/alp_max.tl
deleted file mode 100644
index b02ef45..0000000
--- a/test/test_cartoon/alp_max.tl
+++ /dev/null
@@ -1,3 +0,0 @@
-"alp v time
-0.0000000000000 1.0000000000000
-0.0500000000000 1.0000000000000
diff --git a/test/test_cartoon/alp_min.tl b/test/test_cartoon/alp_min.tl
deleted file mode 100644
index b02ef45..0000000
--- a/test/test_cartoon/alp_min.tl
+++ /dev/null
@@ -1,3 +0,0 @@
-"alp v time
-0.0000000000000 1.0000000000000
-0.0500000000000 1.0000000000000
diff --git a/test/test_cartoon/alp_nm1.tl b/test/test_cartoon/alp_nm1.tl
deleted file mode 100644
index b02ef45..0000000
--- a/test/test_cartoon/alp_nm1.tl
+++ /dev/null
@@ -1,3 +0,0 @@
-"alp v time
-0.0000000000000 1.0000000000000
-0.0500000000000 1.0000000000000
diff --git a/test/test_cartoon/alp_nm2.tl b/test/test_cartoon/alp_nm2.tl
deleted file mode 100644
index b02ef45..0000000
--- a/test/test_cartoon/alp_nm2.tl
+++ /dev/null
@@ -1,3 +0,0 @@
-"alp v time
-0.0000000000000 1.0000000000000
-0.0500000000000 1.0000000000000
diff --git a/test/test_cartoon/grr.xl b/test/test_cartoon/grr.xl
deleted file mode 100644
index 95949b2..0000000
--- a/test/test_cartoon/grr.xl
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-"Time = 0.0000000000000
--0.3000000000000 1.0000000000000
--0.1000000000000 1.0000000000000
-0.1000000000000 1.0000000000000
-0.3000000000000 1.0000000000000
-0.5000000000000 1.0000000000000
-0.7000000000000 1.0000000000000
-0.9000000000000 1.0000000000000
-1.1000000000000 1.0000000000000
-1.3000000000000 1.0000000000000
-1.5000000000000 1.0000000000000
-1.7000000000000 1.0000000000000
-1.9000000000000 1.0000000000000
-2.1000000000000 1.0000000000000
-2.3000000000000 1.0000000000000
-2.5000000000000 1.0000000000000
-2.7000000000000 1.0000000000000
diff --git a/test/test_cartoon/grr.yl b/test/test_cartoon/grr.yl
deleted file mode 100644
index 03bbfaa..0000000
--- a/test/test_cartoon/grr.yl
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-"Time = 0.0000000000000
--0.2000000000000 1.0000000000000
-0.0000000000000 1.0000000000000
-0.2000000000000 1.0000000000000
diff --git a/test/test_cartoon/grr.zl b/test/test_cartoon/grr.zl
deleted file mode 100644
index 0eabaae..0000000
--- a/test/test_cartoon/grr.zl
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-"Time = 0.0000000000000
--3.1000000000000 1.0000000000000
--2.9000000000000 1.0000000000000
--2.7000000000000 1.0000000000000
--2.5000000000000 1.0000000000000
--2.3000000000000 1.0000000000000
--2.1000000000000 1.0000000000000
--1.9000000000000 1.0000000000000
--1.7000000000000 1.0000000000000
--1.5000000000000 1.0000000000000
--1.3000000000000 1.0000000000000
--1.1000000000000 1.0000000000000
--0.9000000000000 1.0000000000000
--0.7000000000000 1.0000000000000
--0.5000000000000 1.0000000000000
--0.3000000000000 1.0000000000000
--0.1000000000000 1.0000000000000
-0.1000000000000 1.0000000000000
-0.3000000000000 1.0000000000000
-0.5000000000000 1.0000000000000
-0.7000000000000 1.0000000000000
-0.9000000000000 1.0000000000000
-1.1000000000000 1.0000000000000
-1.3000000000000 1.0000000000000
-1.5000000000000 1.0000000000000
-1.7000000000000 1.0000000000000
-1.9000000000000 1.0000000000000
-2.1000000000000 1.0000000000000
-2.3000000000000 1.0000000000000
-2.5000000000000 1.0000000000000
-2.7000000000000 1.0000000000000
-2.9000000000000 1.0000000000000
-3.1000000000000 1.0000000000000
diff --git a/test/test_cartoon/grr_max.tl b/test/test_cartoon/grr_max.tl
deleted file mode 100644
index a4c9e19..0000000
--- a/test/test_cartoon/grr_max.tl
+++ /dev/null
@@ -1,3 +0,0 @@
-"grr v time
-0.0000000000000 1.0000000000000
-0.0500000000000 1.0000000000000
diff --git a/test/test_cartoon/grr_min.tl b/test/test_cartoon/grr_min.tl
deleted file mode 100644
index a4c9e19..0000000
--- a/test/test_cartoon/grr_min.tl
+++ /dev/null
@@ -1,3 +0,0 @@
-"grr v time
-0.0000000000000 1.0000000000000
-0.0500000000000 1.0000000000000
diff --git a/test/test_cartoon/grr_nm1.tl b/test/test_cartoon/grr_nm1.tl
deleted file mode 100644
index a4c9e19..0000000
--- a/test/test_cartoon/grr_nm1.tl
+++ /dev/null
@@ -1,3 +0,0 @@
-"grr v time
-0.0000000000000 1.0000000000000
-0.0500000000000 1.0000000000000
diff --git a/test/test_cartoon/grr_nm2.tl b/test/test_cartoon/grr_nm2.tl
deleted file mode 100644
index a4c9e19..0000000
--- a/test/test_cartoon/grr_nm2.tl
+++ /dev/null
@@ -1,3 +0,0 @@
-"grr v time
-0.0000000000000 1.0000000000000
-0.0500000000000 1.0000000000000
diff --git a/test/test_cartoon/gxx.xl b/test/test_cartoon/gxx.xl
deleted file mode 100644
index 95949b2..0000000
--- a/test/test_cartoon/gxx.xl
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-"Time = 0.0000000000000
--0.3000000000000 1.0000000000000
--0.1000000000000 1.0000000000000
-0.1000000000000 1.0000000000000
-0.3000000000000 1.0000000000000
-0.5000000000000 1.0000000000000
-0.7000000000000 1.0000000000000
-0.9000000000000 1.0000000000000
-1.1000000000000 1.0000000000000
-1.3000000000000 1.0000000000000
-1.5000000000000 1.0000000000000
-1.7000000000000 1.0000000000000
-1.9000000000000 1.0000000000000
-2.1000000000000 1.0000000000000
-2.3000000000000 1.0000000000000
-2.5000000000000 1.0000000000000
-2.7000000000000 1.0000000000000
diff --git a/test/test_cartoon/gxx.yl b/test/test_cartoon/gxx.yl
deleted file mode 100644
index 03bbfaa..0000000
--- a/test/test_cartoon/gxx.yl
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-"Time = 0.0000000000000
--0.2000000000000 1.0000000000000
-0.0000000000000 1.0000000000000
-0.2000000000000 1.0000000000000
diff --git a/test/test_cartoon/gxx.zl b/test/test_cartoon/gxx.zl
deleted file mode 100644
index 0eabaae..0000000
--- a/test/test_cartoon/gxx.zl
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-"Time = 0.0000000000000
--3.1000000000000 1.0000000000000
--2.9000000000000 1.0000000000000
--2.7000000000000 1.0000000000000
--2.5000000000000 1.0000000000000
--2.3000000000000 1.0000000000000
--2.1000000000000 1.0000000000000
--1.9000000000000 1.0000000000000
--1.7000000000000 1.0000000000000
--1.5000000000000 1.0000000000000
--1.3000000000000 1.0000000000000
--1.1000000000000 1.0000000000000
--0.9000000000000 1.0000000000000
--0.7000000000000 1.0000000000000
--0.5000000000000 1.0000000000000
--0.3000000000000 1.0000000000000
--0.1000000000000 1.0000000000000
-0.1000000000000 1.0000000000000
-0.3000000000000 1.0000000000000
-0.5000000000000 1.0000000000000
-0.7000000000000 1.0000000000000
-0.9000000000000 1.0000000000000
-1.1000000000000 1.0000000000000
-1.3000000000000 1.0000000000000
-1.5000000000000 1.0000000000000
-1.7000000000000 1.0000000000000
-1.9000000000000 1.0000000000000
-2.1000000000000 1.0000000000000
-2.3000000000000 1.0000000000000
-2.5000000000000 1.0000000000000
-2.7000000000000 1.0000000000000
-2.9000000000000 1.0000000000000
-3.1000000000000 1.0000000000000
diff --git a/test/test_cartoon/gxx_max.tl b/test/test_cartoon/gxx_max.tl
deleted file mode 100644
index 101ffa1..0000000
--- a/test/test_cartoon/gxx_max.tl
+++ /dev/null
@@ -1,3 +0,0 @@
-"gxx v time
-0.0000000000000 1.0000000000000
-0.0500000000000 1.0000000000000
diff --git a/test/test_cartoon/gxx_min.tl b/test/test_cartoon/gxx_min.tl
deleted file mode 100644
index 101ffa1..0000000
--- a/test/test_cartoon/gxx_min.tl
+++ /dev/null
@@ -1,3 +0,0 @@
-"gxx v time
-0.0000000000000 1.0000000000000
-0.0500000000000 1.0000000000000
diff --git a/test/test_cartoon/gxx_nm1.tl b/test/test_cartoon/gxx_nm1.tl
deleted file mode 100644
index 101ffa1..0000000
--- a/test/test_cartoon/gxx_nm1.tl
+++ /dev/null
@@ -1,3 +0,0 @@
-"gxx v time
-0.0000000000000 1.0000000000000
-0.0500000000000 1.0000000000000
diff --git a/test/test_cartoon/gxx_nm2.tl b/test/test_cartoon/gxx_nm2.tl
deleted file mode 100644
index 101ffa1..0000000
--- a/test/test_cartoon/gxx_nm2.tl
+++ /dev/null
@@ -1,3 +0,0 @@
-"gxx v time
-0.0000000000000 1.0000000000000
-0.0500000000000 1.0000000000000
diff --git a/test/test_cartoon/gxy.xl b/test/test_cartoon/gxy.xl
deleted file mode 100644
index 9017626..0000000
--- a/test/test_cartoon/gxy.xl
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-"Time = 0.0000000000000
--0.3000000000000 0.0000000000000
--0.1000000000000 0.0000000000000
-0.1000000000000 0.0000000000000
-0.3000000000000 0.0000000000000
-0.5000000000000 0.0000000000000
-0.7000000000000 0.0000000000000
-0.9000000000000 0.0000000000000
-1.1000000000000 0.0000000000000
-1.3000000000000 0.0000000000000
-1.5000000000000 0.0000000000000
-1.7000000000000 0.0000000000000
-1.9000000000000 0.0000000000000
-2.1000000000000 0.0000000000000
-2.3000000000000 0.0000000000000
-2.5000000000000 0.0000000000000
-2.7000000000000 0.0000000000000
diff --git a/test/test_cartoon/gxy.yl b/test/test_cartoon/gxy.yl
deleted file mode 100644
index a68962e..0000000
--- a/test/test_cartoon/gxy.yl
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-"Time = 0.0000000000000
--0.2000000000000 0.0000000000000
-0.0000000000000 0.0000000000000
-0.2000000000000 0.0000000000000
diff --git a/test/test_cartoon/gxy.zl b/test/test_cartoon/gxy.zl
deleted file mode 100644
index 7173a3f..0000000
--- a/test/test_cartoon/gxy.zl
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-"Time = 0.0000000000000
--3.1000000000000 0.0000000000000
--2.9000000000000 0.0000000000000
--2.7000000000000 0.0000000000000
--2.5000000000000 0.0000000000000
--2.3000000000000 0.0000000000000
--2.1000000000000 0.0000000000000
--1.9000000000000 0.0000000000000
--1.7000000000000 0.0000000000000
--1.5000000000000 0.0000000000000
--1.3000000000000 0.0000000000000
--1.1000000000000 0.0000000000000
--0.9000000000000 0.0000000000000
--0.7000000000000 0.0000000000000
--0.5000000000000 0.0000000000000
--0.3000000000000 0.0000000000000
--0.1000000000000 0.0000000000000
-0.1000000000000 0.0000000000000
-0.3000000000000 0.0000000000000
-0.5000000000000 0.0000000000000
-0.7000000000000 0.0000000000000
-0.9000000000000 0.0000000000000
-1.1000000000000 0.0000000000000
-1.3000000000000 0.0000000000000
-1.5000000000000 0.0000000000000
-1.7000000000000 0.0000000000000
-1.9000000000000 0.0000000000000
-2.1000000000000 0.0000000000000
-2.3000000000000 0.0000000000000
-2.5000000000000 0.0000000000000
-2.7000000000000 0.0000000000000
-2.9000000000000 0.0000000000000
-3.1000000000000 0.0000000000000
diff --git a/test/test_cartoon/gxy_max.tl b/test/test_cartoon/gxy_max.tl
deleted file mode 100644
index db1b46f..0000000
--- a/test/test_cartoon/gxy_max.tl
+++ /dev/null
@@ -1,3 +0,0 @@
-"gxy v time
-0.0000000000000 0.0000000000000
-0.0500000000000 0.0000000000000
diff --git a/test/test_cartoon/gxy_min.tl b/test/test_cartoon/gxy_min.tl
deleted file mode 100644
index db1b46f..0000000
--- a/test/test_cartoon/gxy_min.tl
+++ /dev/null
@@ -1,3 +0,0 @@
-"gxy v time
-0.0000000000000 0.0000000000000
-0.0500000000000 0.0000000000000
diff --git a/test/test_cartoon/gxy_nm1.tl b/test/test_cartoon/gxy_nm1.tl
deleted file mode 100644
index db1b46f..0000000
--- a/test/test_cartoon/gxy_nm1.tl
+++ /dev/null
@@ -1,3 +0,0 @@
-"gxy v time
-0.0000000000000 0.0000000000000
-0.0500000000000 0.0000000000000
diff --git a/test/test_cartoon/gxy_nm2.tl b/test/test_cartoon/gxy_nm2.tl
deleted file mode 100644
index db1b46f..0000000
--- a/test/test_cartoon/gxy_nm2.tl
+++ /dev/null
@@ -1,3 +0,0 @@
-"gxy v time
-0.0000000000000 0.0000000000000
-0.0500000000000 0.0000000000000
diff --git a/test/test_cartoon/gxz.xl b/test/test_cartoon/gxz.xl
deleted file mode 100644
index 9017626..0000000
--- a/test/test_cartoon/gxz.xl
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-"Time = 0.0000000000000
--0.3000000000000 0.0000000000000
--0.1000000000000 0.0000000000000
-0.1000000000000 0.0000000000000
-0.3000000000000 0.0000000000000
-0.5000000000000 0.0000000000000
-0.7000000000000 0.0000000000000
-0.9000000000000 0.0000000000000
-1.1000000000000 0.0000000000000
-1.3000000000000 0.0000000000000
-1.5000000000000 0.0000000000000
-1.7000000000000 0.0000000000000
-1.9000000000000 0.0000000000000
-2.1000000000000 0.0000000000000
-2.3000000000000 0.0000000000000
-2.5000000000000 0.0000000000000
-2.7000000000000 0.0000000000000
diff --git a/test/test_cartoon/gxz.yl b/test/test_cartoon/gxz.yl
deleted file mode 100644
index a68962e..0000000
--- a/test/test_cartoon/gxz.yl
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-"Time = 0.0000000000000
--0.2000000000000 0.0000000000000
-0.0000000000000 0.0000000000000
-0.2000000000000 0.0000000000000
diff --git a/test/test_cartoon/gxz.zl b/test/test_cartoon/gxz.zl
deleted file mode 100644
index 7173a3f..0000000
--- a/test/test_cartoon/gxz.zl
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-"Time = 0.0000000000000
--3.1000000000000 0.0000000000000
--2.9000000000000 0.0000000000000
--2.7000000000000 0.0000000000000
--2.5000000000000 0.0000000000000
--2.3000000000000 0.0000000000000
--2.1000000000000 0.0000000000000
--1.9000000000000 0.0000000000000
--1.7000000000000 0.0000000000000
--1.5000000000000 0.0000000000000
--1.3000000000000 0.0000000000000
--1.1000000000000 0.0000000000000
--0.9000000000000 0.0000000000000
--0.7000000000000 0.0000000000000
--0.5000000000000 0.0000000000000
--0.3000000000000 0.0000000000000
--0.1000000000000 0.0000000000000
-0.1000000000000 0.0000000000000
-0.3000000000000 0.0000000000000
-0.5000000000000 0.0000000000000
-0.7000000000000 0.0000000000000
-0.9000000000000 0.0000000000000
-1.1000000000000 0.0000000000000
-1.3000000000000 0.0000000000000
-1.5000000000000 0.0000000000000
-1.7000000000000 0.0000000000000
-1.9000000000000 0.0000000000000
-2.1000000000000 0.0000000000000
-2.3000000000000 0.0000000000000
-2.5000000000000 0.0000000000000
-2.7000000000000 0.0000000000000
-2.9000000000000 0.0000000000000
-3.1000000000000 0.0000000000000
diff --git a/test/test_cartoon/gxz_max.tl b/test/test_cartoon/gxz_max.tl
deleted file mode 100644
index 7917a26..0000000
--- a/test/test_cartoon/gxz_max.tl
+++ /dev/null
@@ -1,3 +0,0 @@
-"gxz v time
-0.0000000000000 0.0000000000000
-0.0500000000000 0.0000000000000
diff --git a/test/test_cartoon/gxz_min.tl b/test/test_cartoon/gxz_min.tl
deleted file mode 100644
index 7917a26..0000000
--- a/test/test_cartoon/gxz_min.tl
+++ /dev/null
@@ -1,3 +0,0 @@
-"gxz v time
-0.0000000000000 0.0000000000000
-0.0500000000000 0.0000000000000
diff --git a/test/test_cartoon/gxz_nm1.tl b/test/test_cartoon/gxz_nm1.tl
deleted file mode 100644
index 7917a26..0000000
--- a/test/test_cartoon/gxz_nm1.tl
+++ /dev/null
@@ -1,3 +0,0 @@
-"gxz v time
-0.0000000000000 0.0000000000000
-0.0500000000000 0.0000000000000
diff --git a/test/test_cartoon/gxz_nm2.tl b/test/test_cartoon/gxz_nm2.tl
deleted file mode 100644
index 7917a26..0000000
--- a/test/test_cartoon/gxz_nm2.tl
+++ /dev/null
@@ -1,3 +0,0 @@
-"gxz v time
-0.0000000000000 0.0000000000000
-0.0500000000000 0.0000000000000
diff --git a/test/test_cartoon/gyy.xl b/test/test_cartoon/gyy.xl
deleted file mode 100644
index 95949b2..0000000
--- a/test/test_cartoon/gyy.xl
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-"Time = 0.0000000000000
--0.3000000000000 1.0000000000000
--0.1000000000000 1.0000000000000
-0.1000000000000 1.0000000000000
-0.3000000000000 1.0000000000000
-0.5000000000000 1.0000000000000
-0.7000000000000 1.0000000000000
-0.9000000000000 1.0000000000000
-1.1000000000000 1.0000000000000
-1.3000000000000 1.0000000000000
-1.5000000000000 1.0000000000000
-1.7000000000000 1.0000000000000
-1.9000000000000 1.0000000000000
-2.1000000000000 1.0000000000000
-2.3000000000000 1.0000000000000
-2.5000000000000 1.0000000000000
-2.7000000000000 1.0000000000000
diff --git a/test/test_cartoon/gyy.yl b/test/test_cartoon/gyy.yl
deleted file mode 100644
index 03bbfaa..0000000
--- a/test/test_cartoon/gyy.yl
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-"Time = 0.0000000000000
--0.2000000000000 1.0000000000000
-0.0000000000000 1.0000000000000
-0.2000000000000 1.0000000000000
diff --git a/test/test_cartoon/gyy.zl b/test/test_cartoon/gyy.zl
deleted file mode 100644
index 0eabaae..0000000
--- a/test/test_cartoon/gyy.zl
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-"Time = 0.0000000000000
--3.1000000000000 1.0000000000000
--2.9000000000000 1.0000000000000
--2.7000000000000 1.0000000000000
--2.5000000000000 1.0000000000000
--2.3000000000000 1.0000000000000
--2.1000000000000 1.0000000000000
--1.9000000000000 1.0000000000000
--1.7000000000000 1.0000000000000
--1.5000000000000 1.0000000000000
--1.3000000000000 1.0000000000000
--1.1000000000000 1.0000000000000
--0.9000000000000 1.0000000000000
--0.7000000000000 1.0000000000000
--0.5000000000000 1.0000000000000
--0.3000000000000 1.0000000000000
--0.1000000000000 1.0000000000000
-0.1000000000000 1.0000000000000
-0.3000000000000 1.0000000000000
-0.5000000000000 1.0000000000000
-0.7000000000000 1.0000000000000
-0.9000000000000 1.0000000000000
-1.1000000000000 1.0000000000000
-1.3000000000000 1.0000000000000
-1.5000000000000 1.0000000000000
-1.7000000000000 1.0000000000000
-1.9000000000000 1.0000000000000
-2.1000000000000 1.0000000000000
-2.3000000000000 1.0000000000000
-2.5000000000000 1.0000000000000
-2.7000000000000 1.0000000000000
-2.9000000000000 1.0000000000000
-3.1000000000000 1.0000000000000
diff --git a/test/test_cartoon/gyy_max.tl b/test/test_cartoon/gyy_max.tl
deleted file mode 100644
index f0333a5..0000000
--- a/test/test_cartoon/gyy_max.tl
+++ /dev/null
@@ -1,3 +0,0 @@
-"gyy v time
-0.0000000000000 1.0000000000000
-0.0500000000000 1.0000000000000
diff --git a/test/test_cartoon/gyy_min.tl b/test/test_cartoon/gyy_min.tl
deleted file mode 100644
index f0333a5..0000000
--- a/test/test_cartoon/gyy_min.tl
+++ /dev/null
@@ -1,3 +0,0 @@
-"gyy v time
-0.0000000000000 1.0000000000000
-0.0500000000000 1.0000000000000
diff --git a/test/test_cartoon/gyy_nm1.tl b/test/test_cartoon/gyy_nm1.tl
deleted file mode 100644
index f0333a5..0000000
--- a/test/test_cartoon/gyy_nm1.tl
+++ /dev/null
@@ -1,3 +0,0 @@
-"gyy v time
-0.0000000000000 1.0000000000000
-0.0500000000000 1.0000000000000
diff --git a/test/test_cartoon/gyy_nm2.tl b/test/test_cartoon/gyy_nm2.tl
deleted file mode 100644
index f0333a5..0000000
--- a/test/test_cartoon/gyy_nm2.tl
+++ /dev/null
@@ -1,3 +0,0 @@
-"gyy v time
-0.0000000000000 1.0000000000000
-0.0500000000000 1.0000000000000
diff --git a/test/test_cartoon/gyz.xl b/test/test_cartoon/gyz.xl
deleted file mode 100644
index 9017626..0000000
--- a/test/test_cartoon/gyz.xl
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-"Time = 0.0000000000000
--0.3000000000000 0.0000000000000
--0.1000000000000 0.0000000000000
-0.1000000000000 0.0000000000000
-0.3000000000000 0.0000000000000
-0.5000000000000 0.0000000000000
-0.7000000000000 0.0000000000000
-0.9000000000000 0.0000000000000
-1.1000000000000 0.0000000000000
-1.3000000000000 0.0000000000000
-1.5000000000000 0.0000000000000
-1.7000000000000 0.0000000000000
-1.9000000000000 0.0000000000000
-2.1000000000000 0.0000000000000
-2.3000000000000 0.0000000000000
-2.5000000000000 0.0000000000000
-2.7000000000000 0.0000000000000
diff --git a/test/test_cartoon/gyz.yl b/test/test_cartoon/gyz.yl
deleted file mode 100644
index a68962e..0000000
--- a/test/test_cartoon/gyz.yl
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-"Time = 0.0000000000000
--0.2000000000000 0.0000000000000
-0.0000000000000 0.0000000000000
-0.2000000000000 0.0000000000000
diff --git a/test/test_cartoon/gyz.zl b/test/test_cartoon/gyz.zl
deleted file mode 100644
index 7173a3f..0000000
--- a/test/test_cartoon/gyz.zl
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-"Time = 0.0000000000000
--3.1000000000000 0.0000000000000
--2.9000000000000 0.0000000000000
--2.7000000000000 0.0000000000000
--2.5000000000000 0.0000000000000
--2.3000000000000 0.0000000000000
--2.1000000000000 0.0000000000000
--1.9000000000000 0.0000000000000
--1.7000000000000 0.0000000000000
--1.5000000000000 0.0000000000000
--1.3000000000000 0.0000000000000
--1.1000000000000 0.0000000000000
--0.9000000000000 0.0000000000000
--0.7000000000000 0.0000000000000
--0.5000000000000 0.0000000000000
--0.3000000000000 0.0000000000000
--0.1000000000000 0.0000000000000
-0.1000000000000 0.0000000000000
-0.3000000000000 0.0000000000000
-0.5000000000000 0.0000000000000
-0.7000000000000 0.0000000000000
-0.9000000000000 0.0000000000000
-1.1000000000000 0.0000000000000
-1.3000000000000 0.0000000000000
-1.5000000000000 0.0000000000000
-1.7000000000000 0.0000000000000
-1.9000000000000 0.0000000000000
-2.1000000000000 0.0000000000000
-2.3000000000000 0.0000000000000
-2.5000000000000 0.0000000000000
-2.7000000000000 0.0000000000000
-2.9000000000000 0.0000000000000
-3.1000000000000 0.0000000000000
diff --git a/test/test_cartoon/gyz_max.tl b/test/test_cartoon/gyz_max.tl
deleted file mode 100644
index 08c2ff2..0000000
--- a/test/test_cartoon/gyz_max.tl
+++ /dev/null
@@ -1,3 +0,0 @@
-"gyz v time
-0.0000000000000 0.0000000000000
-0.0500000000000 0.0000000000000
diff --git a/test/test_cartoon/gyz_min.tl b/test/test_cartoon/gyz_min.tl
deleted file mode 100644
index 08c2ff2..0000000
--- a/test/test_cartoon/gyz_min.tl
+++ /dev/null
@@ -1,3 +0,0 @@
-"gyz v time
-0.0000000000000 0.0000000000000
-0.0500000000000 0.0000000000000
diff --git a/test/test_cartoon/gyz_nm1.tl b/test/test_cartoon/gyz_nm1.tl
deleted file mode 100644
index 08c2ff2..0000000
--- a/test/test_cartoon/gyz_nm1.tl
+++ /dev/null
@@ -1,3 +0,0 @@
-"gyz v time
-0.0000000000000 0.0000000000000
-0.0500000000000 0.0000000000000
diff --git a/test/test_cartoon/gyz_nm2.tl b/test/test_cartoon/gyz_nm2.tl
deleted file mode 100644
index 08c2ff2..0000000
--- a/test/test_cartoon/gyz_nm2.tl
+++ /dev/null
@@ -1,3 +0,0 @@
-"gyz v time
-0.0000000000000 0.0000000000000
-0.0500000000000 0.0000000000000
diff --git a/test/test_cartoon/gzz.xl b/test/test_cartoon/gzz.xl
deleted file mode 100644
index 95949b2..0000000
--- a/test/test_cartoon/gzz.xl
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-"Time = 0.0000000000000
--0.3000000000000 1.0000000000000
--0.1000000000000 1.0000000000000
-0.1000000000000 1.0000000000000
-0.3000000000000 1.0000000000000
-0.5000000000000 1.0000000000000
-0.7000000000000 1.0000000000000
-0.9000000000000 1.0000000000000
-1.1000000000000 1.0000000000000
-1.3000000000000 1.0000000000000
-1.5000000000000 1.0000000000000
-1.7000000000000 1.0000000000000
-1.9000000000000 1.0000000000000
-2.1000000000000 1.0000000000000
-2.3000000000000 1.0000000000000
-2.5000000000000 1.0000000000000
-2.7000000000000 1.0000000000000
diff --git a/test/test_cartoon/gzz.yl b/test/test_cartoon/gzz.yl
deleted file mode 100644
index 03bbfaa..0000000
--- a/test/test_cartoon/gzz.yl
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-"Time = 0.0000000000000
--0.2000000000000 1.0000000000000
-0.0000000000000 1.0000000000000
-0.2000000000000 1.0000000000000
diff --git a/test/test_cartoon/gzz.zl b/test/test_cartoon/gzz.zl
deleted file mode 100644
index 0eabaae..0000000
--- a/test/test_cartoon/gzz.zl
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-"Time = 0.0000000000000
--3.1000000000000 1.0000000000000
--2.9000000000000 1.0000000000000
--2.7000000000000 1.0000000000000
--2.5000000000000 1.0000000000000
--2.3000000000000 1.0000000000000
--2.1000000000000 1.0000000000000
--1.9000000000000 1.0000000000000
--1.7000000000000 1.0000000000000
--1.5000000000000 1.0000000000000
--1.3000000000000 1.0000000000000
--1.1000000000000 1.0000000000000
--0.9000000000000 1.0000000000000
--0.7000000000000 1.0000000000000
--0.5000000000000 1.0000000000000
--0.3000000000000 1.0000000000000
--0.1000000000000 1.0000000000000
-0.1000000000000 1.0000000000000
-0.3000000000000 1.0000000000000
-0.5000000000000 1.0000000000000
-0.7000000000000 1.0000000000000
-0.9000000000000 1.0000000000000
-1.1000000000000 1.0000000000000
-1.3000000000000 1.0000000000000
-1.5000000000000 1.0000000000000
-1.7000000000000 1.0000000000000
-1.9000000000000 1.0000000000000
-2.1000000000000 1.0000000000000
-2.3000000000000 1.0000000000000
-2.5000000000000 1.0000000000000
-2.7000000000000 1.0000000000000
-2.9000000000000 1.0000000000000
-3.1000000000000 1.0000000000000
diff --git a/test/test_cartoon/gzz_max.tl b/test/test_cartoon/gzz_max.tl
deleted file mode 100644
index ec282d1..0000000
--- a/test/test_cartoon/gzz_max.tl
+++ /dev/null
@@ -1,3 +0,0 @@
-"gzz v time
-0.0000000000000 1.0000000000000
-0.0500000000000 1.0000000000000
diff --git a/test/test_cartoon/gzz_min.tl b/test/test_cartoon/gzz_min.tl
deleted file mode 100644
index ec282d1..0000000
--- a/test/test_cartoon/gzz_min.tl
+++ /dev/null
@@ -1,3 +0,0 @@
-"gzz v time
-0.0000000000000 1.0000000000000
-0.0500000000000 1.0000000000000
diff --git a/test/test_cartoon/gzz_nm1.tl b/test/test_cartoon/gzz_nm1.tl
deleted file mode 100644
index ec282d1..0000000
--- a/test/test_cartoon/gzz_nm1.tl
+++ /dev/null
@@ -1,3 +0,0 @@
-"gzz v time
-0.0000000000000 1.0000000000000
-0.0500000000000 1.0000000000000
diff --git a/test/test_cartoon/gzz_nm2.tl b/test/test_cartoon/gzz_nm2.tl
deleted file mode 100644
index ec282d1..0000000
--- a/test/test_cartoon/gzz_nm2.tl
+++ /dev/null
@@ -1,3 +0,0 @@
-"gzz v time
-0.0000000000000 1.0000000000000
-0.0500000000000 1.0000000000000
diff --git a/test/test_cartoon/ham.xl b/test/test_cartoon/ham.xl
deleted file mode 100644
index 9017626..0000000
--- a/test/test_cartoon/ham.xl
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-"Time = 0.0000000000000
--0.3000000000000 0.0000000000000
--0.1000000000000 0.0000000000000
-0.1000000000000 0.0000000000000
-0.3000000000000 0.0000000000000
-0.5000000000000 0.0000000000000
-0.7000000000000 0.0000000000000
-0.9000000000000 0.0000000000000
-1.1000000000000 0.0000000000000
-1.3000000000000 0.0000000000000
-1.5000000000000 0.0000000000000
-1.7000000000000 0.0000000000000
-1.9000000000000 0.0000000000000
-2.1000000000000 0.0000000000000
-2.3000000000000 0.0000000000000
-2.5000000000000 0.0000000000000
-2.7000000000000 0.0000000000000
diff --git a/test/test_cartoon/ham.yl b/test/test_cartoon/ham.yl
deleted file mode 100644
index a68962e..0000000
--- a/test/test_cartoon/ham.yl
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-"Time = 0.0000000000000
--0.2000000000000 0.0000000000000
-0.0000000000000 0.0000000000000
-0.2000000000000 0.0000000000000
diff --git a/test/test_cartoon/ham.zl b/test/test_cartoon/ham.zl
deleted file mode 100644
index 7173a3f..0000000
--- a/test/test_cartoon/ham.zl
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-"Time = 0.0000000000000
--3.1000000000000 0.0000000000000
--2.9000000000000 0.0000000000000
--2.7000000000000 0.0000000000000
--2.5000000000000 0.0000000000000
--2.3000000000000 0.0000000000000
--2.1000000000000 0.0000000000000
--1.9000000000000 0.0000000000000
--1.7000000000000 0.0000000000000
--1.5000000000000 0.0000000000000
--1.3000000000000 0.0000000000000
--1.1000000000000 0.0000000000000
--0.9000000000000 0.0000000000000
--0.7000000000000 0.0000000000000
--0.5000000000000 0.0000000000000
--0.3000000000000 0.0000000000000
--0.1000000000000 0.0000000000000
-0.1000000000000 0.0000000000000
-0.3000000000000 0.0000000000000
-0.5000000000000 0.0000000000000
-0.7000000000000 0.0000000000000
-0.9000000000000 0.0000000000000
-1.1000000000000 0.0000000000000
-1.3000000000000 0.0000000000000
-1.5000000000000 0.0000000000000
-1.7000000000000 0.0000000000000
-1.9000000000000 0.0000000000000
-2.1000000000000 0.0000000000000
-2.3000000000000 0.0000000000000
-2.5000000000000 0.0000000000000
-2.7000000000000 0.0000000000000
-2.9000000000000 0.0000000000000
-3.1000000000000 0.0000000000000
diff --git a/test/test_cartoon/ham_max.tl b/test/test_cartoon/ham_max.tl
deleted file mode 100644
index bc2ce18..0000000
--- a/test/test_cartoon/ham_max.tl
+++ /dev/null
@@ -1,3 +0,0 @@
-"ham v time
-0.0000000000000 0.0000000000000
-0.0500000000000 -0.0000000981498
diff --git a/test/test_cartoon/ham_min.tl b/test/test_cartoon/ham_min.tl
deleted file mode 100644
index 0e827d8..0000000
--- a/test/test_cartoon/ham_min.tl
+++ /dev/null
@@ -1,3 +0,0 @@
-"ham v time
-0.0000000000000 0.0000000000000
-0.0500000000000 -0.0000146461957
diff --git a/test/test_cartoon/ham_nm1.tl b/test/test_cartoon/ham_nm1.tl
deleted file mode 100644
index 8d7bee2..0000000
--- a/test/test_cartoon/ham_nm1.tl
+++ /dev/null
@@ -1,3 +0,0 @@
-"ham v time
-0.0000000000000 0.0000000000000
-0.0500000000000 0.0000063268182
diff --git a/test/test_cartoon/ham_nm2.tl b/test/test_cartoon/ham_nm2.tl
deleted file mode 100644
index e66c09e..0000000
--- a/test/test_cartoon/ham_nm2.tl
+++ /dev/null
@@ -1,3 +0,0 @@
-"ham v time
-0.0000000000000 0.0000000000000
-0.0500000000000 0.0000075506772
diff --git a/test/test_cartoon/momx.xl b/test/test_cartoon/momx.xl
deleted file mode 100644
index 9017626..0000000
--- a/test/test_cartoon/momx.xl
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-"Time = 0.0000000000000
--0.3000000000000 0.0000000000000
--0.1000000000000 0.0000000000000
-0.1000000000000 0.0000000000000
-0.3000000000000 0.0000000000000
-0.5000000000000 0.0000000000000
-0.7000000000000 0.0000000000000
-0.9000000000000 0.0000000000000
-1.1000000000000 0.0000000000000
-1.3000000000000 0.0000000000000
-1.5000000000000 0.0000000000000
-1.7000000000000 0.0000000000000
-1.9000000000000 0.0000000000000
-2.1000000000000 0.0000000000000
-2.3000000000000 0.0000000000000
-2.5000000000000 0.0000000000000
-2.7000000000000 0.0000000000000
diff --git a/test/test_cartoon/momx.yl b/test/test_cartoon/momx.yl
deleted file mode 100644
index a68962e..0000000
--- a/test/test_cartoon/momx.yl
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-"Time = 0.0000000000000
--0.2000000000000 0.0000000000000
-0.0000000000000 0.0000000000000
-0.2000000000000 0.0000000000000
diff --git a/test/test_cartoon/momx.zl b/test/test_cartoon/momx.zl
deleted file mode 100644
index 7173a3f..0000000
--- a/test/test_cartoon/momx.zl
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-"Time = 0.0000000000000
--3.1000000000000 0.0000000000000
--2.9000000000000 0.0000000000000
--2.7000000000000 0.0000000000000
--2.5000000000000 0.0000000000000
--2.3000000000000 0.0000000000000
--2.1000000000000 0.0000000000000
--1.9000000000000 0.0000000000000
--1.7000000000000 0.0000000000000
--1.5000000000000 0.0000000000000
--1.3000000000000 0.0000000000000
--1.1000000000000 0.0000000000000
--0.9000000000000 0.0000000000000
--0.7000000000000 0.0000000000000
--0.5000000000000 0.0000000000000
--0.3000000000000 0.0000000000000
--0.1000000000000 0.0000000000000
-0.1000000000000 0.0000000000000
-0.3000000000000 0.0000000000000
-0.5000000000000 0.0000000000000
-0.7000000000000 0.0000000000000
-0.9000000000000 0.0000000000000
-1.1000000000000 0.0000000000000
-1.3000000000000 0.0000000000000
-1.5000000000000 0.0000000000000
-1.7000000000000 0.0000000000000
-1.9000000000000 0.0000000000000
-2.1000000000000 0.0000000000000
-2.3000000000000 0.0000000000000
-2.5000000000000 0.0000000000000
-2.7000000000000 0.0000000000000
-2.9000000000000 0.0000000000000
-3.1000000000000 0.0000000000000
diff --git a/test/test_cartoon/momx_max.tl b/test/test_cartoon/momx_max.tl
deleted file mode 100644
index 8718acd..0000000
--- a/test/test_cartoon/momx_max.tl
+++ /dev/null
@@ -1,3 +0,0 @@
-"momx v time
-0.0000000000000 0.0000000000000
-0.0500000000000 0.0056501295872
diff --git a/test/test_cartoon/momx_min.tl b/test/test_cartoon/momx_min.tl
deleted file mode 100644
index 17dd107..0000000
--- a/test/test_cartoon/momx_min.tl
+++ /dev/null
@@ -1,3 +0,0 @@
-"momx v time
-0.0000000000000 0.0000000000000
-0.0500000000000 -0.0056501295872
diff --git a/test/test_cartoon/momx_nm1.tl b/test/test_cartoon/momx_nm1.tl
deleted file mode 100644
index 08c7e3f..0000000
--- a/test/test_cartoon/momx_nm1.tl
+++ /dev/null
@@ -1,3 +0,0 @@
-"momx v time
-0.0000000000000 0.0000000000000
-0.0500000000000 0.0002031367506
diff --git a/test/test_cartoon/momx_nm2.tl b/test/test_cartoon/momx_nm2.tl
deleted file mode 100644
index 61c3f7e..0000000
--- a/test/test_cartoon/momx_nm2.tl
+++ /dev/null
@@ -1,3 +0,0 @@
-"momx v time
-0.0000000000000 0.0000000000000
-0.0500000000000 0.0005086164603
diff --git a/test/test_cartoon/momy.xl b/test/test_cartoon/momy.xl
deleted file mode 100644
index 9017626..0000000
--- a/test/test_cartoon/momy.xl
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-"Time = 0.0000000000000
--0.3000000000000 0.0000000000000
--0.1000000000000 0.0000000000000
-0.1000000000000 0.0000000000000
-0.3000000000000 0.0000000000000
-0.5000000000000 0.0000000000000
-0.7000000000000 0.0000000000000
-0.9000000000000 0.0000000000000
-1.1000000000000 0.0000000000000
-1.3000000000000 0.0000000000000
-1.5000000000000 0.0000000000000
-1.7000000000000 0.0000000000000
-1.9000000000000 0.0000000000000
-2.1000000000000 0.0000000000000
-2.3000000000000 0.0000000000000
-2.5000000000000 0.0000000000000
-2.7000000000000 0.0000000000000
diff --git a/test/test_cartoon/momy.yl b/test/test_cartoon/momy.yl
deleted file mode 100644
index a68962e..0000000
--- a/test/test_cartoon/momy.yl
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-"Time = 0.0000000000000
--0.2000000000000 0.0000000000000
-0.0000000000000 0.0000000000000
-0.2000000000000 0.0000000000000
diff --git a/test/test_cartoon/momy.zl b/test/test_cartoon/momy.zl
deleted file mode 100644
index 7173a3f..0000000
--- a/test/test_cartoon/momy.zl
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-"Time = 0.0000000000000
--3.1000000000000 0.0000000000000
--2.9000000000000 0.0000000000000
--2.7000000000000 0.0000000000000
--2.5000000000000 0.0000000000000
--2.3000000000000 0.0000000000000
--2.1000000000000 0.0000000000000
--1.9000000000000 0.0000000000000
--1.7000000000000 0.0000000000000
--1.5000000000000 0.0000000000000
--1.3000000000000 0.0000000000000
--1.1000000000000 0.0000000000000
--0.9000000000000 0.0000000000000
--0.7000000000000 0.0000000000000
--0.5000000000000 0.0000000000000
--0.3000000000000 0.0000000000000
--0.1000000000000 0.0000000000000
-0.1000000000000 0.0000000000000
-0.3000000000000 0.0000000000000
-0.5000000000000 0.0000000000000
-0.7000000000000 0.0000000000000
-0.9000000000000 0.0000000000000
-1.1000000000000 0.0000000000000
-1.3000000000000 0.0000000000000
-1.5000000000000 0.0000000000000
-1.7000000000000 0.0000000000000
-1.9000000000000 0.0000000000000
-2.1000000000000 0.0000000000000
-2.3000000000000 0.0000000000000
-2.5000000000000 0.0000000000000
-2.7000000000000 0.0000000000000
-2.9000000000000 0.0000000000000
-3.1000000000000 0.0000000000000
diff --git a/test/test_cartoon/momy_max.tl b/test/test_cartoon/momy_max.tl
deleted file mode 100644
index f34f0ac..0000000
--- a/test/test_cartoon/momy_max.tl
+++ /dev/null
@@ -1,3 +0,0 @@
-"momy v time
-0.0000000000000 0.0000000000000
-0.0500000000000 0.0021114480510
diff --git a/test/test_cartoon/momy_min.tl b/test/test_cartoon/momy_min.tl
deleted file mode 100644
index 371d649..0000000
--- a/test/test_cartoon/momy_min.tl
+++ /dev/null
@@ -1,3 +0,0 @@
-"momy v time
-0.0000000000000 0.0000000000000
-0.0500000000000 -0.0021114480510
diff --git a/test/test_cartoon/momy_nm1.tl b/test/test_cartoon/momy_nm1.tl
deleted file mode 100644
index 00f93ff..0000000
--- a/test/test_cartoon/momy_nm1.tl
+++ /dev/null
@@ -1,3 +0,0 @@
-"momy v time
-0.0000000000000 0.0000000000000
-0.0500000000000 0.0000760376547
diff --git a/test/test_cartoon/momy_nm2.tl b/test/test_cartoon/momy_nm2.tl
deleted file mode 100644
index b26457b..0000000
--- a/test/test_cartoon/momy_nm2.tl
+++ /dev/null
@@ -1,3 +0,0 @@
-"momy v time
-0.0000000000000 0.0000000000000
-0.0500000000000 0.0002684175596
diff --git a/test/test_cartoon/momz.xl b/test/test_cartoon/momz.xl
deleted file mode 100644
index 9017626..0000000
--- a/test/test_cartoon/momz.xl
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-"Time = 0.0000000000000
--0.3000000000000 0.0000000000000
--0.1000000000000 0.0000000000000
-0.1000000000000 0.0000000000000
-0.3000000000000 0.0000000000000
-0.5000000000000 0.0000000000000
-0.7000000000000 0.0000000000000
-0.9000000000000 0.0000000000000
-1.1000000000000 0.0000000000000
-1.3000000000000 0.0000000000000
-1.5000000000000 0.0000000000000
-1.7000000000000 0.0000000000000
-1.9000000000000 0.0000000000000
-2.1000000000000 0.0000000000000
-2.3000000000000 0.0000000000000
-2.5000000000000 0.0000000000000
-2.7000000000000 0.0000000000000
diff --git a/test/test_cartoon/momz.yl b/test/test_cartoon/momz.yl
deleted file mode 100644
index a68962e..0000000
--- a/test/test_cartoon/momz.yl
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-"Time = 0.0000000000000
--0.2000000000000 0.0000000000000
-0.0000000000000 0.0000000000000
-0.2000000000000 0.0000000000000
diff --git a/test/test_cartoon/momz.zl b/test/test_cartoon/momz.zl
deleted file mode 100644
index 7173a3f..0000000
--- a/test/test_cartoon/momz.zl
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-"Time = 0.0000000000000
--3.1000000000000 0.0000000000000
--2.9000000000000 0.0000000000000
--2.7000000000000 0.0000000000000
--2.5000000000000 0.0000000000000
--2.3000000000000 0.0000000000000
--2.1000000000000 0.0000000000000
--1.9000000000000 0.0000000000000
--1.7000000000000 0.0000000000000
--1.5000000000000 0.0000000000000
--1.3000000000000 0.0000000000000
--1.1000000000000 0.0000000000000
--0.9000000000000 0.0000000000000
--0.7000000000000 0.0000000000000
--0.5000000000000 0.0000000000000
--0.3000000000000 0.0000000000000
--0.1000000000000 0.0000000000000
-0.1000000000000 0.0000000000000
-0.3000000000000 0.0000000000000
-0.5000000000000 0.0000000000000
-0.7000000000000 0.0000000000000
-0.9000000000000 0.0000000000000
-1.1000000000000 0.0000000000000
-1.3000000000000 0.0000000000000
-1.5000000000000 0.0000000000000
-1.7000000000000 0.0000000000000
-1.9000000000000 0.0000000000000
-2.1000000000000 0.0000000000000
-2.3000000000000 0.0000000000000
-2.5000000000000 0.0000000000000
-2.7000000000000 0.0000000000000
-2.9000000000000 0.0000000000000
-3.1000000000000 0.0000000000000
diff --git a/test/test_cartoon/momz_max.tl b/test/test_cartoon/momz_max.tl
deleted file mode 100644
index 00bc287..0000000
--- a/test/test_cartoon/momz_max.tl
+++ /dev/null
@@ -1,3 +0,0 @@
-"momz v time
-0.0000000000000 0.0000000000000
-0.0500000000000 0.0056606931753
diff --git a/test/test_cartoon/momz_min.tl b/test/test_cartoon/momz_min.tl
deleted file mode 100644
index b710103..0000000
--- a/test/test_cartoon/momz_min.tl
+++ /dev/null
@@ -1,3 +0,0 @@
-"momz v time
-0.0000000000000 0.0000000000000
-0.0500000000000 -0.0056606931753
diff --git a/test/test_cartoon/momz_nm1.tl b/test/test_cartoon/momz_nm1.tl
deleted file mode 100644
index 9def35e..0000000
--- a/test/test_cartoon/momz_nm1.tl
+++ /dev/null
@@ -1,3 +0,0 @@
-"momz v time
-0.0000000000000 0.0000000000000
-0.0500000000000 0.0002524356174
diff --git a/test/test_cartoon/momz_nm2.tl b/test/test_cartoon/momz_nm2.tl
deleted file mode 100644
index e224795..0000000
--- a/test/test_cartoon/momz_nm2.tl
+++ /dev/null
@@ -1,3 +0,0 @@
-"momz v time
-0.0000000000000 0.0000000000000
-0.0500000000000 0.0006916972235
diff --git a/test/test_cartoon/trK.xl b/test/test_cartoon/trK.xl
deleted file mode 100644
index 9017626..0000000
--- a/test/test_cartoon/trK.xl
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-"Time = 0.0000000000000
--0.3000000000000 0.0000000000000
--0.1000000000000 0.0000000000000
-0.1000000000000 0.0000000000000
-0.3000000000000 0.0000000000000
-0.5000000000000 0.0000000000000
-0.7000000000000 0.0000000000000
-0.9000000000000 0.0000000000000
-1.1000000000000 0.0000000000000
-1.3000000000000 0.0000000000000
-1.5000000000000 0.0000000000000
-1.7000000000000 0.0000000000000
-1.9000000000000 0.0000000000000
-2.1000000000000 0.0000000000000
-2.3000000000000 0.0000000000000
-2.5000000000000 0.0000000000000
-2.7000000000000 0.0000000000000
diff --git a/test/test_cartoon/trK.yl b/test/test_cartoon/trK.yl
deleted file mode 100644
index a68962e..0000000
--- a/test/test_cartoon/trK.yl
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-"Time = 0.0000000000000
--0.2000000000000 0.0000000000000
-0.0000000000000 0.0000000000000
-0.2000000000000 0.0000000000000
diff --git a/test/test_cartoon/trK.zl b/test/test_cartoon/trK.zl
deleted file mode 100644
index 7173a3f..0000000
--- a/test/test_cartoon/trK.zl
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-"Time = 0.0000000000000
--3.1000000000000 0.0000000000000
--2.9000000000000 0.0000000000000
--2.7000000000000 0.0000000000000
--2.5000000000000 0.0000000000000
--2.3000000000000 0.0000000000000
--2.1000000000000 0.0000000000000
--1.9000000000000 0.0000000000000
--1.7000000000000 0.0000000000000
--1.5000000000000 0.0000000000000
--1.3000000000000 0.0000000000000
--1.1000000000000 0.0000000000000
--0.9000000000000 0.0000000000000
--0.7000000000000 0.0000000000000
--0.5000000000000 0.0000000000000
--0.3000000000000 0.0000000000000
--0.1000000000000 0.0000000000000
-0.1000000000000 0.0000000000000
-0.3000000000000 0.0000000000000
-0.5000000000000 0.0000000000000
-0.7000000000000 0.0000000000000
-0.9000000000000 0.0000000000000
-1.1000000000000 0.0000000000000
-1.3000000000000 0.0000000000000
-1.5000000000000 0.0000000000000
-1.7000000000000 0.0000000000000
-1.9000000000000 0.0000000000000
-2.1000000000000 0.0000000000000
-2.3000000000000 0.0000000000000
-2.5000000000000 0.0000000000000
-2.7000000000000 0.0000000000000
-2.9000000000000 0.0000000000000
-3.1000000000000 0.0000000000000
diff --git a/test/test_cartoon/trK_max.tl b/test/test_cartoon/trK_max.tl
deleted file mode 100644
index 3e46b0b..0000000
--- a/test/test_cartoon/trK_max.tl
+++ /dev/null
@@ -1,3 +0,0 @@
-"trK v time
-0.0000000000000 0.0000000000000
-0.0500000000000 0.0000000000000
diff --git a/test/test_cartoon/trK_min.tl b/test/test_cartoon/trK_min.tl
deleted file mode 100644
index 3e46b0b..0000000
--- a/test/test_cartoon/trK_min.tl
+++ /dev/null
@@ -1,3 +0,0 @@
-"trK v time
-0.0000000000000 0.0000000000000
-0.0500000000000 0.0000000000000
diff --git a/test/test_cartoon/trK_nm1.tl b/test/test_cartoon/trK_nm1.tl
deleted file mode 100644
index 3e46b0b..0000000
--- a/test/test_cartoon/trK_nm1.tl
+++ /dev/null
@@ -1,3 +0,0 @@
-"trK v time
-0.0000000000000 0.0000000000000
-0.0500000000000 0.0000000000000
diff --git a/test/test_cartoon/trK_nm2.tl b/test/test_cartoon/trK_nm2.tl
deleted file mode 100644
index 3e46b0b..0000000
--- a/test/test_cartoon/trK_nm2.tl
+++ /dev/null
@@ -1,3 +0,0 @@
-"trK v time
-0.0000000000000 0.0000000000000
-0.0500000000000 0.0000000000000
diff --git a/test/test_cartoon_1.par b/test/test_cartoon_1.par
new file mode 100644
index 0000000..08895e4
--- /dev/null
+++ b/test/test_cartoon_1.par
@@ -0,0 +1,90 @@
+#==============================================================================
+# Cartoon2D, using a bitant grid
+#==============================================================================
+
+ActiveThorns = "cartoon2d idanalyticbh einstein adm_bssn admconstraints ahfinder pughinterp boundary time pugh pughreduce pughslab cartgrid3d ioascii ioutil iobasic"
+
+#------------------------------------------------------------------------------
+# Run parameters for Cartoon
+#------------------------------------------------------------------------------
+
+# Cartoon
+cartoon2d::cartoon_active = "yes"
+cartoon2d::verbose = "yes"
+cartoon2d::stencil = "yes"
+cartoon2d::order = 3
+cartoon2d::allow_grid_resize = "yes"
+
+# This is for 2 processors, you have to
+# change manually by processor numbers.
+
+#driver::processor_topology = "manual"
+#driver::processor_topology_3d_x = 1
+#driver::processor_topology_3d_y = 1
+#driver::processor_topology_3d_z = 2
+
+# Grid
+
+driver::global_nx = 16
+driver::global_ny = 3
+driver::global_nz = 16
+
+driver::ghost_size_x = 2
+driver::ghost_size_y = 1
+driver::ghost_size_z = 2
+
+grid::avoid_originy = "no"
+
+grid::type = "byspacing"
+grid::domain = "bitant"
+grid::bitant_plane = "xy"
+grid::dxyz = 0.2
+
+time::dtfac = 0.25
+
+cactus::cctk_itlast = 1
+
+# MODEL
+
+einstein::initial_data = "schwarzschild"
+
+#--- Evolution
+einstein::evolution_system = "adm_bssn"
+adm_bssn::method = "leapfrog"
+adm_bssn::bound = "flat"
+adm_bssn::cartoon = "yes"
+admconstraints::cartoon = "yes"
+
+#--- gauge
+einstein::slicing = "1+log"
+
+#--- AHFinder.
+
+ahfinder::ahf_active = "yes"
+ahfinder::ahf_cartoon = "yes"
+ahfinder::ahf_gaussout = "yes"
+
+ahfinder::ahf_phi = "no"
+ahfinder::ahf_octant = "high"
+
+ahfinder::ahf_lmax = 0
+
+# Interpolation.
+
+ahfinder::interpolation_order = 1
+
+#------------------------------------------------------------------------------
+# Output
+#------------------------------------------------------------------------------
+IO::outdir = "test_cartoon_1"
+IO::out_fileinfo = "none"
+
+IOBasic::outScalar_every = 1
+IOBasic::outScalar_vars = "admconstraints::hamiltonian admconstraints::momentum einstein::alp einstein::grr einstein::metric einstein::trace_of_K einstein::betax einstein::betay einstein::betaz adm_bssn::adm_bs_gxx adm_bssn::adm_bs_phi adm_bssn::ADM_BSSN_K adm_bssn::ADM_BSSN_gamma"
+
+IOASCII::out1D_every = 1
+IOASCII::out1D_vars = "admconstraints::hamiltonian admconstraints::momentum einstein::alp einstein::grr einstein::metric einstein::trace_of_K einstein::betax einstein::betay einstein::betaz adm_bssn::adm_bs_gxx adm_bssn::adm_bs_phi adm_bssn::ADM_BSSN_K adm_bssn::ADM_BSSN_gamma"
+
+IOBasic::outInfo_every = 1
+IOBasic::outInfo_vars = "einstein::alp adm_bssn::adm_bs_dtalp"
+#==============================================================================
diff --git a/test/test_cartoon.par b/test/test_cartoon_2.par
index 80fb0cf..2bd2672 100644
--- a/test/test_cartoon.par
+++ b/test/test_cartoon_2.par
@@ -1,24 +1,27 @@
#==============================================================================
+# Cartoon2D, using a full grid
+#==============================================================================
ActiveThorns = "cartoon2d idanalyticbh einstein adm_bssn admconstraints ahfinder pughinterp boundary time pugh pughreduce pughslab cartgrid3d ioascii ioutil iobasic"
#------------------------------------------------------------------------------
-
# Run parameters for Cartoon
#------------------------------------------------------------------------------
# Cartoon
+cartoon2d::cartoon_active = "yes"
cartoon2d::verbose = "yes"
cartoon2d::stencil = "yes"
cartoon2d::order = 3
+cartoon2d::allow_grid_resize = "yes"
# This is for 2 processors, you have to
# change manually by processor numbers.
-driver::processor_topology = "manual"
-driver::processor_topology_3d_x = 1
-driver::processor_topology_3d_y = 1
-driver::processor_topology_3d_z = 2
+#driver::processor_topology = "manual"
+#driver::processor_topology_3d_x = 1
+#driver::processor_topology_3d_y = 1
+#driver::processor_topology_3d_z = 2
# Grid
@@ -33,8 +36,7 @@ driver::ghost_size_z = 2
grid::avoid_originy = "no"
grid::type = "byspacing"
-grid::domain = "bitant"
-grid::bitant_plane = "yz"
+grid::domain = "full"
grid::dxyz = 0.2
time::dtfac = 0.25
@@ -73,13 +75,13 @@ ahfinder::interpolation_order = 1
#------------------------------------------------------------------------------
# Output
#------------------------------------------------------------------------------
-IO::outdir = "test_cartoon"
+IO::outdir = "test_cartoon_2"
IO::out_fileinfo = "none"
IOBasic::outScalar_every = 1
IOBasic::outScalar_vars = "admconstraints::hamiltonian admconstraints::momentum einstein::alp einstein::grr einstein::metric einstein::trace_of_K einstein::betax einstein::betay einstein::betaz adm_bssn::adm_bs_gxx adm_bssn::adm_bs_phi adm_bssn::ADM_BSSN_K adm_bssn::ADM_BSSN_gamma"
-IOASCII::out1D_every = 5
+IOASCII::out1D_every = 1
IOASCII::out1D_vars = "admconstraints::hamiltonian admconstraints::momentum einstein::alp einstein::grr einstein::metric einstein::trace_of_K einstein::betax einstein::betay einstein::betaz adm_bssn::adm_bs_gxx adm_bssn::adm_bs_phi adm_bssn::ADM_BSSN_K adm_bssn::ADM_BSSN_gamma"
IOBasic::outInfo_every = 1