From f82185918667922d15bd0b2c019ce71b1a530a63 Mon Sep 17 00:00:00 2001
From: eschnett <>
Date: Tue, 13 Mar 2001 12:06:00 +0000
Subject: Fixing bugs with octant mode, coordinates, and ASCII output.

Fixing bugs with octant mode, coordinates, and ASCII output.
Adapting the test suite.

darcs-hash:20010313120652-f6438-6411b2838ea80747009724e17197ae2a7aaeb808.gz
---
 Carpet/Carpet/src/carpet.cc                       | 14 ++++---
 Carpet/CarpetIOASCII/src/ioascii.cc               |  4 +-
 Carpet/CarpetLib/src/dh.cc                        |  4 +-
 CarpetAttic/Cart3dTest/test/axial-xy.log          | 25 ++++++++++++
 CarpetAttic/Cart3dTest/test/axial-xy/ax.xl        | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xy/ax.yl        | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xy/ax.zl        | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xy/ay.xl        | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xy/ay.yl        | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xy/ay.zl        | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xy/az.xl        | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xy/az.yl        | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xy/az.zl        | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xy/cart3d_x.xl  | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xy/cart3d_x.yl  | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xy/cart3d_x.zl  | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xy/cart3d_y.xl  | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xy/cart3d_y.yl  | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xy/cart3d_y.zl  | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xy/cart3d_z.xl  | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xy/cart3d_z.yl  | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xy/cart3d_z.zl  | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xy/fxx.xl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xy/fxx.yl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xy/fxx.zl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xy/fxy.xl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xy/fxy.yl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xy/fxy.zl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xy/fxz.xl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xy/fxz.yl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xy/fxz.zl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xy/fyx.xl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xy/fyx.yl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xy/fyx.zl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xy/fyy.xl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xy/fyy.yl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xy/fyy.zl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xy/fyz.xl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xy/fyz.yl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xy/fyz.zl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xy/fzx.xl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xy/fzx.yl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xy/fzx.zl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xy/fzy.xl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xy/fzy.yl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xy/fzy.zl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xy/fzz.xl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xy/fzz.yl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xy/fzz.zl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xy/s.xl         | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xy/s.yl         | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xy/s.zl         | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xy/spher3d_r.xl | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xy/spher3d_r.yl | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xy/spher3d_r.zl | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xy/txx.xl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xy/txx.yl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xy/txx.zl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xy/txy.xl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xy/txy.yl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xy/txy.zl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xy/txz.xl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xy/txz.yl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xy/txz.zl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xy/tyy.xl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xy/tyy.yl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xy/tyy.zl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xy/tyz.xl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xy/tyz.yl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xy/tyz.zl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xy/tzz.xl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xy/tzz.yl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xy/tzz.zl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xy/vx.xl        | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xy/vx.yl        | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xy/vx.zl        | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xy/vy.xl        | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xy/vy.yl        | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xy/vy.zl        | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xy/vz.xl        | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xy/vz.yl        | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xy/vz.zl        | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xz.log          | 25 ++++++++++++
 CarpetAttic/Cart3dTest/test/axial-xz/ax.xl        | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xz/ax.yl        | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xz/ax.zl        | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xz/ay.xl        | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xz/ay.yl        | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xz/ay.zl        | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xz/az.xl        | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xz/az.yl        | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xz/az.zl        | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xz/cart3d_x.xl  | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xz/cart3d_x.yl  | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xz/cart3d_x.zl  | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xz/cart3d_y.xl  | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xz/cart3d_y.yl  | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xz/cart3d_y.zl  | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xz/cart3d_z.xl  | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xz/cart3d_z.yl  | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xz/cart3d_z.zl  | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xz/fxx.xl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xz/fxx.yl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xz/fxx.zl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xz/fxy.xl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xz/fxy.yl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xz/fxy.zl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xz/fxz.xl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xz/fxz.yl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xz/fxz.zl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xz/fyx.xl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xz/fyx.yl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xz/fyx.zl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xz/fyy.xl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xz/fyy.yl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xz/fyy.zl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xz/fyz.xl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xz/fyz.yl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xz/fyz.zl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xz/fzx.xl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xz/fzx.yl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xz/fzx.zl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xz/fzy.xl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xz/fzy.yl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xz/fzy.zl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xz/fzz.xl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xz/fzz.yl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xz/fzz.zl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xz/s.xl         | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xz/s.yl         | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xz/s.zl         | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xz/spher3d_r.xl | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xz/spher3d_r.yl | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xz/spher3d_r.zl | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xz/txx.xl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xz/txx.yl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xz/txx.zl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xz/txy.xl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xz/txy.yl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xz/txy.zl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xz/txz.xl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xz/txz.yl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xz/txz.zl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xz/tyy.xl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xz/tyy.yl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xz/tyy.zl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xz/tyz.xl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xz/tyz.yl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xz/tyz.zl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xz/tzz.xl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xz/tzz.yl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xz/tzz.zl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xz/vx.xl        | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xz/vx.yl        | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xz/vx.zl        | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xz/vy.xl        | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xz/vy.yl        | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xz/vy.zl        | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xz/vz.xl        | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xz/vz.yl        | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-xz/vz.zl        | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-yz.log          | 25 ++++++++++++
 CarpetAttic/Cart3dTest/test/axial-yz/ax.xl        | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-yz/ax.yl        | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-yz/ax.zl        | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-yz/ay.xl        | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-yz/ay.yl        | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-yz/ay.zl        | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-yz/az.xl        | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-yz/az.yl        | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-yz/az.zl        | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-yz/cart3d_x.xl  | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-yz/cart3d_x.yl  | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-yz/cart3d_x.zl  | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-yz/cart3d_y.xl  | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-yz/cart3d_y.yl  | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-yz/cart3d_y.zl  | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-yz/cart3d_z.xl  | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-yz/cart3d_z.yl  | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-yz/cart3d_z.zl  | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-yz/fxx.xl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-yz/fxx.yl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-yz/fxx.zl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-yz/fxy.xl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-yz/fxy.yl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-yz/fxy.zl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-yz/fxz.xl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-yz/fxz.yl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-yz/fxz.zl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-yz/fyx.xl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-yz/fyx.yl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-yz/fyx.zl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-yz/fyy.xl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-yz/fyy.yl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-yz/fyy.zl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-yz/fyz.xl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-yz/fyz.yl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-yz/fyz.zl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-yz/fzx.xl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-yz/fzx.yl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-yz/fzx.zl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-yz/fzy.xl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-yz/fzy.yl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-yz/fzy.zl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-yz/fzz.xl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-yz/fzz.yl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-yz/fzz.zl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-yz/s.xl         | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-yz/s.yl         | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-yz/s.zl         | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-yz/spher3d_r.xl | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-yz/spher3d_r.yl | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-yz/spher3d_r.zl | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-yz/txx.xl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-yz/txx.yl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-yz/txx.zl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-yz/txy.xl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-yz/txy.yl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-yz/txy.zl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-yz/txz.xl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-yz/txz.yl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-yz/txz.zl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-yz/tyy.xl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-yz/tyy.yl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-yz/tyy.zl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-yz/tyz.xl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-yz/tyz.yl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-yz/tyz.zl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-yz/tzz.xl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-yz/tzz.yl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-yz/tzz.zl       | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-yz/vx.xl        | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-yz/vx.yl        | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-yz/vx.zl        | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-yz/vy.xl        | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-yz/vy.yl        | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-yz/vy.zl        | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-yz/vz.xl        | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-yz/vz.yl        | 46 ++++++++++++-----------
 CarpetAttic/Cart3dTest/test/axial-yz/vz.zl        | 46 ++++++++++++-----------
 CarpetExtra/WaveToyF77/par/wavetoyf77_rad_rl2.par |  8 ++--
 CarpetExtra/WaveToyF77/src/WaveToy.F77            | 12 ++++--
 242 files changed, 5715 insertions(+), 5166 deletions(-)

diff --git a/Carpet/Carpet/src/carpet.cc b/Carpet/Carpet/src/carpet.cc
index 48320d2ce..3ad87c574 100644
--- a/Carpet/Carpet/src/carpet.cc
+++ b/Carpet/Carpet/src/carpet.cc
@@ -1,4 +1,4 @@
-// $Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/Attic/carpet.cc,v 1.7 2001/03/12 16:54:17 eschnett Exp $
+// $Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/Attic/carpet.cc,v 1.8 2001/03/13 13:06:52 eschnett Exp $
 
 /* It is assumed that the number of components of all arrays is equal
    to the number of components of the grid functions, and that their
@@ -32,7 +32,7 @@
 
 #include "carpet.hh"
 
-static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/Attic/carpet.cc,v 1.7 2001/03/12 16:54:17 eschnett Exp $";
+static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/Attic/carpet.cc,v 1.8 2001/03/13 13:06:52 eschnett Exp $";
 
 
 
@@ -652,10 +652,12 @@ namespace Carpet {
 		 * cgh->cctk_levfac[d]);
 	    cgh->cctk_lbnd[d] = (ext.lower() / ext.stride())[d];
 	    cgh->cctk_ubnd[d] = (ext.upper() / ext.stride())[d];
-	    cgh->cctk_bbox[2*d  ]
-	      = reflevel==0 && cgh->cctk_lbnd[d] == 0;
-	    cgh->cctk_bbox[2*d+1]
-	      = reflevel==0 && cgh->cctk_ubnd[d] == cgh->cctk_gsh[d]-1;
+// 	    cgh->cctk_bbox[2*d  ]
+// 	      = reflevel==0 && cgh->cctk_lbnd[d] == 0;
+// 	    cgh->cctk_bbox[2*d+1]
+// 	      = reflevel==0 && cgh->cctk_ubnd[d] == cgh->cctk_gsh[d]-1;
+	    cgh->cctk_bbox[2*d  ] = (ext.lower() < base.lower())[d];
+	    cgh->cctk_bbox[2*d+1] = (ext.upper() > base.upper())[d];
 	    for (int stg=0; stg<CCTK_NSTAGGER; ++stg) {
 	      // TODO: support staggering
 	      cgh->cctk_lssh[CCTK_LSSH_IDX(stg,d)] = cgh->cctk_lsh[d];
diff --git a/Carpet/CarpetIOASCII/src/ioascii.cc b/Carpet/CarpetIOASCII/src/ioascii.cc
index b3fcd8dbe..31405e865 100644
--- a/Carpet/CarpetIOASCII/src/ioascii.cc
+++ b/Carpet/CarpetIOASCII/src/ioascii.cc
@@ -1,4 +1,4 @@
-// $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetIOASCII/src/ioascii.cc,v 1.4 2001/03/12 16:54:25 eschnett Exp $
+// $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetIOASCII/src/ioascii.cc,v 1.5 2001/03/13 13:06:59 eschnett Exp $
 
 #include <cassert>
 #include <cstdio>
@@ -507,7 +507,7 @@ int IOASCII<outdim>::CoordToOffset (cGH* cgh, int dir, double coord)
   
   const int npoints = cgh->cctk_gsh[dir-1];
   
-  const CCTK_REAL rindex = (coord - lower) / (upper - lower) * npoints;
+  const CCTK_REAL rindex = (coord - lower) / (upper - lower) * (npoints-1);
   const int cindex = (int)floor(rindex + 0.5 + 1e-6);
   assert (cindex>=0 && cindex<npoints);
   
diff --git a/Carpet/CarpetLib/src/dh.cc b/Carpet/CarpetLib/src/dh.cc
index 73937df81..c6b4ad3d6 100644
--- a/Carpet/CarpetLib/src/dh.cc
+++ b/Carpet/CarpetLib/src/dh.cc
@@ -6,7 +6,7 @@
     copyright            : (C) 2000 by Erik Schnetter
     email                : schnetter@astro.psu.edu
 
-    $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/dh.cc,v 1.5 2001/03/12 16:54:25 eschnett Exp $
+    $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/dh.cc,v 1.6 2001/03/13 13:06:59 eschnett Exp $
 
  ***************************************************************************/
 
@@ -30,7 +30,7 @@
 #  include "dh.hh"
 #endif
 
-#undef DEBUG_OUTPUT
+#define DEBUG_OUTPUT
 
 
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xy.log b/CarpetAttic/Cart3dTest/test/axial-xy.log
index 5c5218648..8b02f3bdb 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xy.log
+++ b/CarpetAttic/Cart3dTest/test/axial-xy.log
@@ -52,5 +52,30 @@ AMR 2D ASCII I/O provided by CarpetIOASCII
 --------------------------------------------------------------------------------
 AMR 3D ASCII I/O provided by CarpetIOASCII
 --------------------------------------------------------------------------------
+
+dh bboxes:
+rl=0 c=0 ml=0
+exterior=([0,0,0]:[9,9,9]:[1,1,1])
+interior=([0,1,2]:[9,8,7]:[1,1,1])
+send_mg_fine=[]
+send_mg_coarse=[]
+recv_mg_fine=[]
+recv_mg_coarse=[]
+send_ref_fine=[]
+send_ref_coarse=[]
+recv_ref_fine=[]
+recv_ref_coarse=[]
+send_sync=[0:[]]
+send_ref_bnd_fine=[]
+boundaries={([0,0,0]:[9,0,9]:[1,1,1]),([0,1,0]:[9,8,1]:[1,1,1]),([0,9,0]:[9,9,9]:[1,1,1]),([0,1,8]:[9,8,9]:[1,1,1])}
+recv_sync=[0:[]]
+recv_ref_bnd_coarse=[]
+sync_not={([0,0,0]:[9,0,9]:[1,1,1]),([0,1,0]:[9,8,1]:[1,1,1]),([0,9,0]:[9,9,9]:[1,1,1]),([0,1,8]:[9,8,9]:[1,1,1])}
+
+dh bases:
+rl=0 ml=0
+exterior=([0,0,0]:[9,9,9]:[1,1,1])
+interior=([0,1,2]:[9,8,7]:[1,1,1])
+boundaries={([0,0,0]:[9,0,9]:[1,1,1]),([0,1,0]:[9,8,1]:[1,1,1]),([0,9,0]:[9,9,9]:[1,1,1]),([0,1,8]:[9,8,9]:[1,1,1])}
 --------------------------------------------------------------------------------
 Done.
diff --git a/CarpetAttic/Cart3dTest/test/axial-xy/ax.xl b/CarpetAttic/Cart3dTest/test/axial-xy/ax.xl
index e4a772909..397050783 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xy/ax.xl
+++ b/CarpetAttic/Cart3dTest/test/axial-xy/ax.xl
@@ -1,32 +1,34 @@
 # CART3DTEST::ax x (ax)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 10 31000105
-0 0 0 0 0 2 2 10 31010105
-0 0 0 0 0 4 2 10 31020105
-0 0 0 0 0 6 2 10 31030105
-0 0 0 0 0 8 2 10 31040105
-0 0 0 0 0 10 2 10 31050105
-0 0 0 0 0 12 2 10 31060105
-0 0 0 0 0 14 2 10 31070105
-0 0 0 0 0 16 2 10 31080105
-0 0 0 0 0 18 2 10 31090105
+0 0 0 0 0 0 1 5 31000105
+0 0 0 0 0 1 1 5 31010105
+0 0 0 0 0 2 1 5 31020105
+0 0 0 0 0 3 1 5 31030105
+0 0 0 0 0 4 1 5 31040105
+0 0 0 0 0 5 1 5 31050105
+0 0 0 0 0 6 1 5 31060105
+0 0 0 0 0 7 1 5 31070105
+0 0 0 0 0 8 1 5 31080105
+0 0 0 0 0 9 1 5 31090105
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 10 31000105
-1 0 0 0 0 2 2 10 31010105
-1 0 0 0 0 4 2 10 31020105
-1 0 0 0 0 6 2 10 31030105
-1 0 0 0 0 8 2 10 31040105
-1 0 0 0 0 10 2 10 31050105
-1 0 0 0 0 12 2 10 31060105
-1 0 0 0 0 14 2 10 31070105
-1 0 0 0 0 16 2 10 31080105
-1 0 0 0 0 18 2 10 31090105
+1 0 0 0 0 0 1 5 31000105
+1 0 0 0 0 1 1 5 31010105
+1 0 0 0 0 2 1 5 31020105
+1 0 0 0 0 3 1 5 31030105
+1 0 0 0 0 4 1 5 31040105
+1 0 0 0 0 5 1 5 31050105
+1 0 0 0 0 6 1 5 31060105
+1 0 0 0 0 7 1 5 31070105
+1 0 0 0 0 8 1 5 31080105
+1 0 0 0 0 9 1 5 31090105
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xy/ax.yl b/CarpetAttic/Cart3dTest/test/axial-xy/ax.yl
index 9921ba756..eeae13c08 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xy/ax.yl
+++ b/CarpetAttic/Cart3dTest/test/axial-xy/ax.yl
@@ -1,32 +1,34 @@
 # CART3DTEST::ax y (ax)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 0 10 31000005
-0 0 0 0 0 0 2 10 31000105
-0 0 0 0 0 0 4 10 31000205
-0 0 0 0 0 0 6 10 31000305
-0 0 0 0 0 0 8 10 31000405
-0 0 0 0 0 0 10 10 31000505
-0 0 0 0 0 0 12 10 31000605
-0 0 0 0 0 0 14 10 31000705
-0 0 0 0 0 0 16 10 31000805
-0 0 0 0 0 0 18 10 31000905
+0 0 0 0 0 0 0 5 31000005
+0 0 0 0 0 0 1 5 31000105
+0 0 0 0 0 0 2 5 31000205
+0 0 0 0 0 0 3 5 31000305
+0 0 0 0 0 0 4 5 31000405
+0 0 0 0 0 0 5 5 31000505
+0 0 0 0 0 0 6 5 31000605
+0 0 0 0 0 0 7 5 31000705
+0 0 0 0 0 0 8 5 31000805
+0 0 0 0 0 0 9 5 31000905
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 0 10 -32000005
-1 0 0 0 0 0 2 10 31000105
-1 0 0 0 0 0 4 10 31000205
-1 0 0 0 0 0 6 10 31000305
-1 0 0 0 0 0 8 10 31000405
-1 0 0 0 0 0 10 10 31000505
-1 0 0 0 0 0 12 10 31000605
-1 0 0 0 0 0 14 10 31000705
-1 0 0 0 0 0 16 10 31000805
-1 0 0 0 0 0 18 10 31000905
+1 0 0 0 0 0 0 5 -32000005
+1 0 0 0 0 0 1 5 31000105
+1 0 0 0 0 0 2 5 31000205
+1 0 0 0 0 0 3 5 31000305
+1 0 0 0 0 0 4 5 31000405
+1 0 0 0 0 0 5 5 31000505
+1 0 0 0 0 0 6 5 31000605
+1 0 0 0 0 0 7 5 31000705
+1 0 0 0 0 0 8 5 31000805
+1 0 0 0 0 0 9 5 31000905
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xy/ax.zl b/CarpetAttic/Cart3dTest/test/axial-xy/ax.zl
index 2ee990ed2..95884a539 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xy/ax.zl
+++ b/CarpetAttic/Cart3dTest/test/axial-xy/ax.zl
@@ -1,32 +1,34 @@
 # CART3DTEST::ax z (ax)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 0 31000100
-0 0 0 0 0 0 2 2 31000101
-0 0 0 0 0 0 2 4 31000102
-0 0 0 0 0 0 2 6 31000103
-0 0 0 0 0 0 2 8 31000104
-0 0 0 0 0 0 2 10 31000105
-0 0 0 0 0 0 2 12 31000106
-0 0 0 0 0 0 2 14 31000107
-0 0 0 0 0 0 2 16 31000108
-0 0 0 0 0 0 2 18 31000109
+0 0 0 0 0 0 1 0 31000100
+0 0 0 0 0 0 1 1 31000101
+0 0 0 0 0 0 1 2 31000102
+0 0 0 0 0 0 1 3 31000103
+0 0 0 0 0 0 1 4 31000104
+0 0 0 0 0 0 1 5 31000105
+0 0 0 0 0 0 1 6 31000106
+0 0 0 0 0 0 1 7 31000107
+0 0 0 0 0 0 1 8 31000108
+0 0 0 0 0 0 1 9 31000109
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 0 31000100
-1 0 0 0 0 0 2 2 31000101
-1 0 0 0 0 0 2 4 31000102
-1 0 0 0 0 0 2 6 31000103
-1 0 0 0 0 0 2 8 31000104
-1 0 0 0 0 0 2 10 31000105
-1 0 0 0 0 0 2 12 31000106
-1 0 0 0 0 0 2 14 31000107
-1 0 0 0 0 0 2 16 31000108
-1 0 0 0 0 0 2 18 31000109
+1 0 0 0 0 0 1 0 31000100
+1 0 0 0 0 0 1 1 31000101
+1 0 0 0 0 0 1 2 31000102
+1 0 0 0 0 0 1 3 31000103
+1 0 0 0 0 0 1 4 31000104
+1 0 0 0 0 0 1 5 31000105
+1 0 0 0 0 0 1 6 31000106
+1 0 0 0 0 0 1 7 31000107
+1 0 0 0 0 0 1 8 31000108
+1 0 0 0 0 0 1 9 31000109
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xy/ay.xl b/CarpetAttic/Cart3dTest/test/axial-xy/ay.xl
index b80e6d8fb..99252f51f 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xy/ay.xl
+++ b/CarpetAttic/Cart3dTest/test/axial-xy/ay.xl
@@ -1,32 +1,34 @@
 # CART3DTEST::ay x (ay)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 10 32000105
-0 0 0 0 0 2 2 10 32010105
-0 0 0 0 0 4 2 10 32020105
-0 0 0 0 0 6 2 10 32030105
-0 0 0 0 0 8 2 10 32040105
-0 0 0 0 0 10 2 10 32050105
-0 0 0 0 0 12 2 10 32060105
-0 0 0 0 0 14 2 10 32070105
-0 0 0 0 0 16 2 10 32080105
-0 0 0 0 0 18 2 10 32090105
+0 0 0 0 0 0 1 5 32000105
+0 0 0 0 0 1 1 5 32010105
+0 0 0 0 0 2 1 5 32020105
+0 0 0 0 0 3 1 5 32030105
+0 0 0 0 0 4 1 5 32040105
+0 0 0 0 0 5 1 5 32050105
+0 0 0 0 0 6 1 5 32060105
+0 0 0 0 0 7 1 5 32070105
+0 0 0 0 0 8 1 5 32080105
+0 0 0 0 0 9 1 5 32090105
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 10 32000105
-1 0 0 0 0 2 2 10 32010105
-1 0 0 0 0 4 2 10 32020105
-1 0 0 0 0 6 2 10 32030105
-1 0 0 0 0 8 2 10 32040105
-1 0 0 0 0 10 2 10 32050105
-1 0 0 0 0 12 2 10 32060105
-1 0 0 0 0 14 2 10 32070105
-1 0 0 0 0 16 2 10 32080105
-1 0 0 0 0 18 2 10 32090105
+1 0 0 0 0 0 1 5 32000105
+1 0 0 0 0 1 1 5 32010105
+1 0 0 0 0 2 1 5 32020105
+1 0 0 0 0 3 1 5 32030105
+1 0 0 0 0 4 1 5 32040105
+1 0 0 0 0 5 1 5 32050105
+1 0 0 0 0 6 1 5 32060105
+1 0 0 0 0 7 1 5 32070105
+1 0 0 0 0 8 1 5 32080105
+1 0 0 0 0 9 1 5 32090105
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xy/ay.yl b/CarpetAttic/Cart3dTest/test/axial-xy/ay.yl
index 5e5c6176e..ef1b295de 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xy/ay.yl
+++ b/CarpetAttic/Cart3dTest/test/axial-xy/ay.yl
@@ -1,32 +1,34 @@
 # CART3DTEST::ay y (ay)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 0 10 32000005
-0 0 0 0 0 0 2 10 32000105
-0 0 0 0 0 0 4 10 32000205
-0 0 0 0 0 0 6 10 32000305
-0 0 0 0 0 0 8 10 32000405
-0 0 0 0 0 0 10 10 32000505
-0 0 0 0 0 0 12 10 32000605
-0 0 0 0 0 0 14 10 32000705
-0 0 0 0 0 0 16 10 32000805
-0 0 0 0 0 0 18 10 32000905
+0 0 0 0 0 0 0 5 32000005
+0 0 0 0 0 0 1 5 32000105
+0 0 0 0 0 0 2 5 32000205
+0 0 0 0 0 0 3 5 32000305
+0 0 0 0 0 0 4 5 32000405
+0 0 0 0 0 0 5 5 32000505
+0 0 0 0 0 0 6 5 32000605
+0 0 0 0 0 0 7 5 32000705
+0 0 0 0 0 0 8 5 32000805
+0 0 0 0 0 0 9 5 32000905
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 0 10 -32000005
-1 0 0 0 0 0 2 10 32000105
-1 0 0 0 0 0 4 10 32000205
-1 0 0 0 0 0 6 10 32000305
-1 0 0 0 0 0 8 10 32000405
-1 0 0 0 0 0 10 10 32000505
-1 0 0 0 0 0 12 10 32000605
-1 0 0 0 0 0 14 10 32000705
-1 0 0 0 0 0 16 10 32000805
-1 0 0 0 0 0 18 10 32000905
+1 0 0 0 0 0 0 5 -32000005
+1 0 0 0 0 0 1 5 32000105
+1 0 0 0 0 0 2 5 32000205
+1 0 0 0 0 0 3 5 32000305
+1 0 0 0 0 0 4 5 32000405
+1 0 0 0 0 0 5 5 32000505
+1 0 0 0 0 0 6 5 32000605
+1 0 0 0 0 0 7 5 32000705
+1 0 0 0 0 0 8 5 32000805
+1 0 0 0 0 0 9 5 32000905
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xy/ay.zl b/CarpetAttic/Cart3dTest/test/axial-xy/ay.zl
index c4ce83607..2b972174c 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xy/ay.zl
+++ b/CarpetAttic/Cart3dTest/test/axial-xy/ay.zl
@@ -1,32 +1,34 @@
 # CART3DTEST::ay z (ay)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 0 32000100
-0 0 0 0 0 0 2 2 32000101
-0 0 0 0 0 0 2 4 32000102
-0 0 0 0 0 0 2 6 32000103
-0 0 0 0 0 0 2 8 32000104
-0 0 0 0 0 0 2 10 32000105
-0 0 0 0 0 0 2 12 32000106
-0 0 0 0 0 0 2 14 32000107
-0 0 0 0 0 0 2 16 32000108
-0 0 0 0 0 0 2 18 32000109
+0 0 0 0 0 0 1 0 32000100
+0 0 0 0 0 0 1 1 32000101
+0 0 0 0 0 0 1 2 32000102
+0 0 0 0 0 0 1 3 32000103
+0 0 0 0 0 0 1 4 32000104
+0 0 0 0 0 0 1 5 32000105
+0 0 0 0 0 0 1 6 32000106
+0 0 0 0 0 0 1 7 32000107
+0 0 0 0 0 0 1 8 32000108
+0 0 0 0 0 0 1 9 32000109
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 0 32000100
-1 0 0 0 0 0 2 2 32000101
-1 0 0 0 0 0 2 4 32000102
-1 0 0 0 0 0 2 6 32000103
-1 0 0 0 0 0 2 8 32000104
-1 0 0 0 0 0 2 10 32000105
-1 0 0 0 0 0 2 12 32000106
-1 0 0 0 0 0 2 14 32000107
-1 0 0 0 0 0 2 16 32000108
-1 0 0 0 0 0 2 18 32000109
+1 0 0 0 0 0 1 0 32000100
+1 0 0 0 0 0 1 1 32000101
+1 0 0 0 0 0 1 2 32000102
+1 0 0 0 0 0 1 3 32000103
+1 0 0 0 0 0 1 4 32000104
+1 0 0 0 0 0 1 5 32000105
+1 0 0 0 0 0 1 6 32000106
+1 0 0 0 0 0 1 7 32000107
+1 0 0 0 0 0 1 8 32000108
+1 0 0 0 0 0 1 9 32000109
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xy/az.xl b/CarpetAttic/Cart3dTest/test/axial-xy/az.xl
index c663d8f6a..739247d1f 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xy/az.xl
+++ b/CarpetAttic/Cart3dTest/test/axial-xy/az.xl
@@ -1,32 +1,34 @@
 # CART3DTEST::az x (az)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 10 33000105
-0 0 0 0 0 2 2 10 33010105
-0 0 0 0 0 4 2 10 33020105
-0 0 0 0 0 6 2 10 33030105
-0 0 0 0 0 8 2 10 33040105
-0 0 0 0 0 10 2 10 33050105
-0 0 0 0 0 12 2 10 33060105
-0 0 0 0 0 14 2 10 33070105
-0 0 0 0 0 16 2 10 33080105
-0 0 0 0 0 18 2 10 33090105
+0 0 0 0 0 0 1 5 33000105
+0 0 0 0 0 1 1 5 33010105
+0 0 0 0 0 2 1 5 33020105
+0 0 0 0 0 3 1 5 33030105
+0 0 0 0 0 4 1 5 33040105
+0 0 0 0 0 5 1 5 33050105
+0 0 0 0 0 6 1 5 33060105
+0 0 0 0 0 7 1 5 33070105
+0 0 0 0 0 8 1 5 33080105
+0 0 0 0 0 9 1 5 33090105
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 10 33000105
-1 0 0 0 0 2 2 10 33010105
-1 0 0 0 0 4 2 10 33020105
-1 0 0 0 0 6 2 10 33030105
-1 0 0 0 0 8 2 10 33040105
-1 0 0 0 0 10 2 10 33050105
-1 0 0 0 0 12 2 10 33060105
-1 0 0 0 0 14 2 10 33070105
-1 0 0 0 0 16 2 10 33080105
-1 0 0 0 0 18 2 10 33090105
+1 0 0 0 0 0 1 5 33000105
+1 0 0 0 0 1 1 5 33010105
+1 0 0 0 0 2 1 5 33020105
+1 0 0 0 0 3 1 5 33030105
+1 0 0 0 0 4 1 5 33040105
+1 0 0 0 0 5 1 5 33050105
+1 0 0 0 0 6 1 5 33060105
+1 0 0 0 0 7 1 5 33070105
+1 0 0 0 0 8 1 5 33080105
+1 0 0 0 0 9 1 5 33090105
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xy/az.yl b/CarpetAttic/Cart3dTest/test/axial-xy/az.yl
index 2fb043de5..3e2a89501 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xy/az.yl
+++ b/CarpetAttic/Cart3dTest/test/axial-xy/az.yl
@@ -1,32 +1,34 @@
 # CART3DTEST::az y (az)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 0 10 33000005
-0 0 0 0 0 0 2 10 33000105
-0 0 0 0 0 0 4 10 33000205
-0 0 0 0 0 0 6 10 33000305
-0 0 0 0 0 0 8 10 33000405
-0 0 0 0 0 0 10 10 33000505
-0 0 0 0 0 0 12 10 33000605
-0 0 0 0 0 0 14 10 33000705
-0 0 0 0 0 0 16 10 33000805
-0 0 0 0 0 0 18 10 33000905
+0 0 0 0 0 0 0 5 33000005
+0 0 0 0 0 0 1 5 33000105
+0 0 0 0 0 0 2 5 33000205
+0 0 0 0 0 0 3 5 33000305
+0 0 0 0 0 0 4 5 33000405
+0 0 0 0 0 0 5 5 33000505
+0 0 0 0 0 0 6 5 33000605
+0 0 0 0 0 0 7 5 33000705
+0 0 0 0 0 0 8 5 33000805
+0 0 0 0 0 0 9 5 33000905
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 0 10 33000005
-1 0 0 0 0 0 2 10 33000105
-1 0 0 0 0 0 4 10 33000205
-1 0 0 0 0 0 6 10 33000305
-1 0 0 0 0 0 8 10 33000405
-1 0 0 0 0 0 10 10 33000505
-1 0 0 0 0 0 12 10 33000605
-1 0 0 0 0 0 14 10 33000705
-1 0 0 0 0 0 16 10 33000805
-1 0 0 0 0 0 18 10 33000905
+1 0 0 0 0 0 0 5 33000005
+1 0 0 0 0 0 1 5 33000105
+1 0 0 0 0 0 2 5 33000205
+1 0 0 0 0 0 3 5 33000305
+1 0 0 0 0 0 4 5 33000405
+1 0 0 0 0 0 5 5 33000505
+1 0 0 0 0 0 6 5 33000605
+1 0 0 0 0 0 7 5 33000705
+1 0 0 0 0 0 8 5 33000805
+1 0 0 0 0 0 9 5 33000905
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xy/az.zl b/CarpetAttic/Cart3dTest/test/axial-xy/az.zl
index f48b2e293..f6e71f0f1 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xy/az.zl
+++ b/CarpetAttic/Cart3dTest/test/axial-xy/az.zl
@@ -1,32 +1,34 @@
 # CART3DTEST::az z (az)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 0 33000100
-0 0 0 0 0 0 2 2 33000101
-0 0 0 0 0 0 2 4 33000102
-0 0 0 0 0 0 2 6 33000103
-0 0 0 0 0 0 2 8 33000104
-0 0 0 0 0 0 2 10 33000105
-0 0 0 0 0 0 2 12 33000106
-0 0 0 0 0 0 2 14 33000107
-0 0 0 0 0 0 2 16 33000108
-0 0 0 0 0 0 2 18 33000109
+0 0 0 0 0 0 1 0 33000100
+0 0 0 0 0 0 1 1 33000101
+0 0 0 0 0 0 1 2 33000102
+0 0 0 0 0 0 1 3 33000103
+0 0 0 0 0 0 1 4 33000104
+0 0 0 0 0 0 1 5 33000105
+0 0 0 0 0 0 1 6 33000106
+0 0 0 0 0 0 1 7 33000107
+0 0 0 0 0 0 1 8 33000108
+0 0 0 0 0 0 1 9 33000109
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 0 33000100
-1 0 0 0 0 0 2 2 33000101
-1 0 0 0 0 0 2 4 33000102
-1 0 0 0 0 0 2 6 33000103
-1 0 0 0 0 0 2 8 33000104
-1 0 0 0 0 0 2 10 33000105
-1 0 0 0 0 0 2 12 33000106
-1 0 0 0 0 0 2 14 33000107
-1 0 0 0 0 0 2 16 33000108
-1 0 0 0 0 0 2 18 33000109
+1 0 0 0 0 0 1 0 33000100
+1 0 0 0 0 0 1 1 33000101
+1 0 0 0 0 0 1 2 33000102
+1 0 0 0 0 0 1 3 33000103
+1 0 0 0 0 0 1 4 33000104
+1 0 0 0 0 0 1 5 33000105
+1 0 0 0 0 0 1 6 33000106
+1 0 0 0 0 0 1 7 33000107
+1 0 0 0 0 0 1 8 33000108
+1 0 0 0 0 0 1 9 33000109
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xy/cart3d_x.xl b/CarpetAttic/Cart3dTest/test/axial-xy/cart3d_x.xl
index aed5499ce..2fabec940 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xy/cart3d_x.xl
+++ b/CarpetAttic/Cart3dTest/test/axial-xy/cart3d_x.xl
@@ -1,32 +1,34 @@
 # GRID::cart3d_x x (cart3d_x)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 10 0.15
-0 0 0 0 0 2 2 10 0.45
-0 0 0 0 0 4 2 10 0.75
-0 0 0 0 0 6 2 10 1.05
-0 0 0 0 0 8 2 10 1.35
-0 0 0 0 0 10 2 10 1.65
-0 0 0 0 0 12 2 10 1.95
-0 0 0 0 0 14 2 10 2.25
-0 0 0 0 0 16 2 10 2.55
-0 0 0 0 0 18 2 10 2.85
+0 0 0 0 0 0 1 5 0.15
+0 0 0 0 0 1 1 5 0.45
+0 0 0 0 0 2 1 5 0.75
+0 0 0 0 0 3 1 5 1.05
+0 0 0 0 0 4 1 5 1.35
+0 0 0 0 0 5 1 5 1.65
+0 0 0 0 0 6 1 5 1.95
+0 0 0 0 0 7 1 5 2.25
+0 0 0 0 0 8 1 5 2.55
+0 0 0 0 0 9 1 5 2.85
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 10 0.15
-1 0 0 0 0 2 2 10 0.45
-1 0 0 0 0 4 2 10 0.75
-1 0 0 0 0 6 2 10 1.05
-1 0 0 0 0 8 2 10 1.35
-1 0 0 0 0 10 2 10 1.65
-1 0 0 0 0 12 2 10 1.95
-1 0 0 0 0 14 2 10 2.25
-1 0 0 0 0 16 2 10 2.55
-1 0 0 0 0 18 2 10 2.85
+1 0 0 0 0 0 1 5 0.15
+1 0 0 0 0 1 1 5 0.45
+1 0 0 0 0 2 1 5 0.75
+1 0 0 0 0 3 1 5 1.05
+1 0 0 0 0 4 1 5 1.35
+1 0 0 0 0 5 1 5 1.65
+1 0 0 0 0 6 1 5 1.95
+1 0 0 0 0 7 1 5 2.25
+1 0 0 0 0 8 1 5 2.55
+1 0 0 0 0 9 1 5 2.85
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xy/cart3d_x.yl b/CarpetAttic/Cart3dTest/test/axial-xy/cart3d_x.yl
index c5678ecb9..7a88526ed 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xy/cart3d_x.yl
+++ b/CarpetAttic/Cart3dTest/test/axial-xy/cart3d_x.yl
@@ -1,32 +1,34 @@
 # GRID::cart3d_x y (cart3d_x)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 0 10 0.15
-0 0 0 0 0 0 2 10 0.15
-0 0 0 0 0 0 4 10 0.15
-0 0 0 0 0 0 6 10 0.15
-0 0 0 0 0 0 8 10 0.15
-0 0 0 0 0 0 10 10 0.15
-0 0 0 0 0 0 12 10 0.15
-0 0 0 0 0 0 14 10 0.15
-0 0 0 0 0 0 16 10 0.15
-0 0 0 0 0 0 18 10 0.15
+0 0 0 0 0 0 0 5 0.15
+0 0 0 0 0 0 1 5 0.15
+0 0 0 0 0 0 2 5 0.15
+0 0 0 0 0 0 3 5 0.15
+0 0 0 0 0 0 4 5 0.15
+0 0 0 0 0 0 5 5 0.15
+0 0 0 0 0 0 6 5 0.15
+0 0 0 0 0 0 7 5 0.15
+0 0 0 0 0 0 8 5 0.15
+0 0 0 0 0 0 9 5 0.15
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 0 10 0.15
-1 0 0 0 0 0 2 10 0.15
-1 0 0 0 0 0 4 10 0.15
-1 0 0 0 0 0 6 10 0.15
-1 0 0 0 0 0 8 10 0.15
-1 0 0 0 0 0 10 10 0.15
-1 0 0 0 0 0 12 10 0.15
-1 0 0 0 0 0 14 10 0.15
-1 0 0 0 0 0 16 10 0.15
-1 0 0 0 0 0 18 10 0.15
+1 0 0 0 0 0 0 5 0.15
+1 0 0 0 0 0 1 5 0.15
+1 0 0 0 0 0 2 5 0.15
+1 0 0 0 0 0 3 5 0.15
+1 0 0 0 0 0 4 5 0.15
+1 0 0 0 0 0 5 5 0.15
+1 0 0 0 0 0 6 5 0.15
+1 0 0 0 0 0 7 5 0.15
+1 0 0 0 0 0 8 5 0.15
+1 0 0 0 0 0 9 5 0.15
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xy/cart3d_x.zl b/CarpetAttic/Cart3dTest/test/axial-xy/cart3d_x.zl
index a9378c5d0..3920c211d 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xy/cart3d_x.zl
+++ b/CarpetAttic/Cart3dTest/test/axial-xy/cart3d_x.zl
@@ -1,32 +1,34 @@
 # GRID::cart3d_x z (cart3d_x)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 0 0.15
-0 0 0 0 0 0 2 2 0.15
-0 0 0 0 0 0 2 4 0.15
-0 0 0 0 0 0 2 6 0.15
-0 0 0 0 0 0 2 8 0.15
-0 0 0 0 0 0 2 10 0.15
-0 0 0 0 0 0 2 12 0.15
-0 0 0 0 0 0 2 14 0.15
-0 0 0 0 0 0 2 16 0.15
-0 0 0 0 0 0 2 18 0.15
+0 0 0 0 0 0 1 0 0.15
+0 0 0 0 0 0 1 1 0.15
+0 0 0 0 0 0 1 2 0.15
+0 0 0 0 0 0 1 3 0.15
+0 0 0 0 0 0 1 4 0.15
+0 0 0 0 0 0 1 5 0.15
+0 0 0 0 0 0 1 6 0.15
+0 0 0 0 0 0 1 7 0.15
+0 0 0 0 0 0 1 8 0.15
+0 0 0 0 0 0 1 9 0.15
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 0 0.15
-1 0 0 0 0 0 2 2 0.15
-1 0 0 0 0 0 2 4 0.15
-1 0 0 0 0 0 2 6 0.15
-1 0 0 0 0 0 2 8 0.15
-1 0 0 0 0 0 2 10 0.15
-1 0 0 0 0 0 2 12 0.15
-1 0 0 0 0 0 2 14 0.15
-1 0 0 0 0 0 2 16 0.15
-1 0 0 0 0 0 2 18 0.15
+1 0 0 0 0 0 1 0 0.15
+1 0 0 0 0 0 1 1 0.15
+1 0 0 0 0 0 1 2 0.15
+1 0 0 0 0 0 1 3 0.15
+1 0 0 0 0 0 1 4 0.15
+1 0 0 0 0 0 1 5 0.15
+1 0 0 0 0 0 1 6 0.15
+1 0 0 0 0 0 1 7 0.15
+1 0 0 0 0 0 1 8 0.15
+1 0 0 0 0 0 1 9 0.15
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xy/cart3d_y.xl b/CarpetAttic/Cart3dTest/test/axial-xy/cart3d_y.xl
index 09abf970a..e07fa99ab 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xy/cart3d_y.xl
+++ b/CarpetAttic/Cart3dTest/test/axial-xy/cart3d_y.xl
@@ -1,32 +1,34 @@
 # GRID::cart3d_y x (cart3d_y)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 10 0.15
-0 0 0 0 0 2 2 10 0.15
-0 0 0 0 0 4 2 10 0.15
-0 0 0 0 0 6 2 10 0.15
-0 0 0 0 0 8 2 10 0.15
-0 0 0 0 0 10 2 10 0.15
-0 0 0 0 0 12 2 10 0.15
-0 0 0 0 0 14 2 10 0.15
-0 0 0 0 0 16 2 10 0.15
-0 0 0 0 0 18 2 10 0.15
+0 0 0 0 0 0 1 5 0.15
+0 0 0 0 0 1 1 5 0.15
+0 0 0 0 0 2 1 5 0.15
+0 0 0 0 0 3 1 5 0.15
+0 0 0 0 0 4 1 5 0.15
+0 0 0 0 0 5 1 5 0.15
+0 0 0 0 0 6 1 5 0.15
+0 0 0 0 0 7 1 5 0.15
+0 0 0 0 0 8 1 5 0.15
+0 0 0 0 0 9 1 5 0.15
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 10 0.15
-1 0 0 0 0 2 2 10 0.15
-1 0 0 0 0 4 2 10 0.15
-1 0 0 0 0 6 2 10 0.15
-1 0 0 0 0 8 2 10 0.15
-1 0 0 0 0 10 2 10 0.15
-1 0 0 0 0 12 2 10 0.15
-1 0 0 0 0 14 2 10 0.15
-1 0 0 0 0 16 2 10 0.15
-1 0 0 0 0 18 2 10 0.15
+1 0 0 0 0 0 1 5 0.15
+1 0 0 0 0 1 1 5 0.15
+1 0 0 0 0 2 1 5 0.15
+1 0 0 0 0 3 1 5 0.15
+1 0 0 0 0 4 1 5 0.15
+1 0 0 0 0 5 1 5 0.15
+1 0 0 0 0 6 1 5 0.15
+1 0 0 0 0 7 1 5 0.15
+1 0 0 0 0 8 1 5 0.15
+1 0 0 0 0 9 1 5 0.15
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xy/cart3d_y.yl b/CarpetAttic/Cart3dTest/test/axial-xy/cart3d_y.yl
index 3fb8375e2..fef33815d 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xy/cart3d_y.yl
+++ b/CarpetAttic/Cart3dTest/test/axial-xy/cart3d_y.yl
@@ -1,32 +1,34 @@
 # GRID::cart3d_y y (cart3d_y)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 0 10 -0.15
-0 0 0 0 0 0 2 10 0.15
-0 0 0 0 0 0 4 10 0.45
-0 0 0 0 0 0 6 10 0.75
-0 0 0 0 0 0 8 10 1.05
-0 0 0 0 0 0 10 10 1.35
-0 0 0 0 0 0 12 10 1.65
-0 0 0 0 0 0 14 10 1.95
-0 0 0 0 0 0 16 10 2.25
-0 0 0 0 0 0 18 10 2.55
+0 0 0 0 0 0 0 5 -0.15
+0 0 0 0 0 0 1 5 0.15
+0 0 0 0 0 0 2 5 0.45
+0 0 0 0 0 0 3 5 0.75
+0 0 0 0 0 0 4 5 1.05
+0 0 0 0 0 0 5 5 1.35
+0 0 0 0 0 0 6 5 1.65
+0 0 0 0 0 0 7 5 1.95
+0 0 0 0 0 0 8 5 2.25
+0 0 0 0 0 0 9 5 2.55
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 0 10 -0.15
-1 0 0 0 0 0 2 10 0.15
-1 0 0 0 0 0 4 10 0.45
-1 0 0 0 0 0 6 10 0.75
-1 0 0 0 0 0 8 10 1.05
-1 0 0 0 0 0 10 10 1.35
-1 0 0 0 0 0 12 10 1.65
-1 0 0 0 0 0 14 10 1.95
-1 0 0 0 0 0 16 10 2.25
-1 0 0 0 0 0 18 10 2.55
+1 0 0 0 0 0 0 5 -0.15
+1 0 0 0 0 0 1 5 0.15
+1 0 0 0 0 0 2 5 0.45
+1 0 0 0 0 0 3 5 0.75
+1 0 0 0 0 0 4 5 1.05
+1 0 0 0 0 0 5 5 1.35
+1 0 0 0 0 0 6 5 1.65
+1 0 0 0 0 0 7 5 1.95
+1 0 0 0 0 0 8 5 2.25
+1 0 0 0 0 0 9 5 2.55
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xy/cart3d_y.zl b/CarpetAttic/Cart3dTest/test/axial-xy/cart3d_y.zl
index f0d8742c0..1325581cd 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xy/cart3d_y.zl
+++ b/CarpetAttic/Cart3dTest/test/axial-xy/cart3d_y.zl
@@ -1,32 +1,34 @@
 # GRID::cart3d_y z (cart3d_y)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 0 0.15
-0 0 0 0 0 0 2 2 0.15
-0 0 0 0 0 0 2 4 0.15
-0 0 0 0 0 0 2 6 0.15
-0 0 0 0 0 0 2 8 0.15
-0 0 0 0 0 0 2 10 0.15
-0 0 0 0 0 0 2 12 0.15
-0 0 0 0 0 0 2 14 0.15
-0 0 0 0 0 0 2 16 0.15
-0 0 0 0 0 0 2 18 0.15
+0 0 0 0 0 0 1 0 0.15
+0 0 0 0 0 0 1 1 0.15
+0 0 0 0 0 0 1 2 0.15
+0 0 0 0 0 0 1 3 0.15
+0 0 0 0 0 0 1 4 0.15
+0 0 0 0 0 0 1 5 0.15
+0 0 0 0 0 0 1 6 0.15
+0 0 0 0 0 0 1 7 0.15
+0 0 0 0 0 0 1 8 0.15
+0 0 0 0 0 0 1 9 0.15
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 0 0.15
-1 0 0 0 0 0 2 2 0.15
-1 0 0 0 0 0 2 4 0.15
-1 0 0 0 0 0 2 6 0.15
-1 0 0 0 0 0 2 8 0.15
-1 0 0 0 0 0 2 10 0.15
-1 0 0 0 0 0 2 12 0.15
-1 0 0 0 0 0 2 14 0.15
-1 0 0 0 0 0 2 16 0.15
-1 0 0 0 0 0 2 18 0.15
+1 0 0 0 0 0 1 0 0.15
+1 0 0 0 0 0 1 1 0.15
+1 0 0 0 0 0 1 2 0.15
+1 0 0 0 0 0 1 3 0.15
+1 0 0 0 0 0 1 4 0.15
+1 0 0 0 0 0 1 5 0.15
+1 0 0 0 0 0 1 6 0.15
+1 0 0 0 0 0 1 7 0.15
+1 0 0 0 0 0 1 8 0.15
+1 0 0 0 0 0 1 9 0.15
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xy/cart3d_z.xl b/CarpetAttic/Cart3dTest/test/axial-xy/cart3d_z.xl
index 99106802c..9718c560e 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xy/cart3d_z.xl
+++ b/CarpetAttic/Cart3dTest/test/axial-xy/cart3d_z.xl
@@ -1,32 +1,34 @@
 # GRID::cart3d_z x (cart3d_z)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 10 0.15
-0 0 0 0 0 2 2 10 0.15
-0 0 0 0 0 4 2 10 0.15
-0 0 0 0 0 6 2 10 0.15
-0 0 0 0 0 8 2 10 0.15
-0 0 0 0 0 10 2 10 0.15
-0 0 0 0 0 12 2 10 0.15
-0 0 0 0 0 14 2 10 0.15
-0 0 0 0 0 16 2 10 0.15
-0 0 0 0 0 18 2 10 0.15
+0 0 0 0 0 0 1 5 0.15
+0 0 0 0 0 1 1 5 0.15
+0 0 0 0 0 2 1 5 0.15
+0 0 0 0 0 3 1 5 0.15
+0 0 0 0 0 4 1 5 0.15
+0 0 0 0 0 5 1 5 0.15
+0 0 0 0 0 6 1 5 0.15
+0 0 0 0 0 7 1 5 0.15
+0 0 0 0 0 8 1 5 0.15
+0 0 0 0 0 9 1 5 0.15
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 10 0.15
-1 0 0 0 0 2 2 10 0.15
-1 0 0 0 0 4 2 10 0.15
-1 0 0 0 0 6 2 10 0.15
-1 0 0 0 0 8 2 10 0.15
-1 0 0 0 0 10 2 10 0.15
-1 0 0 0 0 12 2 10 0.15
-1 0 0 0 0 14 2 10 0.15
-1 0 0 0 0 16 2 10 0.15
-1 0 0 0 0 18 2 10 0.15
+1 0 0 0 0 0 1 5 0.15
+1 0 0 0 0 1 1 5 0.15
+1 0 0 0 0 2 1 5 0.15
+1 0 0 0 0 3 1 5 0.15
+1 0 0 0 0 4 1 5 0.15
+1 0 0 0 0 5 1 5 0.15
+1 0 0 0 0 6 1 5 0.15
+1 0 0 0 0 7 1 5 0.15
+1 0 0 0 0 8 1 5 0.15
+1 0 0 0 0 9 1 5 0.15
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xy/cart3d_z.yl b/CarpetAttic/Cart3dTest/test/axial-xy/cart3d_z.yl
index 10ff8d018..48fe0f0c9 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xy/cart3d_z.yl
+++ b/CarpetAttic/Cart3dTest/test/axial-xy/cart3d_z.yl
@@ -1,32 +1,34 @@
 # GRID::cart3d_z y (cart3d_z)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 0 10 0.15
-0 0 0 0 0 0 2 10 0.15
-0 0 0 0 0 0 4 10 0.15
-0 0 0 0 0 0 6 10 0.15
-0 0 0 0 0 0 8 10 0.15
-0 0 0 0 0 0 10 10 0.15
-0 0 0 0 0 0 12 10 0.15
-0 0 0 0 0 0 14 10 0.15
-0 0 0 0 0 0 16 10 0.15
-0 0 0 0 0 0 18 10 0.15
+0 0 0 0 0 0 0 5 0.15
+0 0 0 0 0 0 1 5 0.15
+0 0 0 0 0 0 2 5 0.15
+0 0 0 0 0 0 3 5 0.15
+0 0 0 0 0 0 4 5 0.15
+0 0 0 0 0 0 5 5 0.15
+0 0 0 0 0 0 6 5 0.15
+0 0 0 0 0 0 7 5 0.15
+0 0 0 0 0 0 8 5 0.15
+0 0 0 0 0 0 9 5 0.15
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 0 10 0.15
-1 0 0 0 0 0 2 10 0.15
-1 0 0 0 0 0 4 10 0.15
-1 0 0 0 0 0 6 10 0.15
-1 0 0 0 0 0 8 10 0.15
-1 0 0 0 0 0 10 10 0.15
-1 0 0 0 0 0 12 10 0.15
-1 0 0 0 0 0 14 10 0.15
-1 0 0 0 0 0 16 10 0.15
-1 0 0 0 0 0 18 10 0.15
+1 0 0 0 0 0 0 5 0.15
+1 0 0 0 0 0 1 5 0.15
+1 0 0 0 0 0 2 5 0.15
+1 0 0 0 0 0 3 5 0.15
+1 0 0 0 0 0 4 5 0.15
+1 0 0 0 0 0 5 5 0.15
+1 0 0 0 0 0 6 5 0.15
+1 0 0 0 0 0 7 5 0.15
+1 0 0 0 0 0 8 5 0.15
+1 0 0 0 0 0 9 5 0.15
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xy/cart3d_z.zl b/CarpetAttic/Cart3dTest/test/axial-xy/cart3d_z.zl
index b20162249..e7d6808ac 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xy/cart3d_z.zl
+++ b/CarpetAttic/Cart3dTest/test/axial-xy/cart3d_z.zl
@@ -1,32 +1,34 @@
 # GRID::cart3d_z z (cart3d_z)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 0 -1.35
-0 0 0 0 0 0 2 2 -1.05
-0 0 0 0 0 0 2 4 -0.75
-0 0 0 0 0 0 2 6 -0.45
-0 0 0 0 0 0 2 8 -0.15
-0 0 0 0 0 0 2 10 0.15
-0 0 0 0 0 0 2 12 0.45
-0 0 0 0 0 0 2 14 0.75
-0 0 0 0 0 0 2 16 1.05
-0 0 0 0 0 0 2 18 1.35
+0 0 0 0 0 0 1 0 -1.35
+0 0 0 0 0 0 1 1 -1.05
+0 0 0 0 0 0 1 2 -0.75
+0 0 0 0 0 0 1 3 -0.45
+0 0 0 0 0 0 1 4 -0.15
+0 0 0 0 0 0 1 5 0.15
+0 0 0 0 0 0 1 6 0.45
+0 0 0 0 0 0 1 7 0.75
+0 0 0 0 0 0 1 8 1.05
+0 0 0 0 0 0 1 9 1.35
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 0 -1.35
-1 0 0 0 0 0 2 2 -1.05
-1 0 0 0 0 0 2 4 -0.75
-1 0 0 0 0 0 2 6 -0.45
-1 0 0 0 0 0 2 8 -0.15
-1 0 0 0 0 0 2 10 0.15
-1 0 0 0 0 0 2 12 0.45
-1 0 0 0 0 0 2 14 0.75
-1 0 0 0 0 0 2 16 1.05
-1 0 0 0 0 0 2 18 1.35
+1 0 0 0 0 0 1 0 -1.35
+1 0 0 0 0 0 1 1 -1.05
+1 0 0 0 0 0 1 2 -0.75
+1 0 0 0 0 0 1 3 -0.45
+1 0 0 0 0 0 1 4 -0.15
+1 0 0 0 0 0 1 5 0.15
+1 0 0 0 0 0 1 6 0.45
+1 0 0 0 0 0 1 7 0.75
+1 0 0 0 0 0 1 8 1.05
+1 0 0 0 0 0 1 9 1.35
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xy/fxx.xl b/CarpetAttic/Cart3dTest/test/axial-xy/fxx.xl
index ad9cc0bd9..b571599e8 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xy/fxx.xl
+++ b/CarpetAttic/Cart3dTest/test/axial-xy/fxx.xl
@@ -1,32 +1,34 @@
 # CART3DTEST::fxx x (fxx)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 10 41000105
-0 0 0 0 0 2 2 10 41010105
-0 0 0 0 0 4 2 10 41020105
-0 0 0 0 0 6 2 10 41030105
-0 0 0 0 0 8 2 10 41040105
-0 0 0 0 0 10 2 10 41050105
-0 0 0 0 0 12 2 10 41060105
-0 0 0 0 0 14 2 10 41070105
-0 0 0 0 0 16 2 10 41080105
-0 0 0 0 0 18 2 10 41090105
+0 0 0 0 0 0 1 5 41000105
+0 0 0 0 0 1 1 5 41010105
+0 0 0 0 0 2 1 5 41020105
+0 0 0 0 0 3 1 5 41030105
+0 0 0 0 0 4 1 5 41040105
+0 0 0 0 0 5 1 5 41050105
+0 0 0 0 0 6 1 5 41060105
+0 0 0 0 0 7 1 5 41070105
+0 0 0 0 0 8 1 5 41080105
+0 0 0 0 0 9 1 5 41090105
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 10 41000105
-1 0 0 0 0 2 2 10 41010105
-1 0 0 0 0 4 2 10 41020105
-1 0 0 0 0 6 2 10 41030105
-1 0 0 0 0 8 2 10 41040105
-1 0 0 0 0 10 2 10 41050105
-1 0 0 0 0 12 2 10 41060105
-1 0 0 0 0 14 2 10 41070105
-1 0 0 0 0 16 2 10 41080105
-1 0 0 0 0 18 2 10 41090105
+1 0 0 0 0 0 1 5 41000105
+1 0 0 0 0 1 1 5 41010105
+1 0 0 0 0 2 1 5 41020105
+1 0 0 0 0 3 1 5 41030105
+1 0 0 0 0 4 1 5 41040105
+1 0 0 0 0 5 1 5 41050105
+1 0 0 0 0 6 1 5 41060105
+1 0 0 0 0 7 1 5 41070105
+1 0 0 0 0 8 1 5 41080105
+1 0 0 0 0 9 1 5 41090105
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xy/fxx.yl b/CarpetAttic/Cart3dTest/test/axial-xy/fxx.yl
index 27ccacd1d..146635dd7 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xy/fxx.yl
+++ b/CarpetAttic/Cart3dTest/test/axial-xy/fxx.yl
@@ -1,32 +1,34 @@
 # CART3DTEST::fxx y (fxx)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 0 10 41000005
-0 0 0 0 0 0 2 10 41000105
-0 0 0 0 0 0 4 10 41000205
-0 0 0 0 0 0 6 10 41000305
-0 0 0 0 0 0 8 10 41000405
-0 0 0 0 0 0 10 10 41000505
-0 0 0 0 0 0 12 10 41000605
-0 0 0 0 0 0 14 10 41000705
-0 0 0 0 0 0 16 10 41000805
-0 0 0 0 0 0 18 10 41000905
+0 0 0 0 0 0 0 5 41000005
+0 0 0 0 0 0 1 5 41000105
+0 0 0 0 0 0 2 5 41000205
+0 0 0 0 0 0 3 5 41000305
+0 0 0 0 0 0 4 5 41000405
+0 0 0 0 0 0 5 5 41000505
+0 0 0 0 0 0 6 5 41000605
+0 0 0 0 0 0 7 5 41000705
+0 0 0 0 0 0 8 5 41000805
+0 0 0 0 0 0 9 5 41000905
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 0 10 45000005
-1 0 0 0 0 0 2 10 41000105
-1 0 0 0 0 0 4 10 41000205
-1 0 0 0 0 0 6 10 41000305
-1 0 0 0 0 0 8 10 41000405
-1 0 0 0 0 0 10 10 41000505
-1 0 0 0 0 0 12 10 41000605
-1 0 0 0 0 0 14 10 41000705
-1 0 0 0 0 0 16 10 41000805
-1 0 0 0 0 0 18 10 41000905
+1 0 0 0 0 0 0 5 45000005
+1 0 0 0 0 0 1 5 41000105
+1 0 0 0 0 0 2 5 41000205
+1 0 0 0 0 0 3 5 41000305
+1 0 0 0 0 0 4 5 41000405
+1 0 0 0 0 0 5 5 41000505
+1 0 0 0 0 0 6 5 41000605
+1 0 0 0 0 0 7 5 41000705
+1 0 0 0 0 0 8 5 41000805
+1 0 0 0 0 0 9 5 41000905
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xy/fxx.zl b/CarpetAttic/Cart3dTest/test/axial-xy/fxx.zl
index 366497232..bff00fd60 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xy/fxx.zl
+++ b/CarpetAttic/Cart3dTest/test/axial-xy/fxx.zl
@@ -1,32 +1,34 @@
 # CART3DTEST::fxx z (fxx)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 0 41000100
-0 0 0 0 0 0 2 2 41000101
-0 0 0 0 0 0 2 4 41000102
-0 0 0 0 0 0 2 6 41000103
-0 0 0 0 0 0 2 8 41000104
-0 0 0 0 0 0 2 10 41000105
-0 0 0 0 0 0 2 12 41000106
-0 0 0 0 0 0 2 14 41000107
-0 0 0 0 0 0 2 16 41000108
-0 0 0 0 0 0 2 18 41000109
+0 0 0 0 0 0 1 0 41000100
+0 0 0 0 0 0 1 1 41000101
+0 0 0 0 0 0 1 2 41000102
+0 0 0 0 0 0 1 3 41000103
+0 0 0 0 0 0 1 4 41000104
+0 0 0 0 0 0 1 5 41000105
+0 0 0 0 0 0 1 6 41000106
+0 0 0 0 0 0 1 7 41000107
+0 0 0 0 0 0 1 8 41000108
+0 0 0 0 0 0 1 9 41000109
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 0 41000100
-1 0 0 0 0 0 2 2 41000101
-1 0 0 0 0 0 2 4 41000102
-1 0 0 0 0 0 2 6 41000103
-1 0 0 0 0 0 2 8 41000104
-1 0 0 0 0 0 2 10 41000105
-1 0 0 0 0 0 2 12 41000106
-1 0 0 0 0 0 2 14 41000107
-1 0 0 0 0 0 2 16 41000108
-1 0 0 0 0 0 2 18 41000109
+1 0 0 0 0 0 1 0 41000100
+1 0 0 0 0 0 1 1 41000101
+1 0 0 0 0 0 1 2 41000102
+1 0 0 0 0 0 1 3 41000103
+1 0 0 0 0 0 1 4 41000104
+1 0 0 0 0 0 1 5 41000105
+1 0 0 0 0 0 1 6 41000106
+1 0 0 0 0 0 1 7 41000107
+1 0 0 0 0 0 1 8 41000108
+1 0 0 0 0 0 1 9 41000109
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xy/fxy.xl b/CarpetAttic/Cart3dTest/test/axial-xy/fxy.xl
index d344f0cd6..684a57670 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xy/fxy.xl
+++ b/CarpetAttic/Cart3dTest/test/axial-xy/fxy.xl
@@ -1,32 +1,34 @@
 # CART3DTEST::fxy x (fxy)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 10 42000105
-0 0 0 0 0 2 2 10 42010105
-0 0 0 0 0 4 2 10 42020105
-0 0 0 0 0 6 2 10 42030105
-0 0 0 0 0 8 2 10 42040105
-0 0 0 0 0 10 2 10 42050105
-0 0 0 0 0 12 2 10 42060105
-0 0 0 0 0 14 2 10 42070105
-0 0 0 0 0 16 2 10 42080105
-0 0 0 0 0 18 2 10 42090105
+0 0 0 0 0 0 1 5 42000105
+0 0 0 0 0 1 1 5 42010105
+0 0 0 0 0 2 1 5 42020105
+0 0 0 0 0 3 1 5 42030105
+0 0 0 0 0 4 1 5 42040105
+0 0 0 0 0 5 1 5 42050105
+0 0 0 0 0 6 1 5 42060105
+0 0 0 0 0 7 1 5 42070105
+0 0 0 0 0 8 1 5 42080105
+0 0 0 0 0 9 1 5 42090105
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 10 42000105
-1 0 0 0 0 2 2 10 42010105
-1 0 0 0 0 4 2 10 42020105
-1 0 0 0 0 6 2 10 42030105
-1 0 0 0 0 8 2 10 42040105
-1 0 0 0 0 10 2 10 42050105
-1 0 0 0 0 12 2 10 42060105
-1 0 0 0 0 14 2 10 42070105
-1 0 0 0 0 16 2 10 42080105
-1 0 0 0 0 18 2 10 42090105
+1 0 0 0 0 0 1 5 42000105
+1 0 0 0 0 1 1 5 42010105
+1 0 0 0 0 2 1 5 42020105
+1 0 0 0 0 3 1 5 42030105
+1 0 0 0 0 4 1 5 42040105
+1 0 0 0 0 5 1 5 42050105
+1 0 0 0 0 6 1 5 42060105
+1 0 0 0 0 7 1 5 42070105
+1 0 0 0 0 8 1 5 42080105
+1 0 0 0 0 9 1 5 42090105
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xy/fxy.yl b/CarpetAttic/Cart3dTest/test/axial-xy/fxy.yl
index 312cbddd0..0c99fb71b 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xy/fxy.yl
+++ b/CarpetAttic/Cart3dTest/test/axial-xy/fxy.yl
@@ -1,32 +1,34 @@
 # CART3DTEST::fxy y (fxy)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 0 10 42000005
-0 0 0 0 0 0 2 10 42000105
-0 0 0 0 0 0 4 10 42000205
-0 0 0 0 0 0 6 10 42000305
-0 0 0 0 0 0 8 10 42000405
-0 0 0 0 0 0 10 10 42000505
-0 0 0 0 0 0 12 10 42000605
-0 0 0 0 0 0 14 10 42000705
-0 0 0 0 0 0 16 10 42000805
-0 0 0 0 0 0 18 10 42000905
+0 0 0 0 0 0 0 5 42000005
+0 0 0 0 0 0 1 5 42000105
+0 0 0 0 0 0 2 5 42000205
+0 0 0 0 0 0 3 5 42000305
+0 0 0 0 0 0 4 5 42000405
+0 0 0 0 0 0 5 5 42000505
+0 0 0 0 0 0 6 5 42000605
+0 0 0 0 0 0 7 5 42000705
+0 0 0 0 0 0 8 5 42000805
+0 0 0 0 0 0 9 5 42000905
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 0 10 -44000005
-1 0 0 0 0 0 2 10 42000105
-1 0 0 0 0 0 4 10 42000205
-1 0 0 0 0 0 6 10 42000305
-1 0 0 0 0 0 8 10 42000405
-1 0 0 0 0 0 10 10 42000505
-1 0 0 0 0 0 12 10 42000605
-1 0 0 0 0 0 14 10 42000705
-1 0 0 0 0 0 16 10 42000805
-1 0 0 0 0 0 18 10 42000905
+1 0 0 0 0 0 0 5 -44000005
+1 0 0 0 0 0 1 5 42000105
+1 0 0 0 0 0 2 5 42000205
+1 0 0 0 0 0 3 5 42000305
+1 0 0 0 0 0 4 5 42000405
+1 0 0 0 0 0 5 5 42000505
+1 0 0 0 0 0 6 5 42000605
+1 0 0 0 0 0 7 5 42000705
+1 0 0 0 0 0 8 5 42000805
+1 0 0 0 0 0 9 5 42000905
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xy/fxy.zl b/CarpetAttic/Cart3dTest/test/axial-xy/fxy.zl
index d8282ee26..50eef1c0f 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xy/fxy.zl
+++ b/CarpetAttic/Cart3dTest/test/axial-xy/fxy.zl
@@ -1,32 +1,34 @@
 # CART3DTEST::fxy z (fxy)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 0 42000100
-0 0 0 0 0 0 2 2 42000101
-0 0 0 0 0 0 2 4 42000102
-0 0 0 0 0 0 2 6 42000103
-0 0 0 0 0 0 2 8 42000104
-0 0 0 0 0 0 2 10 42000105
-0 0 0 0 0 0 2 12 42000106
-0 0 0 0 0 0 2 14 42000107
-0 0 0 0 0 0 2 16 42000108
-0 0 0 0 0 0 2 18 42000109
+0 0 0 0 0 0 1 0 42000100
+0 0 0 0 0 0 1 1 42000101
+0 0 0 0 0 0 1 2 42000102
+0 0 0 0 0 0 1 3 42000103
+0 0 0 0 0 0 1 4 42000104
+0 0 0 0 0 0 1 5 42000105
+0 0 0 0 0 0 1 6 42000106
+0 0 0 0 0 0 1 7 42000107
+0 0 0 0 0 0 1 8 42000108
+0 0 0 0 0 0 1 9 42000109
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 0 42000100
-1 0 0 0 0 0 2 2 42000101
-1 0 0 0 0 0 2 4 42000102
-1 0 0 0 0 0 2 6 42000103
-1 0 0 0 0 0 2 8 42000104
-1 0 0 0 0 0 2 10 42000105
-1 0 0 0 0 0 2 12 42000106
-1 0 0 0 0 0 2 14 42000107
-1 0 0 0 0 0 2 16 42000108
-1 0 0 0 0 0 2 18 42000109
+1 0 0 0 0 0 1 0 42000100
+1 0 0 0 0 0 1 1 42000101
+1 0 0 0 0 0 1 2 42000102
+1 0 0 0 0 0 1 3 42000103
+1 0 0 0 0 0 1 4 42000104
+1 0 0 0 0 0 1 5 42000105
+1 0 0 0 0 0 1 6 42000106
+1 0 0 0 0 0 1 7 42000107
+1 0 0 0 0 0 1 8 42000108
+1 0 0 0 0 0 1 9 42000109
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xy/fxz.xl b/CarpetAttic/Cart3dTest/test/axial-xy/fxz.xl
index 82d6c42c7..4e6e40ef5 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xy/fxz.xl
+++ b/CarpetAttic/Cart3dTest/test/axial-xy/fxz.xl
@@ -1,32 +1,34 @@
 # CART3DTEST::fxz x (fxz)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 10 43000105
-0 0 0 0 0 2 2 10 43010105
-0 0 0 0 0 4 2 10 43020105
-0 0 0 0 0 6 2 10 43030105
-0 0 0 0 0 8 2 10 43040105
-0 0 0 0 0 10 2 10 43050105
-0 0 0 0 0 12 2 10 43060105
-0 0 0 0 0 14 2 10 43070105
-0 0 0 0 0 16 2 10 43080105
-0 0 0 0 0 18 2 10 43090105
+0 0 0 0 0 0 1 5 43000105
+0 0 0 0 0 1 1 5 43010105
+0 0 0 0 0 2 1 5 43020105
+0 0 0 0 0 3 1 5 43030105
+0 0 0 0 0 4 1 5 43040105
+0 0 0 0 0 5 1 5 43050105
+0 0 0 0 0 6 1 5 43060105
+0 0 0 0 0 7 1 5 43070105
+0 0 0 0 0 8 1 5 43080105
+0 0 0 0 0 9 1 5 43090105
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 10 43000105
-1 0 0 0 0 2 2 10 43010105
-1 0 0 0 0 4 2 10 43020105
-1 0 0 0 0 6 2 10 43030105
-1 0 0 0 0 8 2 10 43040105
-1 0 0 0 0 10 2 10 43050105
-1 0 0 0 0 12 2 10 43060105
-1 0 0 0 0 14 2 10 43070105
-1 0 0 0 0 16 2 10 43080105
-1 0 0 0 0 18 2 10 43090105
+1 0 0 0 0 0 1 5 43000105
+1 0 0 0 0 1 1 5 43010105
+1 0 0 0 0 2 1 5 43020105
+1 0 0 0 0 3 1 5 43030105
+1 0 0 0 0 4 1 5 43040105
+1 0 0 0 0 5 1 5 43050105
+1 0 0 0 0 6 1 5 43060105
+1 0 0 0 0 7 1 5 43070105
+1 0 0 0 0 8 1 5 43080105
+1 0 0 0 0 9 1 5 43090105
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xy/fxz.yl b/CarpetAttic/Cart3dTest/test/axial-xy/fxz.yl
index f2607d5d0..b6f5d4711 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xy/fxz.yl
+++ b/CarpetAttic/Cart3dTest/test/axial-xy/fxz.yl
@@ -1,32 +1,34 @@
 # CART3DTEST::fxz y (fxz)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 0 10 43000005
-0 0 0 0 0 0 2 10 43000105
-0 0 0 0 0 0 4 10 43000205
-0 0 0 0 0 0 6 10 43000305
-0 0 0 0 0 0 8 10 43000405
-0 0 0 0 0 0 10 10 43000505
-0 0 0 0 0 0 12 10 43000605
-0 0 0 0 0 0 14 10 43000705
-0 0 0 0 0 0 16 10 43000805
-0 0 0 0 0 0 18 10 43000905
+0 0 0 0 0 0 0 5 43000005
+0 0 0 0 0 0 1 5 43000105
+0 0 0 0 0 0 2 5 43000205
+0 0 0 0 0 0 3 5 43000305
+0 0 0 0 0 0 4 5 43000405
+0 0 0 0 0 0 5 5 43000505
+0 0 0 0 0 0 6 5 43000605
+0 0 0 0 0 0 7 5 43000705
+0 0 0 0 0 0 8 5 43000805
+0 0 0 0 0 0 9 5 43000905
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 0 10 46000005
-1 0 0 0 0 0 2 10 43000105
-1 0 0 0 0 0 4 10 43000205
-1 0 0 0 0 0 6 10 43000305
-1 0 0 0 0 0 8 10 43000405
-1 0 0 0 0 0 10 10 43000505
-1 0 0 0 0 0 12 10 43000605
-1 0 0 0 0 0 14 10 43000705
-1 0 0 0 0 0 16 10 43000805
-1 0 0 0 0 0 18 10 43000905
+1 0 0 0 0 0 0 5 46000005
+1 0 0 0 0 0 1 5 43000105
+1 0 0 0 0 0 2 5 43000205
+1 0 0 0 0 0 3 5 43000305
+1 0 0 0 0 0 4 5 43000405
+1 0 0 0 0 0 5 5 43000505
+1 0 0 0 0 0 6 5 43000605
+1 0 0 0 0 0 7 5 43000705
+1 0 0 0 0 0 8 5 43000805
+1 0 0 0 0 0 9 5 43000905
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xy/fxz.zl b/CarpetAttic/Cart3dTest/test/axial-xy/fxz.zl
index 27d81d89a..a833696d3 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xy/fxz.zl
+++ b/CarpetAttic/Cart3dTest/test/axial-xy/fxz.zl
@@ -1,32 +1,34 @@
 # CART3DTEST::fxz z (fxz)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 0 43000100
-0 0 0 0 0 0 2 2 43000101
-0 0 0 0 0 0 2 4 43000102
-0 0 0 0 0 0 2 6 43000103
-0 0 0 0 0 0 2 8 43000104
-0 0 0 0 0 0 2 10 43000105
-0 0 0 0 0 0 2 12 43000106
-0 0 0 0 0 0 2 14 43000107
-0 0 0 0 0 0 2 16 43000108
-0 0 0 0 0 0 2 18 43000109
+0 0 0 0 0 0 1 0 43000100
+0 0 0 0 0 0 1 1 43000101
+0 0 0 0 0 0 1 2 43000102
+0 0 0 0 0 0 1 3 43000103
+0 0 0 0 0 0 1 4 43000104
+0 0 0 0 0 0 1 5 43000105
+0 0 0 0 0 0 1 6 43000106
+0 0 0 0 0 0 1 7 43000107
+0 0 0 0 0 0 1 8 43000108
+0 0 0 0 0 0 1 9 43000109
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 0 43000100
-1 0 0 0 0 0 2 2 43000101
-1 0 0 0 0 0 2 4 43000102
-1 0 0 0 0 0 2 6 43000103
-1 0 0 0 0 0 2 8 43000104
-1 0 0 0 0 0 2 10 43000105
-1 0 0 0 0 0 2 12 43000106
-1 0 0 0 0 0 2 14 43000107
-1 0 0 0 0 0 2 16 43000108
-1 0 0 0 0 0 2 18 43000109
+1 0 0 0 0 0 1 0 43000100
+1 0 0 0 0 0 1 1 43000101
+1 0 0 0 0 0 1 2 43000102
+1 0 0 0 0 0 1 3 43000103
+1 0 0 0 0 0 1 4 43000104
+1 0 0 0 0 0 1 5 43000105
+1 0 0 0 0 0 1 6 43000106
+1 0 0 0 0 0 1 7 43000107
+1 0 0 0 0 0 1 8 43000108
+1 0 0 0 0 0 1 9 43000109
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xy/fyx.xl b/CarpetAttic/Cart3dTest/test/axial-xy/fyx.xl
index 6b932253d..b5d966b83 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xy/fyx.xl
+++ b/CarpetAttic/Cart3dTest/test/axial-xy/fyx.xl
@@ -1,32 +1,34 @@
 # CART3DTEST::fyx x (fyx)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 10 44000105
-0 0 0 0 0 2 2 10 44010105
-0 0 0 0 0 4 2 10 44020105
-0 0 0 0 0 6 2 10 44030105
-0 0 0 0 0 8 2 10 44040105
-0 0 0 0 0 10 2 10 44050105
-0 0 0 0 0 12 2 10 44060105
-0 0 0 0 0 14 2 10 44070105
-0 0 0 0 0 16 2 10 44080105
-0 0 0 0 0 18 2 10 44090105
+0 0 0 0 0 0 1 5 44000105
+0 0 0 0 0 1 1 5 44010105
+0 0 0 0 0 2 1 5 44020105
+0 0 0 0 0 3 1 5 44030105
+0 0 0 0 0 4 1 5 44040105
+0 0 0 0 0 5 1 5 44050105
+0 0 0 0 0 6 1 5 44060105
+0 0 0 0 0 7 1 5 44070105
+0 0 0 0 0 8 1 5 44080105
+0 0 0 0 0 9 1 5 44090105
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 10 44000105
-1 0 0 0 0 2 2 10 44010105
-1 0 0 0 0 4 2 10 44020105
-1 0 0 0 0 6 2 10 44030105
-1 0 0 0 0 8 2 10 44040105
-1 0 0 0 0 10 2 10 44050105
-1 0 0 0 0 12 2 10 44060105
-1 0 0 0 0 14 2 10 44070105
-1 0 0 0 0 16 2 10 44080105
-1 0 0 0 0 18 2 10 44090105
+1 0 0 0 0 0 1 5 44000105
+1 0 0 0 0 1 1 5 44010105
+1 0 0 0 0 2 1 5 44020105
+1 0 0 0 0 3 1 5 44030105
+1 0 0 0 0 4 1 5 44040105
+1 0 0 0 0 5 1 5 44050105
+1 0 0 0 0 6 1 5 44060105
+1 0 0 0 0 7 1 5 44070105
+1 0 0 0 0 8 1 5 44080105
+1 0 0 0 0 9 1 5 44090105
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xy/fyx.yl b/CarpetAttic/Cart3dTest/test/axial-xy/fyx.yl
index e911d39bb..2358a2831 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xy/fyx.yl
+++ b/CarpetAttic/Cart3dTest/test/axial-xy/fyx.yl
@@ -1,32 +1,34 @@
 # CART3DTEST::fyx y (fyx)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 0 10 44000005
-0 0 0 0 0 0 2 10 44000105
-0 0 0 0 0 0 4 10 44000205
-0 0 0 0 0 0 6 10 44000305
-0 0 0 0 0 0 8 10 44000405
-0 0 0 0 0 0 10 10 44000505
-0 0 0 0 0 0 12 10 44000605
-0 0 0 0 0 0 14 10 44000705
-0 0 0 0 0 0 16 10 44000805
-0 0 0 0 0 0 18 10 44000905
+0 0 0 0 0 0 0 5 44000005
+0 0 0 0 0 0 1 5 44000105
+0 0 0 0 0 0 2 5 44000205
+0 0 0 0 0 0 3 5 44000305
+0 0 0 0 0 0 4 5 44000405
+0 0 0 0 0 0 5 5 44000505
+0 0 0 0 0 0 6 5 44000605
+0 0 0 0 0 0 7 5 44000705
+0 0 0 0 0 0 8 5 44000805
+0 0 0 0 0 0 9 5 44000905
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 0 10 44000005
-1 0 0 0 0 0 2 10 44000105
-1 0 0 0 0 0 4 10 44000205
-1 0 0 0 0 0 6 10 44000305
-1 0 0 0 0 0 8 10 44000405
-1 0 0 0 0 0 10 10 44000505
-1 0 0 0 0 0 12 10 44000605
-1 0 0 0 0 0 14 10 44000705
-1 0 0 0 0 0 16 10 44000805
-1 0 0 0 0 0 18 10 44000905
+1 0 0 0 0 0 0 5 44000005
+1 0 0 0 0 0 1 5 44000105
+1 0 0 0 0 0 2 5 44000205
+1 0 0 0 0 0 3 5 44000305
+1 0 0 0 0 0 4 5 44000405
+1 0 0 0 0 0 5 5 44000505
+1 0 0 0 0 0 6 5 44000605
+1 0 0 0 0 0 7 5 44000705
+1 0 0 0 0 0 8 5 44000805
+1 0 0 0 0 0 9 5 44000905
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xy/fyx.zl b/CarpetAttic/Cart3dTest/test/axial-xy/fyx.zl
index cecbfc9e8..98d334e95 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xy/fyx.zl
+++ b/CarpetAttic/Cart3dTest/test/axial-xy/fyx.zl
@@ -1,32 +1,34 @@
 # CART3DTEST::fyx z (fyx)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 0 44000100
-0 0 0 0 0 0 2 2 44000101
-0 0 0 0 0 0 2 4 44000102
-0 0 0 0 0 0 2 6 44000103
-0 0 0 0 0 0 2 8 44000104
-0 0 0 0 0 0 2 10 44000105
-0 0 0 0 0 0 2 12 44000106
-0 0 0 0 0 0 2 14 44000107
-0 0 0 0 0 0 2 16 44000108
-0 0 0 0 0 0 2 18 44000109
+0 0 0 0 0 0 1 0 44000100
+0 0 0 0 0 0 1 1 44000101
+0 0 0 0 0 0 1 2 44000102
+0 0 0 0 0 0 1 3 44000103
+0 0 0 0 0 0 1 4 44000104
+0 0 0 0 0 0 1 5 44000105
+0 0 0 0 0 0 1 6 44000106
+0 0 0 0 0 0 1 7 44000107
+0 0 0 0 0 0 1 8 44000108
+0 0 0 0 0 0 1 9 44000109
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 0 44000100
-1 0 0 0 0 0 2 2 44000101
-1 0 0 0 0 0 2 4 44000102
-1 0 0 0 0 0 2 6 44000103
-1 0 0 0 0 0 2 8 44000104
-1 0 0 0 0 0 2 10 44000105
-1 0 0 0 0 0 2 12 44000106
-1 0 0 0 0 0 2 14 44000107
-1 0 0 0 0 0 2 16 44000108
-1 0 0 0 0 0 2 18 44000109
+1 0 0 0 0 0 1 0 44000100
+1 0 0 0 0 0 1 1 44000101
+1 0 0 0 0 0 1 2 44000102
+1 0 0 0 0 0 1 3 44000103
+1 0 0 0 0 0 1 4 44000104
+1 0 0 0 0 0 1 5 44000105
+1 0 0 0 0 0 1 6 44000106
+1 0 0 0 0 0 1 7 44000107
+1 0 0 0 0 0 1 8 44000108
+1 0 0 0 0 0 1 9 44000109
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xy/fyy.xl b/CarpetAttic/Cart3dTest/test/axial-xy/fyy.xl
index e28368296..2d2270ab7 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xy/fyy.xl
+++ b/CarpetAttic/Cart3dTest/test/axial-xy/fyy.xl
@@ -1,32 +1,34 @@
 # CART3DTEST::fyy x (fyy)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 10 45000105
-0 0 0 0 0 2 2 10 45010105
-0 0 0 0 0 4 2 10 45020105
-0 0 0 0 0 6 2 10 45030105
-0 0 0 0 0 8 2 10 45040105
-0 0 0 0 0 10 2 10 45050105
-0 0 0 0 0 12 2 10 45060105
-0 0 0 0 0 14 2 10 45070105
-0 0 0 0 0 16 2 10 45080105
-0 0 0 0 0 18 2 10 45090105
+0 0 0 0 0 0 1 5 45000105
+0 0 0 0 0 1 1 5 45010105
+0 0 0 0 0 2 1 5 45020105
+0 0 0 0 0 3 1 5 45030105
+0 0 0 0 0 4 1 5 45040105
+0 0 0 0 0 5 1 5 45050105
+0 0 0 0 0 6 1 5 45060105
+0 0 0 0 0 7 1 5 45070105
+0 0 0 0 0 8 1 5 45080105
+0 0 0 0 0 9 1 5 45090105
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 10 45000105
-1 0 0 0 0 2 2 10 45010105
-1 0 0 0 0 4 2 10 45020105
-1 0 0 0 0 6 2 10 45030105
-1 0 0 0 0 8 2 10 45040105
-1 0 0 0 0 10 2 10 45050105
-1 0 0 0 0 12 2 10 45060105
-1 0 0 0 0 14 2 10 45070105
-1 0 0 0 0 16 2 10 45080105
-1 0 0 0 0 18 2 10 45090105
+1 0 0 0 0 0 1 5 45000105
+1 0 0 0 0 1 1 5 45010105
+1 0 0 0 0 2 1 5 45020105
+1 0 0 0 0 3 1 5 45030105
+1 0 0 0 0 4 1 5 45040105
+1 0 0 0 0 5 1 5 45050105
+1 0 0 0 0 6 1 5 45060105
+1 0 0 0 0 7 1 5 45070105
+1 0 0 0 0 8 1 5 45080105
+1 0 0 0 0 9 1 5 45090105
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xy/fyy.yl b/CarpetAttic/Cart3dTest/test/axial-xy/fyy.yl
index 91b3fb760..3628c1ab5 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xy/fyy.yl
+++ b/CarpetAttic/Cart3dTest/test/axial-xy/fyy.yl
@@ -1,32 +1,34 @@
 # CART3DTEST::fyy y (fyy)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 0 10 45000005
-0 0 0 0 0 0 2 10 45000105
-0 0 0 0 0 0 4 10 45000205
-0 0 0 0 0 0 6 10 45000305
-0 0 0 0 0 0 8 10 45000405
-0 0 0 0 0 0 10 10 45000505
-0 0 0 0 0 0 12 10 45000605
-0 0 0 0 0 0 14 10 45000705
-0 0 0 0 0 0 16 10 45000805
-0 0 0 0 0 0 18 10 45000905
+0 0 0 0 0 0 0 5 45000005
+0 0 0 0 0 0 1 5 45000105
+0 0 0 0 0 0 2 5 45000205
+0 0 0 0 0 0 3 5 45000305
+0 0 0 0 0 0 4 5 45000405
+0 0 0 0 0 0 5 5 45000505
+0 0 0 0 0 0 6 5 45000605
+0 0 0 0 0 0 7 5 45000705
+0 0 0 0 0 0 8 5 45000805
+0 0 0 0 0 0 9 5 45000905
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 0 10 45000005
-1 0 0 0 0 0 2 10 45000105
-1 0 0 0 0 0 4 10 45000205
-1 0 0 0 0 0 6 10 45000305
-1 0 0 0 0 0 8 10 45000405
-1 0 0 0 0 0 10 10 45000505
-1 0 0 0 0 0 12 10 45000605
-1 0 0 0 0 0 14 10 45000705
-1 0 0 0 0 0 16 10 45000805
-1 0 0 0 0 0 18 10 45000905
+1 0 0 0 0 0 0 5 45000005
+1 0 0 0 0 0 1 5 45000105
+1 0 0 0 0 0 2 5 45000205
+1 0 0 0 0 0 3 5 45000305
+1 0 0 0 0 0 4 5 45000405
+1 0 0 0 0 0 5 5 45000505
+1 0 0 0 0 0 6 5 45000605
+1 0 0 0 0 0 7 5 45000705
+1 0 0 0 0 0 8 5 45000805
+1 0 0 0 0 0 9 5 45000905
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xy/fyy.zl b/CarpetAttic/Cart3dTest/test/axial-xy/fyy.zl
index 2e3e4e00d..1af5792e7 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xy/fyy.zl
+++ b/CarpetAttic/Cart3dTest/test/axial-xy/fyy.zl
@@ -1,32 +1,34 @@
 # CART3DTEST::fyy z (fyy)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 0 45000100
-0 0 0 0 0 0 2 2 45000101
-0 0 0 0 0 0 2 4 45000102
-0 0 0 0 0 0 2 6 45000103
-0 0 0 0 0 0 2 8 45000104
-0 0 0 0 0 0 2 10 45000105
-0 0 0 0 0 0 2 12 45000106
-0 0 0 0 0 0 2 14 45000107
-0 0 0 0 0 0 2 16 45000108
-0 0 0 0 0 0 2 18 45000109
+0 0 0 0 0 0 1 0 45000100
+0 0 0 0 0 0 1 1 45000101
+0 0 0 0 0 0 1 2 45000102
+0 0 0 0 0 0 1 3 45000103
+0 0 0 0 0 0 1 4 45000104
+0 0 0 0 0 0 1 5 45000105
+0 0 0 0 0 0 1 6 45000106
+0 0 0 0 0 0 1 7 45000107
+0 0 0 0 0 0 1 8 45000108
+0 0 0 0 0 0 1 9 45000109
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 0 45000100
-1 0 0 0 0 0 2 2 45000101
-1 0 0 0 0 0 2 4 45000102
-1 0 0 0 0 0 2 6 45000103
-1 0 0 0 0 0 2 8 45000104
-1 0 0 0 0 0 2 10 45000105
-1 0 0 0 0 0 2 12 45000106
-1 0 0 0 0 0 2 14 45000107
-1 0 0 0 0 0 2 16 45000108
-1 0 0 0 0 0 2 18 45000109
+1 0 0 0 0 0 1 0 45000100
+1 0 0 0 0 0 1 1 45000101
+1 0 0 0 0 0 1 2 45000102
+1 0 0 0 0 0 1 3 45000103
+1 0 0 0 0 0 1 4 45000104
+1 0 0 0 0 0 1 5 45000105
+1 0 0 0 0 0 1 6 45000106
+1 0 0 0 0 0 1 7 45000107
+1 0 0 0 0 0 1 8 45000108
+1 0 0 0 0 0 1 9 45000109
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xy/fyz.xl b/CarpetAttic/Cart3dTest/test/axial-xy/fyz.xl
index cfff4cf43..1511cbd22 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xy/fyz.xl
+++ b/CarpetAttic/Cart3dTest/test/axial-xy/fyz.xl
@@ -1,32 +1,34 @@
 # CART3DTEST::fyz x (fyz)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 10 46000105
-0 0 0 0 0 2 2 10 46010105
-0 0 0 0 0 4 2 10 46020105
-0 0 0 0 0 6 2 10 46030105
-0 0 0 0 0 8 2 10 46040105
-0 0 0 0 0 10 2 10 46050105
-0 0 0 0 0 12 2 10 46060105
-0 0 0 0 0 14 2 10 46070105
-0 0 0 0 0 16 2 10 46080105
-0 0 0 0 0 18 2 10 46090105
+0 0 0 0 0 0 1 5 46000105
+0 0 0 0 0 1 1 5 46010105
+0 0 0 0 0 2 1 5 46020105
+0 0 0 0 0 3 1 5 46030105
+0 0 0 0 0 4 1 5 46040105
+0 0 0 0 0 5 1 5 46050105
+0 0 0 0 0 6 1 5 46060105
+0 0 0 0 0 7 1 5 46070105
+0 0 0 0 0 8 1 5 46080105
+0 0 0 0 0 9 1 5 46090105
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 10 46000105
-1 0 0 0 0 2 2 10 46010105
-1 0 0 0 0 4 2 10 46020105
-1 0 0 0 0 6 2 10 46030105
-1 0 0 0 0 8 2 10 46040105
-1 0 0 0 0 10 2 10 46050105
-1 0 0 0 0 12 2 10 46060105
-1 0 0 0 0 14 2 10 46070105
-1 0 0 0 0 16 2 10 46080105
-1 0 0 0 0 18 2 10 46090105
+1 0 0 0 0 0 1 5 46000105
+1 0 0 0 0 1 1 5 46010105
+1 0 0 0 0 2 1 5 46020105
+1 0 0 0 0 3 1 5 46030105
+1 0 0 0 0 4 1 5 46040105
+1 0 0 0 0 5 1 5 46050105
+1 0 0 0 0 6 1 5 46060105
+1 0 0 0 0 7 1 5 46070105
+1 0 0 0 0 8 1 5 46080105
+1 0 0 0 0 9 1 5 46090105
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xy/fyz.yl b/CarpetAttic/Cart3dTest/test/axial-xy/fyz.yl
index 96918fbed..b04bd14b9 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xy/fyz.yl
+++ b/CarpetAttic/Cart3dTest/test/axial-xy/fyz.yl
@@ -1,32 +1,34 @@
 # CART3DTEST::fyz y (fyz)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 0 10 46000005
-0 0 0 0 0 0 2 10 46000105
-0 0 0 0 0 0 4 10 46000205
-0 0 0 0 0 0 6 10 46000305
-0 0 0 0 0 0 8 10 46000405
-0 0 0 0 0 0 10 10 46000505
-0 0 0 0 0 0 12 10 46000605
-0 0 0 0 0 0 14 10 46000705
-0 0 0 0 0 0 16 10 46000805
-0 0 0 0 0 0 18 10 46000905
+0 0 0 0 0 0 0 5 46000005
+0 0 0 0 0 0 1 5 46000105
+0 0 0 0 0 0 2 5 46000205
+0 0 0 0 0 0 3 5 46000305
+0 0 0 0 0 0 4 5 46000405
+0 0 0 0 0 0 5 5 46000505
+0 0 0 0 0 0 6 5 46000605
+0 0 0 0 0 0 7 5 46000705
+0 0 0 0 0 0 8 5 46000805
+0 0 0 0 0 0 9 5 46000905
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 0 10 -46000005
-1 0 0 0 0 0 2 10 46000105
-1 0 0 0 0 0 4 10 46000205
-1 0 0 0 0 0 6 10 46000305
-1 0 0 0 0 0 8 10 46000405
-1 0 0 0 0 0 10 10 46000505
-1 0 0 0 0 0 12 10 46000605
-1 0 0 0 0 0 14 10 46000705
-1 0 0 0 0 0 16 10 46000805
-1 0 0 0 0 0 18 10 46000905
+1 0 0 0 0 0 0 5 -46000005
+1 0 0 0 0 0 1 5 46000105
+1 0 0 0 0 0 2 5 46000205
+1 0 0 0 0 0 3 5 46000305
+1 0 0 0 0 0 4 5 46000405
+1 0 0 0 0 0 5 5 46000505
+1 0 0 0 0 0 6 5 46000605
+1 0 0 0 0 0 7 5 46000705
+1 0 0 0 0 0 8 5 46000805
+1 0 0 0 0 0 9 5 46000905
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xy/fyz.zl b/CarpetAttic/Cart3dTest/test/axial-xy/fyz.zl
index d95a17ba8..198097eb5 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xy/fyz.zl
+++ b/CarpetAttic/Cart3dTest/test/axial-xy/fyz.zl
@@ -1,32 +1,34 @@
 # CART3DTEST::fyz z (fyz)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 0 46000100
-0 0 0 0 0 0 2 2 46000101
-0 0 0 0 0 0 2 4 46000102
-0 0 0 0 0 0 2 6 46000103
-0 0 0 0 0 0 2 8 46000104
-0 0 0 0 0 0 2 10 46000105
-0 0 0 0 0 0 2 12 46000106
-0 0 0 0 0 0 2 14 46000107
-0 0 0 0 0 0 2 16 46000108
-0 0 0 0 0 0 2 18 46000109
+0 0 0 0 0 0 1 0 46000100
+0 0 0 0 0 0 1 1 46000101
+0 0 0 0 0 0 1 2 46000102
+0 0 0 0 0 0 1 3 46000103
+0 0 0 0 0 0 1 4 46000104
+0 0 0 0 0 0 1 5 46000105
+0 0 0 0 0 0 1 6 46000106
+0 0 0 0 0 0 1 7 46000107
+0 0 0 0 0 0 1 8 46000108
+0 0 0 0 0 0 1 9 46000109
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 0 46000100
-1 0 0 0 0 0 2 2 46000101
-1 0 0 0 0 0 2 4 46000102
-1 0 0 0 0 0 2 6 46000103
-1 0 0 0 0 0 2 8 46000104
-1 0 0 0 0 0 2 10 46000105
-1 0 0 0 0 0 2 12 46000106
-1 0 0 0 0 0 2 14 46000107
-1 0 0 0 0 0 2 16 46000108
-1 0 0 0 0 0 2 18 46000109
+1 0 0 0 0 0 1 0 46000100
+1 0 0 0 0 0 1 1 46000101
+1 0 0 0 0 0 1 2 46000102
+1 0 0 0 0 0 1 3 46000103
+1 0 0 0 0 0 1 4 46000104
+1 0 0 0 0 0 1 5 46000105
+1 0 0 0 0 0 1 6 46000106
+1 0 0 0 0 0 1 7 46000107
+1 0 0 0 0 0 1 8 46000108
+1 0 0 0 0 0 1 9 46000109
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xy/fzx.xl b/CarpetAttic/Cart3dTest/test/axial-xy/fzx.xl
index c93376196..7d5236a48 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xy/fzx.xl
+++ b/CarpetAttic/Cart3dTest/test/axial-xy/fzx.xl
@@ -1,32 +1,34 @@
 # CART3DTEST::fzx x (fzx)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 10 47000105
-0 0 0 0 0 2 2 10 47010105
-0 0 0 0 0 4 2 10 47020105
-0 0 0 0 0 6 2 10 47030105
-0 0 0 0 0 8 2 10 47040105
-0 0 0 0 0 10 2 10 47050105
-0 0 0 0 0 12 2 10 47060105
-0 0 0 0 0 14 2 10 47070105
-0 0 0 0 0 16 2 10 47080105
-0 0 0 0 0 18 2 10 47090105
+0 0 0 0 0 0 1 5 47000105
+0 0 0 0 0 1 1 5 47010105
+0 0 0 0 0 2 1 5 47020105
+0 0 0 0 0 3 1 5 47030105
+0 0 0 0 0 4 1 5 47040105
+0 0 0 0 0 5 1 5 47050105
+0 0 0 0 0 6 1 5 47060105
+0 0 0 0 0 7 1 5 47070105
+0 0 0 0 0 8 1 5 47080105
+0 0 0 0 0 9 1 5 47090105
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 10 47000105
-1 0 0 0 0 2 2 10 47010105
-1 0 0 0 0 4 2 10 47020105
-1 0 0 0 0 6 2 10 47030105
-1 0 0 0 0 8 2 10 47040105
-1 0 0 0 0 10 2 10 47050105
-1 0 0 0 0 12 2 10 47060105
-1 0 0 0 0 14 2 10 47070105
-1 0 0 0 0 16 2 10 47080105
-1 0 0 0 0 18 2 10 47090105
+1 0 0 0 0 0 1 5 47000105
+1 0 0 0 0 1 1 5 47010105
+1 0 0 0 0 2 1 5 47020105
+1 0 0 0 0 3 1 5 47030105
+1 0 0 0 0 4 1 5 47040105
+1 0 0 0 0 5 1 5 47050105
+1 0 0 0 0 6 1 5 47060105
+1 0 0 0 0 7 1 5 47070105
+1 0 0 0 0 8 1 5 47080105
+1 0 0 0 0 9 1 5 47090105
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xy/fzx.yl b/CarpetAttic/Cart3dTest/test/axial-xy/fzx.yl
index 6be97ac95..85c08d1bb 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xy/fzx.yl
+++ b/CarpetAttic/Cart3dTest/test/axial-xy/fzx.yl
@@ -1,32 +1,34 @@
 # CART3DTEST::fzx y (fzx)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 0 10 47000005
-0 0 0 0 0 0 2 10 47000105
-0 0 0 0 0 0 4 10 47000205
-0 0 0 0 0 0 6 10 47000305
-0 0 0 0 0 0 8 10 47000405
-0 0 0 0 0 0 10 10 47000505
-0 0 0 0 0 0 12 10 47000605
-0 0 0 0 0 0 14 10 47000705
-0 0 0 0 0 0 16 10 47000805
-0 0 0 0 0 0 18 10 47000905
+0 0 0 0 0 0 0 5 47000005
+0 0 0 0 0 0 1 5 47000105
+0 0 0 0 0 0 2 5 47000205
+0 0 0 0 0 0 3 5 47000305
+0 0 0 0 0 0 4 5 47000405
+0 0 0 0 0 0 5 5 47000505
+0 0 0 0 0 0 6 5 47000605
+0 0 0 0 0 0 7 5 47000705
+0 0 0 0 0 0 8 5 47000805
+0 0 0 0 0 0 9 5 47000905
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 0 10 48000005
-1 0 0 0 0 0 2 10 47000105
-1 0 0 0 0 0 4 10 47000205
-1 0 0 0 0 0 6 10 47000305
-1 0 0 0 0 0 8 10 47000405
-1 0 0 0 0 0 10 10 47000505
-1 0 0 0 0 0 12 10 47000605
-1 0 0 0 0 0 14 10 47000705
-1 0 0 0 0 0 16 10 47000805
-1 0 0 0 0 0 18 10 47000905
+1 0 0 0 0 0 0 5 48000005
+1 0 0 0 0 0 1 5 47000105
+1 0 0 0 0 0 2 5 47000205
+1 0 0 0 0 0 3 5 47000305
+1 0 0 0 0 0 4 5 47000405
+1 0 0 0 0 0 5 5 47000505
+1 0 0 0 0 0 6 5 47000605
+1 0 0 0 0 0 7 5 47000705
+1 0 0 0 0 0 8 5 47000805
+1 0 0 0 0 0 9 5 47000905
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xy/fzx.zl b/CarpetAttic/Cart3dTest/test/axial-xy/fzx.zl
index 2135604d4..882a1b1da 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xy/fzx.zl
+++ b/CarpetAttic/Cart3dTest/test/axial-xy/fzx.zl
@@ -1,32 +1,34 @@
 # CART3DTEST::fzx z (fzx)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 0 47000100
-0 0 0 0 0 0 2 2 47000101
-0 0 0 0 0 0 2 4 47000102
-0 0 0 0 0 0 2 6 47000103
-0 0 0 0 0 0 2 8 47000104
-0 0 0 0 0 0 2 10 47000105
-0 0 0 0 0 0 2 12 47000106
-0 0 0 0 0 0 2 14 47000107
-0 0 0 0 0 0 2 16 47000108
-0 0 0 0 0 0 2 18 47000109
+0 0 0 0 0 0 1 0 47000100
+0 0 0 0 0 0 1 1 47000101
+0 0 0 0 0 0 1 2 47000102
+0 0 0 0 0 0 1 3 47000103
+0 0 0 0 0 0 1 4 47000104
+0 0 0 0 0 0 1 5 47000105
+0 0 0 0 0 0 1 6 47000106
+0 0 0 0 0 0 1 7 47000107
+0 0 0 0 0 0 1 8 47000108
+0 0 0 0 0 0 1 9 47000109
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 0 47000100
-1 0 0 0 0 0 2 2 47000101
-1 0 0 0 0 0 2 4 47000102
-1 0 0 0 0 0 2 6 47000103
-1 0 0 0 0 0 2 8 47000104
-1 0 0 0 0 0 2 10 47000105
-1 0 0 0 0 0 2 12 47000106
-1 0 0 0 0 0 2 14 47000107
-1 0 0 0 0 0 2 16 47000108
-1 0 0 0 0 0 2 18 47000109
+1 0 0 0 0 0 1 0 47000100
+1 0 0 0 0 0 1 1 47000101
+1 0 0 0 0 0 1 2 47000102
+1 0 0 0 0 0 1 3 47000103
+1 0 0 0 0 0 1 4 47000104
+1 0 0 0 0 0 1 5 47000105
+1 0 0 0 0 0 1 6 47000106
+1 0 0 0 0 0 1 7 47000107
+1 0 0 0 0 0 1 8 47000108
+1 0 0 0 0 0 1 9 47000109
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xy/fzy.xl b/CarpetAttic/Cart3dTest/test/axial-xy/fzy.xl
index 1d77323b4..ea27ee9fa 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xy/fzy.xl
+++ b/CarpetAttic/Cart3dTest/test/axial-xy/fzy.xl
@@ -1,32 +1,34 @@
 # CART3DTEST::fzy x (fzy)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 10 48000105
-0 0 0 0 0 2 2 10 48010105
-0 0 0 0 0 4 2 10 48020105
-0 0 0 0 0 6 2 10 48030105
-0 0 0 0 0 8 2 10 48040105
-0 0 0 0 0 10 2 10 48050105
-0 0 0 0 0 12 2 10 48060105
-0 0 0 0 0 14 2 10 48070105
-0 0 0 0 0 16 2 10 48080105
-0 0 0 0 0 18 2 10 48090105
+0 0 0 0 0 0 1 5 48000105
+0 0 0 0 0 1 1 5 48010105
+0 0 0 0 0 2 1 5 48020105
+0 0 0 0 0 3 1 5 48030105
+0 0 0 0 0 4 1 5 48040105
+0 0 0 0 0 5 1 5 48050105
+0 0 0 0 0 6 1 5 48060105
+0 0 0 0 0 7 1 5 48070105
+0 0 0 0 0 8 1 5 48080105
+0 0 0 0 0 9 1 5 48090105
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 10 48000105
-1 0 0 0 0 2 2 10 48010105
-1 0 0 0 0 4 2 10 48020105
-1 0 0 0 0 6 2 10 48030105
-1 0 0 0 0 8 2 10 48040105
-1 0 0 0 0 10 2 10 48050105
-1 0 0 0 0 12 2 10 48060105
-1 0 0 0 0 14 2 10 48070105
-1 0 0 0 0 16 2 10 48080105
-1 0 0 0 0 18 2 10 48090105
+1 0 0 0 0 0 1 5 48000105
+1 0 0 0 0 1 1 5 48010105
+1 0 0 0 0 2 1 5 48020105
+1 0 0 0 0 3 1 5 48030105
+1 0 0 0 0 4 1 5 48040105
+1 0 0 0 0 5 1 5 48050105
+1 0 0 0 0 6 1 5 48060105
+1 0 0 0 0 7 1 5 48070105
+1 0 0 0 0 8 1 5 48080105
+1 0 0 0 0 9 1 5 48090105
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xy/fzy.yl b/CarpetAttic/Cart3dTest/test/axial-xy/fzy.yl
index 1c5c66598..407fae273 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xy/fzy.yl
+++ b/CarpetAttic/Cart3dTest/test/axial-xy/fzy.yl
@@ -1,32 +1,34 @@
 # CART3DTEST::fzy y (fzy)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 0 10 48000005
-0 0 0 0 0 0 2 10 48000105
-0 0 0 0 0 0 4 10 48000205
-0 0 0 0 0 0 6 10 48000305
-0 0 0 0 0 0 8 10 48000405
-0 0 0 0 0 0 10 10 48000505
-0 0 0 0 0 0 12 10 48000605
-0 0 0 0 0 0 14 10 48000705
-0 0 0 0 0 0 16 10 48000805
-0 0 0 0 0 0 18 10 48000905
+0 0 0 0 0 0 0 5 48000005
+0 0 0 0 0 0 1 5 48000105
+0 0 0 0 0 0 2 5 48000205
+0 0 0 0 0 0 3 5 48000305
+0 0 0 0 0 0 4 5 48000405
+0 0 0 0 0 0 5 5 48000505
+0 0 0 0 0 0 6 5 48000605
+0 0 0 0 0 0 7 5 48000705
+0 0 0 0 0 0 8 5 48000805
+0 0 0 0 0 0 9 5 48000905
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 0 10 -48000005
-1 0 0 0 0 0 2 10 48000105
-1 0 0 0 0 0 4 10 48000205
-1 0 0 0 0 0 6 10 48000305
-1 0 0 0 0 0 8 10 48000405
-1 0 0 0 0 0 10 10 48000505
-1 0 0 0 0 0 12 10 48000605
-1 0 0 0 0 0 14 10 48000705
-1 0 0 0 0 0 16 10 48000805
-1 0 0 0 0 0 18 10 48000905
+1 0 0 0 0 0 0 5 -48000005
+1 0 0 0 0 0 1 5 48000105
+1 0 0 0 0 0 2 5 48000205
+1 0 0 0 0 0 3 5 48000305
+1 0 0 0 0 0 4 5 48000405
+1 0 0 0 0 0 5 5 48000505
+1 0 0 0 0 0 6 5 48000605
+1 0 0 0 0 0 7 5 48000705
+1 0 0 0 0 0 8 5 48000805
+1 0 0 0 0 0 9 5 48000905
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xy/fzy.zl b/CarpetAttic/Cart3dTest/test/axial-xy/fzy.zl
index 01abc8a41..4baa764b1 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xy/fzy.zl
+++ b/CarpetAttic/Cart3dTest/test/axial-xy/fzy.zl
@@ -1,32 +1,34 @@
 # CART3DTEST::fzy z (fzy)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 0 48000100
-0 0 0 0 0 0 2 2 48000101
-0 0 0 0 0 0 2 4 48000102
-0 0 0 0 0 0 2 6 48000103
-0 0 0 0 0 0 2 8 48000104
-0 0 0 0 0 0 2 10 48000105
-0 0 0 0 0 0 2 12 48000106
-0 0 0 0 0 0 2 14 48000107
-0 0 0 0 0 0 2 16 48000108
-0 0 0 0 0 0 2 18 48000109
+0 0 0 0 0 0 1 0 48000100
+0 0 0 0 0 0 1 1 48000101
+0 0 0 0 0 0 1 2 48000102
+0 0 0 0 0 0 1 3 48000103
+0 0 0 0 0 0 1 4 48000104
+0 0 0 0 0 0 1 5 48000105
+0 0 0 0 0 0 1 6 48000106
+0 0 0 0 0 0 1 7 48000107
+0 0 0 0 0 0 1 8 48000108
+0 0 0 0 0 0 1 9 48000109
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 0 48000100
-1 0 0 0 0 0 2 2 48000101
-1 0 0 0 0 0 2 4 48000102
-1 0 0 0 0 0 2 6 48000103
-1 0 0 0 0 0 2 8 48000104
-1 0 0 0 0 0 2 10 48000105
-1 0 0 0 0 0 2 12 48000106
-1 0 0 0 0 0 2 14 48000107
-1 0 0 0 0 0 2 16 48000108
-1 0 0 0 0 0 2 18 48000109
+1 0 0 0 0 0 1 0 48000100
+1 0 0 0 0 0 1 1 48000101
+1 0 0 0 0 0 1 2 48000102
+1 0 0 0 0 0 1 3 48000103
+1 0 0 0 0 0 1 4 48000104
+1 0 0 0 0 0 1 5 48000105
+1 0 0 0 0 0 1 6 48000106
+1 0 0 0 0 0 1 7 48000107
+1 0 0 0 0 0 1 8 48000108
+1 0 0 0 0 0 1 9 48000109
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xy/fzz.xl b/CarpetAttic/Cart3dTest/test/axial-xy/fzz.xl
index 07f315a94..4a3af627e 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xy/fzz.xl
+++ b/CarpetAttic/Cart3dTest/test/axial-xy/fzz.xl
@@ -1,32 +1,34 @@
 # CART3DTEST::fzz x (fzz)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 10 49000105
-0 0 0 0 0 2 2 10 49010105
-0 0 0 0 0 4 2 10 49020105
-0 0 0 0 0 6 2 10 49030105
-0 0 0 0 0 8 2 10 49040105
-0 0 0 0 0 10 2 10 49050105
-0 0 0 0 0 12 2 10 49060105
-0 0 0 0 0 14 2 10 49070105
-0 0 0 0 0 16 2 10 49080105
-0 0 0 0 0 18 2 10 49090105
+0 0 0 0 0 0 1 5 49000105
+0 0 0 0 0 1 1 5 49010105
+0 0 0 0 0 2 1 5 49020105
+0 0 0 0 0 3 1 5 49030105
+0 0 0 0 0 4 1 5 49040105
+0 0 0 0 0 5 1 5 49050105
+0 0 0 0 0 6 1 5 49060105
+0 0 0 0 0 7 1 5 49070105
+0 0 0 0 0 8 1 5 49080105
+0 0 0 0 0 9 1 5 49090105
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 10 49000105
-1 0 0 0 0 2 2 10 49010105
-1 0 0 0 0 4 2 10 49020105
-1 0 0 0 0 6 2 10 49030105
-1 0 0 0 0 8 2 10 49040105
-1 0 0 0 0 10 2 10 49050105
-1 0 0 0 0 12 2 10 49060105
-1 0 0 0 0 14 2 10 49070105
-1 0 0 0 0 16 2 10 49080105
-1 0 0 0 0 18 2 10 49090105
+1 0 0 0 0 0 1 5 49000105
+1 0 0 0 0 1 1 5 49010105
+1 0 0 0 0 2 1 5 49020105
+1 0 0 0 0 3 1 5 49030105
+1 0 0 0 0 4 1 5 49040105
+1 0 0 0 0 5 1 5 49050105
+1 0 0 0 0 6 1 5 49060105
+1 0 0 0 0 7 1 5 49070105
+1 0 0 0 0 8 1 5 49080105
+1 0 0 0 0 9 1 5 49090105
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xy/fzz.yl b/CarpetAttic/Cart3dTest/test/axial-xy/fzz.yl
index 4f80b961f..329dd8d2f 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xy/fzz.yl
+++ b/CarpetAttic/Cart3dTest/test/axial-xy/fzz.yl
@@ -1,32 +1,34 @@
 # CART3DTEST::fzz y (fzz)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 0 10 49000005
-0 0 0 0 0 0 2 10 49000105
-0 0 0 0 0 0 4 10 49000205
-0 0 0 0 0 0 6 10 49000305
-0 0 0 0 0 0 8 10 49000405
-0 0 0 0 0 0 10 10 49000505
-0 0 0 0 0 0 12 10 49000605
-0 0 0 0 0 0 14 10 49000705
-0 0 0 0 0 0 16 10 49000805
-0 0 0 0 0 0 18 10 49000905
+0 0 0 0 0 0 0 5 49000005
+0 0 0 0 0 0 1 5 49000105
+0 0 0 0 0 0 2 5 49000205
+0 0 0 0 0 0 3 5 49000305
+0 0 0 0 0 0 4 5 49000405
+0 0 0 0 0 0 5 5 49000505
+0 0 0 0 0 0 6 5 49000605
+0 0 0 0 0 0 7 5 49000705
+0 0 0 0 0 0 8 5 49000805
+0 0 0 0 0 0 9 5 49000905
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 0 10 49000005
-1 0 0 0 0 0 2 10 49000105
-1 0 0 0 0 0 4 10 49000205
-1 0 0 0 0 0 6 10 49000305
-1 0 0 0 0 0 8 10 49000405
-1 0 0 0 0 0 10 10 49000505
-1 0 0 0 0 0 12 10 49000605
-1 0 0 0 0 0 14 10 49000705
-1 0 0 0 0 0 16 10 49000805
-1 0 0 0 0 0 18 10 49000905
+1 0 0 0 0 0 0 5 49000005
+1 0 0 0 0 0 1 5 49000105
+1 0 0 0 0 0 2 5 49000205
+1 0 0 0 0 0 3 5 49000305
+1 0 0 0 0 0 4 5 49000405
+1 0 0 0 0 0 5 5 49000505
+1 0 0 0 0 0 6 5 49000605
+1 0 0 0 0 0 7 5 49000705
+1 0 0 0 0 0 8 5 49000805
+1 0 0 0 0 0 9 5 49000905
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xy/fzz.zl b/CarpetAttic/Cart3dTest/test/axial-xy/fzz.zl
index cd3921541..2c6b7609b 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xy/fzz.zl
+++ b/CarpetAttic/Cart3dTest/test/axial-xy/fzz.zl
@@ -1,32 +1,34 @@
 # CART3DTEST::fzz z (fzz)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 0 49000100
-0 0 0 0 0 0 2 2 49000101
-0 0 0 0 0 0 2 4 49000102
-0 0 0 0 0 0 2 6 49000103
-0 0 0 0 0 0 2 8 49000104
-0 0 0 0 0 0 2 10 49000105
-0 0 0 0 0 0 2 12 49000106
-0 0 0 0 0 0 2 14 49000107
-0 0 0 0 0 0 2 16 49000108
-0 0 0 0 0 0 2 18 49000109
+0 0 0 0 0 0 1 0 49000100
+0 0 0 0 0 0 1 1 49000101
+0 0 0 0 0 0 1 2 49000102
+0 0 0 0 0 0 1 3 49000103
+0 0 0 0 0 0 1 4 49000104
+0 0 0 0 0 0 1 5 49000105
+0 0 0 0 0 0 1 6 49000106
+0 0 0 0 0 0 1 7 49000107
+0 0 0 0 0 0 1 8 49000108
+0 0 0 0 0 0 1 9 49000109
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 0 49000100
-1 0 0 0 0 0 2 2 49000101
-1 0 0 0 0 0 2 4 49000102
-1 0 0 0 0 0 2 6 49000103
-1 0 0 0 0 0 2 8 49000104
-1 0 0 0 0 0 2 10 49000105
-1 0 0 0 0 0 2 12 49000106
-1 0 0 0 0 0 2 14 49000107
-1 0 0 0 0 0 2 16 49000108
-1 0 0 0 0 0 2 18 49000109
+1 0 0 0 0 0 1 0 49000100
+1 0 0 0 0 0 1 1 49000101
+1 0 0 0 0 0 1 2 49000102
+1 0 0 0 0 0 1 3 49000103
+1 0 0 0 0 0 1 4 49000104
+1 0 0 0 0 0 1 5 49000105
+1 0 0 0 0 0 1 6 49000106
+1 0 0 0 0 0 1 7 49000107
+1 0 0 0 0 0 1 8 49000108
+1 0 0 0 0 0 1 9 49000109
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xy/s.xl b/CarpetAttic/Cart3dTest/test/axial-xy/s.xl
index 842edbfd8..fdf407fcd 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xy/s.xl
+++ b/CarpetAttic/Cart3dTest/test/axial-xy/s.xl
@@ -1,32 +1,34 @@
 # CART3DTEST::s x (s)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 10 1000105
-0 0 0 0 0 2 2 10 1010105
-0 0 0 0 0 4 2 10 1020105
-0 0 0 0 0 6 2 10 1030105
-0 0 0 0 0 8 2 10 1040105
-0 0 0 0 0 10 2 10 1050105
-0 0 0 0 0 12 2 10 1060105
-0 0 0 0 0 14 2 10 1070105
-0 0 0 0 0 16 2 10 1080105
-0 0 0 0 0 18 2 10 1090105
+0 0 0 0 0 0 1 5 1000105
+0 0 0 0 0 1 1 5 1010105
+0 0 0 0 0 2 1 5 1020105
+0 0 0 0 0 3 1 5 1030105
+0 0 0 0 0 4 1 5 1040105
+0 0 0 0 0 5 1 5 1050105
+0 0 0 0 0 6 1 5 1060105
+0 0 0 0 0 7 1 5 1070105
+0 0 0 0 0 8 1 5 1080105
+0 0 0 0 0 9 1 5 1090105
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 10 1000105
-1 0 0 0 0 2 2 10 1010105
-1 0 0 0 0 4 2 10 1020105
-1 0 0 0 0 6 2 10 1030105
-1 0 0 0 0 8 2 10 1040105
-1 0 0 0 0 10 2 10 1050105
-1 0 0 0 0 12 2 10 1060105
-1 0 0 0 0 14 2 10 1070105
-1 0 0 0 0 16 2 10 1080105
-1 0 0 0 0 18 2 10 1090105
+1 0 0 0 0 0 1 5 1000105
+1 0 0 0 0 1 1 5 1010105
+1 0 0 0 0 2 1 5 1020105
+1 0 0 0 0 3 1 5 1030105
+1 0 0 0 0 4 1 5 1040105
+1 0 0 0 0 5 1 5 1050105
+1 0 0 0 0 6 1 5 1060105
+1 0 0 0 0 7 1 5 1070105
+1 0 0 0 0 8 1 5 1080105
+1 0 0 0 0 9 1 5 1090105
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xy/s.yl b/CarpetAttic/Cart3dTest/test/axial-xy/s.yl
index 5a11970c5..d62397fa5 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xy/s.yl
+++ b/CarpetAttic/Cart3dTest/test/axial-xy/s.yl
@@ -1,32 +1,34 @@
 # CART3DTEST::s y (s)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 0 10 1000005
-0 0 0 0 0 0 2 10 1000105
-0 0 0 0 0 0 4 10 1000205
-0 0 0 0 0 0 6 10 1000305
-0 0 0 0 0 0 8 10 1000405
-0 0 0 0 0 0 10 10 1000505
-0 0 0 0 0 0 12 10 1000605
-0 0 0 0 0 0 14 10 1000705
-0 0 0 0 0 0 16 10 1000805
-0 0 0 0 0 0 18 10 1000905
+0 0 0 0 0 0 0 5 1000005
+0 0 0 0 0 0 1 5 1000105
+0 0 0 0 0 0 2 5 1000205
+0 0 0 0 0 0 3 5 1000305
+0 0 0 0 0 0 4 5 1000405
+0 0 0 0 0 0 5 5 1000505
+0 0 0 0 0 0 6 5 1000605
+0 0 0 0 0 0 7 5 1000705
+0 0 0 0 0 0 8 5 1000805
+0 0 0 0 0 0 9 5 1000905
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 0 10 1000005
-1 0 0 0 0 0 2 10 1000105
-1 0 0 0 0 0 4 10 1000205
-1 0 0 0 0 0 6 10 1000305
-1 0 0 0 0 0 8 10 1000405
-1 0 0 0 0 0 10 10 1000505
-1 0 0 0 0 0 12 10 1000605
-1 0 0 0 0 0 14 10 1000705
-1 0 0 0 0 0 16 10 1000805
-1 0 0 0 0 0 18 10 1000905
+1 0 0 0 0 0 0 5 1000005
+1 0 0 0 0 0 1 5 1000105
+1 0 0 0 0 0 2 5 1000205
+1 0 0 0 0 0 3 5 1000305
+1 0 0 0 0 0 4 5 1000405
+1 0 0 0 0 0 5 5 1000505
+1 0 0 0 0 0 6 5 1000605
+1 0 0 0 0 0 7 5 1000705
+1 0 0 0 0 0 8 5 1000805
+1 0 0 0 0 0 9 5 1000905
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xy/s.zl b/CarpetAttic/Cart3dTest/test/axial-xy/s.zl
index 52c71b9dc..d806aad3e 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xy/s.zl
+++ b/CarpetAttic/Cart3dTest/test/axial-xy/s.zl
@@ -1,32 +1,34 @@
 # CART3DTEST::s z (s)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 0 1000100
-0 0 0 0 0 0 2 2 1000101
-0 0 0 0 0 0 2 4 1000102
-0 0 0 0 0 0 2 6 1000103
-0 0 0 0 0 0 2 8 1000104
-0 0 0 0 0 0 2 10 1000105
-0 0 0 0 0 0 2 12 1000106
-0 0 0 0 0 0 2 14 1000107
-0 0 0 0 0 0 2 16 1000108
-0 0 0 0 0 0 2 18 1000109
+0 0 0 0 0 0 1 0 1000100
+0 0 0 0 0 0 1 1 1000101
+0 0 0 0 0 0 1 2 1000102
+0 0 0 0 0 0 1 3 1000103
+0 0 0 0 0 0 1 4 1000104
+0 0 0 0 0 0 1 5 1000105
+0 0 0 0 0 0 1 6 1000106
+0 0 0 0 0 0 1 7 1000107
+0 0 0 0 0 0 1 8 1000108
+0 0 0 0 0 0 1 9 1000109
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 0 1000100
-1 0 0 0 0 0 2 2 1000101
-1 0 0 0 0 0 2 4 1000102
-1 0 0 0 0 0 2 6 1000103
-1 0 0 0 0 0 2 8 1000104
-1 0 0 0 0 0 2 10 1000105
-1 0 0 0 0 0 2 12 1000106
-1 0 0 0 0 0 2 14 1000107
-1 0 0 0 0 0 2 16 1000108
-1 0 0 0 0 0 2 18 1000109
+1 0 0 0 0 0 1 0 1000100
+1 0 0 0 0 0 1 1 1000101
+1 0 0 0 0 0 1 2 1000102
+1 0 0 0 0 0 1 3 1000103
+1 0 0 0 0 0 1 4 1000104
+1 0 0 0 0 0 1 5 1000105
+1 0 0 0 0 0 1 6 1000106
+1 0 0 0 0 0 1 7 1000107
+1 0 0 0 0 0 1 8 1000108
+1 0 0 0 0 0 1 9 1000109
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xy/spher3d_r.xl b/CarpetAttic/Cart3dTest/test/axial-xy/spher3d_r.xl
index b87b452e6..d01051ad6 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xy/spher3d_r.xl
+++ b/CarpetAttic/Cart3dTest/test/axial-xy/spher3d_r.xl
@@ -1,32 +1,34 @@
 # GRID::spher3d_r x (spher3d_r)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 10 0.259807621135332
-0 0 0 0 0 2 2 10 0.49749371855331
-0 0 0 0 0 4 2 10 0.779422863405995
-0 0 0 0 0 6 2 10 1.07121426428143
-0 0 0 0 0 8 2 10 1.36656503687164
-0 0 0 0 0 10 2 10 1.66358047596141
-0 0 0 0 0 12 2 10 1.9615045245933
-0 0 0 0 0 14 2 10 2.2599778759979
-0 0 0 0 0 16 2 10 2.5588083163848
-0 0 0 0 0 18 2 10 2.85788383248865
+0 0 0 0 0 0 1 5 0.259807621135332
+0 0 0 0 0 1 1 5 0.49749371855331
+0 0 0 0 0 2 1 5 0.779422863405995
+0 0 0 0 0 3 1 5 1.07121426428143
+0 0 0 0 0 4 1 5 1.36656503687164
+0 0 0 0 0 5 1 5 1.66358047596141
+0 0 0 0 0 6 1 5 1.9615045245933
+0 0 0 0 0 7 1 5 2.2599778759979
+0 0 0 0 0 8 1 5 2.5588083163848
+0 0 0 0 0 9 1 5 2.85788383248865
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 10 0.259807621135332
-1 0 0 0 0 2 2 10 0.49749371855331
-1 0 0 0 0 4 2 10 0.779422863405995
-1 0 0 0 0 6 2 10 1.07121426428143
-1 0 0 0 0 8 2 10 1.36656503687164
-1 0 0 0 0 10 2 10 1.66358047596141
-1 0 0 0 0 12 2 10 1.9615045245933
-1 0 0 0 0 14 2 10 2.2599778759979
-1 0 0 0 0 16 2 10 2.5588083163848
-1 0 0 0 0 18 2 10 2.85788383248865
+1 0 0 0 0 0 1 5 0.259807621135332
+1 0 0 0 0 1 1 5 0.49749371855331
+1 0 0 0 0 2 1 5 0.779422863405995
+1 0 0 0 0 3 1 5 1.07121426428143
+1 0 0 0 0 4 1 5 1.36656503687164
+1 0 0 0 0 5 1 5 1.66358047596141
+1 0 0 0 0 6 1 5 1.9615045245933
+1 0 0 0 0 7 1 5 2.2599778759979
+1 0 0 0 0 8 1 5 2.5588083163848
+1 0 0 0 0 9 1 5 2.85788383248865
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xy/spher3d_r.yl b/CarpetAttic/Cart3dTest/test/axial-xy/spher3d_r.yl
index c2bc8b680..d6cf48a8f 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xy/spher3d_r.yl
+++ b/CarpetAttic/Cart3dTest/test/axial-xy/spher3d_r.yl
@@ -1,32 +1,34 @@
 # GRID::spher3d_r y (spher3d_r)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 0 10 0.259807621135332
-0 0 0 0 0 0 2 10 0.259807621135332
-0 0 0 0 0 0 4 10 0.49749371855331
-0 0 0 0 0 0 6 10 0.779422863405995
-0 0 0 0 0 0 8 10 1.07121426428143
-0 0 0 0 0 0 10 10 1.36656503687164
-0 0 0 0 0 0 12 10 1.66358047596141
-0 0 0 0 0 0 14 10 1.9615045245933
-0 0 0 0 0 0 16 10 2.2599778759979
-0 0 0 0 0 0 18 10 2.5588083163848
+0 0 0 0 0 0 0 5 0.259807621135332
+0 0 0 0 0 0 1 5 0.259807621135332
+0 0 0 0 0 0 2 5 0.49749371855331
+0 0 0 0 0 0 3 5 0.779422863405995
+0 0 0 0 0 0 4 5 1.07121426428143
+0 0 0 0 0 0 5 5 1.36656503687164
+0 0 0 0 0 0 6 5 1.66358047596141
+0 0 0 0 0 0 7 5 1.9615045245933
+0 0 0 0 0 0 8 5 2.2599778759979
+0 0 0 0 0 0 9 5 2.5588083163848
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 0 10 0.259807621135332
-1 0 0 0 0 0 2 10 0.259807621135332
-1 0 0 0 0 0 4 10 0.49749371855331
-1 0 0 0 0 0 6 10 0.779422863405995
-1 0 0 0 0 0 8 10 1.07121426428143
-1 0 0 0 0 0 10 10 1.36656503687164
-1 0 0 0 0 0 12 10 1.66358047596141
-1 0 0 0 0 0 14 10 1.9615045245933
-1 0 0 0 0 0 16 10 2.2599778759979
-1 0 0 0 0 0 18 10 2.5588083163848
+1 0 0 0 0 0 0 5 0.259807621135332
+1 0 0 0 0 0 1 5 0.259807621135332
+1 0 0 0 0 0 2 5 0.49749371855331
+1 0 0 0 0 0 3 5 0.779422863405995
+1 0 0 0 0 0 4 5 1.07121426428143
+1 0 0 0 0 0 5 5 1.36656503687164
+1 0 0 0 0 0 6 5 1.66358047596141
+1 0 0 0 0 0 7 5 1.9615045245933
+1 0 0 0 0 0 8 5 2.2599778759979
+1 0 0 0 0 0 9 5 2.5588083163848
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xy/spher3d_r.zl b/CarpetAttic/Cart3dTest/test/axial-xy/spher3d_r.zl
index 7507ca1f9..8d275dd3b 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xy/spher3d_r.zl
+++ b/CarpetAttic/Cart3dTest/test/axial-xy/spher3d_r.zl
@@ -1,32 +1,34 @@
 # GRID::spher3d_r z (spher3d_r)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 0 1.36656503687164
-0 0 0 0 0 0 2 2 1.07121426428143
-0 0 0 0 0 0 2 4 0.779422863405995
-0 0 0 0 0 0 2 6 0.49749371855331
-0 0 0 0 0 0 2 8 0.259807621135332
-0 0 0 0 0 0 2 10 0.259807621135332
-0 0 0 0 0 0 2 12 0.49749371855331
-0 0 0 0 0 0 2 14 0.779422863405995
-0 0 0 0 0 0 2 16 1.07121426428143
-0 0 0 0 0 0 2 18 1.36656503687164
+0 0 0 0 0 0 1 0 1.36656503687164
+0 0 0 0 0 0 1 1 1.07121426428143
+0 0 0 0 0 0 1 2 0.779422863405995
+0 0 0 0 0 0 1 3 0.49749371855331
+0 0 0 0 0 0 1 4 0.259807621135332
+0 0 0 0 0 0 1 5 0.259807621135332
+0 0 0 0 0 0 1 6 0.49749371855331
+0 0 0 0 0 0 1 7 0.779422863405995
+0 0 0 0 0 0 1 8 1.07121426428143
+0 0 0 0 0 0 1 9 1.36656503687164
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 0 1.36656503687164
-1 0 0 0 0 0 2 2 1.07121426428143
-1 0 0 0 0 0 2 4 0.779422863405995
-1 0 0 0 0 0 2 6 0.49749371855331
-1 0 0 0 0 0 2 8 0.259807621135332
-1 0 0 0 0 0 2 10 0.259807621135332
-1 0 0 0 0 0 2 12 0.49749371855331
-1 0 0 0 0 0 2 14 0.779422863405995
-1 0 0 0 0 0 2 16 1.07121426428143
-1 0 0 0 0 0 2 18 1.36656503687164
+1 0 0 0 0 0 1 0 1.36656503687164
+1 0 0 0 0 0 1 1 1.07121426428143
+1 0 0 0 0 0 1 2 0.779422863405995
+1 0 0 0 0 0 1 3 0.49749371855331
+1 0 0 0 0 0 1 4 0.259807621135332
+1 0 0 0 0 0 1 5 0.259807621135332
+1 0 0 0 0 0 1 6 0.49749371855331
+1 0 0 0 0 0 1 7 0.779422863405995
+1 0 0 0 0 0 1 8 1.07121426428143
+1 0 0 0 0 0 1 9 1.36656503687164
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xy/txx.xl b/CarpetAttic/Cart3dTest/test/axial-xy/txx.xl
index 2bc233aa1..b285daee6 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xy/txx.xl
+++ b/CarpetAttic/Cart3dTest/test/axial-xy/txx.xl
@@ -1,32 +1,34 @@
 # CART3DTEST::txx x (txx)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 10 21000105
-0 0 0 0 0 2 2 10 21010105
-0 0 0 0 0 4 2 10 21020105
-0 0 0 0 0 6 2 10 21030105
-0 0 0 0 0 8 2 10 21040105
-0 0 0 0 0 10 2 10 21050105
-0 0 0 0 0 12 2 10 21060105
-0 0 0 0 0 14 2 10 21070105
-0 0 0 0 0 16 2 10 21080105
-0 0 0 0 0 18 2 10 21090105
+0 0 0 0 0 0 1 5 21000105
+0 0 0 0 0 1 1 5 21010105
+0 0 0 0 0 2 1 5 21020105
+0 0 0 0 0 3 1 5 21030105
+0 0 0 0 0 4 1 5 21040105
+0 0 0 0 0 5 1 5 21050105
+0 0 0 0 0 6 1 5 21060105
+0 0 0 0 0 7 1 5 21070105
+0 0 0 0 0 8 1 5 21080105
+0 0 0 0 0 9 1 5 21090105
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 10 21000105
-1 0 0 0 0 2 2 10 21010105
-1 0 0 0 0 4 2 10 21020105
-1 0 0 0 0 6 2 10 21030105
-1 0 0 0 0 8 2 10 21040105
-1 0 0 0 0 10 2 10 21050105
-1 0 0 0 0 12 2 10 21060105
-1 0 0 0 0 14 2 10 21070105
-1 0 0 0 0 16 2 10 21080105
-1 0 0 0 0 18 2 10 21090105
+1 0 0 0 0 0 1 5 21000105
+1 0 0 0 0 1 1 5 21010105
+1 0 0 0 0 2 1 5 21020105
+1 0 0 0 0 3 1 5 21030105
+1 0 0 0 0 4 1 5 21040105
+1 0 0 0 0 5 1 5 21050105
+1 0 0 0 0 6 1 5 21060105
+1 0 0 0 0 7 1 5 21070105
+1 0 0 0 0 8 1 5 21080105
+1 0 0 0 0 9 1 5 21090105
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xy/txx.yl b/CarpetAttic/Cart3dTest/test/axial-xy/txx.yl
index 5b8b45671..592ac3539 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xy/txx.yl
+++ b/CarpetAttic/Cart3dTest/test/axial-xy/txx.yl
@@ -1,32 +1,34 @@
 # CART3DTEST::txx y (txx)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 0 10 21000005
-0 0 0 0 0 0 2 10 21000105
-0 0 0 0 0 0 4 10 21000205
-0 0 0 0 0 0 6 10 21000305
-0 0 0 0 0 0 8 10 21000405
-0 0 0 0 0 0 10 10 21000505
-0 0 0 0 0 0 12 10 21000605
-0 0 0 0 0 0 14 10 21000705
-0 0 0 0 0 0 16 10 21000805
-0 0 0 0 0 0 18 10 21000905
+0 0 0 0 0 0 0 5 21000005
+0 0 0 0 0 0 1 5 21000105
+0 0 0 0 0 0 2 5 21000205
+0 0 0 0 0 0 3 5 21000305
+0 0 0 0 0 0 4 5 21000405
+0 0 0 0 0 0 5 5 21000505
+0 0 0 0 0 0 6 5 21000605
+0 0 0 0 0 0 7 5 21000705
+0 0 0 0 0 0 8 5 21000805
+0 0 0 0 0 0 9 5 21000905
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 0 10 24000005
-1 0 0 0 0 0 2 10 21000105
-1 0 0 0 0 0 4 10 21000205
-1 0 0 0 0 0 6 10 21000305
-1 0 0 0 0 0 8 10 21000405
-1 0 0 0 0 0 10 10 21000505
-1 0 0 0 0 0 12 10 21000605
-1 0 0 0 0 0 14 10 21000705
-1 0 0 0 0 0 16 10 21000805
-1 0 0 0 0 0 18 10 21000905
+1 0 0 0 0 0 0 5 24000005
+1 0 0 0 0 0 1 5 21000105
+1 0 0 0 0 0 2 5 21000205
+1 0 0 0 0 0 3 5 21000305
+1 0 0 0 0 0 4 5 21000405
+1 0 0 0 0 0 5 5 21000505
+1 0 0 0 0 0 6 5 21000605
+1 0 0 0 0 0 7 5 21000705
+1 0 0 0 0 0 8 5 21000805
+1 0 0 0 0 0 9 5 21000905
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xy/txx.zl b/CarpetAttic/Cart3dTest/test/axial-xy/txx.zl
index d21c61c53..7a52adf1f 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xy/txx.zl
+++ b/CarpetAttic/Cart3dTest/test/axial-xy/txx.zl
@@ -1,32 +1,34 @@
 # CART3DTEST::txx z (txx)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 0 21000100
-0 0 0 0 0 0 2 2 21000101
-0 0 0 0 0 0 2 4 21000102
-0 0 0 0 0 0 2 6 21000103
-0 0 0 0 0 0 2 8 21000104
-0 0 0 0 0 0 2 10 21000105
-0 0 0 0 0 0 2 12 21000106
-0 0 0 0 0 0 2 14 21000107
-0 0 0 0 0 0 2 16 21000108
-0 0 0 0 0 0 2 18 21000109
+0 0 0 0 0 0 1 0 21000100
+0 0 0 0 0 0 1 1 21000101
+0 0 0 0 0 0 1 2 21000102
+0 0 0 0 0 0 1 3 21000103
+0 0 0 0 0 0 1 4 21000104
+0 0 0 0 0 0 1 5 21000105
+0 0 0 0 0 0 1 6 21000106
+0 0 0 0 0 0 1 7 21000107
+0 0 0 0 0 0 1 8 21000108
+0 0 0 0 0 0 1 9 21000109
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 0 21000100
-1 0 0 0 0 0 2 2 21000101
-1 0 0 0 0 0 2 4 21000102
-1 0 0 0 0 0 2 6 21000103
-1 0 0 0 0 0 2 8 21000104
-1 0 0 0 0 0 2 10 21000105
-1 0 0 0 0 0 2 12 21000106
-1 0 0 0 0 0 2 14 21000107
-1 0 0 0 0 0 2 16 21000108
-1 0 0 0 0 0 2 18 21000109
+1 0 0 0 0 0 1 0 21000100
+1 0 0 0 0 0 1 1 21000101
+1 0 0 0 0 0 1 2 21000102
+1 0 0 0 0 0 1 3 21000103
+1 0 0 0 0 0 1 4 21000104
+1 0 0 0 0 0 1 5 21000105
+1 0 0 0 0 0 1 6 21000106
+1 0 0 0 0 0 1 7 21000107
+1 0 0 0 0 0 1 8 21000108
+1 0 0 0 0 0 1 9 21000109
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xy/txy.xl b/CarpetAttic/Cart3dTest/test/axial-xy/txy.xl
index 957d9b191..0c86c4ec1 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xy/txy.xl
+++ b/CarpetAttic/Cart3dTest/test/axial-xy/txy.xl
@@ -1,32 +1,34 @@
 # CART3DTEST::txy x (txy)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 10 22000105
-0 0 0 0 0 2 2 10 22010105
-0 0 0 0 0 4 2 10 22020105
-0 0 0 0 0 6 2 10 22030105
-0 0 0 0 0 8 2 10 22040105
-0 0 0 0 0 10 2 10 22050105
-0 0 0 0 0 12 2 10 22060105
-0 0 0 0 0 14 2 10 22070105
-0 0 0 0 0 16 2 10 22080105
-0 0 0 0 0 18 2 10 22090105
+0 0 0 0 0 0 1 5 22000105
+0 0 0 0 0 1 1 5 22010105
+0 0 0 0 0 2 1 5 22020105
+0 0 0 0 0 3 1 5 22030105
+0 0 0 0 0 4 1 5 22040105
+0 0 0 0 0 5 1 5 22050105
+0 0 0 0 0 6 1 5 22060105
+0 0 0 0 0 7 1 5 22070105
+0 0 0 0 0 8 1 5 22080105
+0 0 0 0 0 9 1 5 22090105
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 10 22000105
-1 0 0 0 0 2 2 10 22010105
-1 0 0 0 0 4 2 10 22020105
-1 0 0 0 0 6 2 10 22030105
-1 0 0 0 0 8 2 10 22040105
-1 0 0 0 0 10 2 10 22050105
-1 0 0 0 0 12 2 10 22060105
-1 0 0 0 0 14 2 10 22070105
-1 0 0 0 0 16 2 10 22080105
-1 0 0 0 0 18 2 10 22090105
+1 0 0 0 0 0 1 5 22000105
+1 0 0 0 0 1 1 5 22010105
+1 0 0 0 0 2 1 5 22020105
+1 0 0 0 0 3 1 5 22030105
+1 0 0 0 0 4 1 5 22040105
+1 0 0 0 0 5 1 5 22050105
+1 0 0 0 0 6 1 5 22060105
+1 0 0 0 0 7 1 5 22070105
+1 0 0 0 0 8 1 5 22080105
+1 0 0 0 0 9 1 5 22090105
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xy/txy.yl b/CarpetAttic/Cart3dTest/test/axial-xy/txy.yl
index 6174f536d..5118d654b 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xy/txy.yl
+++ b/CarpetAttic/Cart3dTest/test/axial-xy/txy.yl
@@ -1,32 +1,34 @@
 # CART3DTEST::txy y (txy)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 0 10 22000005
-0 0 0 0 0 0 2 10 22000105
-0 0 0 0 0 0 4 10 22000205
-0 0 0 0 0 0 6 10 22000305
-0 0 0 0 0 0 8 10 22000405
-0 0 0 0 0 0 10 10 22000505
-0 0 0 0 0 0 12 10 22000605
-0 0 0 0 0 0 14 10 22000705
-0 0 0 0 0 0 16 10 22000805
-0 0 0 0 0 0 18 10 22000905
+0 0 0 0 0 0 0 5 22000005
+0 0 0 0 0 0 1 5 22000105
+0 0 0 0 0 0 2 5 22000205
+0 0 0 0 0 0 3 5 22000305
+0 0 0 0 0 0 4 5 22000405
+0 0 0 0 0 0 5 5 22000505
+0 0 0 0 0 0 6 5 22000605
+0 0 0 0 0 0 7 5 22000705
+0 0 0 0 0 0 8 5 22000805
+0 0 0 0 0 0 9 5 22000905
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 0 10 -22000005
-1 0 0 0 0 0 2 10 22000105
-1 0 0 0 0 0 4 10 22000205
-1 0 0 0 0 0 6 10 22000305
-1 0 0 0 0 0 8 10 22000405
-1 0 0 0 0 0 10 10 22000505
-1 0 0 0 0 0 12 10 22000605
-1 0 0 0 0 0 14 10 22000705
-1 0 0 0 0 0 16 10 22000805
-1 0 0 0 0 0 18 10 22000905
+1 0 0 0 0 0 0 5 -22000005
+1 0 0 0 0 0 1 5 22000105
+1 0 0 0 0 0 2 5 22000205
+1 0 0 0 0 0 3 5 22000305
+1 0 0 0 0 0 4 5 22000405
+1 0 0 0 0 0 5 5 22000505
+1 0 0 0 0 0 6 5 22000605
+1 0 0 0 0 0 7 5 22000705
+1 0 0 0 0 0 8 5 22000805
+1 0 0 0 0 0 9 5 22000905
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xy/txy.zl b/CarpetAttic/Cart3dTest/test/axial-xy/txy.zl
index a612d5ba6..55c8fe543 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xy/txy.zl
+++ b/CarpetAttic/Cart3dTest/test/axial-xy/txy.zl
@@ -1,32 +1,34 @@
 # CART3DTEST::txy z (txy)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 0 22000100
-0 0 0 0 0 0 2 2 22000101
-0 0 0 0 0 0 2 4 22000102
-0 0 0 0 0 0 2 6 22000103
-0 0 0 0 0 0 2 8 22000104
-0 0 0 0 0 0 2 10 22000105
-0 0 0 0 0 0 2 12 22000106
-0 0 0 0 0 0 2 14 22000107
-0 0 0 0 0 0 2 16 22000108
-0 0 0 0 0 0 2 18 22000109
+0 0 0 0 0 0 1 0 22000100
+0 0 0 0 0 0 1 1 22000101
+0 0 0 0 0 0 1 2 22000102
+0 0 0 0 0 0 1 3 22000103
+0 0 0 0 0 0 1 4 22000104
+0 0 0 0 0 0 1 5 22000105
+0 0 0 0 0 0 1 6 22000106
+0 0 0 0 0 0 1 7 22000107
+0 0 0 0 0 0 1 8 22000108
+0 0 0 0 0 0 1 9 22000109
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 0 22000100
-1 0 0 0 0 0 2 2 22000101
-1 0 0 0 0 0 2 4 22000102
-1 0 0 0 0 0 2 6 22000103
-1 0 0 0 0 0 2 8 22000104
-1 0 0 0 0 0 2 10 22000105
-1 0 0 0 0 0 2 12 22000106
-1 0 0 0 0 0 2 14 22000107
-1 0 0 0 0 0 2 16 22000108
-1 0 0 0 0 0 2 18 22000109
+1 0 0 0 0 0 1 0 22000100
+1 0 0 0 0 0 1 1 22000101
+1 0 0 0 0 0 1 2 22000102
+1 0 0 0 0 0 1 3 22000103
+1 0 0 0 0 0 1 4 22000104
+1 0 0 0 0 0 1 5 22000105
+1 0 0 0 0 0 1 6 22000106
+1 0 0 0 0 0 1 7 22000107
+1 0 0 0 0 0 1 8 22000108
+1 0 0 0 0 0 1 9 22000109
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xy/txz.xl b/CarpetAttic/Cart3dTest/test/axial-xy/txz.xl
index a9ef04861..faacecdad 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xy/txz.xl
+++ b/CarpetAttic/Cart3dTest/test/axial-xy/txz.xl
@@ -1,32 +1,34 @@
 # CART3DTEST::txz x (txz)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 10 23000105
-0 0 0 0 0 2 2 10 23010105
-0 0 0 0 0 4 2 10 23020105
-0 0 0 0 0 6 2 10 23030105
-0 0 0 0 0 8 2 10 23040105
-0 0 0 0 0 10 2 10 23050105
-0 0 0 0 0 12 2 10 23060105
-0 0 0 0 0 14 2 10 23070105
-0 0 0 0 0 16 2 10 23080105
-0 0 0 0 0 18 2 10 23090105
+0 0 0 0 0 0 1 5 23000105
+0 0 0 0 0 1 1 5 23010105
+0 0 0 0 0 2 1 5 23020105
+0 0 0 0 0 3 1 5 23030105
+0 0 0 0 0 4 1 5 23040105
+0 0 0 0 0 5 1 5 23050105
+0 0 0 0 0 6 1 5 23060105
+0 0 0 0 0 7 1 5 23070105
+0 0 0 0 0 8 1 5 23080105
+0 0 0 0 0 9 1 5 23090105
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 10 23000105
-1 0 0 0 0 2 2 10 23010105
-1 0 0 0 0 4 2 10 23020105
-1 0 0 0 0 6 2 10 23030105
-1 0 0 0 0 8 2 10 23040105
-1 0 0 0 0 10 2 10 23050105
-1 0 0 0 0 12 2 10 23060105
-1 0 0 0 0 14 2 10 23070105
-1 0 0 0 0 16 2 10 23080105
-1 0 0 0 0 18 2 10 23090105
+1 0 0 0 0 0 1 5 23000105
+1 0 0 0 0 1 1 5 23010105
+1 0 0 0 0 2 1 5 23020105
+1 0 0 0 0 3 1 5 23030105
+1 0 0 0 0 4 1 5 23040105
+1 0 0 0 0 5 1 5 23050105
+1 0 0 0 0 6 1 5 23060105
+1 0 0 0 0 7 1 5 23070105
+1 0 0 0 0 8 1 5 23080105
+1 0 0 0 0 9 1 5 23090105
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xy/txz.yl b/CarpetAttic/Cart3dTest/test/axial-xy/txz.yl
index b9e1b7a99..920b91784 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xy/txz.yl
+++ b/CarpetAttic/Cart3dTest/test/axial-xy/txz.yl
@@ -1,32 +1,34 @@
 # CART3DTEST::txz y (txz)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 0 10 23000005
-0 0 0 0 0 0 2 10 23000105
-0 0 0 0 0 0 4 10 23000205
-0 0 0 0 0 0 6 10 23000305
-0 0 0 0 0 0 8 10 23000405
-0 0 0 0 0 0 10 10 23000505
-0 0 0 0 0 0 12 10 23000605
-0 0 0 0 0 0 14 10 23000705
-0 0 0 0 0 0 16 10 23000805
-0 0 0 0 0 0 18 10 23000905
+0 0 0 0 0 0 0 5 23000005
+0 0 0 0 0 0 1 5 23000105
+0 0 0 0 0 0 2 5 23000205
+0 0 0 0 0 0 3 5 23000305
+0 0 0 0 0 0 4 5 23000405
+0 0 0 0 0 0 5 5 23000505
+0 0 0 0 0 0 6 5 23000605
+0 0 0 0 0 0 7 5 23000705
+0 0 0 0 0 0 8 5 23000805
+0 0 0 0 0 0 9 5 23000905
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 0 10 25000005
-1 0 0 0 0 0 2 10 23000105
-1 0 0 0 0 0 4 10 23000205
-1 0 0 0 0 0 6 10 23000305
-1 0 0 0 0 0 8 10 23000405
-1 0 0 0 0 0 10 10 23000505
-1 0 0 0 0 0 12 10 23000605
-1 0 0 0 0 0 14 10 23000705
-1 0 0 0 0 0 16 10 23000805
-1 0 0 0 0 0 18 10 23000905
+1 0 0 0 0 0 0 5 25000005
+1 0 0 0 0 0 1 5 23000105
+1 0 0 0 0 0 2 5 23000205
+1 0 0 0 0 0 3 5 23000305
+1 0 0 0 0 0 4 5 23000405
+1 0 0 0 0 0 5 5 23000505
+1 0 0 0 0 0 6 5 23000605
+1 0 0 0 0 0 7 5 23000705
+1 0 0 0 0 0 8 5 23000805
+1 0 0 0 0 0 9 5 23000905
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xy/txz.zl b/CarpetAttic/Cart3dTest/test/axial-xy/txz.zl
index 237eac336..bac3693c4 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xy/txz.zl
+++ b/CarpetAttic/Cart3dTest/test/axial-xy/txz.zl
@@ -1,32 +1,34 @@
 # CART3DTEST::txz z (txz)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 0 23000100
-0 0 0 0 0 0 2 2 23000101
-0 0 0 0 0 0 2 4 23000102
-0 0 0 0 0 0 2 6 23000103
-0 0 0 0 0 0 2 8 23000104
-0 0 0 0 0 0 2 10 23000105
-0 0 0 0 0 0 2 12 23000106
-0 0 0 0 0 0 2 14 23000107
-0 0 0 0 0 0 2 16 23000108
-0 0 0 0 0 0 2 18 23000109
+0 0 0 0 0 0 1 0 23000100
+0 0 0 0 0 0 1 1 23000101
+0 0 0 0 0 0 1 2 23000102
+0 0 0 0 0 0 1 3 23000103
+0 0 0 0 0 0 1 4 23000104
+0 0 0 0 0 0 1 5 23000105
+0 0 0 0 0 0 1 6 23000106
+0 0 0 0 0 0 1 7 23000107
+0 0 0 0 0 0 1 8 23000108
+0 0 0 0 0 0 1 9 23000109
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 0 23000100
-1 0 0 0 0 0 2 2 23000101
-1 0 0 0 0 0 2 4 23000102
-1 0 0 0 0 0 2 6 23000103
-1 0 0 0 0 0 2 8 23000104
-1 0 0 0 0 0 2 10 23000105
-1 0 0 0 0 0 2 12 23000106
-1 0 0 0 0 0 2 14 23000107
-1 0 0 0 0 0 2 16 23000108
-1 0 0 0 0 0 2 18 23000109
+1 0 0 0 0 0 1 0 23000100
+1 0 0 0 0 0 1 1 23000101
+1 0 0 0 0 0 1 2 23000102
+1 0 0 0 0 0 1 3 23000103
+1 0 0 0 0 0 1 4 23000104
+1 0 0 0 0 0 1 5 23000105
+1 0 0 0 0 0 1 6 23000106
+1 0 0 0 0 0 1 7 23000107
+1 0 0 0 0 0 1 8 23000108
+1 0 0 0 0 0 1 9 23000109
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xy/tyy.xl b/CarpetAttic/Cart3dTest/test/axial-xy/tyy.xl
index 7396cc0f1..566c0922e 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xy/tyy.xl
+++ b/CarpetAttic/Cart3dTest/test/axial-xy/tyy.xl
@@ -1,32 +1,34 @@
 # CART3DTEST::tyy x (tyy)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 10 24000105
-0 0 0 0 0 2 2 10 24010105
-0 0 0 0 0 4 2 10 24020105
-0 0 0 0 0 6 2 10 24030105
-0 0 0 0 0 8 2 10 24040105
-0 0 0 0 0 10 2 10 24050105
-0 0 0 0 0 12 2 10 24060105
-0 0 0 0 0 14 2 10 24070105
-0 0 0 0 0 16 2 10 24080105
-0 0 0 0 0 18 2 10 24090105
+0 0 0 0 0 0 1 5 24000105
+0 0 0 0 0 1 1 5 24010105
+0 0 0 0 0 2 1 5 24020105
+0 0 0 0 0 3 1 5 24030105
+0 0 0 0 0 4 1 5 24040105
+0 0 0 0 0 5 1 5 24050105
+0 0 0 0 0 6 1 5 24060105
+0 0 0 0 0 7 1 5 24070105
+0 0 0 0 0 8 1 5 24080105
+0 0 0 0 0 9 1 5 24090105
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 10 24000105
-1 0 0 0 0 2 2 10 24010105
-1 0 0 0 0 4 2 10 24020105
-1 0 0 0 0 6 2 10 24030105
-1 0 0 0 0 8 2 10 24040105
-1 0 0 0 0 10 2 10 24050105
-1 0 0 0 0 12 2 10 24060105
-1 0 0 0 0 14 2 10 24070105
-1 0 0 0 0 16 2 10 24080105
-1 0 0 0 0 18 2 10 24090105
+1 0 0 0 0 0 1 5 24000105
+1 0 0 0 0 1 1 5 24010105
+1 0 0 0 0 2 1 5 24020105
+1 0 0 0 0 3 1 5 24030105
+1 0 0 0 0 4 1 5 24040105
+1 0 0 0 0 5 1 5 24050105
+1 0 0 0 0 6 1 5 24060105
+1 0 0 0 0 7 1 5 24070105
+1 0 0 0 0 8 1 5 24080105
+1 0 0 0 0 9 1 5 24090105
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xy/tyy.yl b/CarpetAttic/Cart3dTest/test/axial-xy/tyy.yl
index 9b6535f53..02b77f853 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xy/tyy.yl
+++ b/CarpetAttic/Cart3dTest/test/axial-xy/tyy.yl
@@ -1,32 +1,34 @@
 # CART3DTEST::tyy y (tyy)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 0 10 24000005
-0 0 0 0 0 0 2 10 24000105
-0 0 0 0 0 0 4 10 24000205
-0 0 0 0 0 0 6 10 24000305
-0 0 0 0 0 0 8 10 24000405
-0 0 0 0 0 0 10 10 24000505
-0 0 0 0 0 0 12 10 24000605
-0 0 0 0 0 0 14 10 24000705
-0 0 0 0 0 0 16 10 24000805
-0 0 0 0 0 0 18 10 24000905
+0 0 0 0 0 0 0 5 24000005
+0 0 0 0 0 0 1 5 24000105
+0 0 0 0 0 0 2 5 24000205
+0 0 0 0 0 0 3 5 24000305
+0 0 0 0 0 0 4 5 24000405
+0 0 0 0 0 0 5 5 24000505
+0 0 0 0 0 0 6 5 24000605
+0 0 0 0 0 0 7 5 24000705
+0 0 0 0 0 0 8 5 24000805
+0 0 0 0 0 0 9 5 24000905
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 0 10 24000005
-1 0 0 0 0 0 2 10 24000105
-1 0 0 0 0 0 4 10 24000205
-1 0 0 0 0 0 6 10 24000305
-1 0 0 0 0 0 8 10 24000405
-1 0 0 0 0 0 10 10 24000505
-1 0 0 0 0 0 12 10 24000605
-1 0 0 0 0 0 14 10 24000705
-1 0 0 0 0 0 16 10 24000805
-1 0 0 0 0 0 18 10 24000905
+1 0 0 0 0 0 0 5 24000005
+1 0 0 0 0 0 1 5 24000105
+1 0 0 0 0 0 2 5 24000205
+1 0 0 0 0 0 3 5 24000305
+1 0 0 0 0 0 4 5 24000405
+1 0 0 0 0 0 5 5 24000505
+1 0 0 0 0 0 6 5 24000605
+1 0 0 0 0 0 7 5 24000705
+1 0 0 0 0 0 8 5 24000805
+1 0 0 0 0 0 9 5 24000905
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xy/tyy.zl b/CarpetAttic/Cart3dTest/test/axial-xy/tyy.zl
index 06dc79f89..ed8d3603d 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xy/tyy.zl
+++ b/CarpetAttic/Cart3dTest/test/axial-xy/tyy.zl
@@ -1,32 +1,34 @@
 # CART3DTEST::tyy z (tyy)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 0 24000100
-0 0 0 0 0 0 2 2 24000101
-0 0 0 0 0 0 2 4 24000102
-0 0 0 0 0 0 2 6 24000103
-0 0 0 0 0 0 2 8 24000104
-0 0 0 0 0 0 2 10 24000105
-0 0 0 0 0 0 2 12 24000106
-0 0 0 0 0 0 2 14 24000107
-0 0 0 0 0 0 2 16 24000108
-0 0 0 0 0 0 2 18 24000109
+0 0 0 0 0 0 1 0 24000100
+0 0 0 0 0 0 1 1 24000101
+0 0 0 0 0 0 1 2 24000102
+0 0 0 0 0 0 1 3 24000103
+0 0 0 0 0 0 1 4 24000104
+0 0 0 0 0 0 1 5 24000105
+0 0 0 0 0 0 1 6 24000106
+0 0 0 0 0 0 1 7 24000107
+0 0 0 0 0 0 1 8 24000108
+0 0 0 0 0 0 1 9 24000109
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 0 24000100
-1 0 0 0 0 0 2 2 24000101
-1 0 0 0 0 0 2 4 24000102
-1 0 0 0 0 0 2 6 24000103
-1 0 0 0 0 0 2 8 24000104
-1 0 0 0 0 0 2 10 24000105
-1 0 0 0 0 0 2 12 24000106
-1 0 0 0 0 0 2 14 24000107
-1 0 0 0 0 0 2 16 24000108
-1 0 0 0 0 0 2 18 24000109
+1 0 0 0 0 0 1 0 24000100
+1 0 0 0 0 0 1 1 24000101
+1 0 0 0 0 0 1 2 24000102
+1 0 0 0 0 0 1 3 24000103
+1 0 0 0 0 0 1 4 24000104
+1 0 0 0 0 0 1 5 24000105
+1 0 0 0 0 0 1 6 24000106
+1 0 0 0 0 0 1 7 24000107
+1 0 0 0 0 0 1 8 24000108
+1 0 0 0 0 0 1 9 24000109
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xy/tyz.xl b/CarpetAttic/Cart3dTest/test/axial-xy/tyz.xl
index 3add9bbf5..1cac2cd93 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xy/tyz.xl
+++ b/CarpetAttic/Cart3dTest/test/axial-xy/tyz.xl
@@ -1,32 +1,34 @@
 # CART3DTEST::tyz x (tyz)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 10 25000105
-0 0 0 0 0 2 2 10 25010105
-0 0 0 0 0 4 2 10 25020105
-0 0 0 0 0 6 2 10 25030105
-0 0 0 0 0 8 2 10 25040105
-0 0 0 0 0 10 2 10 25050105
-0 0 0 0 0 12 2 10 25060105
-0 0 0 0 0 14 2 10 25070105
-0 0 0 0 0 16 2 10 25080105
-0 0 0 0 0 18 2 10 25090105
+0 0 0 0 0 0 1 5 25000105
+0 0 0 0 0 1 1 5 25010105
+0 0 0 0 0 2 1 5 25020105
+0 0 0 0 0 3 1 5 25030105
+0 0 0 0 0 4 1 5 25040105
+0 0 0 0 0 5 1 5 25050105
+0 0 0 0 0 6 1 5 25060105
+0 0 0 0 0 7 1 5 25070105
+0 0 0 0 0 8 1 5 25080105
+0 0 0 0 0 9 1 5 25090105
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 10 25000105
-1 0 0 0 0 2 2 10 25010105
-1 0 0 0 0 4 2 10 25020105
-1 0 0 0 0 6 2 10 25030105
-1 0 0 0 0 8 2 10 25040105
-1 0 0 0 0 10 2 10 25050105
-1 0 0 0 0 12 2 10 25060105
-1 0 0 0 0 14 2 10 25070105
-1 0 0 0 0 16 2 10 25080105
-1 0 0 0 0 18 2 10 25090105
+1 0 0 0 0 0 1 5 25000105
+1 0 0 0 0 1 1 5 25010105
+1 0 0 0 0 2 1 5 25020105
+1 0 0 0 0 3 1 5 25030105
+1 0 0 0 0 4 1 5 25040105
+1 0 0 0 0 5 1 5 25050105
+1 0 0 0 0 6 1 5 25060105
+1 0 0 0 0 7 1 5 25070105
+1 0 0 0 0 8 1 5 25080105
+1 0 0 0 0 9 1 5 25090105
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xy/tyz.yl b/CarpetAttic/Cart3dTest/test/axial-xy/tyz.yl
index 4891afda6..bb97b4b59 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xy/tyz.yl
+++ b/CarpetAttic/Cart3dTest/test/axial-xy/tyz.yl
@@ -1,32 +1,34 @@
 # CART3DTEST::tyz y (tyz)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 0 10 25000005
-0 0 0 0 0 0 2 10 25000105
-0 0 0 0 0 0 4 10 25000205
-0 0 0 0 0 0 6 10 25000305
-0 0 0 0 0 0 8 10 25000405
-0 0 0 0 0 0 10 10 25000505
-0 0 0 0 0 0 12 10 25000605
-0 0 0 0 0 0 14 10 25000705
-0 0 0 0 0 0 16 10 25000805
-0 0 0 0 0 0 18 10 25000905
+0 0 0 0 0 0 0 5 25000005
+0 0 0 0 0 0 1 5 25000105
+0 0 0 0 0 0 2 5 25000205
+0 0 0 0 0 0 3 5 25000305
+0 0 0 0 0 0 4 5 25000405
+0 0 0 0 0 0 5 5 25000505
+0 0 0 0 0 0 6 5 25000605
+0 0 0 0 0 0 7 5 25000705
+0 0 0 0 0 0 8 5 25000805
+0 0 0 0 0 0 9 5 25000905
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 0 10 -25000005
-1 0 0 0 0 0 2 10 25000105
-1 0 0 0 0 0 4 10 25000205
-1 0 0 0 0 0 6 10 25000305
-1 0 0 0 0 0 8 10 25000405
-1 0 0 0 0 0 10 10 25000505
-1 0 0 0 0 0 12 10 25000605
-1 0 0 0 0 0 14 10 25000705
-1 0 0 0 0 0 16 10 25000805
-1 0 0 0 0 0 18 10 25000905
+1 0 0 0 0 0 0 5 -25000005
+1 0 0 0 0 0 1 5 25000105
+1 0 0 0 0 0 2 5 25000205
+1 0 0 0 0 0 3 5 25000305
+1 0 0 0 0 0 4 5 25000405
+1 0 0 0 0 0 5 5 25000505
+1 0 0 0 0 0 6 5 25000605
+1 0 0 0 0 0 7 5 25000705
+1 0 0 0 0 0 8 5 25000805
+1 0 0 0 0 0 9 5 25000905
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xy/tyz.zl b/CarpetAttic/Cart3dTest/test/axial-xy/tyz.zl
index aebbe8bd2..38dc66d6f 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xy/tyz.zl
+++ b/CarpetAttic/Cart3dTest/test/axial-xy/tyz.zl
@@ -1,32 +1,34 @@
 # CART3DTEST::tyz z (tyz)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 0 25000100
-0 0 0 0 0 0 2 2 25000101
-0 0 0 0 0 0 2 4 25000102
-0 0 0 0 0 0 2 6 25000103
-0 0 0 0 0 0 2 8 25000104
-0 0 0 0 0 0 2 10 25000105
-0 0 0 0 0 0 2 12 25000106
-0 0 0 0 0 0 2 14 25000107
-0 0 0 0 0 0 2 16 25000108
-0 0 0 0 0 0 2 18 25000109
+0 0 0 0 0 0 1 0 25000100
+0 0 0 0 0 0 1 1 25000101
+0 0 0 0 0 0 1 2 25000102
+0 0 0 0 0 0 1 3 25000103
+0 0 0 0 0 0 1 4 25000104
+0 0 0 0 0 0 1 5 25000105
+0 0 0 0 0 0 1 6 25000106
+0 0 0 0 0 0 1 7 25000107
+0 0 0 0 0 0 1 8 25000108
+0 0 0 0 0 0 1 9 25000109
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 0 25000100
-1 0 0 0 0 0 2 2 25000101
-1 0 0 0 0 0 2 4 25000102
-1 0 0 0 0 0 2 6 25000103
-1 0 0 0 0 0 2 8 25000104
-1 0 0 0 0 0 2 10 25000105
-1 0 0 0 0 0 2 12 25000106
-1 0 0 0 0 0 2 14 25000107
-1 0 0 0 0 0 2 16 25000108
-1 0 0 0 0 0 2 18 25000109
+1 0 0 0 0 0 1 0 25000100
+1 0 0 0 0 0 1 1 25000101
+1 0 0 0 0 0 1 2 25000102
+1 0 0 0 0 0 1 3 25000103
+1 0 0 0 0 0 1 4 25000104
+1 0 0 0 0 0 1 5 25000105
+1 0 0 0 0 0 1 6 25000106
+1 0 0 0 0 0 1 7 25000107
+1 0 0 0 0 0 1 8 25000108
+1 0 0 0 0 0 1 9 25000109
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xy/tzz.xl b/CarpetAttic/Cart3dTest/test/axial-xy/tzz.xl
index 678ff9fc6..1dfc09b33 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xy/tzz.xl
+++ b/CarpetAttic/Cart3dTest/test/axial-xy/tzz.xl
@@ -1,32 +1,34 @@
 # CART3DTEST::tzz x (tzz)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 10 26000105
-0 0 0 0 0 2 2 10 26010105
-0 0 0 0 0 4 2 10 26020105
-0 0 0 0 0 6 2 10 26030105
-0 0 0 0 0 8 2 10 26040105
-0 0 0 0 0 10 2 10 26050105
-0 0 0 0 0 12 2 10 26060105
-0 0 0 0 0 14 2 10 26070105
-0 0 0 0 0 16 2 10 26080105
-0 0 0 0 0 18 2 10 26090105
+0 0 0 0 0 0 1 5 26000105
+0 0 0 0 0 1 1 5 26010105
+0 0 0 0 0 2 1 5 26020105
+0 0 0 0 0 3 1 5 26030105
+0 0 0 0 0 4 1 5 26040105
+0 0 0 0 0 5 1 5 26050105
+0 0 0 0 0 6 1 5 26060105
+0 0 0 0 0 7 1 5 26070105
+0 0 0 0 0 8 1 5 26080105
+0 0 0 0 0 9 1 5 26090105
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 10 26000105
-1 0 0 0 0 2 2 10 26010105
-1 0 0 0 0 4 2 10 26020105
-1 0 0 0 0 6 2 10 26030105
-1 0 0 0 0 8 2 10 26040105
-1 0 0 0 0 10 2 10 26050105
-1 0 0 0 0 12 2 10 26060105
-1 0 0 0 0 14 2 10 26070105
-1 0 0 0 0 16 2 10 26080105
-1 0 0 0 0 18 2 10 26090105
+1 0 0 0 0 0 1 5 26000105
+1 0 0 0 0 1 1 5 26010105
+1 0 0 0 0 2 1 5 26020105
+1 0 0 0 0 3 1 5 26030105
+1 0 0 0 0 4 1 5 26040105
+1 0 0 0 0 5 1 5 26050105
+1 0 0 0 0 6 1 5 26060105
+1 0 0 0 0 7 1 5 26070105
+1 0 0 0 0 8 1 5 26080105
+1 0 0 0 0 9 1 5 26090105
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xy/tzz.yl b/CarpetAttic/Cart3dTest/test/axial-xy/tzz.yl
index 9e4b777d8..e6017cc56 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xy/tzz.yl
+++ b/CarpetAttic/Cart3dTest/test/axial-xy/tzz.yl
@@ -1,32 +1,34 @@
 # CART3DTEST::tzz y (tzz)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 0 10 26000005
-0 0 0 0 0 0 2 10 26000105
-0 0 0 0 0 0 4 10 26000205
-0 0 0 0 0 0 6 10 26000305
-0 0 0 0 0 0 8 10 26000405
-0 0 0 0 0 0 10 10 26000505
-0 0 0 0 0 0 12 10 26000605
-0 0 0 0 0 0 14 10 26000705
-0 0 0 0 0 0 16 10 26000805
-0 0 0 0 0 0 18 10 26000905
+0 0 0 0 0 0 0 5 26000005
+0 0 0 0 0 0 1 5 26000105
+0 0 0 0 0 0 2 5 26000205
+0 0 0 0 0 0 3 5 26000305
+0 0 0 0 0 0 4 5 26000405
+0 0 0 0 0 0 5 5 26000505
+0 0 0 0 0 0 6 5 26000605
+0 0 0 0 0 0 7 5 26000705
+0 0 0 0 0 0 8 5 26000805
+0 0 0 0 0 0 9 5 26000905
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 0 10 26000005
-1 0 0 0 0 0 2 10 26000105
-1 0 0 0 0 0 4 10 26000205
-1 0 0 0 0 0 6 10 26000305
-1 0 0 0 0 0 8 10 26000405
-1 0 0 0 0 0 10 10 26000505
-1 0 0 0 0 0 12 10 26000605
-1 0 0 0 0 0 14 10 26000705
-1 0 0 0 0 0 16 10 26000805
-1 0 0 0 0 0 18 10 26000905
+1 0 0 0 0 0 0 5 26000005
+1 0 0 0 0 0 1 5 26000105
+1 0 0 0 0 0 2 5 26000205
+1 0 0 0 0 0 3 5 26000305
+1 0 0 0 0 0 4 5 26000405
+1 0 0 0 0 0 5 5 26000505
+1 0 0 0 0 0 6 5 26000605
+1 0 0 0 0 0 7 5 26000705
+1 0 0 0 0 0 8 5 26000805
+1 0 0 0 0 0 9 5 26000905
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xy/tzz.zl b/CarpetAttic/Cart3dTest/test/axial-xy/tzz.zl
index 8634ec3fe..610ec9c66 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xy/tzz.zl
+++ b/CarpetAttic/Cart3dTest/test/axial-xy/tzz.zl
@@ -1,32 +1,34 @@
 # CART3DTEST::tzz z (tzz)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 0 26000100
-0 0 0 0 0 0 2 2 26000101
-0 0 0 0 0 0 2 4 26000102
-0 0 0 0 0 0 2 6 26000103
-0 0 0 0 0 0 2 8 26000104
-0 0 0 0 0 0 2 10 26000105
-0 0 0 0 0 0 2 12 26000106
-0 0 0 0 0 0 2 14 26000107
-0 0 0 0 0 0 2 16 26000108
-0 0 0 0 0 0 2 18 26000109
+0 0 0 0 0 0 1 0 26000100
+0 0 0 0 0 0 1 1 26000101
+0 0 0 0 0 0 1 2 26000102
+0 0 0 0 0 0 1 3 26000103
+0 0 0 0 0 0 1 4 26000104
+0 0 0 0 0 0 1 5 26000105
+0 0 0 0 0 0 1 6 26000106
+0 0 0 0 0 0 1 7 26000107
+0 0 0 0 0 0 1 8 26000108
+0 0 0 0 0 0 1 9 26000109
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 0 26000100
-1 0 0 0 0 0 2 2 26000101
-1 0 0 0 0 0 2 4 26000102
-1 0 0 0 0 0 2 6 26000103
-1 0 0 0 0 0 2 8 26000104
-1 0 0 0 0 0 2 10 26000105
-1 0 0 0 0 0 2 12 26000106
-1 0 0 0 0 0 2 14 26000107
-1 0 0 0 0 0 2 16 26000108
-1 0 0 0 0 0 2 18 26000109
+1 0 0 0 0 0 1 0 26000100
+1 0 0 0 0 0 1 1 26000101
+1 0 0 0 0 0 1 2 26000102
+1 0 0 0 0 0 1 3 26000103
+1 0 0 0 0 0 1 4 26000104
+1 0 0 0 0 0 1 5 26000105
+1 0 0 0 0 0 1 6 26000106
+1 0 0 0 0 0 1 7 26000107
+1 0 0 0 0 0 1 8 26000108
+1 0 0 0 0 0 1 9 26000109
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xy/vx.xl b/CarpetAttic/Cart3dTest/test/axial-xy/vx.xl
index 4e858be2c..2fae0a603 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xy/vx.xl
+++ b/CarpetAttic/Cart3dTest/test/axial-xy/vx.xl
@@ -1,32 +1,34 @@
 # CART3DTEST::vx x (vx)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 10 11000105
-0 0 0 0 0 2 2 10 11010105
-0 0 0 0 0 4 2 10 11020105
-0 0 0 0 0 6 2 10 11030105
-0 0 0 0 0 8 2 10 11040105
-0 0 0 0 0 10 2 10 11050105
-0 0 0 0 0 12 2 10 11060105
-0 0 0 0 0 14 2 10 11070105
-0 0 0 0 0 16 2 10 11080105
-0 0 0 0 0 18 2 10 11090105
+0 0 0 0 0 0 1 5 11000105
+0 0 0 0 0 1 1 5 11010105
+0 0 0 0 0 2 1 5 11020105
+0 0 0 0 0 3 1 5 11030105
+0 0 0 0 0 4 1 5 11040105
+0 0 0 0 0 5 1 5 11050105
+0 0 0 0 0 6 1 5 11060105
+0 0 0 0 0 7 1 5 11070105
+0 0 0 0 0 8 1 5 11080105
+0 0 0 0 0 9 1 5 11090105
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 10 11000105
-1 0 0 0 0 2 2 10 11010105
-1 0 0 0 0 4 2 10 11020105
-1 0 0 0 0 6 2 10 11030105
-1 0 0 0 0 8 2 10 11040105
-1 0 0 0 0 10 2 10 11050105
-1 0 0 0 0 12 2 10 11060105
-1 0 0 0 0 14 2 10 11070105
-1 0 0 0 0 16 2 10 11080105
-1 0 0 0 0 18 2 10 11090105
+1 0 0 0 0 0 1 5 11000105
+1 0 0 0 0 1 1 5 11010105
+1 0 0 0 0 2 1 5 11020105
+1 0 0 0 0 3 1 5 11030105
+1 0 0 0 0 4 1 5 11040105
+1 0 0 0 0 5 1 5 11050105
+1 0 0 0 0 6 1 5 11060105
+1 0 0 0 0 7 1 5 11070105
+1 0 0 0 0 8 1 5 11080105
+1 0 0 0 0 9 1 5 11090105
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xy/vx.yl b/CarpetAttic/Cart3dTest/test/axial-xy/vx.yl
index dfe78f971..a82462572 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xy/vx.yl
+++ b/CarpetAttic/Cart3dTest/test/axial-xy/vx.yl
@@ -1,32 +1,34 @@
 # CART3DTEST::vx y (vx)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 0 10 11000005
-0 0 0 0 0 0 2 10 11000105
-0 0 0 0 0 0 4 10 11000205
-0 0 0 0 0 0 6 10 11000305
-0 0 0 0 0 0 8 10 11000405
-0 0 0 0 0 0 10 10 11000505
-0 0 0 0 0 0 12 10 11000605
-0 0 0 0 0 0 14 10 11000705
-0 0 0 0 0 0 16 10 11000805
-0 0 0 0 0 0 18 10 11000905
+0 0 0 0 0 0 0 5 11000005
+0 0 0 0 0 0 1 5 11000105
+0 0 0 0 0 0 2 5 11000205
+0 0 0 0 0 0 3 5 11000305
+0 0 0 0 0 0 4 5 11000405
+0 0 0 0 0 0 5 5 11000505
+0 0 0 0 0 0 6 5 11000605
+0 0 0 0 0 0 7 5 11000705
+0 0 0 0 0 0 8 5 11000805
+0 0 0 0 0 0 9 5 11000905
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 0 10 12000005
-1 0 0 0 0 0 2 10 11000105
-1 0 0 0 0 0 4 10 11000205
-1 0 0 0 0 0 6 10 11000305
-1 0 0 0 0 0 8 10 11000405
-1 0 0 0 0 0 10 10 11000505
-1 0 0 0 0 0 12 10 11000605
-1 0 0 0 0 0 14 10 11000705
-1 0 0 0 0 0 16 10 11000805
-1 0 0 0 0 0 18 10 11000905
+1 0 0 0 0 0 0 5 12000005
+1 0 0 0 0 0 1 5 11000105
+1 0 0 0 0 0 2 5 11000205
+1 0 0 0 0 0 3 5 11000305
+1 0 0 0 0 0 4 5 11000405
+1 0 0 0 0 0 5 5 11000505
+1 0 0 0 0 0 6 5 11000605
+1 0 0 0 0 0 7 5 11000705
+1 0 0 0 0 0 8 5 11000805
+1 0 0 0 0 0 9 5 11000905
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xy/vx.zl b/CarpetAttic/Cart3dTest/test/axial-xy/vx.zl
index f6f9a3edf..51e26621d 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xy/vx.zl
+++ b/CarpetAttic/Cart3dTest/test/axial-xy/vx.zl
@@ -1,32 +1,34 @@
 # CART3DTEST::vx z (vx)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 0 11000100
-0 0 0 0 0 0 2 2 11000101
-0 0 0 0 0 0 2 4 11000102
-0 0 0 0 0 0 2 6 11000103
-0 0 0 0 0 0 2 8 11000104
-0 0 0 0 0 0 2 10 11000105
-0 0 0 0 0 0 2 12 11000106
-0 0 0 0 0 0 2 14 11000107
-0 0 0 0 0 0 2 16 11000108
-0 0 0 0 0 0 2 18 11000109
+0 0 0 0 0 0 1 0 11000100
+0 0 0 0 0 0 1 1 11000101
+0 0 0 0 0 0 1 2 11000102
+0 0 0 0 0 0 1 3 11000103
+0 0 0 0 0 0 1 4 11000104
+0 0 0 0 0 0 1 5 11000105
+0 0 0 0 0 0 1 6 11000106
+0 0 0 0 0 0 1 7 11000107
+0 0 0 0 0 0 1 8 11000108
+0 0 0 0 0 0 1 9 11000109
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 0 11000100
-1 0 0 0 0 0 2 2 11000101
-1 0 0 0 0 0 2 4 11000102
-1 0 0 0 0 0 2 6 11000103
-1 0 0 0 0 0 2 8 11000104
-1 0 0 0 0 0 2 10 11000105
-1 0 0 0 0 0 2 12 11000106
-1 0 0 0 0 0 2 14 11000107
-1 0 0 0 0 0 2 16 11000108
-1 0 0 0 0 0 2 18 11000109
+1 0 0 0 0 0 1 0 11000100
+1 0 0 0 0 0 1 1 11000101
+1 0 0 0 0 0 1 2 11000102
+1 0 0 0 0 0 1 3 11000103
+1 0 0 0 0 0 1 4 11000104
+1 0 0 0 0 0 1 5 11000105
+1 0 0 0 0 0 1 6 11000106
+1 0 0 0 0 0 1 7 11000107
+1 0 0 0 0 0 1 8 11000108
+1 0 0 0 0 0 1 9 11000109
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xy/vy.xl b/CarpetAttic/Cart3dTest/test/axial-xy/vy.xl
index dfdc0c516..abba49be6 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xy/vy.xl
+++ b/CarpetAttic/Cart3dTest/test/axial-xy/vy.xl
@@ -1,32 +1,34 @@
 # CART3DTEST::vy x (vy)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 10 12000105
-0 0 0 0 0 2 2 10 12010105
-0 0 0 0 0 4 2 10 12020105
-0 0 0 0 0 6 2 10 12030105
-0 0 0 0 0 8 2 10 12040105
-0 0 0 0 0 10 2 10 12050105
-0 0 0 0 0 12 2 10 12060105
-0 0 0 0 0 14 2 10 12070105
-0 0 0 0 0 16 2 10 12080105
-0 0 0 0 0 18 2 10 12090105
+0 0 0 0 0 0 1 5 12000105
+0 0 0 0 0 1 1 5 12010105
+0 0 0 0 0 2 1 5 12020105
+0 0 0 0 0 3 1 5 12030105
+0 0 0 0 0 4 1 5 12040105
+0 0 0 0 0 5 1 5 12050105
+0 0 0 0 0 6 1 5 12060105
+0 0 0 0 0 7 1 5 12070105
+0 0 0 0 0 8 1 5 12080105
+0 0 0 0 0 9 1 5 12090105
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 10 12000105
-1 0 0 0 0 2 2 10 12010105
-1 0 0 0 0 4 2 10 12020105
-1 0 0 0 0 6 2 10 12030105
-1 0 0 0 0 8 2 10 12040105
-1 0 0 0 0 10 2 10 12050105
-1 0 0 0 0 12 2 10 12060105
-1 0 0 0 0 14 2 10 12070105
-1 0 0 0 0 16 2 10 12080105
-1 0 0 0 0 18 2 10 12090105
+1 0 0 0 0 0 1 5 12000105
+1 0 0 0 0 1 1 5 12010105
+1 0 0 0 0 2 1 5 12020105
+1 0 0 0 0 3 1 5 12030105
+1 0 0 0 0 4 1 5 12040105
+1 0 0 0 0 5 1 5 12050105
+1 0 0 0 0 6 1 5 12060105
+1 0 0 0 0 7 1 5 12070105
+1 0 0 0 0 8 1 5 12080105
+1 0 0 0 0 9 1 5 12090105
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xy/vy.yl b/CarpetAttic/Cart3dTest/test/axial-xy/vy.yl
index 6b0ae8030..468d28faf 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xy/vy.yl
+++ b/CarpetAttic/Cart3dTest/test/axial-xy/vy.yl
@@ -1,32 +1,34 @@
 # CART3DTEST::vy y (vy)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 0 10 12000005
-0 0 0 0 0 0 2 10 12000105
-0 0 0 0 0 0 4 10 12000205
-0 0 0 0 0 0 6 10 12000305
-0 0 0 0 0 0 8 10 12000405
-0 0 0 0 0 0 10 10 12000505
-0 0 0 0 0 0 12 10 12000605
-0 0 0 0 0 0 14 10 12000705
-0 0 0 0 0 0 16 10 12000805
-0 0 0 0 0 0 18 10 12000905
+0 0 0 0 0 0 0 5 12000005
+0 0 0 0 0 0 1 5 12000105
+0 0 0 0 0 0 2 5 12000205
+0 0 0 0 0 0 3 5 12000305
+0 0 0 0 0 0 4 5 12000405
+0 0 0 0 0 0 5 5 12000505
+0 0 0 0 0 0 6 5 12000605
+0 0 0 0 0 0 7 5 12000705
+0 0 0 0 0 0 8 5 12000805
+0 0 0 0 0 0 9 5 12000905
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 0 10 -12000005
-1 0 0 0 0 0 2 10 12000105
-1 0 0 0 0 0 4 10 12000205
-1 0 0 0 0 0 6 10 12000305
-1 0 0 0 0 0 8 10 12000405
-1 0 0 0 0 0 10 10 12000505
-1 0 0 0 0 0 12 10 12000605
-1 0 0 0 0 0 14 10 12000705
-1 0 0 0 0 0 16 10 12000805
-1 0 0 0 0 0 18 10 12000905
+1 0 0 0 0 0 0 5 -12000005
+1 0 0 0 0 0 1 5 12000105
+1 0 0 0 0 0 2 5 12000205
+1 0 0 0 0 0 3 5 12000305
+1 0 0 0 0 0 4 5 12000405
+1 0 0 0 0 0 5 5 12000505
+1 0 0 0 0 0 6 5 12000605
+1 0 0 0 0 0 7 5 12000705
+1 0 0 0 0 0 8 5 12000805
+1 0 0 0 0 0 9 5 12000905
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xy/vy.zl b/CarpetAttic/Cart3dTest/test/axial-xy/vy.zl
index ed8c4861a..1c5c80a95 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xy/vy.zl
+++ b/CarpetAttic/Cart3dTest/test/axial-xy/vy.zl
@@ -1,32 +1,34 @@
 # CART3DTEST::vy z (vy)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 0 12000100
-0 0 0 0 0 0 2 2 12000101
-0 0 0 0 0 0 2 4 12000102
-0 0 0 0 0 0 2 6 12000103
-0 0 0 0 0 0 2 8 12000104
-0 0 0 0 0 0 2 10 12000105
-0 0 0 0 0 0 2 12 12000106
-0 0 0 0 0 0 2 14 12000107
-0 0 0 0 0 0 2 16 12000108
-0 0 0 0 0 0 2 18 12000109
+0 0 0 0 0 0 1 0 12000100
+0 0 0 0 0 0 1 1 12000101
+0 0 0 0 0 0 1 2 12000102
+0 0 0 0 0 0 1 3 12000103
+0 0 0 0 0 0 1 4 12000104
+0 0 0 0 0 0 1 5 12000105
+0 0 0 0 0 0 1 6 12000106
+0 0 0 0 0 0 1 7 12000107
+0 0 0 0 0 0 1 8 12000108
+0 0 0 0 0 0 1 9 12000109
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 0 12000100
-1 0 0 0 0 0 2 2 12000101
-1 0 0 0 0 0 2 4 12000102
-1 0 0 0 0 0 2 6 12000103
-1 0 0 0 0 0 2 8 12000104
-1 0 0 0 0 0 2 10 12000105
-1 0 0 0 0 0 2 12 12000106
-1 0 0 0 0 0 2 14 12000107
-1 0 0 0 0 0 2 16 12000108
-1 0 0 0 0 0 2 18 12000109
+1 0 0 0 0 0 1 0 12000100
+1 0 0 0 0 0 1 1 12000101
+1 0 0 0 0 0 1 2 12000102
+1 0 0 0 0 0 1 3 12000103
+1 0 0 0 0 0 1 4 12000104
+1 0 0 0 0 0 1 5 12000105
+1 0 0 0 0 0 1 6 12000106
+1 0 0 0 0 0 1 7 12000107
+1 0 0 0 0 0 1 8 12000108
+1 0 0 0 0 0 1 9 12000109
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xy/vz.xl b/CarpetAttic/Cart3dTest/test/axial-xy/vz.xl
index 2bb076ec4..a01f81b61 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xy/vz.xl
+++ b/CarpetAttic/Cart3dTest/test/axial-xy/vz.xl
@@ -1,32 +1,34 @@
 # CART3DTEST::vz x (vz)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 10 13000105
-0 0 0 0 0 2 2 10 13010105
-0 0 0 0 0 4 2 10 13020105
-0 0 0 0 0 6 2 10 13030105
-0 0 0 0 0 8 2 10 13040105
-0 0 0 0 0 10 2 10 13050105
-0 0 0 0 0 12 2 10 13060105
-0 0 0 0 0 14 2 10 13070105
-0 0 0 0 0 16 2 10 13080105
-0 0 0 0 0 18 2 10 13090105
+0 0 0 0 0 0 1 5 13000105
+0 0 0 0 0 1 1 5 13010105
+0 0 0 0 0 2 1 5 13020105
+0 0 0 0 0 3 1 5 13030105
+0 0 0 0 0 4 1 5 13040105
+0 0 0 0 0 5 1 5 13050105
+0 0 0 0 0 6 1 5 13060105
+0 0 0 0 0 7 1 5 13070105
+0 0 0 0 0 8 1 5 13080105
+0 0 0 0 0 9 1 5 13090105
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 10 13000105
-1 0 0 0 0 2 2 10 13010105
-1 0 0 0 0 4 2 10 13020105
-1 0 0 0 0 6 2 10 13030105
-1 0 0 0 0 8 2 10 13040105
-1 0 0 0 0 10 2 10 13050105
-1 0 0 0 0 12 2 10 13060105
-1 0 0 0 0 14 2 10 13070105
-1 0 0 0 0 16 2 10 13080105
-1 0 0 0 0 18 2 10 13090105
+1 0 0 0 0 0 1 5 13000105
+1 0 0 0 0 1 1 5 13010105
+1 0 0 0 0 2 1 5 13020105
+1 0 0 0 0 3 1 5 13030105
+1 0 0 0 0 4 1 5 13040105
+1 0 0 0 0 5 1 5 13050105
+1 0 0 0 0 6 1 5 13060105
+1 0 0 0 0 7 1 5 13070105
+1 0 0 0 0 8 1 5 13080105
+1 0 0 0 0 9 1 5 13090105
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xy/vz.yl b/CarpetAttic/Cart3dTest/test/axial-xy/vz.yl
index 66e1d9f83..2a3d59f32 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xy/vz.yl
+++ b/CarpetAttic/Cart3dTest/test/axial-xy/vz.yl
@@ -1,32 +1,34 @@
 # CART3DTEST::vz y (vz)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 0 10 13000005
-0 0 0 0 0 0 2 10 13000105
-0 0 0 0 0 0 4 10 13000205
-0 0 0 0 0 0 6 10 13000305
-0 0 0 0 0 0 8 10 13000405
-0 0 0 0 0 0 10 10 13000505
-0 0 0 0 0 0 12 10 13000605
-0 0 0 0 0 0 14 10 13000705
-0 0 0 0 0 0 16 10 13000805
-0 0 0 0 0 0 18 10 13000905
+0 0 0 0 0 0 0 5 13000005
+0 0 0 0 0 0 1 5 13000105
+0 0 0 0 0 0 2 5 13000205
+0 0 0 0 0 0 3 5 13000305
+0 0 0 0 0 0 4 5 13000405
+0 0 0 0 0 0 5 5 13000505
+0 0 0 0 0 0 6 5 13000605
+0 0 0 0 0 0 7 5 13000705
+0 0 0 0 0 0 8 5 13000805
+0 0 0 0 0 0 9 5 13000905
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 0 10 13000005
-1 0 0 0 0 0 2 10 13000105
-1 0 0 0 0 0 4 10 13000205
-1 0 0 0 0 0 6 10 13000305
-1 0 0 0 0 0 8 10 13000405
-1 0 0 0 0 0 10 10 13000505
-1 0 0 0 0 0 12 10 13000605
-1 0 0 0 0 0 14 10 13000705
-1 0 0 0 0 0 16 10 13000805
-1 0 0 0 0 0 18 10 13000905
+1 0 0 0 0 0 0 5 13000005
+1 0 0 0 0 0 1 5 13000105
+1 0 0 0 0 0 2 5 13000205
+1 0 0 0 0 0 3 5 13000305
+1 0 0 0 0 0 4 5 13000405
+1 0 0 0 0 0 5 5 13000505
+1 0 0 0 0 0 6 5 13000605
+1 0 0 0 0 0 7 5 13000705
+1 0 0 0 0 0 8 5 13000805
+1 0 0 0 0 0 9 5 13000905
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xy/vz.zl b/CarpetAttic/Cart3dTest/test/axial-xy/vz.zl
index bea6fe2ba..54c6bf1c5 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xy/vz.zl
+++ b/CarpetAttic/Cart3dTest/test/axial-xy/vz.zl
@@ -1,32 +1,34 @@
 # CART3DTEST::vz z (vz)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 0 13000100
-0 0 0 0 0 0 2 2 13000101
-0 0 0 0 0 0 2 4 13000102
-0 0 0 0 0 0 2 6 13000103
-0 0 0 0 0 0 2 8 13000104
-0 0 0 0 0 0 2 10 13000105
-0 0 0 0 0 0 2 12 13000106
-0 0 0 0 0 0 2 14 13000107
-0 0 0 0 0 0 2 16 13000108
-0 0 0 0 0 0 2 18 13000109
+0 0 0 0 0 0 1 0 13000100
+0 0 0 0 0 0 1 1 13000101
+0 0 0 0 0 0 1 2 13000102
+0 0 0 0 0 0 1 3 13000103
+0 0 0 0 0 0 1 4 13000104
+0 0 0 0 0 0 1 5 13000105
+0 0 0 0 0 0 1 6 13000106
+0 0 0 0 0 0 1 7 13000107
+0 0 0 0 0 0 1 8 13000108
+0 0 0 0 0 0 1 9 13000109
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 0 13000100
-1 0 0 0 0 0 2 2 13000101
-1 0 0 0 0 0 2 4 13000102
-1 0 0 0 0 0 2 6 13000103
-1 0 0 0 0 0 2 8 13000104
-1 0 0 0 0 0 2 10 13000105
-1 0 0 0 0 0 2 12 13000106
-1 0 0 0 0 0 2 14 13000107
-1 0 0 0 0 0 2 16 13000108
-1 0 0 0 0 0 2 18 13000109
+1 0 0 0 0 0 1 0 13000100
+1 0 0 0 0 0 1 1 13000101
+1 0 0 0 0 0 1 2 13000102
+1 0 0 0 0 0 1 3 13000103
+1 0 0 0 0 0 1 4 13000104
+1 0 0 0 0 0 1 5 13000105
+1 0 0 0 0 0 1 6 13000106
+1 0 0 0 0 0 1 7 13000107
+1 0 0 0 0 0 1 8 13000108
+1 0 0 0 0 0 1 9 13000109
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xz.log b/CarpetAttic/Cart3dTest/test/axial-xz.log
index 5c5218648..8b02f3bdb 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xz.log
+++ b/CarpetAttic/Cart3dTest/test/axial-xz.log
@@ -52,5 +52,30 @@ AMR 2D ASCII I/O provided by CarpetIOASCII
 --------------------------------------------------------------------------------
 AMR 3D ASCII I/O provided by CarpetIOASCII
 --------------------------------------------------------------------------------
+
+dh bboxes:
+rl=0 c=0 ml=0
+exterior=([0,0,0]:[9,9,9]:[1,1,1])
+interior=([0,1,2]:[9,8,7]:[1,1,1])
+send_mg_fine=[]
+send_mg_coarse=[]
+recv_mg_fine=[]
+recv_mg_coarse=[]
+send_ref_fine=[]
+send_ref_coarse=[]
+recv_ref_fine=[]
+recv_ref_coarse=[]
+send_sync=[0:[]]
+send_ref_bnd_fine=[]
+boundaries={([0,0,0]:[9,0,9]:[1,1,1]),([0,1,0]:[9,8,1]:[1,1,1]),([0,9,0]:[9,9,9]:[1,1,1]),([0,1,8]:[9,8,9]:[1,1,1])}
+recv_sync=[0:[]]
+recv_ref_bnd_coarse=[]
+sync_not={([0,0,0]:[9,0,9]:[1,1,1]),([0,1,0]:[9,8,1]:[1,1,1]),([0,9,0]:[9,9,9]:[1,1,1]),([0,1,8]:[9,8,9]:[1,1,1])}
+
+dh bases:
+rl=0 ml=0
+exterior=([0,0,0]:[9,9,9]:[1,1,1])
+interior=([0,1,2]:[9,8,7]:[1,1,1])
+boundaries={([0,0,0]:[9,0,9]:[1,1,1]),([0,1,0]:[9,8,1]:[1,1,1]),([0,9,0]:[9,9,9]:[1,1,1]),([0,1,8]:[9,8,9]:[1,1,1])}
 --------------------------------------------------------------------------------
 Done.
diff --git a/CarpetAttic/Cart3dTest/test/axial-xz/ax.xl b/CarpetAttic/Cart3dTest/test/axial-xz/ax.xl
index 6bc76e901..7e8e323fa 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xz/ax.xl
+++ b/CarpetAttic/Cart3dTest/test/axial-xz/ax.xl
@@ -1,32 +1,34 @@
 # CART3DTEST::ax x (ax)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 10 4 31000502
-0 0 0 0 0 2 10 4 31010502
-0 0 0 0 0 4 10 4 31020502
-0 0 0 0 0 6 10 4 31030502
-0 0 0 0 0 8 10 4 31040502
-0 0 0 0 0 10 10 4 31050502
-0 0 0 0 0 12 10 4 31060502
-0 0 0 0 0 14 10 4 31070502
-0 0 0 0 0 16 10 4 31080502
-0 0 0 0 0 18 10 4 31090502
+0 0 0 0 0 0 5 2 31000502
+0 0 0 0 0 1 5 2 31010502
+0 0 0 0 0 2 5 2 31020502
+0 0 0 0 0 3 5 2 31030502
+0 0 0 0 0 4 5 2 31040502
+0 0 0 0 0 5 5 2 31050502
+0 0 0 0 0 6 5 2 31060502
+0 0 0 0 0 7 5 2 31070502
+0 0 0 0 0 8 5 2 31080502
+0 0 0 0 0 9 5 2 31090502
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 10 4 31000502
-1 0 0 0 0 2 10 4 31010502
-1 0 0 0 0 4 10 4 31020502
-1 0 0 0 0 6 10 4 31030502
-1 0 0 0 0 8 10 4 31040502
-1 0 0 0 0 10 10 4 31050502
-1 0 0 0 0 12 10 4 31060502
-1 0 0 0 0 14 10 4 31070502
-1 0 0 0 0 16 10 4 31080502
-1 0 0 0 0 18 10 4 31090502
+1 0 0 0 0 0 5 2 31000502
+1 0 0 0 0 1 5 2 31010502
+1 0 0 0 0 2 5 2 31020502
+1 0 0 0 0 3 5 2 31030502
+1 0 0 0 0 4 5 2 31040502
+1 0 0 0 0 5 5 2 31050502
+1 0 0 0 0 6 5 2 31060502
+1 0 0 0 0 7 5 2 31070502
+1 0 0 0 0 8 5 2 31080502
+1 0 0 0 0 9 5 2 31090502
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xz/ax.yl b/CarpetAttic/Cart3dTest/test/axial-xz/ax.yl
index edcc39cc1..a07f39647 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xz/ax.yl
+++ b/CarpetAttic/Cart3dTest/test/axial-xz/ax.yl
@@ -1,32 +1,34 @@
 # CART3DTEST::ax y (ax)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 0 4 31000002
-0 0 0 0 0 0 2 4 31000102
-0 0 0 0 0 0 4 4 31000202
-0 0 0 0 0 0 6 4 31000302
-0 0 0 0 0 0 8 4 31000402
-0 0 0 0 0 0 10 4 31000502
-0 0 0 0 0 0 12 4 31000602
-0 0 0 0 0 0 14 4 31000702
-0 0 0 0 0 0 16 4 31000802
-0 0 0 0 0 0 18 4 31000902
+0 0 0 0 0 0 0 2 31000002
+0 0 0 0 0 0 1 2 31000102
+0 0 0 0 0 0 2 2 31000202
+0 0 0 0 0 0 3 2 31000302
+0 0 0 0 0 0 4 2 31000402
+0 0 0 0 0 0 5 2 31000502
+0 0 0 0 0 0 6 2 31000602
+0 0 0 0 0 0 7 2 31000702
+0 0 0 0 0 0 8 2 31000802
+0 0 0 0 0 0 9 2 31000902
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 0 4 31000002
-1 0 0 0 0 0 2 4 31000102
-1 0 0 0 0 0 4 4 31000202
-1 0 0 0 0 0 6 4 31000302
-1 0 0 0 0 0 8 4 31000402
-1 0 0 0 0 0 10 4 31000502
-1 0 0 0 0 0 12 4 31000602
-1 0 0 0 0 0 14 4 31000702
-1 0 0 0 0 0 16 4 31000802
-1 0 0 0 0 0 18 4 31000902
+1 0 0 0 0 0 0 2 31000002
+1 0 0 0 0 0 1 2 31000102
+1 0 0 0 0 0 2 2 31000202
+1 0 0 0 0 0 3 2 31000302
+1 0 0 0 0 0 4 2 31000402
+1 0 0 0 0 0 5 2 31000502
+1 0 0 0 0 0 6 2 31000602
+1 0 0 0 0 0 7 2 31000702
+1 0 0 0 0 0 8 2 31000802
+1 0 0 0 0 0 9 2 31000902
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xz/ax.zl b/CarpetAttic/Cart3dTest/test/axial-xz/ax.zl
index cd0769f90..a5bca3202 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xz/ax.zl
+++ b/CarpetAttic/Cart3dTest/test/axial-xz/ax.zl
@@ -1,32 +1,34 @@
 # CART3DTEST::ax z (ax)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 10 0 31000500
-0 0 0 0 0 0 10 2 31000501
-0 0 0 0 0 0 10 4 31000502
-0 0 0 0 0 0 10 6 31000503
-0 0 0 0 0 0 10 8 31000504
-0 0 0 0 0 0 10 10 31000505
-0 0 0 0 0 0 10 12 31000506
-0 0 0 0 0 0 10 14 31000507
-0 0 0 0 0 0 10 16 31000508
-0 0 0 0 0 0 10 18 31000509
+0 0 0 0 0 0 5 0 31000500
+0 0 0 0 0 0 5 1 31000501
+0 0 0 0 0 0 5 2 31000502
+0 0 0 0 0 0 5 3 31000503
+0 0 0 0 0 0 5 4 31000504
+0 0 0 0 0 0 5 5 31000505
+0 0 0 0 0 0 5 6 31000506
+0 0 0 0 0 0 5 7 31000507
+0 0 0 0 0 0 5 8 31000508
+0 0 0 0 0 0 5 9 31000509
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 10 0 33010500
-1 0 0 0 0 0 10 2 33000500
-1 0 0 0 0 0 10 4 31000502
-1 0 0 0 0 0 10 6 31000503
-1 0 0 0 0 0 10 8 31000504
-1 0 0 0 0 0 10 10 31000505
-1 0 0 0 0 0 10 12 31000506
-1 0 0 0 0 0 10 14 31000507
-1 0 0 0 0 0 10 16 31000508
-1 0 0 0 0 0 10 18 31000509
+1 0 0 0 0 0 5 0 33010500
+1 0 0 0 0 0 5 1 33000500
+1 0 0 0 0 0 5 2 31000502
+1 0 0 0 0 0 5 3 31000503
+1 0 0 0 0 0 5 4 31000504
+1 0 0 0 0 0 5 5 31000505
+1 0 0 0 0 0 5 6 31000506
+1 0 0 0 0 0 5 7 31000507
+1 0 0 0 0 0 5 8 31000508
+1 0 0 0 0 0 5 9 31000509
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xz/ay.xl b/CarpetAttic/Cart3dTest/test/axial-xz/ay.xl
index 34087a1e2..d5d30f098 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xz/ay.xl
+++ b/CarpetAttic/Cart3dTest/test/axial-xz/ay.xl
@@ -1,32 +1,34 @@
 # CART3DTEST::ay x (ay)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 10 4 32000502
-0 0 0 0 0 2 10 4 32010502
-0 0 0 0 0 4 10 4 32020502
-0 0 0 0 0 6 10 4 32030502
-0 0 0 0 0 8 10 4 32040502
-0 0 0 0 0 10 10 4 32050502
-0 0 0 0 0 12 10 4 32060502
-0 0 0 0 0 14 10 4 32070502
-0 0 0 0 0 16 10 4 32080502
-0 0 0 0 0 18 10 4 32090502
+0 0 0 0 0 0 5 2 32000502
+0 0 0 0 0 1 5 2 32010502
+0 0 0 0 0 2 5 2 32020502
+0 0 0 0 0 3 5 2 32030502
+0 0 0 0 0 4 5 2 32040502
+0 0 0 0 0 5 5 2 32050502
+0 0 0 0 0 6 5 2 32060502
+0 0 0 0 0 7 5 2 32070502
+0 0 0 0 0 8 5 2 32080502
+0 0 0 0 0 9 5 2 32090502
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 10 4 32000502
-1 0 0 0 0 2 10 4 32010502
-1 0 0 0 0 4 10 4 32020502
-1 0 0 0 0 6 10 4 32030502
-1 0 0 0 0 8 10 4 32040502
-1 0 0 0 0 10 10 4 32050502
-1 0 0 0 0 12 10 4 32060502
-1 0 0 0 0 14 10 4 32070502
-1 0 0 0 0 16 10 4 32080502
-1 0 0 0 0 18 10 4 32090502
+1 0 0 0 0 0 5 2 32000502
+1 0 0 0 0 1 5 2 32010502
+1 0 0 0 0 2 5 2 32020502
+1 0 0 0 0 3 5 2 32030502
+1 0 0 0 0 4 5 2 32040502
+1 0 0 0 0 5 5 2 32050502
+1 0 0 0 0 6 5 2 32060502
+1 0 0 0 0 7 5 2 32070502
+1 0 0 0 0 8 5 2 32080502
+1 0 0 0 0 9 5 2 32090502
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xz/ay.yl b/CarpetAttic/Cart3dTest/test/axial-xz/ay.yl
index aa8ee74a9..e7d99e184 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xz/ay.yl
+++ b/CarpetAttic/Cart3dTest/test/axial-xz/ay.yl
@@ -1,32 +1,34 @@
 # CART3DTEST::ay y (ay)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 0 4 32000002
-0 0 0 0 0 0 2 4 32000102
-0 0 0 0 0 0 4 4 32000202
-0 0 0 0 0 0 6 4 32000302
-0 0 0 0 0 0 8 4 32000402
-0 0 0 0 0 0 10 4 32000502
-0 0 0 0 0 0 12 4 32000602
-0 0 0 0 0 0 14 4 32000702
-0 0 0 0 0 0 16 4 32000802
-0 0 0 0 0 0 18 4 32000902
+0 0 0 0 0 0 0 2 32000002
+0 0 0 0 0 0 1 2 32000102
+0 0 0 0 0 0 2 2 32000202
+0 0 0 0 0 0 3 2 32000302
+0 0 0 0 0 0 4 2 32000402
+0 0 0 0 0 0 5 2 32000502
+0 0 0 0 0 0 6 2 32000602
+0 0 0 0 0 0 7 2 32000702
+0 0 0 0 0 0 8 2 32000802
+0 0 0 0 0 0 9 2 32000902
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 0 4 32000002
-1 0 0 0 0 0 2 4 32000102
-1 0 0 0 0 0 4 4 32000202
-1 0 0 0 0 0 6 4 32000302
-1 0 0 0 0 0 8 4 32000402
-1 0 0 0 0 0 10 4 32000502
-1 0 0 0 0 0 12 4 32000602
-1 0 0 0 0 0 14 4 32000702
-1 0 0 0 0 0 16 4 32000802
-1 0 0 0 0 0 18 4 32000902
+1 0 0 0 0 0 0 2 32000002
+1 0 0 0 0 0 1 2 32000102
+1 0 0 0 0 0 2 2 32000202
+1 0 0 0 0 0 3 2 32000302
+1 0 0 0 0 0 4 2 32000402
+1 0 0 0 0 0 5 2 32000502
+1 0 0 0 0 0 6 2 32000602
+1 0 0 0 0 0 7 2 32000702
+1 0 0 0 0 0 8 2 32000802
+1 0 0 0 0 0 9 2 32000902
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xz/ay.zl b/CarpetAttic/Cart3dTest/test/axial-xz/ay.zl
index c25643d2f..79e34c54f 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xz/ay.zl
+++ b/CarpetAttic/Cart3dTest/test/axial-xz/ay.zl
@@ -1,32 +1,34 @@
 # CART3DTEST::ay z (ay)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 10 0 32000500
-0 0 0 0 0 0 10 2 32000501
-0 0 0 0 0 0 10 4 32000502
-0 0 0 0 0 0 10 6 32000503
-0 0 0 0 0 0 10 8 32000504
-0 0 0 0 0 0 10 10 32000505
-0 0 0 0 0 0 10 12 32000506
-0 0 0 0 0 0 10 14 32000507
-0 0 0 0 0 0 10 16 32000508
-0 0 0 0 0 0 10 18 32000509
+0 0 0 0 0 0 5 0 32000500
+0 0 0 0 0 0 5 1 32000501
+0 0 0 0 0 0 5 2 32000502
+0 0 0 0 0 0 5 3 32000503
+0 0 0 0 0 0 5 4 32000504
+0 0 0 0 0 0 5 5 32000505
+0 0 0 0 0 0 5 6 32000506
+0 0 0 0 0 0 5 7 32000507
+0 0 0 0 0 0 5 8 32000508
+0 0 0 0 0 0 5 9 32000509
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 10 0 32010500
-1 0 0 0 0 0 10 2 32000500
-1 0 0 0 0 0 10 4 32000502
-1 0 0 0 0 0 10 6 32000503
-1 0 0 0 0 0 10 8 32000504
-1 0 0 0 0 0 10 10 32000505
-1 0 0 0 0 0 10 12 32000506
-1 0 0 0 0 0 10 14 32000507
-1 0 0 0 0 0 10 16 32000508
-1 0 0 0 0 0 10 18 32000509
+1 0 0 0 0 0 5 0 32010500
+1 0 0 0 0 0 5 1 32000500
+1 0 0 0 0 0 5 2 32000502
+1 0 0 0 0 0 5 3 32000503
+1 0 0 0 0 0 5 4 32000504
+1 0 0 0 0 0 5 5 32000505
+1 0 0 0 0 0 5 6 32000506
+1 0 0 0 0 0 5 7 32000507
+1 0 0 0 0 0 5 8 32000508
+1 0 0 0 0 0 5 9 32000509
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xz/az.xl b/CarpetAttic/Cart3dTest/test/axial-xz/az.xl
index 4e6365741..2801cce26 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xz/az.xl
+++ b/CarpetAttic/Cart3dTest/test/axial-xz/az.xl
@@ -1,32 +1,34 @@
 # CART3DTEST::az x (az)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 10 4 33000502
-0 0 0 0 0 2 10 4 33010502
-0 0 0 0 0 4 10 4 33020502
-0 0 0 0 0 6 10 4 33030502
-0 0 0 0 0 8 10 4 33040502
-0 0 0 0 0 10 10 4 33050502
-0 0 0 0 0 12 10 4 33060502
-0 0 0 0 0 14 10 4 33070502
-0 0 0 0 0 16 10 4 33080502
-0 0 0 0 0 18 10 4 33090502
+0 0 0 0 0 0 5 2 33000502
+0 0 0 0 0 1 5 2 33010502
+0 0 0 0 0 2 5 2 33020502
+0 0 0 0 0 3 5 2 33030502
+0 0 0 0 0 4 5 2 33040502
+0 0 0 0 0 5 5 2 33050502
+0 0 0 0 0 6 5 2 33060502
+0 0 0 0 0 7 5 2 33070502
+0 0 0 0 0 8 5 2 33080502
+0 0 0 0 0 9 5 2 33090502
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 10 4 33000502
-1 0 0 0 0 2 10 4 33010502
-1 0 0 0 0 4 10 4 33020502
-1 0 0 0 0 6 10 4 33030502
-1 0 0 0 0 8 10 4 33040502
-1 0 0 0 0 10 10 4 33050502
-1 0 0 0 0 12 10 4 33060502
-1 0 0 0 0 14 10 4 33070502
-1 0 0 0 0 16 10 4 33080502
-1 0 0 0 0 18 10 4 33090502
+1 0 0 0 0 0 5 2 33000502
+1 0 0 0 0 1 5 2 33010502
+1 0 0 0 0 2 5 2 33020502
+1 0 0 0 0 3 5 2 33030502
+1 0 0 0 0 4 5 2 33040502
+1 0 0 0 0 5 5 2 33050502
+1 0 0 0 0 6 5 2 33060502
+1 0 0 0 0 7 5 2 33070502
+1 0 0 0 0 8 5 2 33080502
+1 0 0 0 0 9 5 2 33090502
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xz/az.yl b/CarpetAttic/Cart3dTest/test/axial-xz/az.yl
index 80336d403..1029ff637 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xz/az.yl
+++ b/CarpetAttic/Cart3dTest/test/axial-xz/az.yl
@@ -1,32 +1,34 @@
 # CART3DTEST::az y (az)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 0 4 33000002
-0 0 0 0 0 0 2 4 33000102
-0 0 0 0 0 0 4 4 33000202
-0 0 0 0 0 0 6 4 33000302
-0 0 0 0 0 0 8 4 33000402
-0 0 0 0 0 0 10 4 33000502
-0 0 0 0 0 0 12 4 33000602
-0 0 0 0 0 0 14 4 33000702
-0 0 0 0 0 0 16 4 33000802
-0 0 0 0 0 0 18 4 33000902
+0 0 0 0 0 0 0 2 33000002
+0 0 0 0 0 0 1 2 33000102
+0 0 0 0 0 0 2 2 33000202
+0 0 0 0 0 0 3 2 33000302
+0 0 0 0 0 0 4 2 33000402
+0 0 0 0 0 0 5 2 33000502
+0 0 0 0 0 0 6 2 33000602
+0 0 0 0 0 0 7 2 33000702
+0 0 0 0 0 0 8 2 33000802
+0 0 0 0 0 0 9 2 33000902
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 0 4 33000002
-1 0 0 0 0 0 2 4 33000102
-1 0 0 0 0 0 4 4 33000202
-1 0 0 0 0 0 6 4 33000302
-1 0 0 0 0 0 8 4 33000402
-1 0 0 0 0 0 10 4 33000502
-1 0 0 0 0 0 12 4 33000602
-1 0 0 0 0 0 14 4 33000702
-1 0 0 0 0 0 16 4 33000802
-1 0 0 0 0 0 18 4 33000902
+1 0 0 0 0 0 0 2 33000002
+1 0 0 0 0 0 1 2 33000102
+1 0 0 0 0 0 2 2 33000202
+1 0 0 0 0 0 3 2 33000302
+1 0 0 0 0 0 4 2 33000402
+1 0 0 0 0 0 5 2 33000502
+1 0 0 0 0 0 6 2 33000602
+1 0 0 0 0 0 7 2 33000702
+1 0 0 0 0 0 8 2 33000802
+1 0 0 0 0 0 9 2 33000902
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xz/az.zl b/CarpetAttic/Cart3dTest/test/axial-xz/az.zl
index d9d4cef9d..3777f3043 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xz/az.zl
+++ b/CarpetAttic/Cart3dTest/test/axial-xz/az.zl
@@ -1,32 +1,34 @@
 # CART3DTEST::az z (az)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 10 0 33000500
-0 0 0 0 0 0 10 2 33000501
-0 0 0 0 0 0 10 4 33000502
-0 0 0 0 0 0 10 6 33000503
-0 0 0 0 0 0 10 8 33000504
-0 0 0 0 0 0 10 10 33000505
-0 0 0 0 0 0 10 12 33000506
-0 0 0 0 0 0 10 14 33000507
-0 0 0 0 0 0 10 16 33000508
-0 0 0 0 0 0 10 18 33000509
+0 0 0 0 0 0 5 0 33000500
+0 0 0 0 0 0 5 1 33000501
+0 0 0 0 0 0 5 2 33000502
+0 0 0 0 0 0 5 3 33000503
+0 0 0 0 0 0 5 4 33000504
+0 0 0 0 0 0 5 5 33000505
+0 0 0 0 0 0 5 6 33000506
+0 0 0 0 0 0 5 7 33000507
+0 0 0 0 0 0 5 8 33000508
+0 0 0 0 0 0 5 9 33000509
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 10 0 -33010501
-1 0 0 0 0 0 10 2 -33010500
-1 0 0 0 0 0 10 4 33000502
-1 0 0 0 0 0 10 6 33000503
-1 0 0 0 0 0 10 8 33000504
-1 0 0 0 0 0 10 10 33000505
-1 0 0 0 0 0 10 12 33000506
-1 0 0 0 0 0 10 14 33000507
-1 0 0 0 0 0 10 16 33000508
-1 0 0 0 0 0 10 18 33000509
+1 0 0 0 0 0 5 0 -33010501
+1 0 0 0 0 0 5 1 -33010500
+1 0 0 0 0 0 5 2 33000502
+1 0 0 0 0 0 5 3 33000503
+1 0 0 0 0 0 5 4 33000504
+1 0 0 0 0 0 5 5 33000505
+1 0 0 0 0 0 5 6 33000506
+1 0 0 0 0 0 5 7 33000507
+1 0 0 0 0 0 5 8 33000508
+1 0 0 0 0 0 5 9 33000509
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xz/cart3d_x.xl b/CarpetAttic/Cart3dTest/test/axial-xz/cart3d_x.xl
index 23d821116..02e361372 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xz/cart3d_x.xl
+++ b/CarpetAttic/Cart3dTest/test/axial-xz/cart3d_x.xl
@@ -1,32 +1,34 @@
 # GRID::cart3d_x x (cart3d_x)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 10 4 0.15
-0 0 0 0 0 2 10 4 0.45
-0 0 0 0 0 4 10 4 0.75
-0 0 0 0 0 6 10 4 1.05
-0 0 0 0 0 8 10 4 1.35
-0 0 0 0 0 10 10 4 1.65
-0 0 0 0 0 12 10 4 1.95
-0 0 0 0 0 14 10 4 2.25
-0 0 0 0 0 16 10 4 2.55
-0 0 0 0 0 18 10 4 2.85
+0 0 0 0 0 0 5 2 0.15
+0 0 0 0 0 1 5 2 0.45
+0 0 0 0 0 2 5 2 0.75
+0 0 0 0 0 3 5 2 1.05
+0 0 0 0 0 4 5 2 1.35
+0 0 0 0 0 5 5 2 1.65
+0 0 0 0 0 6 5 2 1.95
+0 0 0 0 0 7 5 2 2.25
+0 0 0 0 0 8 5 2 2.55
+0 0 0 0 0 9 5 2 2.85
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 10 4 0.15
-1 0 0 0 0 2 10 4 0.45
-1 0 0 0 0 4 10 4 0.75
-1 0 0 0 0 6 10 4 1.05
-1 0 0 0 0 8 10 4 1.35
-1 0 0 0 0 10 10 4 1.65
-1 0 0 0 0 12 10 4 1.95
-1 0 0 0 0 14 10 4 2.25
-1 0 0 0 0 16 10 4 2.55
-1 0 0 0 0 18 10 4 2.85
+1 0 0 0 0 0 5 2 0.15
+1 0 0 0 0 1 5 2 0.45
+1 0 0 0 0 2 5 2 0.75
+1 0 0 0 0 3 5 2 1.05
+1 0 0 0 0 4 5 2 1.35
+1 0 0 0 0 5 5 2 1.65
+1 0 0 0 0 6 5 2 1.95
+1 0 0 0 0 7 5 2 2.25
+1 0 0 0 0 8 5 2 2.55
+1 0 0 0 0 9 5 2 2.85
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xz/cart3d_x.yl b/CarpetAttic/Cart3dTest/test/axial-xz/cart3d_x.yl
index 553154ac4..fab75e1a2 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xz/cart3d_x.yl
+++ b/CarpetAttic/Cart3dTest/test/axial-xz/cart3d_x.yl
@@ -1,32 +1,34 @@
 # GRID::cart3d_x y (cart3d_x)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 0 4 0.15
-0 0 0 0 0 0 2 4 0.15
-0 0 0 0 0 0 4 4 0.15
-0 0 0 0 0 0 6 4 0.15
-0 0 0 0 0 0 8 4 0.15
-0 0 0 0 0 0 10 4 0.15
-0 0 0 0 0 0 12 4 0.15
-0 0 0 0 0 0 14 4 0.15
-0 0 0 0 0 0 16 4 0.15
-0 0 0 0 0 0 18 4 0.15
+0 0 0 0 0 0 0 2 0.15
+0 0 0 0 0 0 1 2 0.15
+0 0 0 0 0 0 2 2 0.15
+0 0 0 0 0 0 3 2 0.15
+0 0 0 0 0 0 4 2 0.15
+0 0 0 0 0 0 5 2 0.15
+0 0 0 0 0 0 6 2 0.15
+0 0 0 0 0 0 7 2 0.15
+0 0 0 0 0 0 8 2 0.15
+0 0 0 0 0 0 9 2 0.15
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 0 4 0.15
-1 0 0 0 0 0 2 4 0.15
-1 0 0 0 0 0 4 4 0.15
-1 0 0 0 0 0 6 4 0.15
-1 0 0 0 0 0 8 4 0.15
-1 0 0 0 0 0 10 4 0.15
-1 0 0 0 0 0 12 4 0.15
-1 0 0 0 0 0 14 4 0.15
-1 0 0 0 0 0 16 4 0.15
-1 0 0 0 0 0 18 4 0.15
+1 0 0 0 0 0 0 2 0.15
+1 0 0 0 0 0 1 2 0.15
+1 0 0 0 0 0 2 2 0.15
+1 0 0 0 0 0 3 2 0.15
+1 0 0 0 0 0 4 2 0.15
+1 0 0 0 0 0 5 2 0.15
+1 0 0 0 0 0 6 2 0.15
+1 0 0 0 0 0 7 2 0.15
+1 0 0 0 0 0 8 2 0.15
+1 0 0 0 0 0 9 2 0.15
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xz/cart3d_x.zl b/CarpetAttic/Cart3dTest/test/axial-xz/cart3d_x.zl
index fdef1c784..bff3dd14d 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xz/cart3d_x.zl
+++ b/CarpetAttic/Cart3dTest/test/axial-xz/cart3d_x.zl
@@ -1,32 +1,34 @@
 # GRID::cart3d_x z (cart3d_x)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 10 0 0.15
-0 0 0 0 0 0 10 2 0.15
-0 0 0 0 0 0 10 4 0.15
-0 0 0 0 0 0 10 6 0.15
-0 0 0 0 0 0 10 8 0.15
-0 0 0 0 0 0 10 10 0.15
-0 0 0 0 0 0 10 12 0.15
-0 0 0 0 0 0 10 14 0.15
-0 0 0 0 0 0 10 16 0.15
-0 0 0 0 0 0 10 18 0.15
+0 0 0 0 0 0 5 0 0.15
+0 0 0 0 0 0 5 1 0.15
+0 0 0 0 0 0 5 2 0.15
+0 0 0 0 0 0 5 3 0.15
+0 0 0 0 0 0 5 4 0.15
+0 0 0 0 0 0 5 5 0.15
+0 0 0 0 0 0 5 6 0.15
+0 0 0 0 0 0 5 7 0.15
+0 0 0 0 0 0 5 8 0.15
+0 0 0 0 0 0 5 9 0.15
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 10 0 0.15
-1 0 0 0 0 0 10 2 0.15
-1 0 0 0 0 0 10 4 0.15
-1 0 0 0 0 0 10 6 0.15
-1 0 0 0 0 0 10 8 0.15
-1 0 0 0 0 0 10 10 0.15
-1 0 0 0 0 0 10 12 0.15
-1 0 0 0 0 0 10 14 0.15
-1 0 0 0 0 0 10 16 0.15
-1 0 0 0 0 0 10 18 0.15
+1 0 0 0 0 0 5 0 0.15
+1 0 0 0 0 0 5 1 0.15
+1 0 0 0 0 0 5 2 0.15
+1 0 0 0 0 0 5 3 0.15
+1 0 0 0 0 0 5 4 0.15
+1 0 0 0 0 0 5 5 0.15
+1 0 0 0 0 0 5 6 0.15
+1 0 0 0 0 0 5 7 0.15
+1 0 0 0 0 0 5 8 0.15
+1 0 0 0 0 0 5 9 0.15
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xz/cart3d_y.xl b/CarpetAttic/Cart3dTest/test/axial-xz/cart3d_y.xl
index 33f961e30..025be7f91 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xz/cart3d_y.xl
+++ b/CarpetAttic/Cart3dTest/test/axial-xz/cart3d_y.xl
@@ -1,32 +1,34 @@
 # GRID::cart3d_y x (cart3d_y)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 10 4 0.15
-0 0 0 0 0 2 10 4 0.15
-0 0 0 0 0 4 10 4 0.15
-0 0 0 0 0 6 10 4 0.15
-0 0 0 0 0 8 10 4 0.15
-0 0 0 0 0 10 10 4 0.15
-0 0 0 0 0 12 10 4 0.15
-0 0 0 0 0 14 10 4 0.15
-0 0 0 0 0 16 10 4 0.15
-0 0 0 0 0 18 10 4 0.15
+0 0 0 0 0 0 5 2 0.15
+0 0 0 0 0 1 5 2 0.15
+0 0 0 0 0 2 5 2 0.15
+0 0 0 0 0 3 5 2 0.15
+0 0 0 0 0 4 5 2 0.15
+0 0 0 0 0 5 5 2 0.15
+0 0 0 0 0 6 5 2 0.15
+0 0 0 0 0 7 5 2 0.15
+0 0 0 0 0 8 5 2 0.15
+0 0 0 0 0 9 5 2 0.15
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 10 4 0.15
-1 0 0 0 0 2 10 4 0.15
-1 0 0 0 0 4 10 4 0.15
-1 0 0 0 0 6 10 4 0.15
-1 0 0 0 0 8 10 4 0.15
-1 0 0 0 0 10 10 4 0.15
-1 0 0 0 0 12 10 4 0.15
-1 0 0 0 0 14 10 4 0.15
-1 0 0 0 0 16 10 4 0.15
-1 0 0 0 0 18 10 4 0.15
+1 0 0 0 0 0 5 2 0.15
+1 0 0 0 0 1 5 2 0.15
+1 0 0 0 0 2 5 2 0.15
+1 0 0 0 0 3 5 2 0.15
+1 0 0 0 0 4 5 2 0.15
+1 0 0 0 0 5 5 2 0.15
+1 0 0 0 0 6 5 2 0.15
+1 0 0 0 0 7 5 2 0.15
+1 0 0 0 0 8 5 2 0.15
+1 0 0 0 0 9 5 2 0.15
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xz/cart3d_y.yl b/CarpetAttic/Cart3dTest/test/axial-xz/cart3d_y.yl
index 1be70c499..7363ffc37 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xz/cart3d_y.yl
+++ b/CarpetAttic/Cart3dTest/test/axial-xz/cart3d_y.yl
@@ -1,32 +1,34 @@
 # GRID::cart3d_y y (cart3d_y)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 0 4 -1.35
-0 0 0 0 0 0 2 4 -1.05
-0 0 0 0 0 0 4 4 -0.75
-0 0 0 0 0 0 6 4 -0.45
-0 0 0 0 0 0 8 4 -0.15
-0 0 0 0 0 0 10 4 0.15
-0 0 0 0 0 0 12 4 0.45
-0 0 0 0 0 0 14 4 0.75
-0 0 0 0 0 0 16 4 1.05
-0 0 0 0 0 0 18 4 1.35
+0 0 0 0 0 0 0 2 -1.35
+0 0 0 0 0 0 1 2 -1.05
+0 0 0 0 0 0 2 2 -0.75
+0 0 0 0 0 0 3 2 -0.45
+0 0 0 0 0 0 4 2 -0.15
+0 0 0 0 0 0 5 2 0.15
+0 0 0 0 0 0 6 2 0.45
+0 0 0 0 0 0 7 2 0.75
+0 0 0 0 0 0 8 2 1.05
+0 0 0 0 0 0 9 2 1.35
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 0 4 -1.35
-1 0 0 0 0 0 2 4 -1.05
-1 0 0 0 0 0 4 4 -0.75
-1 0 0 0 0 0 6 4 -0.45
-1 0 0 0 0 0 8 4 -0.15
-1 0 0 0 0 0 10 4 0.15
-1 0 0 0 0 0 12 4 0.45
-1 0 0 0 0 0 14 4 0.75
-1 0 0 0 0 0 16 4 1.05
-1 0 0 0 0 0 18 4 1.35
+1 0 0 0 0 0 0 2 -1.35
+1 0 0 0 0 0 1 2 -1.05
+1 0 0 0 0 0 2 2 -0.75
+1 0 0 0 0 0 3 2 -0.45
+1 0 0 0 0 0 4 2 -0.15
+1 0 0 0 0 0 5 2 0.15
+1 0 0 0 0 0 6 2 0.45
+1 0 0 0 0 0 7 2 0.75
+1 0 0 0 0 0 8 2 1.05
+1 0 0 0 0 0 9 2 1.35
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xz/cart3d_y.zl b/CarpetAttic/Cart3dTest/test/axial-xz/cart3d_y.zl
index 753722bda..b06b80d04 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xz/cart3d_y.zl
+++ b/CarpetAttic/Cart3dTest/test/axial-xz/cart3d_y.zl
@@ -1,32 +1,34 @@
 # GRID::cart3d_y z (cart3d_y)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 10 0 0.15
-0 0 0 0 0 0 10 2 0.15
-0 0 0 0 0 0 10 4 0.15
-0 0 0 0 0 0 10 6 0.15
-0 0 0 0 0 0 10 8 0.15
-0 0 0 0 0 0 10 10 0.15
-0 0 0 0 0 0 10 12 0.15
-0 0 0 0 0 0 10 14 0.15
-0 0 0 0 0 0 10 16 0.15
-0 0 0 0 0 0 10 18 0.15
+0 0 0 0 0 0 5 0 0.15
+0 0 0 0 0 0 5 1 0.15
+0 0 0 0 0 0 5 2 0.15
+0 0 0 0 0 0 5 3 0.15
+0 0 0 0 0 0 5 4 0.15
+0 0 0 0 0 0 5 5 0.15
+0 0 0 0 0 0 5 6 0.15
+0 0 0 0 0 0 5 7 0.15
+0 0 0 0 0 0 5 8 0.15
+0 0 0 0 0 0 5 9 0.15
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 10 0 0.15
-1 0 0 0 0 0 10 2 0.15
-1 0 0 0 0 0 10 4 0.15
-1 0 0 0 0 0 10 6 0.15
-1 0 0 0 0 0 10 8 0.15
-1 0 0 0 0 0 10 10 0.15
-1 0 0 0 0 0 10 12 0.15
-1 0 0 0 0 0 10 14 0.15
-1 0 0 0 0 0 10 16 0.15
-1 0 0 0 0 0 10 18 0.15
+1 0 0 0 0 0 5 0 0.15
+1 0 0 0 0 0 5 1 0.15
+1 0 0 0 0 0 5 2 0.15
+1 0 0 0 0 0 5 3 0.15
+1 0 0 0 0 0 5 4 0.15
+1 0 0 0 0 0 5 5 0.15
+1 0 0 0 0 0 5 6 0.15
+1 0 0 0 0 0 5 7 0.15
+1 0 0 0 0 0 5 8 0.15
+1 0 0 0 0 0 5 9 0.15
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xz/cart3d_z.xl b/CarpetAttic/Cart3dTest/test/axial-xz/cart3d_z.xl
index c3460bfd7..8c4b8799d 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xz/cart3d_z.xl
+++ b/CarpetAttic/Cart3dTest/test/axial-xz/cart3d_z.xl
@@ -1,32 +1,34 @@
 # GRID::cart3d_z x (cart3d_z)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 10 4 0.15
-0 0 0 0 0 2 10 4 0.15
-0 0 0 0 0 4 10 4 0.15
-0 0 0 0 0 6 10 4 0.15
-0 0 0 0 0 8 10 4 0.15
-0 0 0 0 0 10 10 4 0.15
-0 0 0 0 0 12 10 4 0.15
-0 0 0 0 0 14 10 4 0.15
-0 0 0 0 0 16 10 4 0.15
-0 0 0 0 0 18 10 4 0.15
+0 0 0 0 0 0 5 2 0.15
+0 0 0 0 0 1 5 2 0.15
+0 0 0 0 0 2 5 2 0.15
+0 0 0 0 0 3 5 2 0.15
+0 0 0 0 0 4 5 2 0.15
+0 0 0 0 0 5 5 2 0.15
+0 0 0 0 0 6 5 2 0.15
+0 0 0 0 0 7 5 2 0.15
+0 0 0 0 0 8 5 2 0.15
+0 0 0 0 0 9 5 2 0.15
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 10 4 0.15
-1 0 0 0 0 2 10 4 0.15
-1 0 0 0 0 4 10 4 0.15
-1 0 0 0 0 6 10 4 0.15
-1 0 0 0 0 8 10 4 0.15
-1 0 0 0 0 10 10 4 0.15
-1 0 0 0 0 12 10 4 0.15
-1 0 0 0 0 14 10 4 0.15
-1 0 0 0 0 16 10 4 0.15
-1 0 0 0 0 18 10 4 0.15
+1 0 0 0 0 0 5 2 0.15
+1 0 0 0 0 1 5 2 0.15
+1 0 0 0 0 2 5 2 0.15
+1 0 0 0 0 3 5 2 0.15
+1 0 0 0 0 4 5 2 0.15
+1 0 0 0 0 5 5 2 0.15
+1 0 0 0 0 6 5 2 0.15
+1 0 0 0 0 7 5 2 0.15
+1 0 0 0 0 8 5 2 0.15
+1 0 0 0 0 9 5 2 0.15
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xz/cart3d_z.yl b/CarpetAttic/Cart3dTest/test/axial-xz/cart3d_z.yl
index 40794f9e8..18e371387 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xz/cart3d_z.yl
+++ b/CarpetAttic/Cart3dTest/test/axial-xz/cart3d_z.yl
@@ -1,32 +1,34 @@
 # GRID::cart3d_z y (cart3d_z)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 0 4 0.15
-0 0 0 0 0 0 2 4 0.15
-0 0 0 0 0 0 4 4 0.15
-0 0 0 0 0 0 6 4 0.15
-0 0 0 0 0 0 8 4 0.15
-0 0 0 0 0 0 10 4 0.15
-0 0 0 0 0 0 12 4 0.15
-0 0 0 0 0 0 14 4 0.15
-0 0 0 0 0 0 16 4 0.15
-0 0 0 0 0 0 18 4 0.15
+0 0 0 0 0 0 0 2 0.15
+0 0 0 0 0 0 1 2 0.15
+0 0 0 0 0 0 2 2 0.15
+0 0 0 0 0 0 3 2 0.15
+0 0 0 0 0 0 4 2 0.15
+0 0 0 0 0 0 5 2 0.15
+0 0 0 0 0 0 6 2 0.15
+0 0 0 0 0 0 7 2 0.15
+0 0 0 0 0 0 8 2 0.15
+0 0 0 0 0 0 9 2 0.15
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 0 4 0.15
-1 0 0 0 0 0 2 4 0.15
-1 0 0 0 0 0 4 4 0.15
-1 0 0 0 0 0 6 4 0.15
-1 0 0 0 0 0 8 4 0.15
-1 0 0 0 0 0 10 4 0.15
-1 0 0 0 0 0 12 4 0.15
-1 0 0 0 0 0 14 4 0.15
-1 0 0 0 0 0 16 4 0.15
-1 0 0 0 0 0 18 4 0.15
+1 0 0 0 0 0 0 2 0.15
+1 0 0 0 0 0 1 2 0.15
+1 0 0 0 0 0 2 2 0.15
+1 0 0 0 0 0 3 2 0.15
+1 0 0 0 0 0 4 2 0.15
+1 0 0 0 0 0 5 2 0.15
+1 0 0 0 0 0 6 2 0.15
+1 0 0 0 0 0 7 2 0.15
+1 0 0 0 0 0 8 2 0.15
+1 0 0 0 0 0 9 2 0.15
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xz/cart3d_z.zl b/CarpetAttic/Cart3dTest/test/axial-xz/cart3d_z.zl
index a5252f652..29e21dd85 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xz/cart3d_z.zl
+++ b/CarpetAttic/Cart3dTest/test/axial-xz/cart3d_z.zl
@@ -1,32 +1,34 @@
 # GRID::cart3d_z z (cart3d_z)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 10 0 -0.45
-0 0 0 0 0 0 10 2 -0.15
-0 0 0 0 0 0 10 4 0.15
-0 0 0 0 0 0 10 6 0.45
-0 0 0 0 0 0 10 8 0.75
-0 0 0 0 0 0 10 10 1.05
-0 0 0 0 0 0 10 12 1.35
-0 0 0 0 0 0 10 14 1.65
-0 0 0 0 0 0 10 16 1.95
-0 0 0 0 0 0 10 18 2.25
+0 0 0 0 0 0 5 0 -0.45
+0 0 0 0 0 0 5 1 -0.15
+0 0 0 0 0 0 5 2 0.15
+0 0 0 0 0 0 5 3 0.45
+0 0 0 0 0 0 5 4 0.75
+0 0 0 0 0 0 5 5 1.05
+0 0 0 0 0 0 5 6 1.35
+0 0 0 0 0 0 5 7 1.65
+0 0 0 0 0 0 5 8 1.95
+0 0 0 0 0 0 5 9 2.25
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 10 0 -0.45
-1 0 0 0 0 0 10 2 -0.15
-1 0 0 0 0 0 10 4 0.15
-1 0 0 0 0 0 10 6 0.45
-1 0 0 0 0 0 10 8 0.75
-1 0 0 0 0 0 10 10 1.05
-1 0 0 0 0 0 10 12 1.35
-1 0 0 0 0 0 10 14 1.65
-1 0 0 0 0 0 10 16 1.95
-1 0 0 0 0 0 10 18 2.25
+1 0 0 0 0 0 5 0 -0.45
+1 0 0 0 0 0 5 1 -0.15
+1 0 0 0 0 0 5 2 0.15
+1 0 0 0 0 0 5 3 0.45
+1 0 0 0 0 0 5 4 0.75
+1 0 0 0 0 0 5 5 1.05
+1 0 0 0 0 0 5 6 1.35
+1 0 0 0 0 0 5 7 1.65
+1 0 0 0 0 0 5 8 1.95
+1 0 0 0 0 0 5 9 2.25
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xz/fxx.xl b/CarpetAttic/Cart3dTest/test/axial-xz/fxx.xl
index bf37d6197..95f2f58d9 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xz/fxx.xl
+++ b/CarpetAttic/Cart3dTest/test/axial-xz/fxx.xl
@@ -1,32 +1,34 @@
 # CART3DTEST::fxx x (fxx)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 10 4 41000502
-0 0 0 0 0 2 10 4 41010502
-0 0 0 0 0 4 10 4 41020502
-0 0 0 0 0 6 10 4 41030502
-0 0 0 0 0 8 10 4 41040502
-0 0 0 0 0 10 10 4 41050502
-0 0 0 0 0 12 10 4 41060502
-0 0 0 0 0 14 10 4 41070502
-0 0 0 0 0 16 10 4 41080502
-0 0 0 0 0 18 10 4 41090502
+0 0 0 0 0 0 5 2 41000502
+0 0 0 0 0 1 5 2 41010502
+0 0 0 0 0 2 5 2 41020502
+0 0 0 0 0 3 5 2 41030502
+0 0 0 0 0 4 5 2 41040502
+0 0 0 0 0 5 5 2 41050502
+0 0 0 0 0 6 5 2 41060502
+0 0 0 0 0 7 5 2 41070502
+0 0 0 0 0 8 5 2 41080502
+0 0 0 0 0 9 5 2 41090502
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 10 4 41000502
-1 0 0 0 0 2 10 4 41010502
-1 0 0 0 0 4 10 4 41020502
-1 0 0 0 0 6 10 4 41030502
-1 0 0 0 0 8 10 4 41040502
-1 0 0 0 0 10 10 4 41050502
-1 0 0 0 0 12 10 4 41060502
-1 0 0 0 0 14 10 4 41070502
-1 0 0 0 0 16 10 4 41080502
-1 0 0 0 0 18 10 4 41090502
+1 0 0 0 0 0 5 2 41000502
+1 0 0 0 0 1 5 2 41010502
+1 0 0 0 0 2 5 2 41020502
+1 0 0 0 0 3 5 2 41030502
+1 0 0 0 0 4 5 2 41040502
+1 0 0 0 0 5 5 2 41050502
+1 0 0 0 0 6 5 2 41060502
+1 0 0 0 0 7 5 2 41070502
+1 0 0 0 0 8 5 2 41080502
+1 0 0 0 0 9 5 2 41090502
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xz/fxx.yl b/CarpetAttic/Cart3dTest/test/axial-xz/fxx.yl
index 762bd6104..5f7957931 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xz/fxx.yl
+++ b/CarpetAttic/Cart3dTest/test/axial-xz/fxx.yl
@@ -1,32 +1,34 @@
 # CART3DTEST::fxx y (fxx)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 0 4 41000002
-0 0 0 0 0 0 2 4 41000102
-0 0 0 0 0 0 4 4 41000202
-0 0 0 0 0 0 6 4 41000302
-0 0 0 0 0 0 8 4 41000402
-0 0 0 0 0 0 10 4 41000502
-0 0 0 0 0 0 12 4 41000602
-0 0 0 0 0 0 14 4 41000702
-0 0 0 0 0 0 16 4 41000802
-0 0 0 0 0 0 18 4 41000902
+0 0 0 0 0 0 0 2 41000002
+0 0 0 0 0 0 1 2 41000102
+0 0 0 0 0 0 2 2 41000202
+0 0 0 0 0 0 3 2 41000302
+0 0 0 0 0 0 4 2 41000402
+0 0 0 0 0 0 5 2 41000502
+0 0 0 0 0 0 6 2 41000602
+0 0 0 0 0 0 7 2 41000702
+0 0 0 0 0 0 8 2 41000802
+0 0 0 0 0 0 9 2 41000902
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 0 4 41000002
-1 0 0 0 0 0 2 4 41000102
-1 0 0 0 0 0 4 4 41000202
-1 0 0 0 0 0 6 4 41000302
-1 0 0 0 0 0 8 4 41000402
-1 0 0 0 0 0 10 4 41000502
-1 0 0 0 0 0 12 4 41000602
-1 0 0 0 0 0 14 4 41000702
-1 0 0 0 0 0 16 4 41000802
-1 0 0 0 0 0 18 4 41000902
+1 0 0 0 0 0 0 2 41000002
+1 0 0 0 0 0 1 2 41000102
+1 0 0 0 0 0 2 2 41000202
+1 0 0 0 0 0 3 2 41000302
+1 0 0 0 0 0 4 2 41000402
+1 0 0 0 0 0 5 2 41000502
+1 0 0 0 0 0 6 2 41000602
+1 0 0 0 0 0 7 2 41000702
+1 0 0 0 0 0 8 2 41000802
+1 0 0 0 0 0 9 2 41000902
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xz/fxx.zl b/CarpetAttic/Cart3dTest/test/axial-xz/fxx.zl
index f5e2d1080..36e84963b 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xz/fxx.zl
+++ b/CarpetAttic/Cart3dTest/test/axial-xz/fxx.zl
@@ -1,32 +1,34 @@
 # CART3DTEST::fxx z (fxx)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 10 0 41000500
-0 0 0 0 0 0 10 2 41000501
-0 0 0 0 0 0 10 4 41000502
-0 0 0 0 0 0 10 6 41000503
-0 0 0 0 0 0 10 8 41000504
-0 0 0 0 0 0 10 10 41000505
-0 0 0 0 0 0 10 12 41000506
-0 0 0 0 0 0 10 14 41000507
-0 0 0 0 0 0 10 16 41000508
-0 0 0 0 0 0 10 18 41000509
+0 0 0 0 0 0 5 0 41000500
+0 0 0 0 0 0 5 1 41000501
+0 0 0 0 0 0 5 2 41000502
+0 0 0 0 0 0 5 3 41000503
+0 0 0 0 0 0 5 4 41000504
+0 0 0 0 0 0 5 5 41000505
+0 0 0 0 0 0 5 6 41000506
+0 0 0 0 0 0 5 7 41000507
+0 0 0 0 0 0 5 8 41000508
+0 0 0 0 0 0 5 9 41000509
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 10 0 49010500
-1 0 0 0 0 0 10 2 49000500
-1 0 0 0 0 0 10 4 41000502
-1 0 0 0 0 0 10 6 41000503
-1 0 0 0 0 0 10 8 41000504
-1 0 0 0 0 0 10 10 41000505
-1 0 0 0 0 0 10 12 41000506
-1 0 0 0 0 0 10 14 41000507
-1 0 0 0 0 0 10 16 41000508
-1 0 0 0 0 0 10 18 41000509
+1 0 0 0 0 0 5 0 49010500
+1 0 0 0 0 0 5 1 49000500
+1 0 0 0 0 0 5 2 41000502
+1 0 0 0 0 0 5 3 41000503
+1 0 0 0 0 0 5 4 41000504
+1 0 0 0 0 0 5 5 41000505
+1 0 0 0 0 0 5 6 41000506
+1 0 0 0 0 0 5 7 41000507
+1 0 0 0 0 0 5 8 41000508
+1 0 0 0 0 0 5 9 41000509
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xz/fxy.xl b/CarpetAttic/Cart3dTest/test/axial-xz/fxy.xl
index 939cc9c53..698d922be 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xz/fxy.xl
+++ b/CarpetAttic/Cart3dTest/test/axial-xz/fxy.xl
@@ -1,32 +1,34 @@
 # CART3DTEST::fxy x (fxy)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 10 4 42000502
-0 0 0 0 0 2 10 4 42010502
-0 0 0 0 0 4 10 4 42020502
-0 0 0 0 0 6 10 4 42030502
-0 0 0 0 0 8 10 4 42040502
-0 0 0 0 0 10 10 4 42050502
-0 0 0 0 0 12 10 4 42060502
-0 0 0 0 0 14 10 4 42070502
-0 0 0 0 0 16 10 4 42080502
-0 0 0 0 0 18 10 4 42090502
+0 0 0 0 0 0 5 2 42000502
+0 0 0 0 0 1 5 2 42010502
+0 0 0 0 0 2 5 2 42020502
+0 0 0 0 0 3 5 2 42030502
+0 0 0 0 0 4 5 2 42040502
+0 0 0 0 0 5 5 2 42050502
+0 0 0 0 0 6 5 2 42060502
+0 0 0 0 0 7 5 2 42070502
+0 0 0 0 0 8 5 2 42080502
+0 0 0 0 0 9 5 2 42090502
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 10 4 42000502
-1 0 0 0 0 2 10 4 42010502
-1 0 0 0 0 4 10 4 42020502
-1 0 0 0 0 6 10 4 42030502
-1 0 0 0 0 8 10 4 42040502
-1 0 0 0 0 10 10 4 42050502
-1 0 0 0 0 12 10 4 42060502
-1 0 0 0 0 14 10 4 42070502
-1 0 0 0 0 16 10 4 42080502
-1 0 0 0 0 18 10 4 42090502
+1 0 0 0 0 0 5 2 42000502
+1 0 0 0 0 1 5 2 42010502
+1 0 0 0 0 2 5 2 42020502
+1 0 0 0 0 3 5 2 42030502
+1 0 0 0 0 4 5 2 42040502
+1 0 0 0 0 5 5 2 42050502
+1 0 0 0 0 6 5 2 42060502
+1 0 0 0 0 7 5 2 42070502
+1 0 0 0 0 8 5 2 42080502
+1 0 0 0 0 9 5 2 42090502
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xz/fxy.yl b/CarpetAttic/Cart3dTest/test/axial-xz/fxy.yl
index 2f45d34df..6b08990ec 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xz/fxy.yl
+++ b/CarpetAttic/Cart3dTest/test/axial-xz/fxy.yl
@@ -1,32 +1,34 @@
 # CART3DTEST::fxy y (fxy)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 0 4 42000002
-0 0 0 0 0 0 2 4 42000102
-0 0 0 0 0 0 4 4 42000202
-0 0 0 0 0 0 6 4 42000302
-0 0 0 0 0 0 8 4 42000402
-0 0 0 0 0 0 10 4 42000502
-0 0 0 0 0 0 12 4 42000602
-0 0 0 0 0 0 14 4 42000702
-0 0 0 0 0 0 16 4 42000802
-0 0 0 0 0 0 18 4 42000902
+0 0 0 0 0 0 0 2 42000002
+0 0 0 0 0 0 1 2 42000102
+0 0 0 0 0 0 2 2 42000202
+0 0 0 0 0 0 3 2 42000302
+0 0 0 0 0 0 4 2 42000402
+0 0 0 0 0 0 5 2 42000502
+0 0 0 0 0 0 6 2 42000602
+0 0 0 0 0 0 7 2 42000702
+0 0 0 0 0 0 8 2 42000802
+0 0 0 0 0 0 9 2 42000902
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 0 4 42000002
-1 0 0 0 0 0 2 4 42000102
-1 0 0 0 0 0 4 4 42000202
-1 0 0 0 0 0 6 4 42000302
-1 0 0 0 0 0 8 4 42000402
-1 0 0 0 0 0 10 4 42000502
-1 0 0 0 0 0 12 4 42000602
-1 0 0 0 0 0 14 4 42000702
-1 0 0 0 0 0 16 4 42000802
-1 0 0 0 0 0 18 4 42000902
+1 0 0 0 0 0 0 2 42000002
+1 0 0 0 0 0 1 2 42000102
+1 0 0 0 0 0 2 2 42000202
+1 0 0 0 0 0 3 2 42000302
+1 0 0 0 0 0 4 2 42000402
+1 0 0 0 0 0 5 2 42000502
+1 0 0 0 0 0 6 2 42000602
+1 0 0 0 0 0 7 2 42000702
+1 0 0 0 0 0 8 2 42000802
+1 0 0 0 0 0 9 2 42000902
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xz/fxy.zl b/CarpetAttic/Cart3dTest/test/axial-xz/fxy.zl
index 3cdf8b2a3..f2064eb34 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xz/fxy.zl
+++ b/CarpetAttic/Cart3dTest/test/axial-xz/fxy.zl
@@ -1,32 +1,34 @@
 # CART3DTEST::fxy z (fxy)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 10 0 42000500
-0 0 0 0 0 0 10 2 42000501
-0 0 0 0 0 0 10 4 42000502
-0 0 0 0 0 0 10 6 42000503
-0 0 0 0 0 0 10 8 42000504
-0 0 0 0 0 0 10 10 42000505
-0 0 0 0 0 0 10 12 42000506
-0 0 0 0 0 0 10 14 42000507
-0 0 0 0 0 0 10 16 42000508
-0 0 0 0 0 0 10 18 42000509
+0 0 0 0 0 0 5 0 42000500
+0 0 0 0 0 0 5 1 42000501
+0 0 0 0 0 0 5 2 42000502
+0 0 0 0 0 0 5 3 42000503
+0 0 0 0 0 0 5 4 42000504
+0 0 0 0 0 0 5 5 42000505
+0 0 0 0 0 0 5 6 42000506
+0 0 0 0 0 0 5 7 42000507
+0 0 0 0 0 0 5 8 42000508
+0 0 0 0 0 0 5 9 42000509
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 10 0 48010500
-1 0 0 0 0 0 10 2 48000500
-1 0 0 0 0 0 10 4 42000502
-1 0 0 0 0 0 10 6 42000503
-1 0 0 0 0 0 10 8 42000504
-1 0 0 0 0 0 10 10 42000505
-1 0 0 0 0 0 10 12 42000506
-1 0 0 0 0 0 10 14 42000507
-1 0 0 0 0 0 10 16 42000508
-1 0 0 0 0 0 10 18 42000509
+1 0 0 0 0 0 5 0 48010500
+1 0 0 0 0 0 5 1 48000500
+1 0 0 0 0 0 5 2 42000502
+1 0 0 0 0 0 5 3 42000503
+1 0 0 0 0 0 5 4 42000504
+1 0 0 0 0 0 5 5 42000505
+1 0 0 0 0 0 5 6 42000506
+1 0 0 0 0 0 5 7 42000507
+1 0 0 0 0 0 5 8 42000508
+1 0 0 0 0 0 5 9 42000509
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xz/fxz.xl b/CarpetAttic/Cart3dTest/test/axial-xz/fxz.xl
index 76e2ee029..eb671b85f 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xz/fxz.xl
+++ b/CarpetAttic/Cart3dTest/test/axial-xz/fxz.xl
@@ -1,32 +1,34 @@
 # CART3DTEST::fxz x (fxz)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 10 4 43000502
-0 0 0 0 0 2 10 4 43010502
-0 0 0 0 0 4 10 4 43020502
-0 0 0 0 0 6 10 4 43030502
-0 0 0 0 0 8 10 4 43040502
-0 0 0 0 0 10 10 4 43050502
-0 0 0 0 0 12 10 4 43060502
-0 0 0 0 0 14 10 4 43070502
-0 0 0 0 0 16 10 4 43080502
-0 0 0 0 0 18 10 4 43090502
+0 0 0 0 0 0 5 2 43000502
+0 0 0 0 0 1 5 2 43010502
+0 0 0 0 0 2 5 2 43020502
+0 0 0 0 0 3 5 2 43030502
+0 0 0 0 0 4 5 2 43040502
+0 0 0 0 0 5 5 2 43050502
+0 0 0 0 0 6 5 2 43060502
+0 0 0 0 0 7 5 2 43070502
+0 0 0 0 0 8 5 2 43080502
+0 0 0 0 0 9 5 2 43090502
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 10 4 43000502
-1 0 0 0 0 2 10 4 43010502
-1 0 0 0 0 4 10 4 43020502
-1 0 0 0 0 6 10 4 43030502
-1 0 0 0 0 8 10 4 43040502
-1 0 0 0 0 10 10 4 43050502
-1 0 0 0 0 12 10 4 43060502
-1 0 0 0 0 14 10 4 43070502
-1 0 0 0 0 16 10 4 43080502
-1 0 0 0 0 18 10 4 43090502
+1 0 0 0 0 0 5 2 43000502
+1 0 0 0 0 1 5 2 43010502
+1 0 0 0 0 2 5 2 43020502
+1 0 0 0 0 3 5 2 43030502
+1 0 0 0 0 4 5 2 43040502
+1 0 0 0 0 5 5 2 43050502
+1 0 0 0 0 6 5 2 43060502
+1 0 0 0 0 7 5 2 43070502
+1 0 0 0 0 8 5 2 43080502
+1 0 0 0 0 9 5 2 43090502
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xz/fxz.yl b/CarpetAttic/Cart3dTest/test/axial-xz/fxz.yl
index 396559e46..13c6f7ffa 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xz/fxz.yl
+++ b/CarpetAttic/Cart3dTest/test/axial-xz/fxz.yl
@@ -1,32 +1,34 @@
 # CART3DTEST::fxz y (fxz)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 0 4 43000002
-0 0 0 0 0 0 2 4 43000102
-0 0 0 0 0 0 4 4 43000202
-0 0 0 0 0 0 6 4 43000302
-0 0 0 0 0 0 8 4 43000402
-0 0 0 0 0 0 10 4 43000502
-0 0 0 0 0 0 12 4 43000602
-0 0 0 0 0 0 14 4 43000702
-0 0 0 0 0 0 16 4 43000802
-0 0 0 0 0 0 18 4 43000902
+0 0 0 0 0 0 0 2 43000002
+0 0 0 0 0 0 1 2 43000102
+0 0 0 0 0 0 2 2 43000202
+0 0 0 0 0 0 3 2 43000302
+0 0 0 0 0 0 4 2 43000402
+0 0 0 0 0 0 5 2 43000502
+0 0 0 0 0 0 6 2 43000602
+0 0 0 0 0 0 7 2 43000702
+0 0 0 0 0 0 8 2 43000802
+0 0 0 0 0 0 9 2 43000902
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 0 4 43000002
-1 0 0 0 0 0 2 4 43000102
-1 0 0 0 0 0 4 4 43000202
-1 0 0 0 0 0 6 4 43000302
-1 0 0 0 0 0 8 4 43000402
-1 0 0 0 0 0 10 4 43000502
-1 0 0 0 0 0 12 4 43000602
-1 0 0 0 0 0 14 4 43000702
-1 0 0 0 0 0 16 4 43000802
-1 0 0 0 0 0 18 4 43000902
+1 0 0 0 0 0 0 2 43000002
+1 0 0 0 0 0 1 2 43000102
+1 0 0 0 0 0 2 2 43000202
+1 0 0 0 0 0 3 2 43000302
+1 0 0 0 0 0 4 2 43000402
+1 0 0 0 0 0 5 2 43000502
+1 0 0 0 0 0 6 2 43000602
+1 0 0 0 0 0 7 2 43000702
+1 0 0 0 0 0 8 2 43000802
+1 0 0 0 0 0 9 2 43000902
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xz/fxz.zl b/CarpetAttic/Cart3dTest/test/axial-xz/fxz.zl
index ab82a05bf..4f4c42882 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xz/fxz.zl
+++ b/CarpetAttic/Cart3dTest/test/axial-xz/fxz.zl
@@ -1,32 +1,34 @@
 # CART3DTEST::fxz z (fxz)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 10 0 43000500
-0 0 0 0 0 0 10 2 43000501
-0 0 0 0 0 0 10 4 43000502
-0 0 0 0 0 0 10 6 43000503
-0 0 0 0 0 0 10 8 43000504
-0 0 0 0 0 0 10 10 43000505
-0 0 0 0 0 0 10 12 43000506
-0 0 0 0 0 0 10 14 43000507
-0 0 0 0 0 0 10 16 43000508
-0 0 0 0 0 0 10 18 43000509
+0 0 0 0 0 0 5 0 43000500
+0 0 0 0 0 0 5 1 43000501
+0 0 0 0 0 0 5 2 43000502
+0 0 0 0 0 0 5 3 43000503
+0 0 0 0 0 0 5 4 43000504
+0 0 0 0 0 0 5 5 43000505
+0 0 0 0 0 0 5 6 43000506
+0 0 0 0 0 0 5 7 43000507
+0 0 0 0 0 0 5 8 43000508
+0 0 0 0 0 0 5 9 43000509
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 10 0 -47010500
-1 0 0 0 0 0 10 2 -47000500
-1 0 0 0 0 0 10 4 43000502
-1 0 0 0 0 0 10 6 43000503
-1 0 0 0 0 0 10 8 43000504
-1 0 0 0 0 0 10 10 43000505
-1 0 0 0 0 0 10 12 43000506
-1 0 0 0 0 0 10 14 43000507
-1 0 0 0 0 0 10 16 43000508
-1 0 0 0 0 0 10 18 43000509
+1 0 0 0 0 0 5 0 -47010500
+1 0 0 0 0 0 5 1 -47000500
+1 0 0 0 0 0 5 2 43000502
+1 0 0 0 0 0 5 3 43000503
+1 0 0 0 0 0 5 4 43000504
+1 0 0 0 0 0 5 5 43000505
+1 0 0 0 0 0 5 6 43000506
+1 0 0 0 0 0 5 7 43000507
+1 0 0 0 0 0 5 8 43000508
+1 0 0 0 0 0 5 9 43000509
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xz/fyx.xl b/CarpetAttic/Cart3dTest/test/axial-xz/fyx.xl
index 1d00405f9..caa8164cc 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xz/fyx.xl
+++ b/CarpetAttic/Cart3dTest/test/axial-xz/fyx.xl
@@ -1,32 +1,34 @@
 # CART3DTEST::fyx x (fyx)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 10 4 44000502
-0 0 0 0 0 2 10 4 44010502
-0 0 0 0 0 4 10 4 44020502
-0 0 0 0 0 6 10 4 44030502
-0 0 0 0 0 8 10 4 44040502
-0 0 0 0 0 10 10 4 44050502
-0 0 0 0 0 12 10 4 44060502
-0 0 0 0 0 14 10 4 44070502
-0 0 0 0 0 16 10 4 44080502
-0 0 0 0 0 18 10 4 44090502
+0 0 0 0 0 0 5 2 44000502
+0 0 0 0 0 1 5 2 44010502
+0 0 0 0 0 2 5 2 44020502
+0 0 0 0 0 3 5 2 44030502
+0 0 0 0 0 4 5 2 44040502
+0 0 0 0 0 5 5 2 44050502
+0 0 0 0 0 6 5 2 44060502
+0 0 0 0 0 7 5 2 44070502
+0 0 0 0 0 8 5 2 44080502
+0 0 0 0 0 9 5 2 44090502
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 10 4 44000502
-1 0 0 0 0 2 10 4 44010502
-1 0 0 0 0 4 10 4 44020502
-1 0 0 0 0 6 10 4 44030502
-1 0 0 0 0 8 10 4 44040502
-1 0 0 0 0 10 10 4 44050502
-1 0 0 0 0 12 10 4 44060502
-1 0 0 0 0 14 10 4 44070502
-1 0 0 0 0 16 10 4 44080502
-1 0 0 0 0 18 10 4 44090502
+1 0 0 0 0 0 5 2 44000502
+1 0 0 0 0 1 5 2 44010502
+1 0 0 0 0 2 5 2 44020502
+1 0 0 0 0 3 5 2 44030502
+1 0 0 0 0 4 5 2 44040502
+1 0 0 0 0 5 5 2 44050502
+1 0 0 0 0 6 5 2 44060502
+1 0 0 0 0 7 5 2 44070502
+1 0 0 0 0 8 5 2 44080502
+1 0 0 0 0 9 5 2 44090502
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xz/fyx.yl b/CarpetAttic/Cart3dTest/test/axial-xz/fyx.yl
index 55c4a4cfd..b8690fd62 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xz/fyx.yl
+++ b/CarpetAttic/Cart3dTest/test/axial-xz/fyx.yl
@@ -1,32 +1,34 @@
 # CART3DTEST::fyx y (fyx)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 0 4 44000002
-0 0 0 0 0 0 2 4 44000102
-0 0 0 0 0 0 4 4 44000202
-0 0 0 0 0 0 6 4 44000302
-0 0 0 0 0 0 8 4 44000402
-0 0 0 0 0 0 10 4 44000502
-0 0 0 0 0 0 12 4 44000602
-0 0 0 0 0 0 14 4 44000702
-0 0 0 0 0 0 16 4 44000802
-0 0 0 0 0 0 18 4 44000902
+0 0 0 0 0 0 0 2 44000002
+0 0 0 0 0 0 1 2 44000102
+0 0 0 0 0 0 2 2 44000202
+0 0 0 0 0 0 3 2 44000302
+0 0 0 0 0 0 4 2 44000402
+0 0 0 0 0 0 5 2 44000502
+0 0 0 0 0 0 6 2 44000602
+0 0 0 0 0 0 7 2 44000702
+0 0 0 0 0 0 8 2 44000802
+0 0 0 0 0 0 9 2 44000902
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 0 4 44000002
-1 0 0 0 0 0 2 4 44000102
-1 0 0 0 0 0 4 4 44000202
-1 0 0 0 0 0 6 4 44000302
-1 0 0 0 0 0 8 4 44000402
-1 0 0 0 0 0 10 4 44000502
-1 0 0 0 0 0 12 4 44000602
-1 0 0 0 0 0 14 4 44000702
-1 0 0 0 0 0 16 4 44000802
-1 0 0 0 0 0 18 4 44000902
+1 0 0 0 0 0 0 2 44000002
+1 0 0 0 0 0 1 2 44000102
+1 0 0 0 0 0 2 2 44000202
+1 0 0 0 0 0 3 2 44000302
+1 0 0 0 0 0 4 2 44000402
+1 0 0 0 0 0 5 2 44000502
+1 0 0 0 0 0 6 2 44000602
+1 0 0 0 0 0 7 2 44000702
+1 0 0 0 0 0 8 2 44000802
+1 0 0 0 0 0 9 2 44000902
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xz/fyx.zl b/CarpetAttic/Cart3dTest/test/axial-xz/fyx.zl
index db4131214..e24f4784f 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xz/fyx.zl
+++ b/CarpetAttic/Cart3dTest/test/axial-xz/fyx.zl
@@ -1,32 +1,34 @@
 # CART3DTEST::fyx z (fyx)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 10 0 44000500
-0 0 0 0 0 0 10 2 44000501
-0 0 0 0 0 0 10 4 44000502
-0 0 0 0 0 0 10 6 44000503
-0 0 0 0 0 0 10 8 44000504
-0 0 0 0 0 0 10 10 44000505
-0 0 0 0 0 0 10 12 44000506
-0 0 0 0 0 0 10 14 44000507
-0 0 0 0 0 0 10 16 44000508
-0 0 0 0 0 0 10 18 44000509
+0 0 0 0 0 0 5 0 44000500
+0 0 0 0 0 0 5 1 44000501
+0 0 0 0 0 0 5 2 44000502
+0 0 0 0 0 0 5 3 44000503
+0 0 0 0 0 0 5 4 44000504
+0 0 0 0 0 0 5 5 44000505
+0 0 0 0 0 0 5 6 44000506
+0 0 0 0 0 0 5 7 44000507
+0 0 0 0 0 0 5 8 44000508
+0 0 0 0 0 0 5 9 44000509
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 10 0 46010500
-1 0 0 0 0 0 10 2 46000500
-1 0 0 0 0 0 10 4 44000502
-1 0 0 0 0 0 10 6 44000503
-1 0 0 0 0 0 10 8 44000504
-1 0 0 0 0 0 10 10 44000505
-1 0 0 0 0 0 10 12 44000506
-1 0 0 0 0 0 10 14 44000507
-1 0 0 0 0 0 10 16 44000508
-1 0 0 0 0 0 10 18 44000509
+1 0 0 0 0 0 5 0 46010500
+1 0 0 0 0 0 5 1 46000500
+1 0 0 0 0 0 5 2 44000502
+1 0 0 0 0 0 5 3 44000503
+1 0 0 0 0 0 5 4 44000504
+1 0 0 0 0 0 5 5 44000505
+1 0 0 0 0 0 5 6 44000506
+1 0 0 0 0 0 5 7 44000507
+1 0 0 0 0 0 5 8 44000508
+1 0 0 0 0 0 5 9 44000509
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xz/fyy.xl b/CarpetAttic/Cart3dTest/test/axial-xz/fyy.xl
index 0fb75fee3..d268589ad 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xz/fyy.xl
+++ b/CarpetAttic/Cart3dTest/test/axial-xz/fyy.xl
@@ -1,32 +1,34 @@
 # CART3DTEST::fyy x (fyy)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 10 4 45000502
-0 0 0 0 0 2 10 4 45010502
-0 0 0 0 0 4 10 4 45020502
-0 0 0 0 0 6 10 4 45030502
-0 0 0 0 0 8 10 4 45040502
-0 0 0 0 0 10 10 4 45050502
-0 0 0 0 0 12 10 4 45060502
-0 0 0 0 0 14 10 4 45070502
-0 0 0 0 0 16 10 4 45080502
-0 0 0 0 0 18 10 4 45090502
+0 0 0 0 0 0 5 2 45000502
+0 0 0 0 0 1 5 2 45010502
+0 0 0 0 0 2 5 2 45020502
+0 0 0 0 0 3 5 2 45030502
+0 0 0 0 0 4 5 2 45040502
+0 0 0 0 0 5 5 2 45050502
+0 0 0 0 0 6 5 2 45060502
+0 0 0 0 0 7 5 2 45070502
+0 0 0 0 0 8 5 2 45080502
+0 0 0 0 0 9 5 2 45090502
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 10 4 45000502
-1 0 0 0 0 2 10 4 45010502
-1 0 0 0 0 4 10 4 45020502
-1 0 0 0 0 6 10 4 45030502
-1 0 0 0 0 8 10 4 45040502
-1 0 0 0 0 10 10 4 45050502
-1 0 0 0 0 12 10 4 45060502
-1 0 0 0 0 14 10 4 45070502
-1 0 0 0 0 16 10 4 45080502
-1 0 0 0 0 18 10 4 45090502
+1 0 0 0 0 0 5 2 45000502
+1 0 0 0 0 1 5 2 45010502
+1 0 0 0 0 2 5 2 45020502
+1 0 0 0 0 3 5 2 45030502
+1 0 0 0 0 4 5 2 45040502
+1 0 0 0 0 5 5 2 45050502
+1 0 0 0 0 6 5 2 45060502
+1 0 0 0 0 7 5 2 45070502
+1 0 0 0 0 8 5 2 45080502
+1 0 0 0 0 9 5 2 45090502
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xz/fyy.yl b/CarpetAttic/Cart3dTest/test/axial-xz/fyy.yl
index 66e48bb38..f2169d3d2 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xz/fyy.yl
+++ b/CarpetAttic/Cart3dTest/test/axial-xz/fyy.yl
@@ -1,32 +1,34 @@
 # CART3DTEST::fyy y (fyy)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 0 4 45000002
-0 0 0 0 0 0 2 4 45000102
-0 0 0 0 0 0 4 4 45000202
-0 0 0 0 0 0 6 4 45000302
-0 0 0 0 0 0 8 4 45000402
-0 0 0 0 0 0 10 4 45000502
-0 0 0 0 0 0 12 4 45000602
-0 0 0 0 0 0 14 4 45000702
-0 0 0 0 0 0 16 4 45000802
-0 0 0 0 0 0 18 4 45000902
+0 0 0 0 0 0 0 2 45000002
+0 0 0 0 0 0 1 2 45000102
+0 0 0 0 0 0 2 2 45000202
+0 0 0 0 0 0 3 2 45000302
+0 0 0 0 0 0 4 2 45000402
+0 0 0 0 0 0 5 2 45000502
+0 0 0 0 0 0 6 2 45000602
+0 0 0 0 0 0 7 2 45000702
+0 0 0 0 0 0 8 2 45000802
+0 0 0 0 0 0 9 2 45000902
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 0 4 45000002
-1 0 0 0 0 0 2 4 45000102
-1 0 0 0 0 0 4 4 45000202
-1 0 0 0 0 0 6 4 45000302
-1 0 0 0 0 0 8 4 45000402
-1 0 0 0 0 0 10 4 45000502
-1 0 0 0 0 0 12 4 45000602
-1 0 0 0 0 0 14 4 45000702
-1 0 0 0 0 0 16 4 45000802
-1 0 0 0 0 0 18 4 45000902
+1 0 0 0 0 0 0 2 45000002
+1 0 0 0 0 0 1 2 45000102
+1 0 0 0 0 0 2 2 45000202
+1 0 0 0 0 0 3 2 45000302
+1 0 0 0 0 0 4 2 45000402
+1 0 0 0 0 0 5 2 45000502
+1 0 0 0 0 0 6 2 45000602
+1 0 0 0 0 0 7 2 45000702
+1 0 0 0 0 0 8 2 45000802
+1 0 0 0 0 0 9 2 45000902
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xz/fyy.zl b/CarpetAttic/Cart3dTest/test/axial-xz/fyy.zl
index 9b5ff157c..696215acb 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xz/fyy.zl
+++ b/CarpetAttic/Cart3dTest/test/axial-xz/fyy.zl
@@ -1,32 +1,34 @@
 # CART3DTEST::fyy z (fyy)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 10 0 45000500
-0 0 0 0 0 0 10 2 45000501
-0 0 0 0 0 0 10 4 45000502
-0 0 0 0 0 0 10 6 45000503
-0 0 0 0 0 0 10 8 45000504
-0 0 0 0 0 0 10 10 45000505
-0 0 0 0 0 0 10 12 45000506
-0 0 0 0 0 0 10 14 45000507
-0 0 0 0 0 0 10 16 45000508
-0 0 0 0 0 0 10 18 45000509
+0 0 0 0 0 0 5 0 45000500
+0 0 0 0 0 0 5 1 45000501
+0 0 0 0 0 0 5 2 45000502
+0 0 0 0 0 0 5 3 45000503
+0 0 0 0 0 0 5 4 45000504
+0 0 0 0 0 0 5 5 45000505
+0 0 0 0 0 0 5 6 45000506
+0 0 0 0 0 0 5 7 45000507
+0 0 0 0 0 0 5 8 45000508
+0 0 0 0 0 0 5 9 45000509
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 10 0 45010500
-1 0 0 0 0 0 10 2 45000500
-1 0 0 0 0 0 10 4 45000502
-1 0 0 0 0 0 10 6 45000503
-1 0 0 0 0 0 10 8 45000504
-1 0 0 0 0 0 10 10 45000505
-1 0 0 0 0 0 10 12 45000506
-1 0 0 0 0 0 10 14 45000507
-1 0 0 0 0 0 10 16 45000508
-1 0 0 0 0 0 10 18 45000509
+1 0 0 0 0 0 5 0 45010500
+1 0 0 0 0 0 5 1 45000500
+1 0 0 0 0 0 5 2 45000502
+1 0 0 0 0 0 5 3 45000503
+1 0 0 0 0 0 5 4 45000504
+1 0 0 0 0 0 5 5 45000505
+1 0 0 0 0 0 5 6 45000506
+1 0 0 0 0 0 5 7 45000507
+1 0 0 0 0 0 5 8 45000508
+1 0 0 0 0 0 5 9 45000509
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xz/fyz.xl b/CarpetAttic/Cart3dTest/test/axial-xz/fyz.xl
index 4cdf793ab..d9da37975 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xz/fyz.xl
+++ b/CarpetAttic/Cart3dTest/test/axial-xz/fyz.xl
@@ -1,32 +1,34 @@
 # CART3DTEST::fyz x (fyz)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 10 4 46000502
-0 0 0 0 0 2 10 4 46010502
-0 0 0 0 0 4 10 4 46020502
-0 0 0 0 0 6 10 4 46030502
-0 0 0 0 0 8 10 4 46040502
-0 0 0 0 0 10 10 4 46050502
-0 0 0 0 0 12 10 4 46060502
-0 0 0 0 0 14 10 4 46070502
-0 0 0 0 0 16 10 4 46080502
-0 0 0 0 0 18 10 4 46090502
+0 0 0 0 0 0 5 2 46000502
+0 0 0 0 0 1 5 2 46010502
+0 0 0 0 0 2 5 2 46020502
+0 0 0 0 0 3 5 2 46030502
+0 0 0 0 0 4 5 2 46040502
+0 0 0 0 0 5 5 2 46050502
+0 0 0 0 0 6 5 2 46060502
+0 0 0 0 0 7 5 2 46070502
+0 0 0 0 0 8 5 2 46080502
+0 0 0 0 0 9 5 2 46090502
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 10 4 46000502
-1 0 0 0 0 2 10 4 46010502
-1 0 0 0 0 4 10 4 46020502
-1 0 0 0 0 6 10 4 46030502
-1 0 0 0 0 8 10 4 46040502
-1 0 0 0 0 10 10 4 46050502
-1 0 0 0 0 12 10 4 46060502
-1 0 0 0 0 14 10 4 46070502
-1 0 0 0 0 16 10 4 46080502
-1 0 0 0 0 18 10 4 46090502
+1 0 0 0 0 0 5 2 46000502
+1 0 0 0 0 1 5 2 46010502
+1 0 0 0 0 2 5 2 46020502
+1 0 0 0 0 3 5 2 46030502
+1 0 0 0 0 4 5 2 46040502
+1 0 0 0 0 5 5 2 46050502
+1 0 0 0 0 6 5 2 46060502
+1 0 0 0 0 7 5 2 46070502
+1 0 0 0 0 8 5 2 46080502
+1 0 0 0 0 9 5 2 46090502
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xz/fyz.yl b/CarpetAttic/Cart3dTest/test/axial-xz/fyz.yl
index 7cfeb664d..73e6f3e57 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xz/fyz.yl
+++ b/CarpetAttic/Cart3dTest/test/axial-xz/fyz.yl
@@ -1,32 +1,34 @@
 # CART3DTEST::fyz y (fyz)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 0 4 46000002
-0 0 0 0 0 0 2 4 46000102
-0 0 0 0 0 0 4 4 46000202
-0 0 0 0 0 0 6 4 46000302
-0 0 0 0 0 0 8 4 46000402
-0 0 0 0 0 0 10 4 46000502
-0 0 0 0 0 0 12 4 46000602
-0 0 0 0 0 0 14 4 46000702
-0 0 0 0 0 0 16 4 46000802
-0 0 0 0 0 0 18 4 46000902
+0 0 0 0 0 0 0 2 46000002
+0 0 0 0 0 0 1 2 46000102
+0 0 0 0 0 0 2 2 46000202
+0 0 0 0 0 0 3 2 46000302
+0 0 0 0 0 0 4 2 46000402
+0 0 0 0 0 0 5 2 46000502
+0 0 0 0 0 0 6 2 46000602
+0 0 0 0 0 0 7 2 46000702
+0 0 0 0 0 0 8 2 46000802
+0 0 0 0 0 0 9 2 46000902
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 0 4 46000002
-1 0 0 0 0 0 2 4 46000102
-1 0 0 0 0 0 4 4 46000202
-1 0 0 0 0 0 6 4 46000302
-1 0 0 0 0 0 8 4 46000402
-1 0 0 0 0 0 10 4 46000502
-1 0 0 0 0 0 12 4 46000602
-1 0 0 0 0 0 14 4 46000702
-1 0 0 0 0 0 16 4 46000802
-1 0 0 0 0 0 18 4 46000902
+1 0 0 0 0 0 0 2 46000002
+1 0 0 0 0 0 1 2 46000102
+1 0 0 0 0 0 2 2 46000202
+1 0 0 0 0 0 3 2 46000302
+1 0 0 0 0 0 4 2 46000402
+1 0 0 0 0 0 5 2 46000502
+1 0 0 0 0 0 6 2 46000602
+1 0 0 0 0 0 7 2 46000702
+1 0 0 0 0 0 8 2 46000802
+1 0 0 0 0 0 9 2 46000902
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xz/fyz.zl b/CarpetAttic/Cart3dTest/test/axial-xz/fyz.zl
index a580801fc..366bf2eb3 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xz/fyz.zl
+++ b/CarpetAttic/Cart3dTest/test/axial-xz/fyz.zl
@@ -1,32 +1,34 @@
 # CART3DTEST::fyz z (fyz)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 10 0 46000500
-0 0 0 0 0 0 10 2 46000501
-0 0 0 0 0 0 10 4 46000502
-0 0 0 0 0 0 10 6 46000503
-0 0 0 0 0 0 10 8 46000504
-0 0 0 0 0 0 10 10 46000505
-0 0 0 0 0 0 10 12 46000506
-0 0 0 0 0 0 10 14 46000507
-0 0 0 0 0 0 10 16 46000508
-0 0 0 0 0 0 10 18 46000509
+0 0 0 0 0 0 5 0 46000500
+0 0 0 0 0 0 5 1 46000501
+0 0 0 0 0 0 5 2 46000502
+0 0 0 0 0 0 5 3 46000503
+0 0 0 0 0 0 5 4 46000504
+0 0 0 0 0 0 5 5 46000505
+0 0 0 0 0 0 5 6 46000506
+0 0 0 0 0 0 5 7 46000507
+0 0 0 0 0 0 5 8 46000508
+0 0 0 0 0 0 5 9 46000509
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 10 0 -46010501
-1 0 0 0 0 0 10 2 -46010500
-1 0 0 0 0 0 10 4 46000502
-1 0 0 0 0 0 10 6 46000503
-1 0 0 0 0 0 10 8 46000504
-1 0 0 0 0 0 10 10 46000505
-1 0 0 0 0 0 10 12 46000506
-1 0 0 0 0 0 10 14 46000507
-1 0 0 0 0 0 10 16 46000508
-1 0 0 0 0 0 10 18 46000509
+1 0 0 0 0 0 5 0 -46010501
+1 0 0 0 0 0 5 1 -46010500
+1 0 0 0 0 0 5 2 46000502
+1 0 0 0 0 0 5 3 46000503
+1 0 0 0 0 0 5 4 46000504
+1 0 0 0 0 0 5 5 46000505
+1 0 0 0 0 0 5 6 46000506
+1 0 0 0 0 0 5 7 46000507
+1 0 0 0 0 0 5 8 46000508
+1 0 0 0 0 0 5 9 46000509
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xz/fzx.xl b/CarpetAttic/Cart3dTest/test/axial-xz/fzx.xl
index 1d7a90245..166ce0b93 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xz/fzx.xl
+++ b/CarpetAttic/Cart3dTest/test/axial-xz/fzx.xl
@@ -1,32 +1,34 @@
 # CART3DTEST::fzx x (fzx)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 10 4 47000502
-0 0 0 0 0 2 10 4 47010502
-0 0 0 0 0 4 10 4 47020502
-0 0 0 0 0 6 10 4 47030502
-0 0 0 0 0 8 10 4 47040502
-0 0 0 0 0 10 10 4 47050502
-0 0 0 0 0 12 10 4 47060502
-0 0 0 0 0 14 10 4 47070502
-0 0 0 0 0 16 10 4 47080502
-0 0 0 0 0 18 10 4 47090502
+0 0 0 0 0 0 5 2 47000502
+0 0 0 0 0 1 5 2 47010502
+0 0 0 0 0 2 5 2 47020502
+0 0 0 0 0 3 5 2 47030502
+0 0 0 0 0 4 5 2 47040502
+0 0 0 0 0 5 5 2 47050502
+0 0 0 0 0 6 5 2 47060502
+0 0 0 0 0 7 5 2 47070502
+0 0 0 0 0 8 5 2 47080502
+0 0 0 0 0 9 5 2 47090502
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 10 4 47000502
-1 0 0 0 0 2 10 4 47010502
-1 0 0 0 0 4 10 4 47020502
-1 0 0 0 0 6 10 4 47030502
-1 0 0 0 0 8 10 4 47040502
-1 0 0 0 0 10 10 4 47050502
-1 0 0 0 0 12 10 4 47060502
-1 0 0 0 0 14 10 4 47070502
-1 0 0 0 0 16 10 4 47080502
-1 0 0 0 0 18 10 4 47090502
+1 0 0 0 0 0 5 2 47000502
+1 0 0 0 0 1 5 2 47010502
+1 0 0 0 0 2 5 2 47020502
+1 0 0 0 0 3 5 2 47030502
+1 0 0 0 0 4 5 2 47040502
+1 0 0 0 0 5 5 2 47050502
+1 0 0 0 0 6 5 2 47060502
+1 0 0 0 0 7 5 2 47070502
+1 0 0 0 0 8 5 2 47080502
+1 0 0 0 0 9 5 2 47090502
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xz/fzx.yl b/CarpetAttic/Cart3dTest/test/axial-xz/fzx.yl
index 19bfb9c74..88192fd84 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xz/fzx.yl
+++ b/CarpetAttic/Cart3dTest/test/axial-xz/fzx.yl
@@ -1,32 +1,34 @@
 # CART3DTEST::fzx y (fzx)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 0 4 47000002
-0 0 0 0 0 0 2 4 47000102
-0 0 0 0 0 0 4 4 47000202
-0 0 0 0 0 0 6 4 47000302
-0 0 0 0 0 0 8 4 47000402
-0 0 0 0 0 0 10 4 47000502
-0 0 0 0 0 0 12 4 47000602
-0 0 0 0 0 0 14 4 47000702
-0 0 0 0 0 0 16 4 47000802
-0 0 0 0 0 0 18 4 47000902
+0 0 0 0 0 0 0 2 47000002
+0 0 0 0 0 0 1 2 47000102
+0 0 0 0 0 0 2 2 47000202
+0 0 0 0 0 0 3 2 47000302
+0 0 0 0 0 0 4 2 47000402
+0 0 0 0 0 0 5 2 47000502
+0 0 0 0 0 0 6 2 47000602
+0 0 0 0 0 0 7 2 47000702
+0 0 0 0 0 0 8 2 47000802
+0 0 0 0 0 0 9 2 47000902
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 0 4 47000002
-1 0 0 0 0 0 2 4 47000102
-1 0 0 0 0 0 4 4 47000202
-1 0 0 0 0 0 6 4 47000302
-1 0 0 0 0 0 8 4 47000402
-1 0 0 0 0 0 10 4 47000502
-1 0 0 0 0 0 12 4 47000602
-1 0 0 0 0 0 14 4 47000702
-1 0 0 0 0 0 16 4 47000802
-1 0 0 0 0 0 18 4 47000902
+1 0 0 0 0 0 0 2 47000002
+1 0 0 0 0 0 1 2 47000102
+1 0 0 0 0 0 2 2 47000202
+1 0 0 0 0 0 3 2 47000302
+1 0 0 0 0 0 4 2 47000402
+1 0 0 0 0 0 5 2 47000502
+1 0 0 0 0 0 6 2 47000602
+1 0 0 0 0 0 7 2 47000702
+1 0 0 0 0 0 8 2 47000802
+1 0 0 0 0 0 9 2 47000902
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xz/fzx.zl b/CarpetAttic/Cart3dTest/test/axial-xz/fzx.zl
index 7b2423853..141936c56 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xz/fzx.zl
+++ b/CarpetAttic/Cart3dTest/test/axial-xz/fzx.zl
@@ -1,32 +1,34 @@
 # CART3DTEST::fzx z (fzx)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 10 0 47000500
-0 0 0 0 0 0 10 2 47000501
-0 0 0 0 0 0 10 4 47000502
-0 0 0 0 0 0 10 6 47000503
-0 0 0 0 0 0 10 8 47000504
-0 0 0 0 0 0 10 10 47000505
-0 0 0 0 0 0 10 12 47000506
-0 0 0 0 0 0 10 14 47000507
-0 0 0 0 0 0 10 16 47000508
-0 0 0 0 0 0 10 18 47000509
+0 0 0 0 0 0 5 0 47000500
+0 0 0 0 0 0 5 1 47000501
+0 0 0 0 0 0 5 2 47000502
+0 0 0 0 0 0 5 3 47000503
+0 0 0 0 0 0 5 4 47000504
+0 0 0 0 0 0 5 5 47000505
+0 0 0 0 0 0 5 6 47000506
+0 0 0 0 0 0 5 7 47000507
+0 0 0 0 0 0 5 8 47000508
+0 0 0 0 0 0 5 9 47000509
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 10 0 47010501
-1 0 0 0 0 0 10 2 47010500
-1 0 0 0 0 0 10 4 47000502
-1 0 0 0 0 0 10 6 47000503
-1 0 0 0 0 0 10 8 47000504
-1 0 0 0 0 0 10 10 47000505
-1 0 0 0 0 0 10 12 47000506
-1 0 0 0 0 0 10 14 47000507
-1 0 0 0 0 0 10 16 47000508
-1 0 0 0 0 0 10 18 47000509
+1 0 0 0 0 0 5 0 47010501
+1 0 0 0 0 0 5 1 47010500
+1 0 0 0 0 0 5 2 47000502
+1 0 0 0 0 0 5 3 47000503
+1 0 0 0 0 0 5 4 47000504
+1 0 0 0 0 0 5 5 47000505
+1 0 0 0 0 0 5 6 47000506
+1 0 0 0 0 0 5 7 47000507
+1 0 0 0 0 0 5 8 47000508
+1 0 0 0 0 0 5 9 47000509
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xz/fzy.xl b/CarpetAttic/Cart3dTest/test/axial-xz/fzy.xl
index 979a22cdd..67d0795b4 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xz/fzy.xl
+++ b/CarpetAttic/Cart3dTest/test/axial-xz/fzy.xl
@@ -1,32 +1,34 @@
 # CART3DTEST::fzy x (fzy)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 10 4 48000502
-0 0 0 0 0 2 10 4 48010502
-0 0 0 0 0 4 10 4 48020502
-0 0 0 0 0 6 10 4 48030502
-0 0 0 0 0 8 10 4 48040502
-0 0 0 0 0 10 10 4 48050502
-0 0 0 0 0 12 10 4 48060502
-0 0 0 0 0 14 10 4 48070502
-0 0 0 0 0 16 10 4 48080502
-0 0 0 0 0 18 10 4 48090502
+0 0 0 0 0 0 5 2 48000502
+0 0 0 0 0 1 5 2 48010502
+0 0 0 0 0 2 5 2 48020502
+0 0 0 0 0 3 5 2 48030502
+0 0 0 0 0 4 5 2 48040502
+0 0 0 0 0 5 5 2 48050502
+0 0 0 0 0 6 5 2 48060502
+0 0 0 0 0 7 5 2 48070502
+0 0 0 0 0 8 5 2 48080502
+0 0 0 0 0 9 5 2 48090502
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 10 4 48000502
-1 0 0 0 0 2 10 4 48010502
-1 0 0 0 0 4 10 4 48020502
-1 0 0 0 0 6 10 4 48030502
-1 0 0 0 0 8 10 4 48040502
-1 0 0 0 0 10 10 4 48050502
-1 0 0 0 0 12 10 4 48060502
-1 0 0 0 0 14 10 4 48070502
-1 0 0 0 0 16 10 4 48080502
-1 0 0 0 0 18 10 4 48090502
+1 0 0 0 0 0 5 2 48000502
+1 0 0 0 0 1 5 2 48010502
+1 0 0 0 0 2 5 2 48020502
+1 0 0 0 0 3 5 2 48030502
+1 0 0 0 0 4 5 2 48040502
+1 0 0 0 0 5 5 2 48050502
+1 0 0 0 0 6 5 2 48060502
+1 0 0 0 0 7 5 2 48070502
+1 0 0 0 0 8 5 2 48080502
+1 0 0 0 0 9 5 2 48090502
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xz/fzy.yl b/CarpetAttic/Cart3dTest/test/axial-xz/fzy.yl
index edd7c454c..857d6559f 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xz/fzy.yl
+++ b/CarpetAttic/Cart3dTest/test/axial-xz/fzy.yl
@@ -1,32 +1,34 @@
 # CART3DTEST::fzy y (fzy)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 0 4 48000002
-0 0 0 0 0 0 2 4 48000102
-0 0 0 0 0 0 4 4 48000202
-0 0 0 0 0 0 6 4 48000302
-0 0 0 0 0 0 8 4 48000402
-0 0 0 0 0 0 10 4 48000502
-0 0 0 0 0 0 12 4 48000602
-0 0 0 0 0 0 14 4 48000702
-0 0 0 0 0 0 16 4 48000802
-0 0 0 0 0 0 18 4 48000902
+0 0 0 0 0 0 0 2 48000002
+0 0 0 0 0 0 1 2 48000102
+0 0 0 0 0 0 2 2 48000202
+0 0 0 0 0 0 3 2 48000302
+0 0 0 0 0 0 4 2 48000402
+0 0 0 0 0 0 5 2 48000502
+0 0 0 0 0 0 6 2 48000602
+0 0 0 0 0 0 7 2 48000702
+0 0 0 0 0 0 8 2 48000802
+0 0 0 0 0 0 9 2 48000902
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 0 4 48000002
-1 0 0 0 0 0 2 4 48000102
-1 0 0 0 0 0 4 4 48000202
-1 0 0 0 0 0 6 4 48000302
-1 0 0 0 0 0 8 4 48000402
-1 0 0 0 0 0 10 4 48000502
-1 0 0 0 0 0 12 4 48000602
-1 0 0 0 0 0 14 4 48000702
-1 0 0 0 0 0 16 4 48000802
-1 0 0 0 0 0 18 4 48000902
+1 0 0 0 0 0 0 2 48000002
+1 0 0 0 0 0 1 2 48000102
+1 0 0 0 0 0 2 2 48000202
+1 0 0 0 0 0 3 2 48000302
+1 0 0 0 0 0 4 2 48000402
+1 0 0 0 0 0 5 2 48000502
+1 0 0 0 0 0 6 2 48000602
+1 0 0 0 0 0 7 2 48000702
+1 0 0 0 0 0 8 2 48000802
+1 0 0 0 0 0 9 2 48000902
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xz/fzy.zl b/CarpetAttic/Cart3dTest/test/axial-xz/fzy.zl
index 370ff6a56..e06b7b4d3 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xz/fzy.zl
+++ b/CarpetAttic/Cart3dTest/test/axial-xz/fzy.zl
@@ -1,32 +1,34 @@
 # CART3DTEST::fzy z (fzy)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 10 0 48000500
-0 0 0 0 0 0 10 2 48000501
-0 0 0 0 0 0 10 4 48000502
-0 0 0 0 0 0 10 6 48000503
-0 0 0 0 0 0 10 8 48000504
-0 0 0 0 0 0 10 10 48000505
-0 0 0 0 0 0 10 12 48000506
-0 0 0 0 0 0 10 14 48000507
-0 0 0 0 0 0 10 16 48000508
-0 0 0 0 0 0 10 18 48000509
+0 0 0 0 0 0 5 0 48000500
+0 0 0 0 0 0 5 1 48000501
+0 0 0 0 0 0 5 2 48000502
+0 0 0 0 0 0 5 3 48000503
+0 0 0 0 0 0 5 4 48000504
+0 0 0 0 0 0 5 5 48000505
+0 0 0 0 0 0 5 6 48000506
+0 0 0 0 0 0 5 7 48000507
+0 0 0 0 0 0 5 8 48000508
+0 0 0 0 0 0 5 9 48000509
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 10 0 -48010501
-1 0 0 0 0 0 10 2 -48010500
-1 0 0 0 0 0 10 4 48000502
-1 0 0 0 0 0 10 6 48000503
-1 0 0 0 0 0 10 8 48000504
-1 0 0 0 0 0 10 10 48000505
-1 0 0 0 0 0 10 12 48000506
-1 0 0 0 0 0 10 14 48000507
-1 0 0 0 0 0 10 16 48000508
-1 0 0 0 0 0 10 18 48000509
+1 0 0 0 0 0 5 0 -48010501
+1 0 0 0 0 0 5 1 -48010500
+1 0 0 0 0 0 5 2 48000502
+1 0 0 0 0 0 5 3 48000503
+1 0 0 0 0 0 5 4 48000504
+1 0 0 0 0 0 5 5 48000505
+1 0 0 0 0 0 5 6 48000506
+1 0 0 0 0 0 5 7 48000507
+1 0 0 0 0 0 5 8 48000508
+1 0 0 0 0 0 5 9 48000509
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xz/fzz.xl b/CarpetAttic/Cart3dTest/test/axial-xz/fzz.xl
index dc6c56e96..ea6d43b75 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xz/fzz.xl
+++ b/CarpetAttic/Cart3dTest/test/axial-xz/fzz.xl
@@ -1,32 +1,34 @@
 # CART3DTEST::fzz x (fzz)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 10 4 49000502
-0 0 0 0 0 2 10 4 49010502
-0 0 0 0 0 4 10 4 49020502
-0 0 0 0 0 6 10 4 49030502
-0 0 0 0 0 8 10 4 49040502
-0 0 0 0 0 10 10 4 49050502
-0 0 0 0 0 12 10 4 49060502
-0 0 0 0 0 14 10 4 49070502
-0 0 0 0 0 16 10 4 49080502
-0 0 0 0 0 18 10 4 49090502
+0 0 0 0 0 0 5 2 49000502
+0 0 0 0 0 1 5 2 49010502
+0 0 0 0 0 2 5 2 49020502
+0 0 0 0 0 3 5 2 49030502
+0 0 0 0 0 4 5 2 49040502
+0 0 0 0 0 5 5 2 49050502
+0 0 0 0 0 6 5 2 49060502
+0 0 0 0 0 7 5 2 49070502
+0 0 0 0 0 8 5 2 49080502
+0 0 0 0 0 9 5 2 49090502
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 10 4 49000502
-1 0 0 0 0 2 10 4 49010502
-1 0 0 0 0 4 10 4 49020502
-1 0 0 0 0 6 10 4 49030502
-1 0 0 0 0 8 10 4 49040502
-1 0 0 0 0 10 10 4 49050502
-1 0 0 0 0 12 10 4 49060502
-1 0 0 0 0 14 10 4 49070502
-1 0 0 0 0 16 10 4 49080502
-1 0 0 0 0 18 10 4 49090502
+1 0 0 0 0 0 5 2 49000502
+1 0 0 0 0 1 5 2 49010502
+1 0 0 0 0 2 5 2 49020502
+1 0 0 0 0 3 5 2 49030502
+1 0 0 0 0 4 5 2 49040502
+1 0 0 0 0 5 5 2 49050502
+1 0 0 0 0 6 5 2 49060502
+1 0 0 0 0 7 5 2 49070502
+1 0 0 0 0 8 5 2 49080502
+1 0 0 0 0 9 5 2 49090502
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xz/fzz.yl b/CarpetAttic/Cart3dTest/test/axial-xz/fzz.yl
index f3995c451..dc2c59142 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xz/fzz.yl
+++ b/CarpetAttic/Cart3dTest/test/axial-xz/fzz.yl
@@ -1,32 +1,34 @@
 # CART3DTEST::fzz y (fzz)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 0 4 49000002
-0 0 0 0 0 0 2 4 49000102
-0 0 0 0 0 0 4 4 49000202
-0 0 0 0 0 0 6 4 49000302
-0 0 0 0 0 0 8 4 49000402
-0 0 0 0 0 0 10 4 49000502
-0 0 0 0 0 0 12 4 49000602
-0 0 0 0 0 0 14 4 49000702
-0 0 0 0 0 0 16 4 49000802
-0 0 0 0 0 0 18 4 49000902
+0 0 0 0 0 0 0 2 49000002
+0 0 0 0 0 0 1 2 49000102
+0 0 0 0 0 0 2 2 49000202
+0 0 0 0 0 0 3 2 49000302
+0 0 0 0 0 0 4 2 49000402
+0 0 0 0 0 0 5 2 49000502
+0 0 0 0 0 0 6 2 49000602
+0 0 0 0 0 0 7 2 49000702
+0 0 0 0 0 0 8 2 49000802
+0 0 0 0 0 0 9 2 49000902
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 0 4 49000002
-1 0 0 0 0 0 2 4 49000102
-1 0 0 0 0 0 4 4 49000202
-1 0 0 0 0 0 6 4 49000302
-1 0 0 0 0 0 8 4 49000402
-1 0 0 0 0 0 10 4 49000502
-1 0 0 0 0 0 12 4 49000602
-1 0 0 0 0 0 14 4 49000702
-1 0 0 0 0 0 16 4 49000802
-1 0 0 0 0 0 18 4 49000902
+1 0 0 0 0 0 0 2 49000002
+1 0 0 0 0 0 1 2 49000102
+1 0 0 0 0 0 2 2 49000202
+1 0 0 0 0 0 3 2 49000302
+1 0 0 0 0 0 4 2 49000402
+1 0 0 0 0 0 5 2 49000502
+1 0 0 0 0 0 6 2 49000602
+1 0 0 0 0 0 7 2 49000702
+1 0 0 0 0 0 8 2 49000802
+1 0 0 0 0 0 9 2 49000902
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xz/fzz.zl b/CarpetAttic/Cart3dTest/test/axial-xz/fzz.zl
index 90dc77140..393f38d75 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xz/fzz.zl
+++ b/CarpetAttic/Cart3dTest/test/axial-xz/fzz.zl
@@ -1,32 +1,34 @@
 # CART3DTEST::fzz z (fzz)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 10 0 49000500
-0 0 0 0 0 0 10 2 49000501
-0 0 0 0 0 0 10 4 49000502
-0 0 0 0 0 0 10 6 49000503
-0 0 0 0 0 0 10 8 49000504
-0 0 0 0 0 0 10 10 49000505
-0 0 0 0 0 0 10 12 49000506
-0 0 0 0 0 0 10 14 49000507
-0 0 0 0 0 0 10 16 49000508
-0 0 0 0 0 0 10 18 49000509
+0 0 0 0 0 0 5 0 49000500
+0 0 0 0 0 0 5 1 49000501
+0 0 0 0 0 0 5 2 49000502
+0 0 0 0 0 0 5 3 49000503
+0 0 0 0 0 0 5 4 49000504
+0 0 0 0 0 0 5 5 49000505
+0 0 0 0 0 0 5 6 49000506
+0 0 0 0 0 0 5 7 49000507
+0 0 0 0 0 0 5 8 49000508
+0 0 0 0 0 0 5 9 49000509
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 10 0 49010501
-1 0 0 0 0 0 10 2 49010500
-1 0 0 0 0 0 10 4 49000502
-1 0 0 0 0 0 10 6 49000503
-1 0 0 0 0 0 10 8 49000504
-1 0 0 0 0 0 10 10 49000505
-1 0 0 0 0 0 10 12 49000506
-1 0 0 0 0 0 10 14 49000507
-1 0 0 0 0 0 10 16 49000508
-1 0 0 0 0 0 10 18 49000509
+1 0 0 0 0 0 5 0 49010501
+1 0 0 0 0 0 5 1 49010500
+1 0 0 0 0 0 5 2 49000502
+1 0 0 0 0 0 5 3 49000503
+1 0 0 0 0 0 5 4 49000504
+1 0 0 0 0 0 5 5 49000505
+1 0 0 0 0 0 5 6 49000506
+1 0 0 0 0 0 5 7 49000507
+1 0 0 0 0 0 5 8 49000508
+1 0 0 0 0 0 5 9 49000509
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xz/s.xl b/CarpetAttic/Cart3dTest/test/axial-xz/s.xl
index d22878e7c..7a04400cd 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xz/s.xl
+++ b/CarpetAttic/Cart3dTest/test/axial-xz/s.xl
@@ -1,32 +1,34 @@
 # CART3DTEST::s x (s)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 10 4 1000502
-0 0 0 0 0 2 10 4 1010502
-0 0 0 0 0 4 10 4 1020502
-0 0 0 0 0 6 10 4 1030502
-0 0 0 0 0 8 10 4 1040502
-0 0 0 0 0 10 10 4 1050502
-0 0 0 0 0 12 10 4 1060502
-0 0 0 0 0 14 10 4 1070502
-0 0 0 0 0 16 10 4 1080502
-0 0 0 0 0 18 10 4 1090502
+0 0 0 0 0 0 5 2 1000502
+0 0 0 0 0 1 5 2 1010502
+0 0 0 0 0 2 5 2 1020502
+0 0 0 0 0 3 5 2 1030502
+0 0 0 0 0 4 5 2 1040502
+0 0 0 0 0 5 5 2 1050502
+0 0 0 0 0 6 5 2 1060502
+0 0 0 0 0 7 5 2 1070502
+0 0 0 0 0 8 5 2 1080502
+0 0 0 0 0 9 5 2 1090502
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 10 4 1000502
-1 0 0 0 0 2 10 4 1010502
-1 0 0 0 0 4 10 4 1020502
-1 0 0 0 0 6 10 4 1030502
-1 0 0 0 0 8 10 4 1040502
-1 0 0 0 0 10 10 4 1050502
-1 0 0 0 0 12 10 4 1060502
-1 0 0 0 0 14 10 4 1070502
-1 0 0 0 0 16 10 4 1080502
-1 0 0 0 0 18 10 4 1090502
+1 0 0 0 0 0 5 2 1000502
+1 0 0 0 0 1 5 2 1010502
+1 0 0 0 0 2 5 2 1020502
+1 0 0 0 0 3 5 2 1030502
+1 0 0 0 0 4 5 2 1040502
+1 0 0 0 0 5 5 2 1050502
+1 0 0 0 0 6 5 2 1060502
+1 0 0 0 0 7 5 2 1070502
+1 0 0 0 0 8 5 2 1080502
+1 0 0 0 0 9 5 2 1090502
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xz/s.yl b/CarpetAttic/Cart3dTest/test/axial-xz/s.yl
index 56ee22b55..40c6a24c3 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xz/s.yl
+++ b/CarpetAttic/Cart3dTest/test/axial-xz/s.yl
@@ -1,32 +1,34 @@
 # CART3DTEST::s y (s)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 0 4 1000002
-0 0 0 0 0 0 2 4 1000102
-0 0 0 0 0 0 4 4 1000202
-0 0 0 0 0 0 6 4 1000302
-0 0 0 0 0 0 8 4 1000402
-0 0 0 0 0 0 10 4 1000502
-0 0 0 0 0 0 12 4 1000602
-0 0 0 0 0 0 14 4 1000702
-0 0 0 0 0 0 16 4 1000802
-0 0 0 0 0 0 18 4 1000902
+0 0 0 0 0 0 0 2 1000002
+0 0 0 0 0 0 1 2 1000102
+0 0 0 0 0 0 2 2 1000202
+0 0 0 0 0 0 3 2 1000302
+0 0 0 0 0 0 4 2 1000402
+0 0 0 0 0 0 5 2 1000502
+0 0 0 0 0 0 6 2 1000602
+0 0 0 0 0 0 7 2 1000702
+0 0 0 0 0 0 8 2 1000802
+0 0 0 0 0 0 9 2 1000902
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 0 4 1000002
-1 0 0 0 0 0 2 4 1000102
-1 0 0 0 0 0 4 4 1000202
-1 0 0 0 0 0 6 4 1000302
-1 0 0 0 0 0 8 4 1000402
-1 0 0 0 0 0 10 4 1000502
-1 0 0 0 0 0 12 4 1000602
-1 0 0 0 0 0 14 4 1000702
-1 0 0 0 0 0 16 4 1000802
-1 0 0 0 0 0 18 4 1000902
+1 0 0 0 0 0 0 2 1000002
+1 0 0 0 0 0 1 2 1000102
+1 0 0 0 0 0 2 2 1000202
+1 0 0 0 0 0 3 2 1000302
+1 0 0 0 0 0 4 2 1000402
+1 0 0 0 0 0 5 2 1000502
+1 0 0 0 0 0 6 2 1000602
+1 0 0 0 0 0 7 2 1000702
+1 0 0 0 0 0 8 2 1000802
+1 0 0 0 0 0 9 2 1000902
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xz/s.zl b/CarpetAttic/Cart3dTest/test/axial-xz/s.zl
index 9c1183901..c575bae8a 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xz/s.zl
+++ b/CarpetAttic/Cart3dTest/test/axial-xz/s.zl
@@ -1,32 +1,34 @@
 # CART3DTEST::s z (s)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 10 0 1000500
-0 0 0 0 0 0 10 2 1000501
-0 0 0 0 0 0 10 4 1000502
-0 0 0 0 0 0 10 6 1000503
-0 0 0 0 0 0 10 8 1000504
-0 0 0 0 0 0 10 10 1000505
-0 0 0 0 0 0 10 12 1000506
-0 0 0 0 0 0 10 14 1000507
-0 0 0 0 0 0 10 16 1000508
-0 0 0 0 0 0 10 18 1000509
+0 0 0 0 0 0 5 0 1000500
+0 0 0 0 0 0 5 1 1000501
+0 0 0 0 0 0 5 2 1000502
+0 0 0 0 0 0 5 3 1000503
+0 0 0 0 0 0 5 4 1000504
+0 0 0 0 0 0 5 5 1000505
+0 0 0 0 0 0 5 6 1000506
+0 0 0 0 0 0 5 7 1000507
+0 0 0 0 0 0 5 8 1000508
+0 0 0 0 0 0 5 9 1000509
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 10 0 1010500
-1 0 0 0 0 0 10 2 1000500
-1 0 0 0 0 0 10 4 1000502
-1 0 0 0 0 0 10 6 1000503
-1 0 0 0 0 0 10 8 1000504
-1 0 0 0 0 0 10 10 1000505
-1 0 0 0 0 0 10 12 1000506
-1 0 0 0 0 0 10 14 1000507
-1 0 0 0 0 0 10 16 1000508
-1 0 0 0 0 0 10 18 1000509
+1 0 0 0 0 0 5 0 1010500
+1 0 0 0 0 0 5 1 1000500
+1 0 0 0 0 0 5 2 1000502
+1 0 0 0 0 0 5 3 1000503
+1 0 0 0 0 0 5 4 1000504
+1 0 0 0 0 0 5 5 1000505
+1 0 0 0 0 0 5 6 1000506
+1 0 0 0 0 0 5 7 1000507
+1 0 0 0 0 0 5 8 1000508
+1 0 0 0 0 0 5 9 1000509
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xz/spher3d_r.xl b/CarpetAttic/Cart3dTest/test/axial-xz/spher3d_r.xl
index 0798c4dd6..21ffaff0d 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xz/spher3d_r.xl
+++ b/CarpetAttic/Cart3dTest/test/axial-xz/spher3d_r.xl
@@ -1,32 +1,34 @@
 # GRID::spher3d_r x (spher3d_r)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 10 4 0.259807621135332
-0 0 0 0 0 2 10 4 0.49749371855331
-0 0 0 0 0 4 10 4 0.779422863405995
-0 0 0 0 0 6 10 4 1.07121426428143
-0 0 0 0 0 8 10 4 1.36656503687164
-0 0 0 0 0 10 10 4 1.66358047596141
-0 0 0 0 0 12 10 4 1.9615045245933
-0 0 0 0 0 14 10 4 2.2599778759979
-0 0 0 0 0 16 10 4 2.5588083163848
-0 0 0 0 0 18 10 4 2.85788383248865
+0 0 0 0 0 0 5 2 0.259807621135332
+0 0 0 0 0 1 5 2 0.49749371855331
+0 0 0 0 0 2 5 2 0.779422863405995
+0 0 0 0 0 3 5 2 1.07121426428143
+0 0 0 0 0 4 5 2 1.36656503687164
+0 0 0 0 0 5 5 2 1.66358047596141
+0 0 0 0 0 6 5 2 1.9615045245933
+0 0 0 0 0 7 5 2 2.2599778759979
+0 0 0 0 0 8 5 2 2.5588083163848
+0 0 0 0 0 9 5 2 2.85788383248865
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 10 4 0.259807621135332
-1 0 0 0 0 2 10 4 0.49749371855331
-1 0 0 0 0 4 10 4 0.779422863405995
-1 0 0 0 0 6 10 4 1.07121426428143
-1 0 0 0 0 8 10 4 1.36656503687164
-1 0 0 0 0 10 10 4 1.66358047596141
-1 0 0 0 0 12 10 4 1.9615045245933
-1 0 0 0 0 14 10 4 2.2599778759979
-1 0 0 0 0 16 10 4 2.5588083163848
-1 0 0 0 0 18 10 4 2.85788383248865
+1 0 0 0 0 0 5 2 0.259807621135332
+1 0 0 0 0 1 5 2 0.49749371855331
+1 0 0 0 0 2 5 2 0.779422863405995
+1 0 0 0 0 3 5 2 1.07121426428143
+1 0 0 0 0 4 5 2 1.36656503687164
+1 0 0 0 0 5 5 2 1.66358047596141
+1 0 0 0 0 6 5 2 1.9615045245933
+1 0 0 0 0 7 5 2 2.2599778759979
+1 0 0 0 0 8 5 2 2.5588083163848
+1 0 0 0 0 9 5 2 2.85788383248865
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xz/spher3d_r.yl b/CarpetAttic/Cart3dTest/test/axial-xz/spher3d_r.yl
index 133ae8c21..6a580329f 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xz/spher3d_r.yl
+++ b/CarpetAttic/Cart3dTest/test/axial-xz/spher3d_r.yl
@@ -1,32 +1,34 @@
 # GRID::spher3d_r y (spher3d_r)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 0 4 1.36656503687164
-0 0 0 0 0 0 2 4 1.07121426428143
-0 0 0 0 0 0 4 4 0.779422863405995
-0 0 0 0 0 0 6 4 0.49749371855331
-0 0 0 0 0 0 8 4 0.259807621135332
-0 0 0 0 0 0 10 4 0.259807621135332
-0 0 0 0 0 0 12 4 0.49749371855331
-0 0 0 0 0 0 14 4 0.779422863405995
-0 0 0 0 0 0 16 4 1.07121426428143
-0 0 0 0 0 0 18 4 1.36656503687164
+0 0 0 0 0 0 0 2 1.36656503687164
+0 0 0 0 0 0 1 2 1.07121426428143
+0 0 0 0 0 0 2 2 0.779422863405995
+0 0 0 0 0 0 3 2 0.49749371855331
+0 0 0 0 0 0 4 2 0.259807621135332
+0 0 0 0 0 0 5 2 0.259807621135332
+0 0 0 0 0 0 6 2 0.49749371855331
+0 0 0 0 0 0 7 2 0.779422863405995
+0 0 0 0 0 0 8 2 1.07121426428143
+0 0 0 0 0 0 9 2 1.36656503687164
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 0 4 1.36656503687164
-1 0 0 0 0 0 2 4 1.07121426428143
-1 0 0 0 0 0 4 4 0.779422863405995
-1 0 0 0 0 0 6 4 0.49749371855331
-1 0 0 0 0 0 8 4 0.259807621135332
-1 0 0 0 0 0 10 4 0.259807621135332
-1 0 0 0 0 0 12 4 0.49749371855331
-1 0 0 0 0 0 14 4 0.779422863405995
-1 0 0 0 0 0 16 4 1.07121426428143
-1 0 0 0 0 0 18 4 1.36656503687164
+1 0 0 0 0 0 0 2 1.36656503687164
+1 0 0 0 0 0 1 2 1.07121426428143
+1 0 0 0 0 0 2 2 0.779422863405995
+1 0 0 0 0 0 3 2 0.49749371855331
+1 0 0 0 0 0 4 2 0.259807621135332
+1 0 0 0 0 0 5 2 0.259807621135332
+1 0 0 0 0 0 6 2 0.49749371855331
+1 0 0 0 0 0 7 2 0.779422863405995
+1 0 0 0 0 0 8 2 1.07121426428143
+1 0 0 0 0 0 9 2 1.36656503687164
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xz/spher3d_r.zl b/CarpetAttic/Cart3dTest/test/axial-xz/spher3d_r.zl
index fa7518125..2a988009e 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xz/spher3d_r.zl
+++ b/CarpetAttic/Cart3dTest/test/axial-xz/spher3d_r.zl
@@ -1,32 +1,34 @@
 # GRID::spher3d_r z (spher3d_r)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 10 0 0.49749371855331
-0 0 0 0 0 0 10 2 0.259807621135332
-0 0 0 0 0 0 10 4 0.259807621135332
-0 0 0 0 0 0 10 6 0.49749371855331
-0 0 0 0 0 0 10 8 0.779422863405995
-0 0 0 0 0 0 10 10 1.07121426428143
-0 0 0 0 0 0 10 12 1.36656503687164
-0 0 0 0 0 0 10 14 1.66358047596141
-0 0 0 0 0 0 10 16 1.9615045245933
-0 0 0 0 0 0 10 18 2.2599778759979
+0 0 0 0 0 0 5 0 0.49749371855331
+0 0 0 0 0 0 5 1 0.259807621135332
+0 0 0 0 0 0 5 2 0.259807621135332
+0 0 0 0 0 0 5 3 0.49749371855331
+0 0 0 0 0 0 5 4 0.779422863405995
+0 0 0 0 0 0 5 5 1.07121426428143
+0 0 0 0 0 0 5 6 1.36656503687164
+0 0 0 0 0 0 5 7 1.66358047596141
+0 0 0 0 0 0 5 8 1.9615045245933
+0 0 0 0 0 0 5 9 2.2599778759979
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 10 0 0.49749371855331
-1 0 0 0 0 0 10 2 0.259807621135332
-1 0 0 0 0 0 10 4 0.259807621135332
-1 0 0 0 0 0 10 6 0.49749371855331
-1 0 0 0 0 0 10 8 0.779422863405995
-1 0 0 0 0 0 10 10 1.07121426428143
-1 0 0 0 0 0 10 12 1.36656503687164
-1 0 0 0 0 0 10 14 1.66358047596141
-1 0 0 0 0 0 10 16 1.9615045245933
-1 0 0 0 0 0 10 18 2.2599778759979
+1 0 0 0 0 0 5 0 0.49749371855331
+1 0 0 0 0 0 5 1 0.259807621135332
+1 0 0 0 0 0 5 2 0.259807621135332
+1 0 0 0 0 0 5 3 0.49749371855331
+1 0 0 0 0 0 5 4 0.779422863405995
+1 0 0 0 0 0 5 5 1.07121426428143
+1 0 0 0 0 0 5 6 1.36656503687164
+1 0 0 0 0 0 5 7 1.66358047596141
+1 0 0 0 0 0 5 8 1.9615045245933
+1 0 0 0 0 0 5 9 2.2599778759979
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xz/txx.xl b/CarpetAttic/Cart3dTest/test/axial-xz/txx.xl
index 595e8f820..b7e4ea8ba 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xz/txx.xl
+++ b/CarpetAttic/Cart3dTest/test/axial-xz/txx.xl
@@ -1,32 +1,34 @@
 # CART3DTEST::txx x (txx)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 10 4 21000502
-0 0 0 0 0 2 10 4 21010502
-0 0 0 0 0 4 10 4 21020502
-0 0 0 0 0 6 10 4 21030502
-0 0 0 0 0 8 10 4 21040502
-0 0 0 0 0 10 10 4 21050502
-0 0 0 0 0 12 10 4 21060502
-0 0 0 0 0 14 10 4 21070502
-0 0 0 0 0 16 10 4 21080502
-0 0 0 0 0 18 10 4 21090502
+0 0 0 0 0 0 5 2 21000502
+0 0 0 0 0 1 5 2 21010502
+0 0 0 0 0 2 5 2 21020502
+0 0 0 0 0 3 5 2 21030502
+0 0 0 0 0 4 5 2 21040502
+0 0 0 0 0 5 5 2 21050502
+0 0 0 0 0 6 5 2 21060502
+0 0 0 0 0 7 5 2 21070502
+0 0 0 0 0 8 5 2 21080502
+0 0 0 0 0 9 5 2 21090502
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 10 4 21000502
-1 0 0 0 0 2 10 4 21010502
-1 0 0 0 0 4 10 4 21020502
-1 0 0 0 0 6 10 4 21030502
-1 0 0 0 0 8 10 4 21040502
-1 0 0 0 0 10 10 4 21050502
-1 0 0 0 0 12 10 4 21060502
-1 0 0 0 0 14 10 4 21070502
-1 0 0 0 0 16 10 4 21080502
-1 0 0 0 0 18 10 4 21090502
+1 0 0 0 0 0 5 2 21000502
+1 0 0 0 0 1 5 2 21010502
+1 0 0 0 0 2 5 2 21020502
+1 0 0 0 0 3 5 2 21030502
+1 0 0 0 0 4 5 2 21040502
+1 0 0 0 0 5 5 2 21050502
+1 0 0 0 0 6 5 2 21060502
+1 0 0 0 0 7 5 2 21070502
+1 0 0 0 0 8 5 2 21080502
+1 0 0 0 0 9 5 2 21090502
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xz/txx.yl b/CarpetAttic/Cart3dTest/test/axial-xz/txx.yl
index 3e91225ef..7c4e672d3 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xz/txx.yl
+++ b/CarpetAttic/Cart3dTest/test/axial-xz/txx.yl
@@ -1,32 +1,34 @@
 # CART3DTEST::txx y (txx)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 0 4 21000002
-0 0 0 0 0 0 2 4 21000102
-0 0 0 0 0 0 4 4 21000202
-0 0 0 0 0 0 6 4 21000302
-0 0 0 0 0 0 8 4 21000402
-0 0 0 0 0 0 10 4 21000502
-0 0 0 0 0 0 12 4 21000602
-0 0 0 0 0 0 14 4 21000702
-0 0 0 0 0 0 16 4 21000802
-0 0 0 0 0 0 18 4 21000902
+0 0 0 0 0 0 0 2 21000002
+0 0 0 0 0 0 1 2 21000102
+0 0 0 0 0 0 2 2 21000202
+0 0 0 0 0 0 3 2 21000302
+0 0 0 0 0 0 4 2 21000402
+0 0 0 0 0 0 5 2 21000502
+0 0 0 0 0 0 6 2 21000602
+0 0 0 0 0 0 7 2 21000702
+0 0 0 0 0 0 8 2 21000802
+0 0 0 0 0 0 9 2 21000902
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 0 4 21000002
-1 0 0 0 0 0 2 4 21000102
-1 0 0 0 0 0 4 4 21000202
-1 0 0 0 0 0 6 4 21000302
-1 0 0 0 0 0 8 4 21000402
-1 0 0 0 0 0 10 4 21000502
-1 0 0 0 0 0 12 4 21000602
-1 0 0 0 0 0 14 4 21000702
-1 0 0 0 0 0 16 4 21000802
-1 0 0 0 0 0 18 4 21000902
+1 0 0 0 0 0 0 2 21000002
+1 0 0 0 0 0 1 2 21000102
+1 0 0 0 0 0 2 2 21000202
+1 0 0 0 0 0 3 2 21000302
+1 0 0 0 0 0 4 2 21000402
+1 0 0 0 0 0 5 2 21000502
+1 0 0 0 0 0 6 2 21000602
+1 0 0 0 0 0 7 2 21000702
+1 0 0 0 0 0 8 2 21000802
+1 0 0 0 0 0 9 2 21000902
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xz/txx.zl b/CarpetAttic/Cart3dTest/test/axial-xz/txx.zl
index 03d025f88..33b33a490 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xz/txx.zl
+++ b/CarpetAttic/Cart3dTest/test/axial-xz/txx.zl
@@ -1,32 +1,34 @@
 # CART3DTEST::txx z (txx)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 10 0 21000500
-0 0 0 0 0 0 10 2 21000501
-0 0 0 0 0 0 10 4 21000502
-0 0 0 0 0 0 10 6 21000503
-0 0 0 0 0 0 10 8 21000504
-0 0 0 0 0 0 10 10 21000505
-0 0 0 0 0 0 10 12 21000506
-0 0 0 0 0 0 10 14 21000507
-0 0 0 0 0 0 10 16 21000508
-0 0 0 0 0 0 10 18 21000509
+0 0 0 0 0 0 5 0 21000500
+0 0 0 0 0 0 5 1 21000501
+0 0 0 0 0 0 5 2 21000502
+0 0 0 0 0 0 5 3 21000503
+0 0 0 0 0 0 5 4 21000504
+0 0 0 0 0 0 5 5 21000505
+0 0 0 0 0 0 5 6 21000506
+0 0 0 0 0 0 5 7 21000507
+0 0 0 0 0 0 5 8 21000508
+0 0 0 0 0 0 5 9 21000509
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 10 0 26010500
-1 0 0 0 0 0 10 2 26000500
-1 0 0 0 0 0 10 4 21000502
-1 0 0 0 0 0 10 6 21000503
-1 0 0 0 0 0 10 8 21000504
-1 0 0 0 0 0 10 10 21000505
-1 0 0 0 0 0 10 12 21000506
-1 0 0 0 0 0 10 14 21000507
-1 0 0 0 0 0 10 16 21000508
-1 0 0 0 0 0 10 18 21000509
+1 0 0 0 0 0 5 0 26010500
+1 0 0 0 0 0 5 1 26000500
+1 0 0 0 0 0 5 2 21000502
+1 0 0 0 0 0 5 3 21000503
+1 0 0 0 0 0 5 4 21000504
+1 0 0 0 0 0 5 5 21000505
+1 0 0 0 0 0 5 6 21000506
+1 0 0 0 0 0 5 7 21000507
+1 0 0 0 0 0 5 8 21000508
+1 0 0 0 0 0 5 9 21000509
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xz/txy.xl b/CarpetAttic/Cart3dTest/test/axial-xz/txy.xl
index ad930fa1a..2278b90e1 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xz/txy.xl
+++ b/CarpetAttic/Cart3dTest/test/axial-xz/txy.xl
@@ -1,32 +1,34 @@
 # CART3DTEST::txy x (txy)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 10 4 22000502
-0 0 0 0 0 2 10 4 22010502
-0 0 0 0 0 4 10 4 22020502
-0 0 0 0 0 6 10 4 22030502
-0 0 0 0 0 8 10 4 22040502
-0 0 0 0 0 10 10 4 22050502
-0 0 0 0 0 12 10 4 22060502
-0 0 0 0 0 14 10 4 22070502
-0 0 0 0 0 16 10 4 22080502
-0 0 0 0 0 18 10 4 22090502
+0 0 0 0 0 0 5 2 22000502
+0 0 0 0 0 1 5 2 22010502
+0 0 0 0 0 2 5 2 22020502
+0 0 0 0 0 3 5 2 22030502
+0 0 0 0 0 4 5 2 22040502
+0 0 0 0 0 5 5 2 22050502
+0 0 0 0 0 6 5 2 22060502
+0 0 0 0 0 7 5 2 22070502
+0 0 0 0 0 8 5 2 22080502
+0 0 0 0 0 9 5 2 22090502
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 10 4 22000502
-1 0 0 0 0 2 10 4 22010502
-1 0 0 0 0 4 10 4 22020502
-1 0 0 0 0 6 10 4 22030502
-1 0 0 0 0 8 10 4 22040502
-1 0 0 0 0 10 10 4 22050502
-1 0 0 0 0 12 10 4 22060502
-1 0 0 0 0 14 10 4 22070502
-1 0 0 0 0 16 10 4 22080502
-1 0 0 0 0 18 10 4 22090502
+1 0 0 0 0 0 5 2 22000502
+1 0 0 0 0 1 5 2 22010502
+1 0 0 0 0 2 5 2 22020502
+1 0 0 0 0 3 5 2 22030502
+1 0 0 0 0 4 5 2 22040502
+1 0 0 0 0 5 5 2 22050502
+1 0 0 0 0 6 5 2 22060502
+1 0 0 0 0 7 5 2 22070502
+1 0 0 0 0 8 5 2 22080502
+1 0 0 0 0 9 5 2 22090502
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xz/txy.yl b/CarpetAttic/Cart3dTest/test/axial-xz/txy.yl
index 5caa18105..5775010c6 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xz/txy.yl
+++ b/CarpetAttic/Cart3dTest/test/axial-xz/txy.yl
@@ -1,32 +1,34 @@
 # CART3DTEST::txy y (txy)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 0 4 22000002
-0 0 0 0 0 0 2 4 22000102
-0 0 0 0 0 0 4 4 22000202
-0 0 0 0 0 0 6 4 22000302
-0 0 0 0 0 0 8 4 22000402
-0 0 0 0 0 0 10 4 22000502
-0 0 0 0 0 0 12 4 22000602
-0 0 0 0 0 0 14 4 22000702
-0 0 0 0 0 0 16 4 22000802
-0 0 0 0 0 0 18 4 22000902
+0 0 0 0 0 0 0 2 22000002
+0 0 0 0 0 0 1 2 22000102
+0 0 0 0 0 0 2 2 22000202
+0 0 0 0 0 0 3 2 22000302
+0 0 0 0 0 0 4 2 22000402
+0 0 0 0 0 0 5 2 22000502
+0 0 0 0 0 0 6 2 22000602
+0 0 0 0 0 0 7 2 22000702
+0 0 0 0 0 0 8 2 22000802
+0 0 0 0 0 0 9 2 22000902
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 0 4 22000002
-1 0 0 0 0 0 2 4 22000102
-1 0 0 0 0 0 4 4 22000202
-1 0 0 0 0 0 6 4 22000302
-1 0 0 0 0 0 8 4 22000402
-1 0 0 0 0 0 10 4 22000502
-1 0 0 0 0 0 12 4 22000602
-1 0 0 0 0 0 14 4 22000702
-1 0 0 0 0 0 16 4 22000802
-1 0 0 0 0 0 18 4 22000902
+1 0 0 0 0 0 0 2 22000002
+1 0 0 0 0 0 1 2 22000102
+1 0 0 0 0 0 2 2 22000202
+1 0 0 0 0 0 3 2 22000302
+1 0 0 0 0 0 4 2 22000402
+1 0 0 0 0 0 5 2 22000502
+1 0 0 0 0 0 6 2 22000602
+1 0 0 0 0 0 7 2 22000702
+1 0 0 0 0 0 8 2 22000802
+1 0 0 0 0 0 9 2 22000902
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xz/txy.zl b/CarpetAttic/Cart3dTest/test/axial-xz/txy.zl
index 66d020a92..b1f503063 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xz/txy.zl
+++ b/CarpetAttic/Cart3dTest/test/axial-xz/txy.zl
@@ -1,32 +1,34 @@
 # CART3DTEST::txy z (txy)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 10 0 22000500
-0 0 0 0 0 0 10 2 22000501
-0 0 0 0 0 0 10 4 22000502
-0 0 0 0 0 0 10 6 22000503
-0 0 0 0 0 0 10 8 22000504
-0 0 0 0 0 0 10 10 22000505
-0 0 0 0 0 0 10 12 22000506
-0 0 0 0 0 0 10 14 22000507
-0 0 0 0 0 0 10 16 22000508
-0 0 0 0 0 0 10 18 22000509
+0 0 0 0 0 0 5 0 22000500
+0 0 0 0 0 0 5 1 22000501
+0 0 0 0 0 0 5 2 22000502
+0 0 0 0 0 0 5 3 22000503
+0 0 0 0 0 0 5 4 22000504
+0 0 0 0 0 0 5 5 22000505
+0 0 0 0 0 0 5 6 22000506
+0 0 0 0 0 0 5 7 22000507
+0 0 0 0 0 0 5 8 22000508
+0 0 0 0 0 0 5 9 22000509
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 10 0 25010500
-1 0 0 0 0 0 10 2 25000500
-1 0 0 0 0 0 10 4 22000502
-1 0 0 0 0 0 10 6 22000503
-1 0 0 0 0 0 10 8 22000504
-1 0 0 0 0 0 10 10 22000505
-1 0 0 0 0 0 10 12 22000506
-1 0 0 0 0 0 10 14 22000507
-1 0 0 0 0 0 10 16 22000508
-1 0 0 0 0 0 10 18 22000509
+1 0 0 0 0 0 5 0 25010500
+1 0 0 0 0 0 5 1 25000500
+1 0 0 0 0 0 5 2 22000502
+1 0 0 0 0 0 5 3 22000503
+1 0 0 0 0 0 5 4 22000504
+1 0 0 0 0 0 5 5 22000505
+1 0 0 0 0 0 5 6 22000506
+1 0 0 0 0 0 5 7 22000507
+1 0 0 0 0 0 5 8 22000508
+1 0 0 0 0 0 5 9 22000509
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xz/txz.xl b/CarpetAttic/Cart3dTest/test/axial-xz/txz.xl
index 9c33a5b8a..f00e24469 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xz/txz.xl
+++ b/CarpetAttic/Cart3dTest/test/axial-xz/txz.xl
@@ -1,32 +1,34 @@
 # CART3DTEST::txz x (txz)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 10 4 23000502
-0 0 0 0 0 2 10 4 23010502
-0 0 0 0 0 4 10 4 23020502
-0 0 0 0 0 6 10 4 23030502
-0 0 0 0 0 8 10 4 23040502
-0 0 0 0 0 10 10 4 23050502
-0 0 0 0 0 12 10 4 23060502
-0 0 0 0 0 14 10 4 23070502
-0 0 0 0 0 16 10 4 23080502
-0 0 0 0 0 18 10 4 23090502
+0 0 0 0 0 0 5 2 23000502
+0 0 0 0 0 1 5 2 23010502
+0 0 0 0 0 2 5 2 23020502
+0 0 0 0 0 3 5 2 23030502
+0 0 0 0 0 4 5 2 23040502
+0 0 0 0 0 5 5 2 23050502
+0 0 0 0 0 6 5 2 23060502
+0 0 0 0 0 7 5 2 23070502
+0 0 0 0 0 8 5 2 23080502
+0 0 0 0 0 9 5 2 23090502
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 10 4 23000502
-1 0 0 0 0 2 10 4 23010502
-1 0 0 0 0 4 10 4 23020502
-1 0 0 0 0 6 10 4 23030502
-1 0 0 0 0 8 10 4 23040502
-1 0 0 0 0 10 10 4 23050502
-1 0 0 0 0 12 10 4 23060502
-1 0 0 0 0 14 10 4 23070502
-1 0 0 0 0 16 10 4 23080502
-1 0 0 0 0 18 10 4 23090502
+1 0 0 0 0 0 5 2 23000502
+1 0 0 0 0 1 5 2 23010502
+1 0 0 0 0 2 5 2 23020502
+1 0 0 0 0 3 5 2 23030502
+1 0 0 0 0 4 5 2 23040502
+1 0 0 0 0 5 5 2 23050502
+1 0 0 0 0 6 5 2 23060502
+1 0 0 0 0 7 5 2 23070502
+1 0 0 0 0 8 5 2 23080502
+1 0 0 0 0 9 5 2 23090502
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xz/txz.yl b/CarpetAttic/Cart3dTest/test/axial-xz/txz.yl
index 33102f028..782c67599 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xz/txz.yl
+++ b/CarpetAttic/Cart3dTest/test/axial-xz/txz.yl
@@ -1,32 +1,34 @@
 # CART3DTEST::txz y (txz)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 0 4 23000002
-0 0 0 0 0 0 2 4 23000102
-0 0 0 0 0 0 4 4 23000202
-0 0 0 0 0 0 6 4 23000302
-0 0 0 0 0 0 8 4 23000402
-0 0 0 0 0 0 10 4 23000502
-0 0 0 0 0 0 12 4 23000602
-0 0 0 0 0 0 14 4 23000702
-0 0 0 0 0 0 16 4 23000802
-0 0 0 0 0 0 18 4 23000902
+0 0 0 0 0 0 0 2 23000002
+0 0 0 0 0 0 1 2 23000102
+0 0 0 0 0 0 2 2 23000202
+0 0 0 0 0 0 3 2 23000302
+0 0 0 0 0 0 4 2 23000402
+0 0 0 0 0 0 5 2 23000502
+0 0 0 0 0 0 6 2 23000602
+0 0 0 0 0 0 7 2 23000702
+0 0 0 0 0 0 8 2 23000802
+0 0 0 0 0 0 9 2 23000902
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 0 4 23000002
-1 0 0 0 0 0 2 4 23000102
-1 0 0 0 0 0 4 4 23000202
-1 0 0 0 0 0 6 4 23000302
-1 0 0 0 0 0 8 4 23000402
-1 0 0 0 0 0 10 4 23000502
-1 0 0 0 0 0 12 4 23000602
-1 0 0 0 0 0 14 4 23000702
-1 0 0 0 0 0 16 4 23000802
-1 0 0 0 0 0 18 4 23000902
+1 0 0 0 0 0 0 2 23000002
+1 0 0 0 0 0 1 2 23000102
+1 0 0 0 0 0 2 2 23000202
+1 0 0 0 0 0 3 2 23000302
+1 0 0 0 0 0 4 2 23000402
+1 0 0 0 0 0 5 2 23000502
+1 0 0 0 0 0 6 2 23000602
+1 0 0 0 0 0 7 2 23000702
+1 0 0 0 0 0 8 2 23000802
+1 0 0 0 0 0 9 2 23000902
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xz/txz.zl b/CarpetAttic/Cart3dTest/test/axial-xz/txz.zl
index 376fb6239..dcb7d5658 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xz/txz.zl
+++ b/CarpetAttic/Cart3dTest/test/axial-xz/txz.zl
@@ -1,32 +1,34 @@
 # CART3DTEST::txz z (txz)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 10 0 23000500
-0 0 0 0 0 0 10 2 23000501
-0 0 0 0 0 0 10 4 23000502
-0 0 0 0 0 0 10 6 23000503
-0 0 0 0 0 0 10 8 23000504
-0 0 0 0 0 0 10 10 23000505
-0 0 0 0 0 0 10 12 23000506
-0 0 0 0 0 0 10 14 23000507
-0 0 0 0 0 0 10 16 23000508
-0 0 0 0 0 0 10 18 23000509
+0 0 0 0 0 0 5 0 23000500
+0 0 0 0 0 0 5 1 23000501
+0 0 0 0 0 0 5 2 23000502
+0 0 0 0 0 0 5 3 23000503
+0 0 0 0 0 0 5 4 23000504
+0 0 0 0 0 0 5 5 23000505
+0 0 0 0 0 0 5 6 23000506
+0 0 0 0 0 0 5 7 23000507
+0 0 0 0 0 0 5 8 23000508
+0 0 0 0 0 0 5 9 23000509
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 10 0 -23010500
-1 0 0 0 0 0 10 2 -23000500
-1 0 0 0 0 0 10 4 23000502
-1 0 0 0 0 0 10 6 23000503
-1 0 0 0 0 0 10 8 23000504
-1 0 0 0 0 0 10 10 23000505
-1 0 0 0 0 0 10 12 23000506
-1 0 0 0 0 0 10 14 23000507
-1 0 0 0 0 0 10 16 23000508
-1 0 0 0 0 0 10 18 23000509
+1 0 0 0 0 0 5 0 -23010500
+1 0 0 0 0 0 5 1 -23000500
+1 0 0 0 0 0 5 2 23000502
+1 0 0 0 0 0 5 3 23000503
+1 0 0 0 0 0 5 4 23000504
+1 0 0 0 0 0 5 5 23000505
+1 0 0 0 0 0 5 6 23000506
+1 0 0 0 0 0 5 7 23000507
+1 0 0 0 0 0 5 8 23000508
+1 0 0 0 0 0 5 9 23000509
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xz/tyy.xl b/CarpetAttic/Cart3dTest/test/axial-xz/tyy.xl
index b6cf8fe0a..e6d2a0f09 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xz/tyy.xl
+++ b/CarpetAttic/Cart3dTest/test/axial-xz/tyy.xl
@@ -1,32 +1,34 @@
 # CART3DTEST::tyy x (tyy)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 10 4 24000502
-0 0 0 0 0 2 10 4 24010502
-0 0 0 0 0 4 10 4 24020502
-0 0 0 0 0 6 10 4 24030502
-0 0 0 0 0 8 10 4 24040502
-0 0 0 0 0 10 10 4 24050502
-0 0 0 0 0 12 10 4 24060502
-0 0 0 0 0 14 10 4 24070502
-0 0 0 0 0 16 10 4 24080502
-0 0 0 0 0 18 10 4 24090502
+0 0 0 0 0 0 5 2 24000502
+0 0 0 0 0 1 5 2 24010502
+0 0 0 0 0 2 5 2 24020502
+0 0 0 0 0 3 5 2 24030502
+0 0 0 0 0 4 5 2 24040502
+0 0 0 0 0 5 5 2 24050502
+0 0 0 0 0 6 5 2 24060502
+0 0 0 0 0 7 5 2 24070502
+0 0 0 0 0 8 5 2 24080502
+0 0 0 0 0 9 5 2 24090502
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 10 4 24000502
-1 0 0 0 0 2 10 4 24010502
-1 0 0 0 0 4 10 4 24020502
-1 0 0 0 0 6 10 4 24030502
-1 0 0 0 0 8 10 4 24040502
-1 0 0 0 0 10 10 4 24050502
-1 0 0 0 0 12 10 4 24060502
-1 0 0 0 0 14 10 4 24070502
-1 0 0 0 0 16 10 4 24080502
-1 0 0 0 0 18 10 4 24090502
+1 0 0 0 0 0 5 2 24000502
+1 0 0 0 0 1 5 2 24010502
+1 0 0 0 0 2 5 2 24020502
+1 0 0 0 0 3 5 2 24030502
+1 0 0 0 0 4 5 2 24040502
+1 0 0 0 0 5 5 2 24050502
+1 0 0 0 0 6 5 2 24060502
+1 0 0 0 0 7 5 2 24070502
+1 0 0 0 0 8 5 2 24080502
+1 0 0 0 0 9 5 2 24090502
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xz/tyy.yl b/CarpetAttic/Cart3dTest/test/axial-xz/tyy.yl
index ae2bd6976..270b462b7 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xz/tyy.yl
+++ b/CarpetAttic/Cart3dTest/test/axial-xz/tyy.yl
@@ -1,32 +1,34 @@
 # CART3DTEST::tyy y (tyy)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 0 4 24000002
-0 0 0 0 0 0 2 4 24000102
-0 0 0 0 0 0 4 4 24000202
-0 0 0 0 0 0 6 4 24000302
-0 0 0 0 0 0 8 4 24000402
-0 0 0 0 0 0 10 4 24000502
-0 0 0 0 0 0 12 4 24000602
-0 0 0 0 0 0 14 4 24000702
-0 0 0 0 0 0 16 4 24000802
-0 0 0 0 0 0 18 4 24000902
+0 0 0 0 0 0 0 2 24000002
+0 0 0 0 0 0 1 2 24000102
+0 0 0 0 0 0 2 2 24000202
+0 0 0 0 0 0 3 2 24000302
+0 0 0 0 0 0 4 2 24000402
+0 0 0 0 0 0 5 2 24000502
+0 0 0 0 0 0 6 2 24000602
+0 0 0 0 0 0 7 2 24000702
+0 0 0 0 0 0 8 2 24000802
+0 0 0 0 0 0 9 2 24000902
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 0 4 24000002
-1 0 0 0 0 0 2 4 24000102
-1 0 0 0 0 0 4 4 24000202
-1 0 0 0 0 0 6 4 24000302
-1 0 0 0 0 0 8 4 24000402
-1 0 0 0 0 0 10 4 24000502
-1 0 0 0 0 0 12 4 24000602
-1 0 0 0 0 0 14 4 24000702
-1 0 0 0 0 0 16 4 24000802
-1 0 0 0 0 0 18 4 24000902
+1 0 0 0 0 0 0 2 24000002
+1 0 0 0 0 0 1 2 24000102
+1 0 0 0 0 0 2 2 24000202
+1 0 0 0 0 0 3 2 24000302
+1 0 0 0 0 0 4 2 24000402
+1 0 0 0 0 0 5 2 24000502
+1 0 0 0 0 0 6 2 24000602
+1 0 0 0 0 0 7 2 24000702
+1 0 0 0 0 0 8 2 24000802
+1 0 0 0 0 0 9 2 24000902
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xz/tyy.zl b/CarpetAttic/Cart3dTest/test/axial-xz/tyy.zl
index 16f008950..51aa618db 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xz/tyy.zl
+++ b/CarpetAttic/Cart3dTest/test/axial-xz/tyy.zl
@@ -1,32 +1,34 @@
 # CART3DTEST::tyy z (tyy)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 10 0 24000500
-0 0 0 0 0 0 10 2 24000501
-0 0 0 0 0 0 10 4 24000502
-0 0 0 0 0 0 10 6 24000503
-0 0 0 0 0 0 10 8 24000504
-0 0 0 0 0 0 10 10 24000505
-0 0 0 0 0 0 10 12 24000506
-0 0 0 0 0 0 10 14 24000507
-0 0 0 0 0 0 10 16 24000508
-0 0 0 0 0 0 10 18 24000509
+0 0 0 0 0 0 5 0 24000500
+0 0 0 0 0 0 5 1 24000501
+0 0 0 0 0 0 5 2 24000502
+0 0 0 0 0 0 5 3 24000503
+0 0 0 0 0 0 5 4 24000504
+0 0 0 0 0 0 5 5 24000505
+0 0 0 0 0 0 5 6 24000506
+0 0 0 0 0 0 5 7 24000507
+0 0 0 0 0 0 5 8 24000508
+0 0 0 0 0 0 5 9 24000509
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 10 0 24010500
-1 0 0 0 0 0 10 2 24000500
-1 0 0 0 0 0 10 4 24000502
-1 0 0 0 0 0 10 6 24000503
-1 0 0 0 0 0 10 8 24000504
-1 0 0 0 0 0 10 10 24000505
-1 0 0 0 0 0 10 12 24000506
-1 0 0 0 0 0 10 14 24000507
-1 0 0 0 0 0 10 16 24000508
-1 0 0 0 0 0 10 18 24000509
+1 0 0 0 0 0 5 0 24010500
+1 0 0 0 0 0 5 1 24000500
+1 0 0 0 0 0 5 2 24000502
+1 0 0 0 0 0 5 3 24000503
+1 0 0 0 0 0 5 4 24000504
+1 0 0 0 0 0 5 5 24000505
+1 0 0 0 0 0 5 6 24000506
+1 0 0 0 0 0 5 7 24000507
+1 0 0 0 0 0 5 8 24000508
+1 0 0 0 0 0 5 9 24000509
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xz/tyz.xl b/CarpetAttic/Cart3dTest/test/axial-xz/tyz.xl
index adeb3a638..d6075fb0e 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xz/tyz.xl
+++ b/CarpetAttic/Cart3dTest/test/axial-xz/tyz.xl
@@ -1,32 +1,34 @@
 # CART3DTEST::tyz x (tyz)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 10 4 25000502
-0 0 0 0 0 2 10 4 25010502
-0 0 0 0 0 4 10 4 25020502
-0 0 0 0 0 6 10 4 25030502
-0 0 0 0 0 8 10 4 25040502
-0 0 0 0 0 10 10 4 25050502
-0 0 0 0 0 12 10 4 25060502
-0 0 0 0 0 14 10 4 25070502
-0 0 0 0 0 16 10 4 25080502
-0 0 0 0 0 18 10 4 25090502
+0 0 0 0 0 0 5 2 25000502
+0 0 0 0 0 1 5 2 25010502
+0 0 0 0 0 2 5 2 25020502
+0 0 0 0 0 3 5 2 25030502
+0 0 0 0 0 4 5 2 25040502
+0 0 0 0 0 5 5 2 25050502
+0 0 0 0 0 6 5 2 25060502
+0 0 0 0 0 7 5 2 25070502
+0 0 0 0 0 8 5 2 25080502
+0 0 0 0 0 9 5 2 25090502
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 10 4 25000502
-1 0 0 0 0 2 10 4 25010502
-1 0 0 0 0 4 10 4 25020502
-1 0 0 0 0 6 10 4 25030502
-1 0 0 0 0 8 10 4 25040502
-1 0 0 0 0 10 10 4 25050502
-1 0 0 0 0 12 10 4 25060502
-1 0 0 0 0 14 10 4 25070502
-1 0 0 0 0 16 10 4 25080502
-1 0 0 0 0 18 10 4 25090502
+1 0 0 0 0 0 5 2 25000502
+1 0 0 0 0 1 5 2 25010502
+1 0 0 0 0 2 5 2 25020502
+1 0 0 0 0 3 5 2 25030502
+1 0 0 0 0 4 5 2 25040502
+1 0 0 0 0 5 5 2 25050502
+1 0 0 0 0 6 5 2 25060502
+1 0 0 0 0 7 5 2 25070502
+1 0 0 0 0 8 5 2 25080502
+1 0 0 0 0 9 5 2 25090502
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xz/tyz.yl b/CarpetAttic/Cart3dTest/test/axial-xz/tyz.yl
index 4c4b5be75..ff7f16429 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xz/tyz.yl
+++ b/CarpetAttic/Cart3dTest/test/axial-xz/tyz.yl
@@ -1,32 +1,34 @@
 # CART3DTEST::tyz y (tyz)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 0 4 25000002
-0 0 0 0 0 0 2 4 25000102
-0 0 0 0 0 0 4 4 25000202
-0 0 0 0 0 0 6 4 25000302
-0 0 0 0 0 0 8 4 25000402
-0 0 0 0 0 0 10 4 25000502
-0 0 0 0 0 0 12 4 25000602
-0 0 0 0 0 0 14 4 25000702
-0 0 0 0 0 0 16 4 25000802
-0 0 0 0 0 0 18 4 25000902
+0 0 0 0 0 0 0 2 25000002
+0 0 0 0 0 0 1 2 25000102
+0 0 0 0 0 0 2 2 25000202
+0 0 0 0 0 0 3 2 25000302
+0 0 0 0 0 0 4 2 25000402
+0 0 0 0 0 0 5 2 25000502
+0 0 0 0 0 0 6 2 25000602
+0 0 0 0 0 0 7 2 25000702
+0 0 0 0 0 0 8 2 25000802
+0 0 0 0 0 0 9 2 25000902
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 0 4 25000002
-1 0 0 0 0 0 2 4 25000102
-1 0 0 0 0 0 4 4 25000202
-1 0 0 0 0 0 6 4 25000302
-1 0 0 0 0 0 8 4 25000402
-1 0 0 0 0 0 10 4 25000502
-1 0 0 0 0 0 12 4 25000602
-1 0 0 0 0 0 14 4 25000702
-1 0 0 0 0 0 16 4 25000802
-1 0 0 0 0 0 18 4 25000902
+1 0 0 0 0 0 0 2 25000002
+1 0 0 0 0 0 1 2 25000102
+1 0 0 0 0 0 2 2 25000202
+1 0 0 0 0 0 3 2 25000302
+1 0 0 0 0 0 4 2 25000402
+1 0 0 0 0 0 5 2 25000502
+1 0 0 0 0 0 6 2 25000602
+1 0 0 0 0 0 7 2 25000702
+1 0 0 0 0 0 8 2 25000802
+1 0 0 0 0 0 9 2 25000902
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xz/tyz.zl b/CarpetAttic/Cart3dTest/test/axial-xz/tyz.zl
index 332ecde05..582d165d8 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xz/tyz.zl
+++ b/CarpetAttic/Cart3dTest/test/axial-xz/tyz.zl
@@ -1,32 +1,34 @@
 # CART3DTEST::tyz z (tyz)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 10 0 25000500
-0 0 0 0 0 0 10 2 25000501
-0 0 0 0 0 0 10 4 25000502
-0 0 0 0 0 0 10 6 25000503
-0 0 0 0 0 0 10 8 25000504
-0 0 0 0 0 0 10 10 25000505
-0 0 0 0 0 0 10 12 25000506
-0 0 0 0 0 0 10 14 25000507
-0 0 0 0 0 0 10 16 25000508
-0 0 0 0 0 0 10 18 25000509
+0 0 0 0 0 0 5 0 25000500
+0 0 0 0 0 0 5 1 25000501
+0 0 0 0 0 0 5 2 25000502
+0 0 0 0 0 0 5 3 25000503
+0 0 0 0 0 0 5 4 25000504
+0 0 0 0 0 0 5 5 25000505
+0 0 0 0 0 0 5 6 25000506
+0 0 0 0 0 0 5 7 25000507
+0 0 0 0 0 0 5 8 25000508
+0 0 0 0 0 0 5 9 25000509
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 10 0 -25010501
-1 0 0 0 0 0 10 2 -25010500
-1 0 0 0 0 0 10 4 25000502
-1 0 0 0 0 0 10 6 25000503
-1 0 0 0 0 0 10 8 25000504
-1 0 0 0 0 0 10 10 25000505
-1 0 0 0 0 0 10 12 25000506
-1 0 0 0 0 0 10 14 25000507
-1 0 0 0 0 0 10 16 25000508
-1 0 0 0 0 0 10 18 25000509
+1 0 0 0 0 0 5 0 -25010501
+1 0 0 0 0 0 5 1 -25010500
+1 0 0 0 0 0 5 2 25000502
+1 0 0 0 0 0 5 3 25000503
+1 0 0 0 0 0 5 4 25000504
+1 0 0 0 0 0 5 5 25000505
+1 0 0 0 0 0 5 6 25000506
+1 0 0 0 0 0 5 7 25000507
+1 0 0 0 0 0 5 8 25000508
+1 0 0 0 0 0 5 9 25000509
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xz/tzz.xl b/CarpetAttic/Cart3dTest/test/axial-xz/tzz.xl
index 74f2a19c7..6a6693415 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xz/tzz.xl
+++ b/CarpetAttic/Cart3dTest/test/axial-xz/tzz.xl
@@ -1,32 +1,34 @@
 # CART3DTEST::tzz x (tzz)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 10 4 26000502
-0 0 0 0 0 2 10 4 26010502
-0 0 0 0 0 4 10 4 26020502
-0 0 0 0 0 6 10 4 26030502
-0 0 0 0 0 8 10 4 26040502
-0 0 0 0 0 10 10 4 26050502
-0 0 0 0 0 12 10 4 26060502
-0 0 0 0 0 14 10 4 26070502
-0 0 0 0 0 16 10 4 26080502
-0 0 0 0 0 18 10 4 26090502
+0 0 0 0 0 0 5 2 26000502
+0 0 0 0 0 1 5 2 26010502
+0 0 0 0 0 2 5 2 26020502
+0 0 0 0 0 3 5 2 26030502
+0 0 0 0 0 4 5 2 26040502
+0 0 0 0 0 5 5 2 26050502
+0 0 0 0 0 6 5 2 26060502
+0 0 0 0 0 7 5 2 26070502
+0 0 0 0 0 8 5 2 26080502
+0 0 0 0 0 9 5 2 26090502
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 10 4 26000502
-1 0 0 0 0 2 10 4 26010502
-1 0 0 0 0 4 10 4 26020502
-1 0 0 0 0 6 10 4 26030502
-1 0 0 0 0 8 10 4 26040502
-1 0 0 0 0 10 10 4 26050502
-1 0 0 0 0 12 10 4 26060502
-1 0 0 0 0 14 10 4 26070502
-1 0 0 0 0 16 10 4 26080502
-1 0 0 0 0 18 10 4 26090502
+1 0 0 0 0 0 5 2 26000502
+1 0 0 0 0 1 5 2 26010502
+1 0 0 0 0 2 5 2 26020502
+1 0 0 0 0 3 5 2 26030502
+1 0 0 0 0 4 5 2 26040502
+1 0 0 0 0 5 5 2 26050502
+1 0 0 0 0 6 5 2 26060502
+1 0 0 0 0 7 5 2 26070502
+1 0 0 0 0 8 5 2 26080502
+1 0 0 0 0 9 5 2 26090502
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xz/tzz.yl b/CarpetAttic/Cart3dTest/test/axial-xz/tzz.yl
index 54465805f..90cc003bd 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xz/tzz.yl
+++ b/CarpetAttic/Cart3dTest/test/axial-xz/tzz.yl
@@ -1,32 +1,34 @@
 # CART3DTEST::tzz y (tzz)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 0 4 26000002
-0 0 0 0 0 0 2 4 26000102
-0 0 0 0 0 0 4 4 26000202
-0 0 0 0 0 0 6 4 26000302
-0 0 0 0 0 0 8 4 26000402
-0 0 0 0 0 0 10 4 26000502
-0 0 0 0 0 0 12 4 26000602
-0 0 0 0 0 0 14 4 26000702
-0 0 0 0 0 0 16 4 26000802
-0 0 0 0 0 0 18 4 26000902
+0 0 0 0 0 0 0 2 26000002
+0 0 0 0 0 0 1 2 26000102
+0 0 0 0 0 0 2 2 26000202
+0 0 0 0 0 0 3 2 26000302
+0 0 0 0 0 0 4 2 26000402
+0 0 0 0 0 0 5 2 26000502
+0 0 0 0 0 0 6 2 26000602
+0 0 0 0 0 0 7 2 26000702
+0 0 0 0 0 0 8 2 26000802
+0 0 0 0 0 0 9 2 26000902
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 0 4 26000002
-1 0 0 0 0 0 2 4 26000102
-1 0 0 0 0 0 4 4 26000202
-1 0 0 0 0 0 6 4 26000302
-1 0 0 0 0 0 8 4 26000402
-1 0 0 0 0 0 10 4 26000502
-1 0 0 0 0 0 12 4 26000602
-1 0 0 0 0 0 14 4 26000702
-1 0 0 0 0 0 16 4 26000802
-1 0 0 0 0 0 18 4 26000902
+1 0 0 0 0 0 0 2 26000002
+1 0 0 0 0 0 1 2 26000102
+1 0 0 0 0 0 2 2 26000202
+1 0 0 0 0 0 3 2 26000302
+1 0 0 0 0 0 4 2 26000402
+1 0 0 0 0 0 5 2 26000502
+1 0 0 0 0 0 6 2 26000602
+1 0 0 0 0 0 7 2 26000702
+1 0 0 0 0 0 8 2 26000802
+1 0 0 0 0 0 9 2 26000902
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xz/tzz.zl b/CarpetAttic/Cart3dTest/test/axial-xz/tzz.zl
index 2c531b9ab..3b7aeff2c 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xz/tzz.zl
+++ b/CarpetAttic/Cart3dTest/test/axial-xz/tzz.zl
@@ -1,32 +1,34 @@
 # CART3DTEST::tzz z (tzz)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 10 0 26000500
-0 0 0 0 0 0 10 2 26000501
-0 0 0 0 0 0 10 4 26000502
-0 0 0 0 0 0 10 6 26000503
-0 0 0 0 0 0 10 8 26000504
-0 0 0 0 0 0 10 10 26000505
-0 0 0 0 0 0 10 12 26000506
-0 0 0 0 0 0 10 14 26000507
-0 0 0 0 0 0 10 16 26000508
-0 0 0 0 0 0 10 18 26000509
+0 0 0 0 0 0 5 0 26000500
+0 0 0 0 0 0 5 1 26000501
+0 0 0 0 0 0 5 2 26000502
+0 0 0 0 0 0 5 3 26000503
+0 0 0 0 0 0 5 4 26000504
+0 0 0 0 0 0 5 5 26000505
+0 0 0 0 0 0 5 6 26000506
+0 0 0 0 0 0 5 7 26000507
+0 0 0 0 0 0 5 8 26000508
+0 0 0 0 0 0 5 9 26000509
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 10 0 26010501
-1 0 0 0 0 0 10 2 26010500
-1 0 0 0 0 0 10 4 26000502
-1 0 0 0 0 0 10 6 26000503
-1 0 0 0 0 0 10 8 26000504
-1 0 0 0 0 0 10 10 26000505
-1 0 0 0 0 0 10 12 26000506
-1 0 0 0 0 0 10 14 26000507
-1 0 0 0 0 0 10 16 26000508
-1 0 0 0 0 0 10 18 26000509
+1 0 0 0 0 0 5 0 26010501
+1 0 0 0 0 0 5 1 26010500
+1 0 0 0 0 0 5 2 26000502
+1 0 0 0 0 0 5 3 26000503
+1 0 0 0 0 0 5 4 26000504
+1 0 0 0 0 0 5 5 26000505
+1 0 0 0 0 0 5 6 26000506
+1 0 0 0 0 0 5 7 26000507
+1 0 0 0 0 0 5 8 26000508
+1 0 0 0 0 0 5 9 26000509
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xz/vx.xl b/CarpetAttic/Cart3dTest/test/axial-xz/vx.xl
index 608bbdda1..f94c0a207 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xz/vx.xl
+++ b/CarpetAttic/Cart3dTest/test/axial-xz/vx.xl
@@ -1,32 +1,34 @@
 # CART3DTEST::vx x (vx)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 10 4 11000502
-0 0 0 0 0 2 10 4 11010502
-0 0 0 0 0 4 10 4 11020502
-0 0 0 0 0 6 10 4 11030502
-0 0 0 0 0 8 10 4 11040502
-0 0 0 0 0 10 10 4 11050502
-0 0 0 0 0 12 10 4 11060502
-0 0 0 0 0 14 10 4 11070502
-0 0 0 0 0 16 10 4 11080502
-0 0 0 0 0 18 10 4 11090502
+0 0 0 0 0 0 5 2 11000502
+0 0 0 0 0 1 5 2 11010502
+0 0 0 0 0 2 5 2 11020502
+0 0 0 0 0 3 5 2 11030502
+0 0 0 0 0 4 5 2 11040502
+0 0 0 0 0 5 5 2 11050502
+0 0 0 0 0 6 5 2 11060502
+0 0 0 0 0 7 5 2 11070502
+0 0 0 0 0 8 5 2 11080502
+0 0 0 0 0 9 5 2 11090502
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 10 4 11000502
-1 0 0 0 0 2 10 4 11010502
-1 0 0 0 0 4 10 4 11020502
-1 0 0 0 0 6 10 4 11030502
-1 0 0 0 0 8 10 4 11040502
-1 0 0 0 0 10 10 4 11050502
-1 0 0 0 0 12 10 4 11060502
-1 0 0 0 0 14 10 4 11070502
-1 0 0 0 0 16 10 4 11080502
-1 0 0 0 0 18 10 4 11090502
+1 0 0 0 0 0 5 2 11000502
+1 0 0 0 0 1 5 2 11010502
+1 0 0 0 0 2 5 2 11020502
+1 0 0 0 0 3 5 2 11030502
+1 0 0 0 0 4 5 2 11040502
+1 0 0 0 0 5 5 2 11050502
+1 0 0 0 0 6 5 2 11060502
+1 0 0 0 0 7 5 2 11070502
+1 0 0 0 0 8 5 2 11080502
+1 0 0 0 0 9 5 2 11090502
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xz/vx.yl b/CarpetAttic/Cart3dTest/test/axial-xz/vx.yl
index b0f8ef328..f000b94d1 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xz/vx.yl
+++ b/CarpetAttic/Cart3dTest/test/axial-xz/vx.yl
@@ -1,32 +1,34 @@
 # CART3DTEST::vx y (vx)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 0 4 11000002
-0 0 0 0 0 0 2 4 11000102
-0 0 0 0 0 0 4 4 11000202
-0 0 0 0 0 0 6 4 11000302
-0 0 0 0 0 0 8 4 11000402
-0 0 0 0 0 0 10 4 11000502
-0 0 0 0 0 0 12 4 11000602
-0 0 0 0 0 0 14 4 11000702
-0 0 0 0 0 0 16 4 11000802
-0 0 0 0 0 0 18 4 11000902
+0 0 0 0 0 0 0 2 11000002
+0 0 0 0 0 0 1 2 11000102
+0 0 0 0 0 0 2 2 11000202
+0 0 0 0 0 0 3 2 11000302
+0 0 0 0 0 0 4 2 11000402
+0 0 0 0 0 0 5 2 11000502
+0 0 0 0 0 0 6 2 11000602
+0 0 0 0 0 0 7 2 11000702
+0 0 0 0 0 0 8 2 11000802
+0 0 0 0 0 0 9 2 11000902
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 0 4 11000002
-1 0 0 0 0 0 2 4 11000102
-1 0 0 0 0 0 4 4 11000202
-1 0 0 0 0 0 6 4 11000302
-1 0 0 0 0 0 8 4 11000402
-1 0 0 0 0 0 10 4 11000502
-1 0 0 0 0 0 12 4 11000602
-1 0 0 0 0 0 14 4 11000702
-1 0 0 0 0 0 16 4 11000802
-1 0 0 0 0 0 18 4 11000902
+1 0 0 0 0 0 0 2 11000002
+1 0 0 0 0 0 1 2 11000102
+1 0 0 0 0 0 2 2 11000202
+1 0 0 0 0 0 3 2 11000302
+1 0 0 0 0 0 4 2 11000402
+1 0 0 0 0 0 5 2 11000502
+1 0 0 0 0 0 6 2 11000602
+1 0 0 0 0 0 7 2 11000702
+1 0 0 0 0 0 8 2 11000802
+1 0 0 0 0 0 9 2 11000902
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xz/vx.zl b/CarpetAttic/Cart3dTest/test/axial-xz/vx.zl
index aff434ea4..50b6fbf37 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xz/vx.zl
+++ b/CarpetAttic/Cart3dTest/test/axial-xz/vx.zl
@@ -1,32 +1,34 @@
 # CART3DTEST::vx z (vx)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 10 0 11000500
-0 0 0 0 0 0 10 2 11000501
-0 0 0 0 0 0 10 4 11000502
-0 0 0 0 0 0 10 6 11000503
-0 0 0 0 0 0 10 8 11000504
-0 0 0 0 0 0 10 10 11000505
-0 0 0 0 0 0 10 12 11000506
-0 0 0 0 0 0 10 14 11000507
-0 0 0 0 0 0 10 16 11000508
-0 0 0 0 0 0 10 18 11000509
+0 0 0 0 0 0 5 0 11000500
+0 0 0 0 0 0 5 1 11000501
+0 0 0 0 0 0 5 2 11000502
+0 0 0 0 0 0 5 3 11000503
+0 0 0 0 0 0 5 4 11000504
+0 0 0 0 0 0 5 5 11000505
+0 0 0 0 0 0 5 6 11000506
+0 0 0 0 0 0 5 7 11000507
+0 0 0 0 0 0 5 8 11000508
+0 0 0 0 0 0 5 9 11000509
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 10 0 13010500
-1 0 0 0 0 0 10 2 13000500
-1 0 0 0 0 0 10 4 11000502
-1 0 0 0 0 0 10 6 11000503
-1 0 0 0 0 0 10 8 11000504
-1 0 0 0 0 0 10 10 11000505
-1 0 0 0 0 0 10 12 11000506
-1 0 0 0 0 0 10 14 11000507
-1 0 0 0 0 0 10 16 11000508
-1 0 0 0 0 0 10 18 11000509
+1 0 0 0 0 0 5 0 13010500
+1 0 0 0 0 0 5 1 13000500
+1 0 0 0 0 0 5 2 11000502
+1 0 0 0 0 0 5 3 11000503
+1 0 0 0 0 0 5 4 11000504
+1 0 0 0 0 0 5 5 11000505
+1 0 0 0 0 0 5 6 11000506
+1 0 0 0 0 0 5 7 11000507
+1 0 0 0 0 0 5 8 11000508
+1 0 0 0 0 0 5 9 11000509
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xz/vy.xl b/CarpetAttic/Cart3dTest/test/axial-xz/vy.xl
index c828836a1..2a77d06ac 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xz/vy.xl
+++ b/CarpetAttic/Cart3dTest/test/axial-xz/vy.xl
@@ -1,32 +1,34 @@
 # CART3DTEST::vy x (vy)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 10 4 12000502
-0 0 0 0 0 2 10 4 12010502
-0 0 0 0 0 4 10 4 12020502
-0 0 0 0 0 6 10 4 12030502
-0 0 0 0 0 8 10 4 12040502
-0 0 0 0 0 10 10 4 12050502
-0 0 0 0 0 12 10 4 12060502
-0 0 0 0 0 14 10 4 12070502
-0 0 0 0 0 16 10 4 12080502
-0 0 0 0 0 18 10 4 12090502
+0 0 0 0 0 0 5 2 12000502
+0 0 0 0 0 1 5 2 12010502
+0 0 0 0 0 2 5 2 12020502
+0 0 0 0 0 3 5 2 12030502
+0 0 0 0 0 4 5 2 12040502
+0 0 0 0 0 5 5 2 12050502
+0 0 0 0 0 6 5 2 12060502
+0 0 0 0 0 7 5 2 12070502
+0 0 0 0 0 8 5 2 12080502
+0 0 0 0 0 9 5 2 12090502
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 10 4 12000502
-1 0 0 0 0 2 10 4 12010502
-1 0 0 0 0 4 10 4 12020502
-1 0 0 0 0 6 10 4 12030502
-1 0 0 0 0 8 10 4 12040502
-1 0 0 0 0 10 10 4 12050502
-1 0 0 0 0 12 10 4 12060502
-1 0 0 0 0 14 10 4 12070502
-1 0 0 0 0 16 10 4 12080502
-1 0 0 0 0 18 10 4 12090502
+1 0 0 0 0 0 5 2 12000502
+1 0 0 0 0 1 5 2 12010502
+1 0 0 0 0 2 5 2 12020502
+1 0 0 0 0 3 5 2 12030502
+1 0 0 0 0 4 5 2 12040502
+1 0 0 0 0 5 5 2 12050502
+1 0 0 0 0 6 5 2 12060502
+1 0 0 0 0 7 5 2 12070502
+1 0 0 0 0 8 5 2 12080502
+1 0 0 0 0 9 5 2 12090502
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xz/vy.yl b/CarpetAttic/Cart3dTest/test/axial-xz/vy.yl
index 5d60f4f19..c1d290909 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xz/vy.yl
+++ b/CarpetAttic/Cart3dTest/test/axial-xz/vy.yl
@@ -1,32 +1,34 @@
 # CART3DTEST::vy y (vy)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 0 4 12000002
-0 0 0 0 0 0 2 4 12000102
-0 0 0 0 0 0 4 4 12000202
-0 0 0 0 0 0 6 4 12000302
-0 0 0 0 0 0 8 4 12000402
-0 0 0 0 0 0 10 4 12000502
-0 0 0 0 0 0 12 4 12000602
-0 0 0 0 0 0 14 4 12000702
-0 0 0 0 0 0 16 4 12000802
-0 0 0 0 0 0 18 4 12000902
+0 0 0 0 0 0 0 2 12000002
+0 0 0 0 0 0 1 2 12000102
+0 0 0 0 0 0 2 2 12000202
+0 0 0 0 0 0 3 2 12000302
+0 0 0 0 0 0 4 2 12000402
+0 0 0 0 0 0 5 2 12000502
+0 0 0 0 0 0 6 2 12000602
+0 0 0 0 0 0 7 2 12000702
+0 0 0 0 0 0 8 2 12000802
+0 0 0 0 0 0 9 2 12000902
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 0 4 12000002
-1 0 0 0 0 0 2 4 12000102
-1 0 0 0 0 0 4 4 12000202
-1 0 0 0 0 0 6 4 12000302
-1 0 0 0 0 0 8 4 12000402
-1 0 0 0 0 0 10 4 12000502
-1 0 0 0 0 0 12 4 12000602
-1 0 0 0 0 0 14 4 12000702
-1 0 0 0 0 0 16 4 12000802
-1 0 0 0 0 0 18 4 12000902
+1 0 0 0 0 0 0 2 12000002
+1 0 0 0 0 0 1 2 12000102
+1 0 0 0 0 0 2 2 12000202
+1 0 0 0 0 0 3 2 12000302
+1 0 0 0 0 0 4 2 12000402
+1 0 0 0 0 0 5 2 12000502
+1 0 0 0 0 0 6 2 12000602
+1 0 0 0 0 0 7 2 12000702
+1 0 0 0 0 0 8 2 12000802
+1 0 0 0 0 0 9 2 12000902
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xz/vy.zl b/CarpetAttic/Cart3dTest/test/axial-xz/vy.zl
index c448534a8..79d579108 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xz/vy.zl
+++ b/CarpetAttic/Cart3dTest/test/axial-xz/vy.zl
@@ -1,32 +1,34 @@
 # CART3DTEST::vy z (vy)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 10 0 12000500
-0 0 0 0 0 0 10 2 12000501
-0 0 0 0 0 0 10 4 12000502
-0 0 0 0 0 0 10 6 12000503
-0 0 0 0 0 0 10 8 12000504
-0 0 0 0 0 0 10 10 12000505
-0 0 0 0 0 0 10 12 12000506
-0 0 0 0 0 0 10 14 12000507
-0 0 0 0 0 0 10 16 12000508
-0 0 0 0 0 0 10 18 12000509
+0 0 0 0 0 0 5 0 12000500
+0 0 0 0 0 0 5 1 12000501
+0 0 0 0 0 0 5 2 12000502
+0 0 0 0 0 0 5 3 12000503
+0 0 0 0 0 0 5 4 12000504
+0 0 0 0 0 0 5 5 12000505
+0 0 0 0 0 0 5 6 12000506
+0 0 0 0 0 0 5 7 12000507
+0 0 0 0 0 0 5 8 12000508
+0 0 0 0 0 0 5 9 12000509
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 10 0 12010500
-1 0 0 0 0 0 10 2 12000500
-1 0 0 0 0 0 10 4 12000502
-1 0 0 0 0 0 10 6 12000503
-1 0 0 0 0 0 10 8 12000504
-1 0 0 0 0 0 10 10 12000505
-1 0 0 0 0 0 10 12 12000506
-1 0 0 0 0 0 10 14 12000507
-1 0 0 0 0 0 10 16 12000508
-1 0 0 0 0 0 10 18 12000509
+1 0 0 0 0 0 5 0 12010500
+1 0 0 0 0 0 5 1 12000500
+1 0 0 0 0 0 5 2 12000502
+1 0 0 0 0 0 5 3 12000503
+1 0 0 0 0 0 5 4 12000504
+1 0 0 0 0 0 5 5 12000505
+1 0 0 0 0 0 5 6 12000506
+1 0 0 0 0 0 5 7 12000507
+1 0 0 0 0 0 5 8 12000508
+1 0 0 0 0 0 5 9 12000509
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xz/vz.xl b/CarpetAttic/Cart3dTest/test/axial-xz/vz.xl
index 2b2c448d8..76d749a6a 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xz/vz.xl
+++ b/CarpetAttic/Cart3dTest/test/axial-xz/vz.xl
@@ -1,32 +1,34 @@
 # CART3DTEST::vz x (vz)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 10 4 13000502
-0 0 0 0 0 2 10 4 13010502
-0 0 0 0 0 4 10 4 13020502
-0 0 0 0 0 6 10 4 13030502
-0 0 0 0 0 8 10 4 13040502
-0 0 0 0 0 10 10 4 13050502
-0 0 0 0 0 12 10 4 13060502
-0 0 0 0 0 14 10 4 13070502
-0 0 0 0 0 16 10 4 13080502
-0 0 0 0 0 18 10 4 13090502
+0 0 0 0 0 0 5 2 13000502
+0 0 0 0 0 1 5 2 13010502
+0 0 0 0 0 2 5 2 13020502
+0 0 0 0 0 3 5 2 13030502
+0 0 0 0 0 4 5 2 13040502
+0 0 0 0 0 5 5 2 13050502
+0 0 0 0 0 6 5 2 13060502
+0 0 0 0 0 7 5 2 13070502
+0 0 0 0 0 8 5 2 13080502
+0 0 0 0 0 9 5 2 13090502
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 10 4 13000502
-1 0 0 0 0 2 10 4 13010502
-1 0 0 0 0 4 10 4 13020502
-1 0 0 0 0 6 10 4 13030502
-1 0 0 0 0 8 10 4 13040502
-1 0 0 0 0 10 10 4 13050502
-1 0 0 0 0 12 10 4 13060502
-1 0 0 0 0 14 10 4 13070502
-1 0 0 0 0 16 10 4 13080502
-1 0 0 0 0 18 10 4 13090502
+1 0 0 0 0 0 5 2 13000502
+1 0 0 0 0 1 5 2 13010502
+1 0 0 0 0 2 5 2 13020502
+1 0 0 0 0 3 5 2 13030502
+1 0 0 0 0 4 5 2 13040502
+1 0 0 0 0 5 5 2 13050502
+1 0 0 0 0 6 5 2 13060502
+1 0 0 0 0 7 5 2 13070502
+1 0 0 0 0 8 5 2 13080502
+1 0 0 0 0 9 5 2 13090502
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xz/vz.yl b/CarpetAttic/Cart3dTest/test/axial-xz/vz.yl
index e3a60bc47..ef98a6c9c 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xz/vz.yl
+++ b/CarpetAttic/Cart3dTest/test/axial-xz/vz.yl
@@ -1,32 +1,34 @@
 # CART3DTEST::vz y (vz)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 0 4 13000002
-0 0 0 0 0 0 2 4 13000102
-0 0 0 0 0 0 4 4 13000202
-0 0 0 0 0 0 6 4 13000302
-0 0 0 0 0 0 8 4 13000402
-0 0 0 0 0 0 10 4 13000502
-0 0 0 0 0 0 12 4 13000602
-0 0 0 0 0 0 14 4 13000702
-0 0 0 0 0 0 16 4 13000802
-0 0 0 0 0 0 18 4 13000902
+0 0 0 0 0 0 0 2 13000002
+0 0 0 0 0 0 1 2 13000102
+0 0 0 0 0 0 2 2 13000202
+0 0 0 0 0 0 3 2 13000302
+0 0 0 0 0 0 4 2 13000402
+0 0 0 0 0 0 5 2 13000502
+0 0 0 0 0 0 6 2 13000602
+0 0 0 0 0 0 7 2 13000702
+0 0 0 0 0 0 8 2 13000802
+0 0 0 0 0 0 9 2 13000902
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 0 4 13000002
-1 0 0 0 0 0 2 4 13000102
-1 0 0 0 0 0 4 4 13000202
-1 0 0 0 0 0 6 4 13000302
-1 0 0 0 0 0 8 4 13000402
-1 0 0 0 0 0 10 4 13000502
-1 0 0 0 0 0 12 4 13000602
-1 0 0 0 0 0 14 4 13000702
-1 0 0 0 0 0 16 4 13000802
-1 0 0 0 0 0 18 4 13000902
+1 0 0 0 0 0 0 2 13000002
+1 0 0 0 0 0 1 2 13000102
+1 0 0 0 0 0 2 2 13000202
+1 0 0 0 0 0 3 2 13000302
+1 0 0 0 0 0 4 2 13000402
+1 0 0 0 0 0 5 2 13000502
+1 0 0 0 0 0 6 2 13000602
+1 0 0 0 0 0 7 2 13000702
+1 0 0 0 0 0 8 2 13000802
+1 0 0 0 0 0 9 2 13000902
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-xz/vz.zl b/CarpetAttic/Cart3dTest/test/axial-xz/vz.zl
index d3d43e769..bb3f3505f 100644
--- a/CarpetAttic/Cart3dTest/test/axial-xz/vz.zl
+++ b/CarpetAttic/Cart3dTest/test/axial-xz/vz.zl
@@ -1,32 +1,34 @@
 # CART3DTEST::vz z (vz)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 10 0 13000500
-0 0 0 0 0 0 10 2 13000501
-0 0 0 0 0 0 10 4 13000502
-0 0 0 0 0 0 10 6 13000503
-0 0 0 0 0 0 10 8 13000504
-0 0 0 0 0 0 10 10 13000505
-0 0 0 0 0 0 10 12 13000506
-0 0 0 0 0 0 10 14 13000507
-0 0 0 0 0 0 10 16 13000508
-0 0 0 0 0 0 10 18 13000509
+0 0 0 0 0 0 5 0 13000500
+0 0 0 0 0 0 5 1 13000501
+0 0 0 0 0 0 5 2 13000502
+0 0 0 0 0 0 5 3 13000503
+0 0 0 0 0 0 5 4 13000504
+0 0 0 0 0 0 5 5 13000505
+0 0 0 0 0 0 5 6 13000506
+0 0 0 0 0 0 5 7 13000507
+0 0 0 0 0 0 5 8 13000508
+0 0 0 0 0 0 5 9 13000509
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 10 0 -13010501
-1 0 0 0 0 0 10 2 -13010500
-1 0 0 0 0 0 10 4 13000502
-1 0 0 0 0 0 10 6 13000503
-1 0 0 0 0 0 10 8 13000504
-1 0 0 0 0 0 10 10 13000505
-1 0 0 0 0 0 10 12 13000506
-1 0 0 0 0 0 10 14 13000507
-1 0 0 0 0 0 10 16 13000508
-1 0 0 0 0 0 10 18 13000509
+1 0 0 0 0 0 5 0 -13010501
+1 0 0 0 0 0 5 1 -13010500
+1 0 0 0 0 0 5 2 13000502
+1 0 0 0 0 0 5 3 13000503
+1 0 0 0 0 0 5 4 13000504
+1 0 0 0 0 0 5 5 13000505
+1 0 0 0 0 0 5 6 13000506
+1 0 0 0 0 0 5 7 13000507
+1 0 0 0 0 0 5 8 13000508
+1 0 0 0 0 0 5 9 13000509
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-yz.log b/CarpetAttic/Cart3dTest/test/axial-yz.log
index 5c5218648..8b02f3bdb 100644
--- a/CarpetAttic/Cart3dTest/test/axial-yz.log
+++ b/CarpetAttic/Cart3dTest/test/axial-yz.log
@@ -52,5 +52,30 @@ AMR 2D ASCII I/O provided by CarpetIOASCII
 --------------------------------------------------------------------------------
 AMR 3D ASCII I/O provided by CarpetIOASCII
 --------------------------------------------------------------------------------
+
+dh bboxes:
+rl=0 c=0 ml=0
+exterior=([0,0,0]:[9,9,9]:[1,1,1])
+interior=([0,1,2]:[9,8,7]:[1,1,1])
+send_mg_fine=[]
+send_mg_coarse=[]
+recv_mg_fine=[]
+recv_mg_coarse=[]
+send_ref_fine=[]
+send_ref_coarse=[]
+recv_ref_fine=[]
+recv_ref_coarse=[]
+send_sync=[0:[]]
+send_ref_bnd_fine=[]
+boundaries={([0,0,0]:[9,0,9]:[1,1,1]),([0,1,0]:[9,8,1]:[1,1,1]),([0,9,0]:[9,9,9]:[1,1,1]),([0,1,8]:[9,8,9]:[1,1,1])}
+recv_sync=[0:[]]
+recv_ref_bnd_coarse=[]
+sync_not={([0,0,0]:[9,0,9]:[1,1,1]),([0,1,0]:[9,8,1]:[1,1,1]),([0,9,0]:[9,9,9]:[1,1,1]),([0,1,8]:[9,8,9]:[1,1,1])}
+
+dh bases:
+rl=0 ml=0
+exterior=([0,0,0]:[9,9,9]:[1,1,1])
+interior=([0,1,2]:[9,8,7]:[1,1,1])
+boundaries={([0,0,0]:[9,0,9]:[1,1,1]),([0,1,0]:[9,8,1]:[1,1,1]),([0,9,0]:[9,9,9]:[1,1,1]),([0,1,8]:[9,8,9]:[1,1,1])}
 --------------------------------------------------------------------------------
 Done.
diff --git a/CarpetAttic/Cart3dTest/test/axial-yz/ax.xl b/CarpetAttic/Cart3dTest/test/axial-yz/ax.xl
index 86c4d7bb7..8dd8e5c6f 100644
--- a/CarpetAttic/Cart3dTest/test/axial-yz/ax.xl
+++ b/CarpetAttic/Cart3dTest/test/axial-yz/ax.xl
@@ -1,32 +1,34 @@
 # CART3DTEST::ax x (ax)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 4 31000102
-0 0 0 0 0 2 2 4 31010102
-0 0 0 0 0 4 2 4 31020102
-0 0 0 0 0 6 2 4 31030102
-0 0 0 0 0 8 2 4 31040102
-0 0 0 0 0 10 2 4 31050102
-0 0 0 0 0 12 2 4 31060102
-0 0 0 0 0 14 2 4 31070102
-0 0 0 0 0 16 2 4 31080102
-0 0 0 0 0 18 2 4 31090102
+0 0 0 0 0 0 1 2 31000102
+0 0 0 0 0 1 1 2 31010102
+0 0 0 0 0 2 1 2 31020102
+0 0 0 0 0 3 1 2 31030102
+0 0 0 0 0 4 1 2 31040102
+0 0 0 0 0 5 1 2 31050102
+0 0 0 0 0 6 1 2 31060102
+0 0 0 0 0 7 1 2 31070102
+0 0 0 0 0 8 1 2 31080102
+0 0 0 0 0 9 1 2 31090102
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 4 31000102
-1 0 0 0 0 2 2 4 31010102
-1 0 0 0 0 4 2 4 31020102
-1 0 0 0 0 6 2 4 31030102
-1 0 0 0 0 8 2 4 31040102
-1 0 0 0 0 10 2 4 31050102
-1 0 0 0 0 12 2 4 31060102
-1 0 0 0 0 14 2 4 31070102
-1 0 0 0 0 16 2 4 31080102
-1 0 0 0 0 18 2 4 31090102
+1 0 0 0 0 0 1 2 31000102
+1 0 0 0 0 1 1 2 31010102
+1 0 0 0 0 2 1 2 31020102
+1 0 0 0 0 3 1 2 31030102
+1 0 0 0 0 4 1 2 31040102
+1 0 0 0 0 5 1 2 31050102
+1 0 0 0 0 6 1 2 31060102
+1 0 0 0 0 7 1 2 31070102
+1 0 0 0 0 8 1 2 31080102
+1 0 0 0 0 9 1 2 31090102
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-yz/ax.yl b/CarpetAttic/Cart3dTest/test/axial-yz/ax.yl
index 2bbb855b4..0e1b27c9d 100644
--- a/CarpetAttic/Cart3dTest/test/axial-yz/ax.yl
+++ b/CarpetAttic/Cart3dTest/test/axial-yz/ax.yl
@@ -1,32 +1,34 @@
 # CART3DTEST::ax y (ax)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 10 0 4 31050002
-0 0 0 0 0 10 2 4 31050102
-0 0 0 0 0 10 4 4 31050202
-0 0 0 0 0 10 6 4 31050302
-0 0 0 0 0 10 8 4 31050402
-0 0 0 0 0 10 10 4 31050502
-0 0 0 0 0 10 12 4 31050602
-0 0 0 0 0 10 14 4 31050702
-0 0 0 0 0 10 16 4 31050802
-0 0 0 0 0 10 18 4 31050902
+0 0 0 0 0 5 0 2 31050002
+0 0 0 0 0 5 1 2 31050102
+0 0 0 0 0 5 2 2 31050202
+0 0 0 0 0 5 3 2 31050302
+0 0 0 0 0 5 4 2 31050402
+0 0 0 0 0 5 5 2 31050502
+0 0 0 0 0 5 6 2 31050602
+0 0 0 0 0 5 7 2 31050702
+0 0 0 0 0 5 8 2 31050802
+0 0 0 0 0 5 9 2 31050902
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 10 0 4 31050202
-1 0 0 0 0 10 2 4 31050102
-1 0 0 0 0 10 4 4 31050202
-1 0 0 0 0 10 6 4 31050302
-1 0 0 0 0 10 8 4 31050402
-1 0 0 0 0 10 10 4 31050502
-1 0 0 0 0 10 12 4 31050602
-1 0 0 0 0 10 14 4 31050702
-1 0 0 0 0 10 16 4 31050802
-1 0 0 0 0 10 18 4 31050902
+1 0 0 0 0 5 0 2 31050202
+1 0 0 0 0 5 1 2 31050102
+1 0 0 0 0 5 2 2 31050202
+1 0 0 0 0 5 3 2 31050302
+1 0 0 0 0 5 4 2 31050402
+1 0 0 0 0 5 5 2 31050502
+1 0 0 0 0 5 6 2 31050602
+1 0 0 0 0 5 7 2 31050702
+1 0 0 0 0 5 8 2 31050802
+1 0 0 0 0 5 9 2 31050902
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-yz/ax.zl b/CarpetAttic/Cart3dTest/test/axial-yz/ax.zl
index 0011092db..aaf4d4b21 100644
--- a/CarpetAttic/Cart3dTest/test/axial-yz/ax.zl
+++ b/CarpetAttic/Cart3dTest/test/axial-yz/ax.zl
@@ -1,32 +1,34 @@
 # CART3DTEST::ax z (ax)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 10 2 0 31050100
-0 0 0 0 0 10 2 2 31050101
-0 0 0 0 0 10 2 4 31050102
-0 0 0 0 0 10 2 6 31050103
-0 0 0 0 0 10 2 8 31050104
-0 0 0 0 0 10 2 10 31050105
-0 0 0 0 0 10 2 12 31050106
-0 0 0 0 0 10 2 14 31050107
-0 0 0 0 0 10 2 16 31050108
-0 0 0 0 0 10 2 18 31050109
+0 0 0 0 0 5 1 0 31050100
+0 0 0 0 0 5 1 1 31050101
+0 0 0 0 0 5 1 2 31050102
+0 0 0 0 0 5 1 3 31050103
+0 0 0 0 0 5 1 4 31050104
+0 0 0 0 0 5 1 5 31050105
+0 0 0 0 0 5 1 6 31050106
+0 0 0 0 0 5 1 7 31050107
+0 0 0 0 0 5 1 8 31050108
+0 0 0 0 0 5 1 9 31050109
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 10 2 0 31050201
-1 0 0 0 0 10 2 2 31050101
-1 0 0 0 0 10 2 4 31050102
-1 0 0 0 0 10 2 6 31050103
-1 0 0 0 0 10 2 8 31050104
-1 0 0 0 0 10 2 10 31050105
-1 0 0 0 0 10 2 12 31050106
-1 0 0 0 0 10 2 14 31050107
-1 0 0 0 0 10 2 16 31050108
-1 0 0 0 0 10 2 18 31050109
+1 0 0 0 0 5 1 0 31050201
+1 0 0 0 0 5 1 1 31050101
+1 0 0 0 0 5 1 2 31050102
+1 0 0 0 0 5 1 3 31050103
+1 0 0 0 0 5 1 4 31050104
+1 0 0 0 0 5 1 5 31050105
+1 0 0 0 0 5 1 6 31050106
+1 0 0 0 0 5 1 7 31050107
+1 0 0 0 0 5 1 8 31050108
+1 0 0 0 0 5 1 9 31050109
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-yz/ay.xl b/CarpetAttic/Cart3dTest/test/axial-yz/ay.xl
index 1ed08090e..0a23fdefd 100644
--- a/CarpetAttic/Cart3dTest/test/axial-yz/ay.xl
+++ b/CarpetAttic/Cart3dTest/test/axial-yz/ay.xl
@@ -1,32 +1,34 @@
 # CART3DTEST::ay x (ay)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 4 32000102
-0 0 0 0 0 2 2 4 32010102
-0 0 0 0 0 4 2 4 32020102
-0 0 0 0 0 6 2 4 32030102
-0 0 0 0 0 8 2 4 32040102
-0 0 0 0 0 10 2 4 32050102
-0 0 0 0 0 12 2 4 32060102
-0 0 0 0 0 14 2 4 32070102
-0 0 0 0 0 16 2 4 32080102
-0 0 0 0 0 18 2 4 32090102
+0 0 0 0 0 0 1 2 32000102
+0 0 0 0 0 1 1 2 32010102
+0 0 0 0 0 2 1 2 32020102
+0 0 0 0 0 3 1 2 32030102
+0 0 0 0 0 4 1 2 32040102
+0 0 0 0 0 5 1 2 32050102
+0 0 0 0 0 6 1 2 32060102
+0 0 0 0 0 7 1 2 32070102
+0 0 0 0 0 8 1 2 32080102
+0 0 0 0 0 9 1 2 32090102
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 4 32000102
-1 0 0 0 0 2 2 4 32010102
-1 0 0 0 0 4 2 4 32020102
-1 0 0 0 0 6 2 4 32030102
-1 0 0 0 0 8 2 4 32040102
-1 0 0 0 0 10 2 4 32050102
-1 0 0 0 0 12 2 4 32060102
-1 0 0 0 0 14 2 4 32070102
-1 0 0 0 0 16 2 4 32080102
-1 0 0 0 0 18 2 4 32090102
+1 0 0 0 0 0 1 2 32000102
+1 0 0 0 0 1 1 2 32010102
+1 0 0 0 0 2 1 2 32020102
+1 0 0 0 0 3 1 2 32030102
+1 0 0 0 0 4 1 2 32040102
+1 0 0 0 0 5 1 2 32050102
+1 0 0 0 0 6 1 2 32060102
+1 0 0 0 0 7 1 2 32070102
+1 0 0 0 0 8 1 2 32080102
+1 0 0 0 0 9 1 2 32090102
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-yz/ay.yl b/CarpetAttic/Cart3dTest/test/axial-yz/ay.yl
index 2b459c7ee..67425c785 100644
--- a/CarpetAttic/Cart3dTest/test/axial-yz/ay.yl
+++ b/CarpetAttic/Cart3dTest/test/axial-yz/ay.yl
@@ -1,32 +1,34 @@
 # CART3DTEST::ay y (ay)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 10 0 4 32050002
-0 0 0 0 0 10 2 4 32050102
-0 0 0 0 0 10 4 4 32050202
-0 0 0 0 0 10 6 4 32050302
-0 0 0 0 0 10 8 4 32050402
-0 0 0 0 0 10 10 4 32050502
-0 0 0 0 0 10 12 4 32050602
-0 0 0 0 0 10 14 4 32050702
-0 0 0 0 0 10 16 4 32050802
-0 0 0 0 0 10 18 4 32050902
+0 0 0 0 0 5 0 2 32050002
+0 0 0 0 0 5 1 2 32050102
+0 0 0 0 0 5 2 2 32050202
+0 0 0 0 0 5 3 2 32050302
+0 0 0 0 0 5 4 2 32050402
+0 0 0 0 0 5 5 2 32050502
+0 0 0 0 0 5 6 2 32050602
+0 0 0 0 0 5 7 2 32050702
+0 0 0 0 0 5 8 2 32050802
+0 0 0 0 0 5 9 2 32050902
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 10 0 4 33050202
-1 0 0 0 0 10 2 4 32050102
-1 0 0 0 0 10 4 4 32050202
-1 0 0 0 0 10 6 4 32050302
-1 0 0 0 0 10 8 4 32050402
-1 0 0 0 0 10 10 4 32050502
-1 0 0 0 0 10 12 4 32050602
-1 0 0 0 0 10 14 4 32050702
-1 0 0 0 0 10 16 4 32050802
-1 0 0 0 0 10 18 4 32050902
+1 0 0 0 0 5 0 2 33050202
+1 0 0 0 0 5 1 2 32050102
+1 0 0 0 0 5 2 2 32050202
+1 0 0 0 0 5 3 2 32050302
+1 0 0 0 0 5 4 2 32050402
+1 0 0 0 0 5 5 2 32050502
+1 0 0 0 0 5 6 2 32050602
+1 0 0 0 0 5 7 2 32050702
+1 0 0 0 0 5 8 2 32050802
+1 0 0 0 0 5 9 2 32050902
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-yz/ay.zl b/CarpetAttic/Cart3dTest/test/axial-yz/ay.zl
index 0de30baa4..05cbd04ee 100644
--- a/CarpetAttic/Cart3dTest/test/axial-yz/ay.zl
+++ b/CarpetAttic/Cart3dTest/test/axial-yz/ay.zl
@@ -1,32 +1,34 @@
 # CART3DTEST::ay z (ay)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 10 2 0 32050100
-0 0 0 0 0 10 2 2 32050101
-0 0 0 0 0 10 2 4 32050102
-0 0 0 0 0 10 2 6 32050103
-0 0 0 0 0 10 2 8 32050104
-0 0 0 0 0 10 2 10 32050105
-0 0 0 0 0 10 2 12 32050106
-0 0 0 0 0 10 2 14 32050107
-0 0 0 0 0 10 2 16 32050108
-0 0 0 0 0 10 2 18 32050109
+0 0 0 0 0 5 1 0 32050100
+0 0 0 0 0 5 1 1 32050101
+0 0 0 0 0 5 1 2 32050102
+0 0 0 0 0 5 1 3 32050103
+0 0 0 0 0 5 1 4 32050104
+0 0 0 0 0 5 1 5 32050105
+0 0 0 0 0 5 1 6 32050106
+0 0 0 0 0 5 1 7 32050107
+0 0 0 0 0 5 1 8 32050108
+0 0 0 0 0 5 1 9 32050109
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 10 2 0 -33050201
-1 0 0 0 0 10 2 2 -33050101
-1 0 0 0 0 10 2 4 32050102
-1 0 0 0 0 10 2 6 32050103
-1 0 0 0 0 10 2 8 32050104
-1 0 0 0 0 10 2 10 32050105
-1 0 0 0 0 10 2 12 32050106
-1 0 0 0 0 10 2 14 32050107
-1 0 0 0 0 10 2 16 32050108
-1 0 0 0 0 10 2 18 32050109
+1 0 0 0 0 5 1 0 -33050201
+1 0 0 0 0 5 1 1 -33050101
+1 0 0 0 0 5 1 2 32050102
+1 0 0 0 0 5 1 3 32050103
+1 0 0 0 0 5 1 4 32050104
+1 0 0 0 0 5 1 5 32050105
+1 0 0 0 0 5 1 6 32050106
+1 0 0 0 0 5 1 7 32050107
+1 0 0 0 0 5 1 8 32050108
+1 0 0 0 0 5 1 9 32050109
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-yz/az.xl b/CarpetAttic/Cart3dTest/test/axial-yz/az.xl
index 02cd21c69..f3620a409 100644
--- a/CarpetAttic/Cart3dTest/test/axial-yz/az.xl
+++ b/CarpetAttic/Cart3dTest/test/axial-yz/az.xl
@@ -1,32 +1,34 @@
 # CART3DTEST::az x (az)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 4 33000102
-0 0 0 0 0 2 2 4 33010102
-0 0 0 0 0 4 2 4 33020102
-0 0 0 0 0 6 2 4 33030102
-0 0 0 0 0 8 2 4 33040102
-0 0 0 0 0 10 2 4 33050102
-0 0 0 0 0 12 2 4 33060102
-0 0 0 0 0 14 2 4 33070102
-0 0 0 0 0 16 2 4 33080102
-0 0 0 0 0 18 2 4 33090102
+0 0 0 0 0 0 1 2 33000102
+0 0 0 0 0 1 1 2 33010102
+0 0 0 0 0 2 1 2 33020102
+0 0 0 0 0 3 1 2 33030102
+0 0 0 0 0 4 1 2 33040102
+0 0 0 0 0 5 1 2 33050102
+0 0 0 0 0 6 1 2 33060102
+0 0 0 0 0 7 1 2 33070102
+0 0 0 0 0 8 1 2 33080102
+0 0 0 0 0 9 1 2 33090102
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 4 33000102
-1 0 0 0 0 2 2 4 33010102
-1 0 0 0 0 4 2 4 33020102
-1 0 0 0 0 6 2 4 33030102
-1 0 0 0 0 8 2 4 33040102
-1 0 0 0 0 10 2 4 33050102
-1 0 0 0 0 12 2 4 33060102
-1 0 0 0 0 14 2 4 33070102
-1 0 0 0 0 16 2 4 33080102
-1 0 0 0 0 18 2 4 33090102
+1 0 0 0 0 0 1 2 33000102
+1 0 0 0 0 1 1 2 33010102
+1 0 0 0 0 2 1 2 33020102
+1 0 0 0 0 3 1 2 33030102
+1 0 0 0 0 4 1 2 33040102
+1 0 0 0 0 5 1 2 33050102
+1 0 0 0 0 6 1 2 33060102
+1 0 0 0 0 7 1 2 33070102
+1 0 0 0 0 8 1 2 33080102
+1 0 0 0 0 9 1 2 33090102
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-yz/az.yl b/CarpetAttic/Cart3dTest/test/axial-yz/az.yl
index 10e2669e5..801f83c1f 100644
--- a/CarpetAttic/Cart3dTest/test/axial-yz/az.yl
+++ b/CarpetAttic/Cart3dTest/test/axial-yz/az.yl
@@ -1,32 +1,34 @@
 # CART3DTEST::az y (az)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 10 0 4 33050002
-0 0 0 0 0 10 2 4 33050102
-0 0 0 0 0 10 4 4 33050202
-0 0 0 0 0 10 6 4 33050302
-0 0 0 0 0 10 8 4 33050402
-0 0 0 0 0 10 10 4 33050502
-0 0 0 0 0 10 12 4 33050602
-0 0 0 0 0 10 14 4 33050702
-0 0 0 0 0 10 16 4 33050802
-0 0 0 0 0 10 18 4 33050902
+0 0 0 0 0 5 0 2 33050002
+0 0 0 0 0 5 1 2 33050102
+0 0 0 0 0 5 2 2 33050202
+0 0 0 0 0 5 3 2 33050302
+0 0 0 0 0 5 4 2 33050402
+0 0 0 0 0 5 5 2 33050502
+0 0 0 0 0 5 6 2 33050602
+0 0 0 0 0 5 7 2 33050702
+0 0 0 0 0 5 8 2 33050802
+0 0 0 0 0 5 9 2 33050902
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 10 0 4 -32050202
-1 0 0 0 0 10 2 4 33050102
-1 0 0 0 0 10 4 4 33050202
-1 0 0 0 0 10 6 4 33050302
-1 0 0 0 0 10 8 4 33050402
-1 0 0 0 0 10 10 4 33050502
-1 0 0 0 0 10 12 4 33050602
-1 0 0 0 0 10 14 4 33050702
-1 0 0 0 0 10 16 4 33050802
-1 0 0 0 0 10 18 4 33050902
+1 0 0 0 0 5 0 2 -32050202
+1 0 0 0 0 5 1 2 33050102
+1 0 0 0 0 5 2 2 33050202
+1 0 0 0 0 5 3 2 33050302
+1 0 0 0 0 5 4 2 33050402
+1 0 0 0 0 5 5 2 33050502
+1 0 0 0 0 5 6 2 33050602
+1 0 0 0 0 5 7 2 33050702
+1 0 0 0 0 5 8 2 33050802
+1 0 0 0 0 5 9 2 33050902
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-yz/az.zl b/CarpetAttic/Cart3dTest/test/axial-yz/az.zl
index 56cb3e410..1f78c8a33 100644
--- a/CarpetAttic/Cart3dTest/test/axial-yz/az.zl
+++ b/CarpetAttic/Cart3dTest/test/axial-yz/az.zl
@@ -1,32 +1,34 @@
 # CART3DTEST::az z (az)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 10 2 0 33050100
-0 0 0 0 0 10 2 2 33050101
-0 0 0 0 0 10 2 4 33050102
-0 0 0 0 0 10 2 6 33050103
-0 0 0 0 0 10 2 8 33050104
-0 0 0 0 0 10 2 10 33050105
-0 0 0 0 0 10 2 12 33050106
-0 0 0 0 0 10 2 14 33050107
-0 0 0 0 0 10 2 16 33050108
-0 0 0 0 0 10 2 18 33050109
+0 0 0 0 0 5 1 0 33050100
+0 0 0 0 0 5 1 1 33050101
+0 0 0 0 0 5 1 2 33050102
+0 0 0 0 0 5 1 3 33050103
+0 0 0 0 0 5 1 4 33050104
+0 0 0 0 0 5 1 5 33050105
+0 0 0 0 0 5 1 6 33050106
+0 0 0 0 0 5 1 7 33050107
+0 0 0 0 0 5 1 8 33050108
+0 0 0 0 0 5 1 9 33050109
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 10 2 0 -33050102
-1 0 0 0 0 10 2 2 -33050101
-1 0 0 0 0 10 2 4 33050102
-1 0 0 0 0 10 2 6 33050103
-1 0 0 0 0 10 2 8 33050104
-1 0 0 0 0 10 2 10 33050105
-1 0 0 0 0 10 2 12 33050106
-1 0 0 0 0 10 2 14 33050107
-1 0 0 0 0 10 2 16 33050108
-1 0 0 0 0 10 2 18 33050109
+1 0 0 0 0 5 1 0 -33050102
+1 0 0 0 0 5 1 1 -33050101
+1 0 0 0 0 5 1 2 33050102
+1 0 0 0 0 5 1 3 33050103
+1 0 0 0 0 5 1 4 33050104
+1 0 0 0 0 5 1 5 33050105
+1 0 0 0 0 5 1 6 33050106
+1 0 0 0 0 5 1 7 33050107
+1 0 0 0 0 5 1 8 33050108
+1 0 0 0 0 5 1 9 33050109
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-yz/cart3d_x.xl b/CarpetAttic/Cart3dTest/test/axial-yz/cart3d_x.xl
index 7373a3b9b..15adda44b 100644
--- a/CarpetAttic/Cart3dTest/test/axial-yz/cart3d_x.xl
+++ b/CarpetAttic/Cart3dTest/test/axial-yz/cart3d_x.xl
@@ -1,32 +1,34 @@
 # GRID::cart3d_x x (cart3d_x)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 4 -1.35
-0 0 0 0 0 2 2 4 -1.05
-0 0 0 0 0 4 2 4 -0.75
-0 0 0 0 0 6 2 4 -0.45
-0 0 0 0 0 8 2 4 -0.15
-0 0 0 0 0 10 2 4 0.15
-0 0 0 0 0 12 2 4 0.45
-0 0 0 0 0 14 2 4 0.75
-0 0 0 0 0 16 2 4 1.05
-0 0 0 0 0 18 2 4 1.35
+0 0 0 0 0 0 1 2 -1.35
+0 0 0 0 0 1 1 2 -1.05
+0 0 0 0 0 2 1 2 -0.75
+0 0 0 0 0 3 1 2 -0.45
+0 0 0 0 0 4 1 2 -0.15
+0 0 0 0 0 5 1 2 0.15
+0 0 0 0 0 6 1 2 0.45
+0 0 0 0 0 7 1 2 0.75
+0 0 0 0 0 8 1 2 1.05
+0 0 0 0 0 9 1 2 1.35
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 4 -1.35
-1 0 0 0 0 2 2 4 -1.05
-1 0 0 0 0 4 2 4 -0.75
-1 0 0 0 0 6 2 4 -0.45
-1 0 0 0 0 8 2 4 -0.15
-1 0 0 0 0 10 2 4 0.15
-1 0 0 0 0 12 2 4 0.45
-1 0 0 0 0 14 2 4 0.75
-1 0 0 0 0 16 2 4 1.05
-1 0 0 0 0 18 2 4 1.35
+1 0 0 0 0 0 1 2 -1.35
+1 0 0 0 0 1 1 2 -1.05
+1 0 0 0 0 2 1 2 -0.75
+1 0 0 0 0 3 1 2 -0.45
+1 0 0 0 0 4 1 2 -0.15
+1 0 0 0 0 5 1 2 0.15
+1 0 0 0 0 6 1 2 0.45
+1 0 0 0 0 7 1 2 0.75
+1 0 0 0 0 8 1 2 1.05
+1 0 0 0 0 9 1 2 1.35
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-yz/cart3d_x.yl b/CarpetAttic/Cart3dTest/test/axial-yz/cart3d_x.yl
index 953e91c27..ffac552e2 100644
--- a/CarpetAttic/Cart3dTest/test/axial-yz/cart3d_x.yl
+++ b/CarpetAttic/Cart3dTest/test/axial-yz/cart3d_x.yl
@@ -1,32 +1,34 @@
 # GRID::cart3d_x y (cart3d_x)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 10 0 4 0.15
-0 0 0 0 0 10 2 4 0.15
-0 0 0 0 0 10 4 4 0.15
-0 0 0 0 0 10 6 4 0.15
-0 0 0 0 0 10 8 4 0.15
-0 0 0 0 0 10 10 4 0.15
-0 0 0 0 0 10 12 4 0.15
-0 0 0 0 0 10 14 4 0.15
-0 0 0 0 0 10 16 4 0.15
-0 0 0 0 0 10 18 4 0.15
+0 0 0 0 0 5 0 2 0.15
+0 0 0 0 0 5 1 2 0.15
+0 0 0 0 0 5 2 2 0.15
+0 0 0 0 0 5 3 2 0.15
+0 0 0 0 0 5 4 2 0.15
+0 0 0 0 0 5 5 2 0.15
+0 0 0 0 0 5 6 2 0.15
+0 0 0 0 0 5 7 2 0.15
+0 0 0 0 0 5 8 2 0.15
+0 0 0 0 0 5 9 2 0.15
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 10 0 4 0.15
-1 0 0 0 0 10 2 4 0.15
-1 0 0 0 0 10 4 4 0.15
-1 0 0 0 0 10 6 4 0.15
-1 0 0 0 0 10 8 4 0.15
-1 0 0 0 0 10 10 4 0.15
-1 0 0 0 0 10 12 4 0.15
-1 0 0 0 0 10 14 4 0.15
-1 0 0 0 0 10 16 4 0.15
-1 0 0 0 0 10 18 4 0.15
+1 0 0 0 0 5 0 2 0.15
+1 0 0 0 0 5 1 2 0.15
+1 0 0 0 0 5 2 2 0.15
+1 0 0 0 0 5 3 2 0.15
+1 0 0 0 0 5 4 2 0.15
+1 0 0 0 0 5 5 2 0.15
+1 0 0 0 0 5 6 2 0.15
+1 0 0 0 0 5 7 2 0.15
+1 0 0 0 0 5 8 2 0.15
+1 0 0 0 0 5 9 2 0.15
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-yz/cart3d_x.zl b/CarpetAttic/Cart3dTest/test/axial-yz/cart3d_x.zl
index b4a78f2a0..c3d57ce1b 100644
--- a/CarpetAttic/Cart3dTest/test/axial-yz/cart3d_x.zl
+++ b/CarpetAttic/Cart3dTest/test/axial-yz/cart3d_x.zl
@@ -1,32 +1,34 @@
 # GRID::cart3d_x z (cart3d_x)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 10 2 0 0.15
-0 0 0 0 0 10 2 2 0.15
-0 0 0 0 0 10 2 4 0.15
-0 0 0 0 0 10 2 6 0.15
-0 0 0 0 0 10 2 8 0.15
-0 0 0 0 0 10 2 10 0.15
-0 0 0 0 0 10 2 12 0.15
-0 0 0 0 0 10 2 14 0.15
-0 0 0 0 0 10 2 16 0.15
-0 0 0 0 0 10 2 18 0.15
+0 0 0 0 0 5 1 0 0.15
+0 0 0 0 0 5 1 1 0.15
+0 0 0 0 0 5 1 2 0.15
+0 0 0 0 0 5 1 3 0.15
+0 0 0 0 0 5 1 4 0.15
+0 0 0 0 0 5 1 5 0.15
+0 0 0 0 0 5 1 6 0.15
+0 0 0 0 0 5 1 7 0.15
+0 0 0 0 0 5 1 8 0.15
+0 0 0 0 0 5 1 9 0.15
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 10 2 0 0.15
-1 0 0 0 0 10 2 2 0.15
-1 0 0 0 0 10 2 4 0.15
-1 0 0 0 0 10 2 6 0.15
-1 0 0 0 0 10 2 8 0.15
-1 0 0 0 0 10 2 10 0.15
-1 0 0 0 0 10 2 12 0.15
-1 0 0 0 0 10 2 14 0.15
-1 0 0 0 0 10 2 16 0.15
-1 0 0 0 0 10 2 18 0.15
+1 0 0 0 0 5 1 0 0.15
+1 0 0 0 0 5 1 1 0.15
+1 0 0 0 0 5 1 2 0.15
+1 0 0 0 0 5 1 3 0.15
+1 0 0 0 0 5 1 4 0.15
+1 0 0 0 0 5 1 5 0.15
+1 0 0 0 0 5 1 6 0.15
+1 0 0 0 0 5 1 7 0.15
+1 0 0 0 0 5 1 8 0.15
+1 0 0 0 0 5 1 9 0.15
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-yz/cart3d_y.xl b/CarpetAttic/Cart3dTest/test/axial-yz/cart3d_y.xl
index 7aeca332a..27036592d 100644
--- a/CarpetAttic/Cart3dTest/test/axial-yz/cart3d_y.xl
+++ b/CarpetAttic/Cart3dTest/test/axial-yz/cart3d_y.xl
@@ -1,32 +1,34 @@
 # GRID::cart3d_y x (cart3d_y)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 4 0.15
-0 0 0 0 0 2 2 4 0.15
-0 0 0 0 0 4 2 4 0.15
-0 0 0 0 0 6 2 4 0.15
-0 0 0 0 0 8 2 4 0.15
-0 0 0 0 0 10 2 4 0.15
-0 0 0 0 0 12 2 4 0.15
-0 0 0 0 0 14 2 4 0.15
-0 0 0 0 0 16 2 4 0.15
-0 0 0 0 0 18 2 4 0.15
+0 0 0 0 0 0 1 2 0.15
+0 0 0 0 0 1 1 2 0.15
+0 0 0 0 0 2 1 2 0.15
+0 0 0 0 0 3 1 2 0.15
+0 0 0 0 0 4 1 2 0.15
+0 0 0 0 0 5 1 2 0.15
+0 0 0 0 0 6 1 2 0.15
+0 0 0 0 0 7 1 2 0.15
+0 0 0 0 0 8 1 2 0.15
+0 0 0 0 0 9 1 2 0.15
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 4 0.15
-1 0 0 0 0 2 2 4 0.15
-1 0 0 0 0 4 2 4 0.15
-1 0 0 0 0 6 2 4 0.15
-1 0 0 0 0 8 2 4 0.15
-1 0 0 0 0 10 2 4 0.15
-1 0 0 0 0 12 2 4 0.15
-1 0 0 0 0 14 2 4 0.15
-1 0 0 0 0 16 2 4 0.15
-1 0 0 0 0 18 2 4 0.15
+1 0 0 0 0 0 1 2 0.15
+1 0 0 0 0 1 1 2 0.15
+1 0 0 0 0 2 1 2 0.15
+1 0 0 0 0 3 1 2 0.15
+1 0 0 0 0 4 1 2 0.15
+1 0 0 0 0 5 1 2 0.15
+1 0 0 0 0 6 1 2 0.15
+1 0 0 0 0 7 1 2 0.15
+1 0 0 0 0 8 1 2 0.15
+1 0 0 0 0 9 1 2 0.15
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-yz/cart3d_y.yl b/CarpetAttic/Cart3dTest/test/axial-yz/cart3d_y.yl
index 2cd1bf4b7..189ed4035 100644
--- a/CarpetAttic/Cart3dTest/test/axial-yz/cart3d_y.yl
+++ b/CarpetAttic/Cart3dTest/test/axial-yz/cart3d_y.yl
@@ -1,32 +1,34 @@
 # GRID::cart3d_y y (cart3d_y)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 10 0 4 -0.15
-0 0 0 0 0 10 2 4 0.15
-0 0 0 0 0 10 4 4 0.45
-0 0 0 0 0 10 6 4 0.75
-0 0 0 0 0 10 8 4 1.05
-0 0 0 0 0 10 10 4 1.35
-0 0 0 0 0 10 12 4 1.65
-0 0 0 0 0 10 14 4 1.95
-0 0 0 0 0 10 16 4 2.25
-0 0 0 0 0 10 18 4 2.55
+0 0 0 0 0 5 0 2 -0.15
+0 0 0 0 0 5 1 2 0.15
+0 0 0 0 0 5 2 2 0.45
+0 0 0 0 0 5 3 2 0.75
+0 0 0 0 0 5 4 2 1.05
+0 0 0 0 0 5 5 2 1.35
+0 0 0 0 0 5 6 2 1.65
+0 0 0 0 0 5 7 2 1.95
+0 0 0 0 0 5 8 2 2.25
+0 0 0 0 0 5 9 2 2.55
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 10 0 4 -0.15
-1 0 0 0 0 10 2 4 0.15
-1 0 0 0 0 10 4 4 0.45
-1 0 0 0 0 10 6 4 0.75
-1 0 0 0 0 10 8 4 1.05
-1 0 0 0 0 10 10 4 1.35
-1 0 0 0 0 10 12 4 1.65
-1 0 0 0 0 10 14 4 1.95
-1 0 0 0 0 10 16 4 2.25
-1 0 0 0 0 10 18 4 2.55
+1 0 0 0 0 5 0 2 -0.15
+1 0 0 0 0 5 1 2 0.15
+1 0 0 0 0 5 2 2 0.45
+1 0 0 0 0 5 3 2 0.75
+1 0 0 0 0 5 4 2 1.05
+1 0 0 0 0 5 5 2 1.35
+1 0 0 0 0 5 6 2 1.65
+1 0 0 0 0 5 7 2 1.95
+1 0 0 0 0 5 8 2 2.25
+1 0 0 0 0 5 9 2 2.55
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-yz/cart3d_y.zl b/CarpetAttic/Cart3dTest/test/axial-yz/cart3d_y.zl
index 3d45aa33f..5ad3531ba 100644
--- a/CarpetAttic/Cart3dTest/test/axial-yz/cart3d_y.zl
+++ b/CarpetAttic/Cart3dTest/test/axial-yz/cart3d_y.zl
@@ -1,32 +1,34 @@
 # GRID::cart3d_y z (cart3d_y)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 10 2 0 0.15
-0 0 0 0 0 10 2 2 0.15
-0 0 0 0 0 10 2 4 0.15
-0 0 0 0 0 10 2 6 0.15
-0 0 0 0 0 10 2 8 0.15
-0 0 0 0 0 10 2 10 0.15
-0 0 0 0 0 10 2 12 0.15
-0 0 0 0 0 10 2 14 0.15
-0 0 0 0 0 10 2 16 0.15
-0 0 0 0 0 10 2 18 0.15
+0 0 0 0 0 5 1 0 0.15
+0 0 0 0 0 5 1 1 0.15
+0 0 0 0 0 5 1 2 0.15
+0 0 0 0 0 5 1 3 0.15
+0 0 0 0 0 5 1 4 0.15
+0 0 0 0 0 5 1 5 0.15
+0 0 0 0 0 5 1 6 0.15
+0 0 0 0 0 5 1 7 0.15
+0 0 0 0 0 5 1 8 0.15
+0 0 0 0 0 5 1 9 0.15
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 10 2 0 0.15
-1 0 0 0 0 10 2 2 0.15
-1 0 0 0 0 10 2 4 0.15
-1 0 0 0 0 10 2 6 0.15
-1 0 0 0 0 10 2 8 0.15
-1 0 0 0 0 10 2 10 0.15
-1 0 0 0 0 10 2 12 0.15
-1 0 0 0 0 10 2 14 0.15
-1 0 0 0 0 10 2 16 0.15
-1 0 0 0 0 10 2 18 0.15
+1 0 0 0 0 5 1 0 0.15
+1 0 0 0 0 5 1 1 0.15
+1 0 0 0 0 5 1 2 0.15
+1 0 0 0 0 5 1 3 0.15
+1 0 0 0 0 5 1 4 0.15
+1 0 0 0 0 5 1 5 0.15
+1 0 0 0 0 5 1 6 0.15
+1 0 0 0 0 5 1 7 0.15
+1 0 0 0 0 5 1 8 0.15
+1 0 0 0 0 5 1 9 0.15
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-yz/cart3d_z.xl b/CarpetAttic/Cart3dTest/test/axial-yz/cart3d_z.xl
index e3e938cf3..e6951854e 100644
--- a/CarpetAttic/Cart3dTest/test/axial-yz/cart3d_z.xl
+++ b/CarpetAttic/Cart3dTest/test/axial-yz/cart3d_z.xl
@@ -1,32 +1,34 @@
 # GRID::cart3d_z x (cart3d_z)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 4 0.15
-0 0 0 0 0 2 2 4 0.15
-0 0 0 0 0 4 2 4 0.15
-0 0 0 0 0 6 2 4 0.15
-0 0 0 0 0 8 2 4 0.15
-0 0 0 0 0 10 2 4 0.15
-0 0 0 0 0 12 2 4 0.15
-0 0 0 0 0 14 2 4 0.15
-0 0 0 0 0 16 2 4 0.15
-0 0 0 0 0 18 2 4 0.15
+0 0 0 0 0 0 1 2 0.15
+0 0 0 0 0 1 1 2 0.15
+0 0 0 0 0 2 1 2 0.15
+0 0 0 0 0 3 1 2 0.15
+0 0 0 0 0 4 1 2 0.15
+0 0 0 0 0 5 1 2 0.15
+0 0 0 0 0 6 1 2 0.15
+0 0 0 0 0 7 1 2 0.15
+0 0 0 0 0 8 1 2 0.15
+0 0 0 0 0 9 1 2 0.15
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 4 0.15
-1 0 0 0 0 2 2 4 0.15
-1 0 0 0 0 4 2 4 0.15
-1 0 0 0 0 6 2 4 0.15
-1 0 0 0 0 8 2 4 0.15
-1 0 0 0 0 10 2 4 0.15
-1 0 0 0 0 12 2 4 0.15
-1 0 0 0 0 14 2 4 0.15
-1 0 0 0 0 16 2 4 0.15
-1 0 0 0 0 18 2 4 0.15
+1 0 0 0 0 0 1 2 0.15
+1 0 0 0 0 1 1 2 0.15
+1 0 0 0 0 2 1 2 0.15
+1 0 0 0 0 3 1 2 0.15
+1 0 0 0 0 4 1 2 0.15
+1 0 0 0 0 5 1 2 0.15
+1 0 0 0 0 6 1 2 0.15
+1 0 0 0 0 7 1 2 0.15
+1 0 0 0 0 8 1 2 0.15
+1 0 0 0 0 9 1 2 0.15
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-yz/cart3d_z.yl b/CarpetAttic/Cart3dTest/test/axial-yz/cart3d_z.yl
index fb8e35863..16379780b 100644
--- a/CarpetAttic/Cart3dTest/test/axial-yz/cart3d_z.yl
+++ b/CarpetAttic/Cart3dTest/test/axial-yz/cart3d_z.yl
@@ -1,32 +1,34 @@
 # GRID::cart3d_z y (cart3d_z)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 10 0 4 0.15
-0 0 0 0 0 10 2 4 0.15
-0 0 0 0 0 10 4 4 0.15
-0 0 0 0 0 10 6 4 0.15
-0 0 0 0 0 10 8 4 0.15
-0 0 0 0 0 10 10 4 0.15
-0 0 0 0 0 10 12 4 0.15
-0 0 0 0 0 10 14 4 0.15
-0 0 0 0 0 10 16 4 0.15
-0 0 0 0 0 10 18 4 0.15
+0 0 0 0 0 5 0 2 0.15
+0 0 0 0 0 5 1 2 0.15
+0 0 0 0 0 5 2 2 0.15
+0 0 0 0 0 5 3 2 0.15
+0 0 0 0 0 5 4 2 0.15
+0 0 0 0 0 5 5 2 0.15
+0 0 0 0 0 5 6 2 0.15
+0 0 0 0 0 5 7 2 0.15
+0 0 0 0 0 5 8 2 0.15
+0 0 0 0 0 5 9 2 0.15
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 10 0 4 0.15
-1 0 0 0 0 10 2 4 0.15
-1 0 0 0 0 10 4 4 0.15
-1 0 0 0 0 10 6 4 0.15
-1 0 0 0 0 10 8 4 0.15
-1 0 0 0 0 10 10 4 0.15
-1 0 0 0 0 10 12 4 0.15
-1 0 0 0 0 10 14 4 0.15
-1 0 0 0 0 10 16 4 0.15
-1 0 0 0 0 10 18 4 0.15
+1 0 0 0 0 5 0 2 0.15
+1 0 0 0 0 5 1 2 0.15
+1 0 0 0 0 5 2 2 0.15
+1 0 0 0 0 5 3 2 0.15
+1 0 0 0 0 5 4 2 0.15
+1 0 0 0 0 5 5 2 0.15
+1 0 0 0 0 5 6 2 0.15
+1 0 0 0 0 5 7 2 0.15
+1 0 0 0 0 5 8 2 0.15
+1 0 0 0 0 5 9 2 0.15
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-yz/cart3d_z.zl b/CarpetAttic/Cart3dTest/test/axial-yz/cart3d_z.zl
index 65224dd15..ed455d056 100644
--- a/CarpetAttic/Cart3dTest/test/axial-yz/cart3d_z.zl
+++ b/CarpetAttic/Cart3dTest/test/axial-yz/cart3d_z.zl
@@ -1,32 +1,34 @@
 # GRID::cart3d_z z (cart3d_z)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 10 2 0 -0.45
-0 0 0 0 0 10 2 2 -0.15
-0 0 0 0 0 10 2 4 0.15
-0 0 0 0 0 10 2 6 0.45
-0 0 0 0 0 10 2 8 0.75
-0 0 0 0 0 10 2 10 1.05
-0 0 0 0 0 10 2 12 1.35
-0 0 0 0 0 10 2 14 1.65
-0 0 0 0 0 10 2 16 1.95
-0 0 0 0 0 10 2 18 2.25
+0 0 0 0 0 5 1 0 -0.45
+0 0 0 0 0 5 1 1 -0.15
+0 0 0 0 0 5 1 2 0.15
+0 0 0 0 0 5 1 3 0.45
+0 0 0 0 0 5 1 4 0.75
+0 0 0 0 0 5 1 5 1.05
+0 0 0 0 0 5 1 6 1.35
+0 0 0 0 0 5 1 7 1.65
+0 0 0 0 0 5 1 8 1.95
+0 0 0 0 0 5 1 9 2.25
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 10 2 0 -0.45
-1 0 0 0 0 10 2 2 -0.15
-1 0 0 0 0 10 2 4 0.15
-1 0 0 0 0 10 2 6 0.45
-1 0 0 0 0 10 2 8 0.75
-1 0 0 0 0 10 2 10 1.05
-1 0 0 0 0 10 2 12 1.35
-1 0 0 0 0 10 2 14 1.65
-1 0 0 0 0 10 2 16 1.95
-1 0 0 0 0 10 2 18 2.25
+1 0 0 0 0 5 1 0 -0.45
+1 0 0 0 0 5 1 1 -0.15
+1 0 0 0 0 5 1 2 0.15
+1 0 0 0 0 5 1 3 0.45
+1 0 0 0 0 5 1 4 0.75
+1 0 0 0 0 5 1 5 1.05
+1 0 0 0 0 5 1 6 1.35
+1 0 0 0 0 5 1 7 1.65
+1 0 0 0 0 5 1 8 1.95
+1 0 0 0 0 5 1 9 2.25
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-yz/fxx.xl b/CarpetAttic/Cart3dTest/test/axial-yz/fxx.xl
index 423953b4b..bb3587def 100644
--- a/CarpetAttic/Cart3dTest/test/axial-yz/fxx.xl
+++ b/CarpetAttic/Cart3dTest/test/axial-yz/fxx.xl
@@ -1,32 +1,34 @@
 # CART3DTEST::fxx x (fxx)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 4 41000102
-0 0 0 0 0 2 2 4 41010102
-0 0 0 0 0 4 2 4 41020102
-0 0 0 0 0 6 2 4 41030102
-0 0 0 0 0 8 2 4 41040102
-0 0 0 0 0 10 2 4 41050102
-0 0 0 0 0 12 2 4 41060102
-0 0 0 0 0 14 2 4 41070102
-0 0 0 0 0 16 2 4 41080102
-0 0 0 0 0 18 2 4 41090102
+0 0 0 0 0 0 1 2 41000102
+0 0 0 0 0 1 1 2 41010102
+0 0 0 0 0 2 1 2 41020102
+0 0 0 0 0 3 1 2 41030102
+0 0 0 0 0 4 1 2 41040102
+0 0 0 0 0 5 1 2 41050102
+0 0 0 0 0 6 1 2 41060102
+0 0 0 0 0 7 1 2 41070102
+0 0 0 0 0 8 1 2 41080102
+0 0 0 0 0 9 1 2 41090102
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 4 41000102
-1 0 0 0 0 2 2 4 41010102
-1 0 0 0 0 4 2 4 41020102
-1 0 0 0 0 6 2 4 41030102
-1 0 0 0 0 8 2 4 41040102
-1 0 0 0 0 10 2 4 41050102
-1 0 0 0 0 12 2 4 41060102
-1 0 0 0 0 14 2 4 41070102
-1 0 0 0 0 16 2 4 41080102
-1 0 0 0 0 18 2 4 41090102
+1 0 0 0 0 0 1 2 41000102
+1 0 0 0 0 1 1 2 41010102
+1 0 0 0 0 2 1 2 41020102
+1 0 0 0 0 3 1 2 41030102
+1 0 0 0 0 4 1 2 41040102
+1 0 0 0 0 5 1 2 41050102
+1 0 0 0 0 6 1 2 41060102
+1 0 0 0 0 7 1 2 41070102
+1 0 0 0 0 8 1 2 41080102
+1 0 0 0 0 9 1 2 41090102
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-yz/fxx.yl b/CarpetAttic/Cart3dTest/test/axial-yz/fxx.yl
index 7377160c0..770760731 100644
--- a/CarpetAttic/Cart3dTest/test/axial-yz/fxx.yl
+++ b/CarpetAttic/Cart3dTest/test/axial-yz/fxx.yl
@@ -1,32 +1,34 @@
 # CART3DTEST::fxx y (fxx)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 10 0 4 41050002
-0 0 0 0 0 10 2 4 41050102
-0 0 0 0 0 10 4 4 41050202
-0 0 0 0 0 10 6 4 41050302
-0 0 0 0 0 10 8 4 41050402
-0 0 0 0 0 10 10 4 41050502
-0 0 0 0 0 10 12 4 41050602
-0 0 0 0 0 10 14 4 41050702
-0 0 0 0 0 10 16 4 41050802
-0 0 0 0 0 10 18 4 41050902
+0 0 0 0 0 5 0 2 41050002
+0 0 0 0 0 5 1 2 41050102
+0 0 0 0 0 5 2 2 41050202
+0 0 0 0 0 5 3 2 41050302
+0 0 0 0 0 5 4 2 41050402
+0 0 0 0 0 5 5 2 41050502
+0 0 0 0 0 5 6 2 41050602
+0 0 0 0 0 5 7 2 41050702
+0 0 0 0 0 5 8 2 41050802
+0 0 0 0 0 5 9 2 41050902
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 10 0 4 41050202
-1 0 0 0 0 10 2 4 41050102
-1 0 0 0 0 10 4 4 41050202
-1 0 0 0 0 10 6 4 41050302
-1 0 0 0 0 10 8 4 41050402
-1 0 0 0 0 10 10 4 41050502
-1 0 0 0 0 10 12 4 41050602
-1 0 0 0 0 10 14 4 41050702
-1 0 0 0 0 10 16 4 41050802
-1 0 0 0 0 10 18 4 41050902
+1 0 0 0 0 5 0 2 41050202
+1 0 0 0 0 5 1 2 41050102
+1 0 0 0 0 5 2 2 41050202
+1 0 0 0 0 5 3 2 41050302
+1 0 0 0 0 5 4 2 41050402
+1 0 0 0 0 5 5 2 41050502
+1 0 0 0 0 5 6 2 41050602
+1 0 0 0 0 5 7 2 41050702
+1 0 0 0 0 5 8 2 41050802
+1 0 0 0 0 5 9 2 41050902
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-yz/fxx.zl b/CarpetAttic/Cart3dTest/test/axial-yz/fxx.zl
index 44e959186..5f40df95b 100644
--- a/CarpetAttic/Cart3dTest/test/axial-yz/fxx.zl
+++ b/CarpetAttic/Cart3dTest/test/axial-yz/fxx.zl
@@ -1,32 +1,34 @@
 # CART3DTEST::fxx z (fxx)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 10 2 0 41050100
-0 0 0 0 0 10 2 2 41050101
-0 0 0 0 0 10 2 4 41050102
-0 0 0 0 0 10 2 6 41050103
-0 0 0 0 0 10 2 8 41050104
-0 0 0 0 0 10 2 10 41050105
-0 0 0 0 0 10 2 12 41050106
-0 0 0 0 0 10 2 14 41050107
-0 0 0 0 0 10 2 16 41050108
-0 0 0 0 0 10 2 18 41050109
+0 0 0 0 0 5 1 0 41050100
+0 0 0 0 0 5 1 1 41050101
+0 0 0 0 0 5 1 2 41050102
+0 0 0 0 0 5 1 3 41050103
+0 0 0 0 0 5 1 4 41050104
+0 0 0 0 0 5 1 5 41050105
+0 0 0 0 0 5 1 6 41050106
+0 0 0 0 0 5 1 7 41050107
+0 0 0 0 0 5 1 8 41050108
+0 0 0 0 0 5 1 9 41050109
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 10 2 0 41050201
-1 0 0 0 0 10 2 2 41050101
-1 0 0 0 0 10 2 4 41050102
-1 0 0 0 0 10 2 6 41050103
-1 0 0 0 0 10 2 8 41050104
-1 0 0 0 0 10 2 10 41050105
-1 0 0 0 0 10 2 12 41050106
-1 0 0 0 0 10 2 14 41050107
-1 0 0 0 0 10 2 16 41050108
-1 0 0 0 0 10 2 18 41050109
+1 0 0 0 0 5 1 0 41050201
+1 0 0 0 0 5 1 1 41050101
+1 0 0 0 0 5 1 2 41050102
+1 0 0 0 0 5 1 3 41050103
+1 0 0 0 0 5 1 4 41050104
+1 0 0 0 0 5 1 5 41050105
+1 0 0 0 0 5 1 6 41050106
+1 0 0 0 0 5 1 7 41050107
+1 0 0 0 0 5 1 8 41050108
+1 0 0 0 0 5 1 9 41050109
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-yz/fxy.xl b/CarpetAttic/Cart3dTest/test/axial-yz/fxy.xl
index 728f7e726..e5581373a 100644
--- a/CarpetAttic/Cart3dTest/test/axial-yz/fxy.xl
+++ b/CarpetAttic/Cart3dTest/test/axial-yz/fxy.xl
@@ -1,32 +1,34 @@
 # CART3DTEST::fxy x (fxy)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 4 42000102
-0 0 0 0 0 2 2 4 42010102
-0 0 0 0 0 4 2 4 42020102
-0 0 0 0 0 6 2 4 42030102
-0 0 0 0 0 8 2 4 42040102
-0 0 0 0 0 10 2 4 42050102
-0 0 0 0 0 12 2 4 42060102
-0 0 0 0 0 14 2 4 42070102
-0 0 0 0 0 16 2 4 42080102
-0 0 0 0 0 18 2 4 42090102
+0 0 0 0 0 0 1 2 42000102
+0 0 0 0 0 1 1 2 42010102
+0 0 0 0 0 2 1 2 42020102
+0 0 0 0 0 3 1 2 42030102
+0 0 0 0 0 4 1 2 42040102
+0 0 0 0 0 5 1 2 42050102
+0 0 0 0 0 6 1 2 42060102
+0 0 0 0 0 7 1 2 42070102
+0 0 0 0 0 8 1 2 42080102
+0 0 0 0 0 9 1 2 42090102
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 4 42000102
-1 0 0 0 0 2 2 4 42010102
-1 0 0 0 0 4 2 4 42020102
-1 0 0 0 0 6 2 4 42030102
-1 0 0 0 0 8 2 4 42040102
-1 0 0 0 0 10 2 4 42050102
-1 0 0 0 0 12 2 4 42060102
-1 0 0 0 0 14 2 4 42070102
-1 0 0 0 0 16 2 4 42080102
-1 0 0 0 0 18 2 4 42090102
+1 0 0 0 0 0 1 2 42000102
+1 0 0 0 0 1 1 2 42010102
+1 0 0 0 0 2 1 2 42020102
+1 0 0 0 0 3 1 2 42030102
+1 0 0 0 0 4 1 2 42040102
+1 0 0 0 0 5 1 2 42050102
+1 0 0 0 0 6 1 2 42060102
+1 0 0 0 0 7 1 2 42070102
+1 0 0 0 0 8 1 2 42080102
+1 0 0 0 0 9 1 2 42090102
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-yz/fxy.yl b/CarpetAttic/Cart3dTest/test/axial-yz/fxy.yl
index 57ae21ce9..6e43370d6 100644
--- a/CarpetAttic/Cart3dTest/test/axial-yz/fxy.yl
+++ b/CarpetAttic/Cart3dTest/test/axial-yz/fxy.yl
@@ -1,32 +1,34 @@
 # CART3DTEST::fxy y (fxy)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 10 0 4 42050002
-0 0 0 0 0 10 2 4 42050102
-0 0 0 0 0 10 4 4 42050202
-0 0 0 0 0 10 6 4 42050302
-0 0 0 0 0 10 8 4 42050402
-0 0 0 0 0 10 10 4 42050502
-0 0 0 0 0 10 12 4 42050602
-0 0 0 0 0 10 14 4 42050702
-0 0 0 0 0 10 16 4 42050802
-0 0 0 0 0 10 18 4 42050902
+0 0 0 0 0 5 0 2 42050002
+0 0 0 0 0 5 1 2 42050102
+0 0 0 0 0 5 2 2 42050202
+0 0 0 0 0 5 3 2 42050302
+0 0 0 0 0 5 4 2 42050402
+0 0 0 0 0 5 5 2 42050502
+0 0 0 0 0 5 6 2 42050602
+0 0 0 0 0 5 7 2 42050702
+0 0 0 0 0 5 8 2 42050802
+0 0 0 0 0 5 9 2 42050902
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 10 0 4 -43050202
-1 0 0 0 0 10 2 4 42050102
-1 0 0 0 0 10 4 4 42050202
-1 0 0 0 0 10 6 4 42050302
-1 0 0 0 0 10 8 4 42050402
-1 0 0 0 0 10 10 4 42050502
-1 0 0 0 0 10 12 4 42050602
-1 0 0 0 0 10 14 4 42050702
-1 0 0 0 0 10 16 4 42050802
-1 0 0 0 0 10 18 4 42050902
+1 0 0 0 0 5 0 2 -43050202
+1 0 0 0 0 5 1 2 42050102
+1 0 0 0 0 5 2 2 42050202
+1 0 0 0 0 5 3 2 42050302
+1 0 0 0 0 5 4 2 42050402
+1 0 0 0 0 5 5 2 42050502
+1 0 0 0 0 5 6 2 42050602
+1 0 0 0 0 5 7 2 42050702
+1 0 0 0 0 5 8 2 42050802
+1 0 0 0 0 5 9 2 42050902
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-yz/fxy.zl b/CarpetAttic/Cart3dTest/test/axial-yz/fxy.zl
index e07080c9a..c051d4d6c 100644
--- a/CarpetAttic/Cart3dTest/test/axial-yz/fxy.zl
+++ b/CarpetAttic/Cart3dTest/test/axial-yz/fxy.zl
@@ -1,32 +1,34 @@
 # CART3DTEST::fxy z (fxy)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 10 2 0 42050100
-0 0 0 0 0 10 2 2 42050101
-0 0 0 0 0 10 2 4 42050102
-0 0 0 0 0 10 2 6 42050103
-0 0 0 0 0 10 2 8 42050104
-0 0 0 0 0 10 2 10 42050105
-0 0 0 0 0 10 2 12 42050106
-0 0 0 0 0 10 2 14 42050107
-0 0 0 0 0 10 2 16 42050108
-0 0 0 0 0 10 2 18 42050109
+0 0 0 0 0 5 1 0 42050100
+0 0 0 0 0 5 1 1 42050101
+0 0 0 0 0 5 1 2 42050102
+0 0 0 0 0 5 1 3 42050103
+0 0 0 0 0 5 1 4 42050104
+0 0 0 0 0 5 1 5 42050105
+0 0 0 0 0 5 1 6 42050106
+0 0 0 0 0 5 1 7 42050107
+0 0 0 0 0 5 1 8 42050108
+0 0 0 0 0 5 1 9 42050109
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 10 2 0 43050201
-1 0 0 0 0 10 2 2 43050101
-1 0 0 0 0 10 2 4 42050102
-1 0 0 0 0 10 2 6 42050103
-1 0 0 0 0 10 2 8 42050104
-1 0 0 0 0 10 2 10 42050105
-1 0 0 0 0 10 2 12 42050106
-1 0 0 0 0 10 2 14 42050107
-1 0 0 0 0 10 2 16 42050108
-1 0 0 0 0 10 2 18 42050109
+1 0 0 0 0 5 1 0 43050201
+1 0 0 0 0 5 1 1 43050101
+1 0 0 0 0 5 1 2 42050102
+1 0 0 0 0 5 1 3 42050103
+1 0 0 0 0 5 1 4 42050104
+1 0 0 0 0 5 1 5 42050105
+1 0 0 0 0 5 1 6 42050106
+1 0 0 0 0 5 1 7 42050107
+1 0 0 0 0 5 1 8 42050108
+1 0 0 0 0 5 1 9 42050109
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-yz/fxz.xl b/CarpetAttic/Cart3dTest/test/axial-yz/fxz.xl
index b65002cdd..f21c7d9c4 100644
--- a/CarpetAttic/Cart3dTest/test/axial-yz/fxz.xl
+++ b/CarpetAttic/Cart3dTest/test/axial-yz/fxz.xl
@@ -1,32 +1,34 @@
 # CART3DTEST::fxz x (fxz)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 4 43000102
-0 0 0 0 0 2 2 4 43010102
-0 0 0 0 0 4 2 4 43020102
-0 0 0 0 0 6 2 4 43030102
-0 0 0 0 0 8 2 4 43040102
-0 0 0 0 0 10 2 4 43050102
-0 0 0 0 0 12 2 4 43060102
-0 0 0 0 0 14 2 4 43070102
-0 0 0 0 0 16 2 4 43080102
-0 0 0 0 0 18 2 4 43090102
+0 0 0 0 0 0 1 2 43000102
+0 0 0 0 0 1 1 2 43010102
+0 0 0 0 0 2 1 2 43020102
+0 0 0 0 0 3 1 2 43030102
+0 0 0 0 0 4 1 2 43040102
+0 0 0 0 0 5 1 2 43050102
+0 0 0 0 0 6 1 2 43060102
+0 0 0 0 0 7 1 2 43070102
+0 0 0 0 0 8 1 2 43080102
+0 0 0 0 0 9 1 2 43090102
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 4 43000102
-1 0 0 0 0 2 2 4 43010102
-1 0 0 0 0 4 2 4 43020102
-1 0 0 0 0 6 2 4 43030102
-1 0 0 0 0 8 2 4 43040102
-1 0 0 0 0 10 2 4 43050102
-1 0 0 0 0 12 2 4 43060102
-1 0 0 0 0 14 2 4 43070102
-1 0 0 0 0 16 2 4 43080102
-1 0 0 0 0 18 2 4 43090102
+1 0 0 0 0 0 1 2 43000102
+1 0 0 0 0 1 1 2 43010102
+1 0 0 0 0 2 1 2 43020102
+1 0 0 0 0 3 1 2 43030102
+1 0 0 0 0 4 1 2 43040102
+1 0 0 0 0 5 1 2 43050102
+1 0 0 0 0 6 1 2 43060102
+1 0 0 0 0 7 1 2 43070102
+1 0 0 0 0 8 1 2 43080102
+1 0 0 0 0 9 1 2 43090102
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-yz/fxz.yl b/CarpetAttic/Cart3dTest/test/axial-yz/fxz.yl
index 7c9a78889..a81e3c17f 100644
--- a/CarpetAttic/Cart3dTest/test/axial-yz/fxz.yl
+++ b/CarpetAttic/Cart3dTest/test/axial-yz/fxz.yl
@@ -1,32 +1,34 @@
 # CART3DTEST::fxz y (fxz)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 10 0 4 43050002
-0 0 0 0 0 10 2 4 43050102
-0 0 0 0 0 10 4 4 43050202
-0 0 0 0 0 10 6 4 43050302
-0 0 0 0 0 10 8 4 43050402
-0 0 0 0 0 10 10 4 43050502
-0 0 0 0 0 10 12 4 43050602
-0 0 0 0 0 10 14 4 43050702
-0 0 0 0 0 10 16 4 43050802
-0 0 0 0 0 10 18 4 43050902
+0 0 0 0 0 5 0 2 43050002
+0 0 0 0 0 5 1 2 43050102
+0 0 0 0 0 5 2 2 43050202
+0 0 0 0 0 5 3 2 43050302
+0 0 0 0 0 5 4 2 43050402
+0 0 0 0 0 5 5 2 43050502
+0 0 0 0 0 5 6 2 43050602
+0 0 0 0 0 5 7 2 43050702
+0 0 0 0 0 5 8 2 43050802
+0 0 0 0 0 5 9 2 43050902
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 10 0 4 42050202
-1 0 0 0 0 10 2 4 43050102
-1 0 0 0 0 10 4 4 43050202
-1 0 0 0 0 10 6 4 43050302
-1 0 0 0 0 10 8 4 43050402
-1 0 0 0 0 10 10 4 43050502
-1 0 0 0 0 10 12 4 43050602
-1 0 0 0 0 10 14 4 43050702
-1 0 0 0 0 10 16 4 43050802
-1 0 0 0 0 10 18 4 43050902
+1 0 0 0 0 5 0 2 42050202
+1 0 0 0 0 5 1 2 43050102
+1 0 0 0 0 5 2 2 43050202
+1 0 0 0 0 5 3 2 43050302
+1 0 0 0 0 5 4 2 43050402
+1 0 0 0 0 5 5 2 43050502
+1 0 0 0 0 5 6 2 43050602
+1 0 0 0 0 5 7 2 43050702
+1 0 0 0 0 5 8 2 43050802
+1 0 0 0 0 5 9 2 43050902
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-yz/fxz.zl b/CarpetAttic/Cart3dTest/test/axial-yz/fxz.zl
index 05adf7259..0011006e0 100644
--- a/CarpetAttic/Cart3dTest/test/axial-yz/fxz.zl
+++ b/CarpetAttic/Cart3dTest/test/axial-yz/fxz.zl
@@ -1,32 +1,34 @@
 # CART3DTEST::fxz z (fxz)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 10 2 0 43050100
-0 0 0 0 0 10 2 2 43050101
-0 0 0 0 0 10 2 4 43050102
-0 0 0 0 0 10 2 6 43050103
-0 0 0 0 0 10 2 8 43050104
-0 0 0 0 0 10 2 10 43050105
-0 0 0 0 0 10 2 12 43050106
-0 0 0 0 0 10 2 14 43050107
-0 0 0 0 0 10 2 16 43050108
-0 0 0 0 0 10 2 18 43050109
+0 0 0 0 0 5 1 0 43050100
+0 0 0 0 0 5 1 1 43050101
+0 0 0 0 0 5 1 2 43050102
+0 0 0 0 0 5 1 3 43050103
+0 0 0 0 0 5 1 4 43050104
+0 0 0 0 0 5 1 5 43050105
+0 0 0 0 0 5 1 6 43050106
+0 0 0 0 0 5 1 7 43050107
+0 0 0 0 0 5 1 8 43050108
+0 0 0 0 0 5 1 9 43050109
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 10 2 0 -43050102
-1 0 0 0 0 10 2 2 -43050101
-1 0 0 0 0 10 2 4 43050102
-1 0 0 0 0 10 2 6 43050103
-1 0 0 0 0 10 2 8 43050104
-1 0 0 0 0 10 2 10 43050105
-1 0 0 0 0 10 2 12 43050106
-1 0 0 0 0 10 2 14 43050107
-1 0 0 0 0 10 2 16 43050108
-1 0 0 0 0 10 2 18 43050109
+1 0 0 0 0 5 1 0 -43050102
+1 0 0 0 0 5 1 1 -43050101
+1 0 0 0 0 5 1 2 43050102
+1 0 0 0 0 5 1 3 43050103
+1 0 0 0 0 5 1 4 43050104
+1 0 0 0 0 5 1 5 43050105
+1 0 0 0 0 5 1 6 43050106
+1 0 0 0 0 5 1 7 43050107
+1 0 0 0 0 5 1 8 43050108
+1 0 0 0 0 5 1 9 43050109
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-yz/fyx.xl b/CarpetAttic/Cart3dTest/test/axial-yz/fyx.xl
index a83f71fa8..29d37aa19 100644
--- a/CarpetAttic/Cart3dTest/test/axial-yz/fyx.xl
+++ b/CarpetAttic/Cart3dTest/test/axial-yz/fyx.xl
@@ -1,32 +1,34 @@
 # CART3DTEST::fyx x (fyx)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 4 44000102
-0 0 0 0 0 2 2 4 44010102
-0 0 0 0 0 4 2 4 44020102
-0 0 0 0 0 6 2 4 44030102
-0 0 0 0 0 8 2 4 44040102
-0 0 0 0 0 10 2 4 44050102
-0 0 0 0 0 12 2 4 44060102
-0 0 0 0 0 14 2 4 44070102
-0 0 0 0 0 16 2 4 44080102
-0 0 0 0 0 18 2 4 44090102
+0 0 0 0 0 0 1 2 44000102
+0 0 0 0 0 1 1 2 44010102
+0 0 0 0 0 2 1 2 44020102
+0 0 0 0 0 3 1 2 44030102
+0 0 0 0 0 4 1 2 44040102
+0 0 0 0 0 5 1 2 44050102
+0 0 0 0 0 6 1 2 44060102
+0 0 0 0 0 7 1 2 44070102
+0 0 0 0 0 8 1 2 44080102
+0 0 0 0 0 9 1 2 44090102
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 4 44000102
-1 0 0 0 0 2 2 4 44010102
-1 0 0 0 0 4 2 4 44020102
-1 0 0 0 0 6 2 4 44030102
-1 0 0 0 0 8 2 4 44040102
-1 0 0 0 0 10 2 4 44050102
-1 0 0 0 0 12 2 4 44060102
-1 0 0 0 0 14 2 4 44070102
-1 0 0 0 0 16 2 4 44080102
-1 0 0 0 0 18 2 4 44090102
+1 0 0 0 0 0 1 2 44000102
+1 0 0 0 0 1 1 2 44010102
+1 0 0 0 0 2 1 2 44020102
+1 0 0 0 0 3 1 2 44030102
+1 0 0 0 0 4 1 2 44040102
+1 0 0 0 0 5 1 2 44050102
+1 0 0 0 0 6 1 2 44060102
+1 0 0 0 0 7 1 2 44070102
+1 0 0 0 0 8 1 2 44080102
+1 0 0 0 0 9 1 2 44090102
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-yz/fyx.yl b/CarpetAttic/Cart3dTest/test/axial-yz/fyx.yl
index e0d4bf327..588cd7cbf 100644
--- a/CarpetAttic/Cart3dTest/test/axial-yz/fyx.yl
+++ b/CarpetAttic/Cart3dTest/test/axial-yz/fyx.yl
@@ -1,32 +1,34 @@
 # CART3DTEST::fyx y (fyx)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 10 0 4 44050002
-0 0 0 0 0 10 2 4 44050102
-0 0 0 0 0 10 4 4 44050202
-0 0 0 0 0 10 6 4 44050302
-0 0 0 0 0 10 8 4 44050402
-0 0 0 0 0 10 10 4 44050502
-0 0 0 0 0 10 12 4 44050602
-0 0 0 0 0 10 14 4 44050702
-0 0 0 0 0 10 16 4 44050802
-0 0 0 0 0 10 18 4 44050902
+0 0 0 0 0 5 0 2 44050002
+0 0 0 0 0 5 1 2 44050102
+0 0 0 0 0 5 2 2 44050202
+0 0 0 0 0 5 3 2 44050302
+0 0 0 0 0 5 4 2 44050402
+0 0 0 0 0 5 5 2 44050502
+0 0 0 0 0 5 6 2 44050602
+0 0 0 0 0 5 7 2 44050702
+0 0 0 0 0 5 8 2 44050802
+0 0 0 0 0 5 9 2 44050902
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 10 0 4 -47050202
-1 0 0 0 0 10 2 4 44050102
-1 0 0 0 0 10 4 4 44050202
-1 0 0 0 0 10 6 4 44050302
-1 0 0 0 0 10 8 4 44050402
-1 0 0 0 0 10 10 4 44050502
-1 0 0 0 0 10 12 4 44050602
-1 0 0 0 0 10 14 4 44050702
-1 0 0 0 0 10 16 4 44050802
-1 0 0 0 0 10 18 4 44050902
+1 0 0 0 0 5 0 2 -47050202
+1 0 0 0 0 5 1 2 44050102
+1 0 0 0 0 5 2 2 44050202
+1 0 0 0 0 5 3 2 44050302
+1 0 0 0 0 5 4 2 44050402
+1 0 0 0 0 5 5 2 44050502
+1 0 0 0 0 5 6 2 44050602
+1 0 0 0 0 5 7 2 44050702
+1 0 0 0 0 5 8 2 44050802
+1 0 0 0 0 5 9 2 44050902
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-yz/fyx.zl b/CarpetAttic/Cart3dTest/test/axial-yz/fyx.zl
index 237f108be..308e7c29c 100644
--- a/CarpetAttic/Cart3dTest/test/axial-yz/fyx.zl
+++ b/CarpetAttic/Cart3dTest/test/axial-yz/fyx.zl
@@ -1,32 +1,34 @@
 # CART3DTEST::fyx z (fyx)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 10 2 0 44050100
-0 0 0 0 0 10 2 2 44050101
-0 0 0 0 0 10 2 4 44050102
-0 0 0 0 0 10 2 6 44050103
-0 0 0 0 0 10 2 8 44050104
-0 0 0 0 0 10 2 10 44050105
-0 0 0 0 0 10 2 12 44050106
-0 0 0 0 0 10 2 14 44050107
-0 0 0 0 0 10 2 16 44050108
-0 0 0 0 0 10 2 18 44050109
+0 0 0 0 0 5 1 0 44050100
+0 0 0 0 0 5 1 1 44050101
+0 0 0 0 0 5 1 2 44050102
+0 0 0 0 0 5 1 3 44050103
+0 0 0 0 0 5 1 4 44050104
+0 0 0 0 0 5 1 5 44050105
+0 0 0 0 0 5 1 6 44050106
+0 0 0 0 0 5 1 7 44050107
+0 0 0 0 0 5 1 8 44050108
+0 0 0 0 0 5 1 9 44050109
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 10 2 0 47050201
-1 0 0 0 0 10 2 2 47050101
-1 0 0 0 0 10 2 4 44050102
-1 0 0 0 0 10 2 6 44050103
-1 0 0 0 0 10 2 8 44050104
-1 0 0 0 0 10 2 10 44050105
-1 0 0 0 0 10 2 12 44050106
-1 0 0 0 0 10 2 14 44050107
-1 0 0 0 0 10 2 16 44050108
-1 0 0 0 0 10 2 18 44050109
+1 0 0 0 0 5 1 0 47050201
+1 0 0 0 0 5 1 1 47050101
+1 0 0 0 0 5 1 2 44050102
+1 0 0 0 0 5 1 3 44050103
+1 0 0 0 0 5 1 4 44050104
+1 0 0 0 0 5 1 5 44050105
+1 0 0 0 0 5 1 6 44050106
+1 0 0 0 0 5 1 7 44050107
+1 0 0 0 0 5 1 8 44050108
+1 0 0 0 0 5 1 9 44050109
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-yz/fyy.xl b/CarpetAttic/Cart3dTest/test/axial-yz/fyy.xl
index fa30e66f7..4c99ee513 100644
--- a/CarpetAttic/Cart3dTest/test/axial-yz/fyy.xl
+++ b/CarpetAttic/Cart3dTest/test/axial-yz/fyy.xl
@@ -1,32 +1,34 @@
 # CART3DTEST::fyy x (fyy)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 4 45000102
-0 0 0 0 0 2 2 4 45010102
-0 0 0 0 0 4 2 4 45020102
-0 0 0 0 0 6 2 4 45030102
-0 0 0 0 0 8 2 4 45040102
-0 0 0 0 0 10 2 4 45050102
-0 0 0 0 0 12 2 4 45060102
-0 0 0 0 0 14 2 4 45070102
-0 0 0 0 0 16 2 4 45080102
-0 0 0 0 0 18 2 4 45090102
+0 0 0 0 0 0 1 2 45000102
+0 0 0 0 0 1 1 2 45010102
+0 0 0 0 0 2 1 2 45020102
+0 0 0 0 0 3 1 2 45030102
+0 0 0 0 0 4 1 2 45040102
+0 0 0 0 0 5 1 2 45050102
+0 0 0 0 0 6 1 2 45060102
+0 0 0 0 0 7 1 2 45070102
+0 0 0 0 0 8 1 2 45080102
+0 0 0 0 0 9 1 2 45090102
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 4 45000102
-1 0 0 0 0 2 2 4 45010102
-1 0 0 0 0 4 2 4 45020102
-1 0 0 0 0 6 2 4 45030102
-1 0 0 0 0 8 2 4 45040102
-1 0 0 0 0 10 2 4 45050102
-1 0 0 0 0 12 2 4 45060102
-1 0 0 0 0 14 2 4 45070102
-1 0 0 0 0 16 2 4 45080102
-1 0 0 0 0 18 2 4 45090102
+1 0 0 0 0 0 1 2 45000102
+1 0 0 0 0 1 1 2 45010102
+1 0 0 0 0 2 1 2 45020102
+1 0 0 0 0 3 1 2 45030102
+1 0 0 0 0 4 1 2 45040102
+1 0 0 0 0 5 1 2 45050102
+1 0 0 0 0 6 1 2 45060102
+1 0 0 0 0 7 1 2 45070102
+1 0 0 0 0 8 1 2 45080102
+1 0 0 0 0 9 1 2 45090102
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-yz/fyy.yl b/CarpetAttic/Cart3dTest/test/axial-yz/fyy.yl
index 53635456a..fcfa32f3e 100644
--- a/CarpetAttic/Cart3dTest/test/axial-yz/fyy.yl
+++ b/CarpetAttic/Cart3dTest/test/axial-yz/fyy.yl
@@ -1,32 +1,34 @@
 # CART3DTEST::fyy y (fyy)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 10 0 4 45050002
-0 0 0 0 0 10 2 4 45050102
-0 0 0 0 0 10 4 4 45050202
-0 0 0 0 0 10 6 4 45050302
-0 0 0 0 0 10 8 4 45050402
-0 0 0 0 0 10 10 4 45050502
-0 0 0 0 0 10 12 4 45050602
-0 0 0 0 0 10 14 4 45050702
-0 0 0 0 0 10 16 4 45050802
-0 0 0 0 0 10 18 4 45050902
+0 0 0 0 0 5 0 2 45050002
+0 0 0 0 0 5 1 2 45050102
+0 0 0 0 0 5 2 2 45050202
+0 0 0 0 0 5 3 2 45050302
+0 0 0 0 0 5 4 2 45050402
+0 0 0 0 0 5 5 2 45050502
+0 0 0 0 0 5 6 2 45050602
+0 0 0 0 0 5 7 2 45050702
+0 0 0 0 0 5 8 2 45050802
+0 0 0 0 0 5 9 2 45050902
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 10 0 4 49050202
-1 0 0 0 0 10 2 4 45050102
-1 0 0 0 0 10 4 4 45050202
-1 0 0 0 0 10 6 4 45050302
-1 0 0 0 0 10 8 4 45050402
-1 0 0 0 0 10 10 4 45050502
-1 0 0 0 0 10 12 4 45050602
-1 0 0 0 0 10 14 4 45050702
-1 0 0 0 0 10 16 4 45050802
-1 0 0 0 0 10 18 4 45050902
+1 0 0 0 0 5 0 2 49050202
+1 0 0 0 0 5 1 2 45050102
+1 0 0 0 0 5 2 2 45050202
+1 0 0 0 0 5 3 2 45050302
+1 0 0 0 0 5 4 2 45050402
+1 0 0 0 0 5 5 2 45050502
+1 0 0 0 0 5 6 2 45050602
+1 0 0 0 0 5 7 2 45050702
+1 0 0 0 0 5 8 2 45050802
+1 0 0 0 0 5 9 2 45050902
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-yz/fyy.zl b/CarpetAttic/Cart3dTest/test/axial-yz/fyy.zl
index 0ea0fc081..ead5e324f 100644
--- a/CarpetAttic/Cart3dTest/test/axial-yz/fyy.zl
+++ b/CarpetAttic/Cart3dTest/test/axial-yz/fyy.zl
@@ -1,32 +1,34 @@
 # CART3DTEST::fyy z (fyy)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 10 2 0 45050100
-0 0 0 0 0 10 2 2 45050101
-0 0 0 0 0 10 2 4 45050102
-0 0 0 0 0 10 2 6 45050103
-0 0 0 0 0 10 2 8 45050104
-0 0 0 0 0 10 2 10 45050105
-0 0 0 0 0 10 2 12 45050106
-0 0 0 0 0 10 2 14 45050107
-0 0 0 0 0 10 2 16 45050108
-0 0 0 0 0 10 2 18 45050109
+0 0 0 0 0 5 1 0 45050100
+0 0 0 0 0 5 1 1 45050101
+0 0 0 0 0 5 1 2 45050102
+0 0 0 0 0 5 1 3 45050103
+0 0 0 0 0 5 1 4 45050104
+0 0 0 0 0 5 1 5 45050105
+0 0 0 0 0 5 1 6 45050106
+0 0 0 0 0 5 1 7 45050107
+0 0 0 0 0 5 1 8 45050108
+0 0 0 0 0 5 1 9 45050109
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 10 2 0 49050201
-1 0 0 0 0 10 2 2 49050101
-1 0 0 0 0 10 2 4 45050102
-1 0 0 0 0 10 2 6 45050103
-1 0 0 0 0 10 2 8 45050104
-1 0 0 0 0 10 2 10 45050105
-1 0 0 0 0 10 2 12 45050106
-1 0 0 0 0 10 2 14 45050107
-1 0 0 0 0 10 2 16 45050108
-1 0 0 0 0 10 2 18 45050109
+1 0 0 0 0 5 1 0 49050201
+1 0 0 0 0 5 1 1 49050101
+1 0 0 0 0 5 1 2 45050102
+1 0 0 0 0 5 1 3 45050103
+1 0 0 0 0 5 1 4 45050104
+1 0 0 0 0 5 1 5 45050105
+1 0 0 0 0 5 1 6 45050106
+1 0 0 0 0 5 1 7 45050107
+1 0 0 0 0 5 1 8 45050108
+1 0 0 0 0 5 1 9 45050109
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-yz/fyz.xl b/CarpetAttic/Cart3dTest/test/axial-yz/fyz.xl
index fbe4d125e..63279046f 100644
--- a/CarpetAttic/Cart3dTest/test/axial-yz/fyz.xl
+++ b/CarpetAttic/Cart3dTest/test/axial-yz/fyz.xl
@@ -1,32 +1,34 @@
 # CART3DTEST::fyz x (fyz)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 4 46000102
-0 0 0 0 0 2 2 4 46010102
-0 0 0 0 0 4 2 4 46020102
-0 0 0 0 0 6 2 4 46030102
-0 0 0 0 0 8 2 4 46040102
-0 0 0 0 0 10 2 4 46050102
-0 0 0 0 0 12 2 4 46060102
-0 0 0 0 0 14 2 4 46070102
-0 0 0 0 0 16 2 4 46080102
-0 0 0 0 0 18 2 4 46090102
+0 0 0 0 0 0 1 2 46000102
+0 0 0 0 0 1 1 2 46010102
+0 0 0 0 0 2 1 2 46020102
+0 0 0 0 0 3 1 2 46030102
+0 0 0 0 0 4 1 2 46040102
+0 0 0 0 0 5 1 2 46050102
+0 0 0 0 0 6 1 2 46060102
+0 0 0 0 0 7 1 2 46070102
+0 0 0 0 0 8 1 2 46080102
+0 0 0 0 0 9 1 2 46090102
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 4 46000102
-1 0 0 0 0 2 2 4 46010102
-1 0 0 0 0 4 2 4 46020102
-1 0 0 0 0 6 2 4 46030102
-1 0 0 0 0 8 2 4 46040102
-1 0 0 0 0 10 2 4 46050102
-1 0 0 0 0 12 2 4 46060102
-1 0 0 0 0 14 2 4 46070102
-1 0 0 0 0 16 2 4 46080102
-1 0 0 0 0 18 2 4 46090102
+1 0 0 0 0 0 1 2 46000102
+1 0 0 0 0 1 1 2 46010102
+1 0 0 0 0 2 1 2 46020102
+1 0 0 0 0 3 1 2 46030102
+1 0 0 0 0 4 1 2 46040102
+1 0 0 0 0 5 1 2 46050102
+1 0 0 0 0 6 1 2 46060102
+1 0 0 0 0 7 1 2 46070102
+1 0 0 0 0 8 1 2 46080102
+1 0 0 0 0 9 1 2 46090102
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-yz/fyz.yl b/CarpetAttic/Cart3dTest/test/axial-yz/fyz.yl
index 7e706fa1a..3c1caa721 100644
--- a/CarpetAttic/Cart3dTest/test/axial-yz/fyz.yl
+++ b/CarpetAttic/Cart3dTest/test/axial-yz/fyz.yl
@@ -1,32 +1,34 @@
 # CART3DTEST::fyz y (fyz)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 10 0 4 46050002
-0 0 0 0 0 10 2 4 46050102
-0 0 0 0 0 10 4 4 46050202
-0 0 0 0 0 10 6 4 46050302
-0 0 0 0 0 10 8 4 46050402
-0 0 0 0 0 10 10 4 46050502
-0 0 0 0 0 10 12 4 46050602
-0 0 0 0 0 10 14 4 46050702
-0 0 0 0 0 10 16 4 46050802
-0 0 0 0 0 10 18 4 46050902
+0 0 0 0 0 5 0 2 46050002
+0 0 0 0 0 5 1 2 46050102
+0 0 0 0 0 5 2 2 46050202
+0 0 0 0 0 5 3 2 46050302
+0 0 0 0 0 5 4 2 46050402
+0 0 0 0 0 5 5 2 46050502
+0 0 0 0 0 5 6 2 46050602
+0 0 0 0 0 5 7 2 46050702
+0 0 0 0 0 5 8 2 46050802
+0 0 0 0 0 5 9 2 46050902
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 10 0 4 -48050202
-1 0 0 0 0 10 2 4 46050102
-1 0 0 0 0 10 4 4 46050202
-1 0 0 0 0 10 6 4 46050302
-1 0 0 0 0 10 8 4 46050402
-1 0 0 0 0 10 10 4 46050502
-1 0 0 0 0 10 12 4 46050602
-1 0 0 0 0 10 14 4 46050702
-1 0 0 0 0 10 16 4 46050802
-1 0 0 0 0 10 18 4 46050902
+1 0 0 0 0 5 0 2 -48050202
+1 0 0 0 0 5 1 2 46050102
+1 0 0 0 0 5 2 2 46050202
+1 0 0 0 0 5 3 2 46050302
+1 0 0 0 0 5 4 2 46050402
+1 0 0 0 0 5 5 2 46050502
+1 0 0 0 0 5 6 2 46050602
+1 0 0 0 0 5 7 2 46050702
+1 0 0 0 0 5 8 2 46050802
+1 0 0 0 0 5 9 2 46050902
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-yz/fyz.zl b/CarpetAttic/Cart3dTest/test/axial-yz/fyz.zl
index e3067317e..a1aa3d8fe 100644
--- a/CarpetAttic/Cart3dTest/test/axial-yz/fyz.zl
+++ b/CarpetAttic/Cart3dTest/test/axial-yz/fyz.zl
@@ -1,32 +1,34 @@
 # CART3DTEST::fyz z (fyz)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 10 2 0 46050100
-0 0 0 0 0 10 2 2 46050101
-0 0 0 0 0 10 2 4 46050102
-0 0 0 0 0 10 2 6 46050103
-0 0 0 0 0 10 2 8 46050104
-0 0 0 0 0 10 2 10 46050105
-0 0 0 0 0 10 2 12 46050106
-0 0 0 0 0 10 2 14 46050107
-0 0 0 0 0 10 2 16 46050108
-0 0 0 0 0 10 2 18 46050109
+0 0 0 0 0 5 1 0 46050100
+0 0 0 0 0 5 1 1 46050101
+0 0 0 0 0 5 1 2 46050102
+0 0 0 0 0 5 1 3 46050103
+0 0 0 0 0 5 1 4 46050104
+0 0 0 0 0 5 1 5 46050105
+0 0 0 0 0 5 1 6 46050106
+0 0 0 0 0 5 1 7 46050107
+0 0 0 0 0 5 1 8 46050108
+0 0 0 0 0 5 1 9 46050109
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 10 2 0 -48050201
-1 0 0 0 0 10 2 2 -48050101
-1 0 0 0 0 10 2 4 46050102
-1 0 0 0 0 10 2 6 46050103
-1 0 0 0 0 10 2 8 46050104
-1 0 0 0 0 10 2 10 46050105
-1 0 0 0 0 10 2 12 46050106
-1 0 0 0 0 10 2 14 46050107
-1 0 0 0 0 10 2 16 46050108
-1 0 0 0 0 10 2 18 46050109
+1 0 0 0 0 5 1 0 -48050201
+1 0 0 0 0 5 1 1 -48050101
+1 0 0 0 0 5 1 2 46050102
+1 0 0 0 0 5 1 3 46050103
+1 0 0 0 0 5 1 4 46050104
+1 0 0 0 0 5 1 5 46050105
+1 0 0 0 0 5 1 6 46050106
+1 0 0 0 0 5 1 7 46050107
+1 0 0 0 0 5 1 8 46050108
+1 0 0 0 0 5 1 9 46050109
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-yz/fzx.xl b/CarpetAttic/Cart3dTest/test/axial-yz/fzx.xl
index 635f72c29..77ebb762b 100644
--- a/CarpetAttic/Cart3dTest/test/axial-yz/fzx.xl
+++ b/CarpetAttic/Cart3dTest/test/axial-yz/fzx.xl
@@ -1,32 +1,34 @@
 # CART3DTEST::fzx x (fzx)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 4 47000102
-0 0 0 0 0 2 2 4 47010102
-0 0 0 0 0 4 2 4 47020102
-0 0 0 0 0 6 2 4 47030102
-0 0 0 0 0 8 2 4 47040102
-0 0 0 0 0 10 2 4 47050102
-0 0 0 0 0 12 2 4 47060102
-0 0 0 0 0 14 2 4 47070102
-0 0 0 0 0 16 2 4 47080102
-0 0 0 0 0 18 2 4 47090102
+0 0 0 0 0 0 1 2 47000102
+0 0 0 0 0 1 1 2 47010102
+0 0 0 0 0 2 1 2 47020102
+0 0 0 0 0 3 1 2 47030102
+0 0 0 0 0 4 1 2 47040102
+0 0 0 0 0 5 1 2 47050102
+0 0 0 0 0 6 1 2 47060102
+0 0 0 0 0 7 1 2 47070102
+0 0 0 0 0 8 1 2 47080102
+0 0 0 0 0 9 1 2 47090102
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 4 47000102
-1 0 0 0 0 2 2 4 47010102
-1 0 0 0 0 4 2 4 47020102
-1 0 0 0 0 6 2 4 47030102
-1 0 0 0 0 8 2 4 47040102
-1 0 0 0 0 10 2 4 47050102
-1 0 0 0 0 12 2 4 47060102
-1 0 0 0 0 14 2 4 47070102
-1 0 0 0 0 16 2 4 47080102
-1 0 0 0 0 18 2 4 47090102
+1 0 0 0 0 0 1 2 47000102
+1 0 0 0 0 1 1 2 47010102
+1 0 0 0 0 2 1 2 47020102
+1 0 0 0 0 3 1 2 47030102
+1 0 0 0 0 4 1 2 47040102
+1 0 0 0 0 5 1 2 47050102
+1 0 0 0 0 6 1 2 47060102
+1 0 0 0 0 7 1 2 47070102
+1 0 0 0 0 8 1 2 47080102
+1 0 0 0 0 9 1 2 47090102
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-yz/fzx.yl b/CarpetAttic/Cart3dTest/test/axial-yz/fzx.yl
index 662b200d8..92f02a064 100644
--- a/CarpetAttic/Cart3dTest/test/axial-yz/fzx.yl
+++ b/CarpetAttic/Cart3dTest/test/axial-yz/fzx.yl
@@ -1,32 +1,34 @@
 # CART3DTEST::fzx y (fzx)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 10 0 4 47050002
-0 0 0 0 0 10 2 4 47050102
-0 0 0 0 0 10 4 4 47050202
-0 0 0 0 0 10 6 4 47050302
-0 0 0 0 0 10 8 4 47050402
-0 0 0 0 0 10 10 4 47050502
-0 0 0 0 0 10 12 4 47050602
-0 0 0 0 0 10 14 4 47050702
-0 0 0 0 0 10 16 4 47050802
-0 0 0 0 0 10 18 4 47050902
+0 0 0 0 0 5 0 2 47050002
+0 0 0 0 0 5 1 2 47050102
+0 0 0 0 0 5 2 2 47050202
+0 0 0 0 0 5 3 2 47050302
+0 0 0 0 0 5 4 2 47050402
+0 0 0 0 0 5 5 2 47050502
+0 0 0 0 0 5 6 2 47050602
+0 0 0 0 0 5 7 2 47050702
+0 0 0 0 0 5 8 2 47050802
+0 0 0 0 0 5 9 2 47050902
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 10 0 4 44050202
-1 0 0 0 0 10 2 4 47050102
-1 0 0 0 0 10 4 4 47050202
-1 0 0 0 0 10 6 4 47050302
-1 0 0 0 0 10 8 4 47050402
-1 0 0 0 0 10 10 4 47050502
-1 0 0 0 0 10 12 4 47050602
-1 0 0 0 0 10 14 4 47050702
-1 0 0 0 0 10 16 4 47050802
-1 0 0 0 0 10 18 4 47050902
+1 0 0 0 0 5 0 2 44050202
+1 0 0 0 0 5 1 2 47050102
+1 0 0 0 0 5 2 2 47050202
+1 0 0 0 0 5 3 2 47050302
+1 0 0 0 0 5 4 2 47050402
+1 0 0 0 0 5 5 2 47050502
+1 0 0 0 0 5 6 2 47050602
+1 0 0 0 0 5 7 2 47050702
+1 0 0 0 0 5 8 2 47050802
+1 0 0 0 0 5 9 2 47050902
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-yz/fzx.zl b/CarpetAttic/Cart3dTest/test/axial-yz/fzx.zl
index a11159f8c..5489372e7 100644
--- a/CarpetAttic/Cart3dTest/test/axial-yz/fzx.zl
+++ b/CarpetAttic/Cart3dTest/test/axial-yz/fzx.zl
@@ -1,32 +1,34 @@
 # CART3DTEST::fzx z (fzx)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 10 2 0 47050100
-0 0 0 0 0 10 2 2 47050101
-0 0 0 0 0 10 2 4 47050102
-0 0 0 0 0 10 2 6 47050103
-0 0 0 0 0 10 2 8 47050104
-0 0 0 0 0 10 2 10 47050105
-0 0 0 0 0 10 2 12 47050106
-0 0 0 0 0 10 2 14 47050107
-0 0 0 0 0 10 2 16 47050108
-0 0 0 0 0 10 2 18 47050109
+0 0 0 0 0 5 1 0 47050100
+0 0 0 0 0 5 1 1 47050101
+0 0 0 0 0 5 1 2 47050102
+0 0 0 0 0 5 1 3 47050103
+0 0 0 0 0 5 1 4 47050104
+0 0 0 0 0 5 1 5 47050105
+0 0 0 0 0 5 1 6 47050106
+0 0 0 0 0 5 1 7 47050107
+0 0 0 0 0 5 1 8 47050108
+0 0 0 0 0 5 1 9 47050109
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 10 2 0 -47050102
-1 0 0 0 0 10 2 2 -47050101
-1 0 0 0 0 10 2 4 47050102
-1 0 0 0 0 10 2 6 47050103
-1 0 0 0 0 10 2 8 47050104
-1 0 0 0 0 10 2 10 47050105
-1 0 0 0 0 10 2 12 47050106
-1 0 0 0 0 10 2 14 47050107
-1 0 0 0 0 10 2 16 47050108
-1 0 0 0 0 10 2 18 47050109
+1 0 0 0 0 5 1 0 -47050102
+1 0 0 0 0 5 1 1 -47050101
+1 0 0 0 0 5 1 2 47050102
+1 0 0 0 0 5 1 3 47050103
+1 0 0 0 0 5 1 4 47050104
+1 0 0 0 0 5 1 5 47050105
+1 0 0 0 0 5 1 6 47050106
+1 0 0 0 0 5 1 7 47050107
+1 0 0 0 0 5 1 8 47050108
+1 0 0 0 0 5 1 9 47050109
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-yz/fzy.xl b/CarpetAttic/Cart3dTest/test/axial-yz/fzy.xl
index 2378068ed..ef9d32810 100644
--- a/CarpetAttic/Cart3dTest/test/axial-yz/fzy.xl
+++ b/CarpetAttic/Cart3dTest/test/axial-yz/fzy.xl
@@ -1,32 +1,34 @@
 # CART3DTEST::fzy x (fzy)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 4 48000102
-0 0 0 0 0 2 2 4 48010102
-0 0 0 0 0 4 2 4 48020102
-0 0 0 0 0 6 2 4 48030102
-0 0 0 0 0 8 2 4 48040102
-0 0 0 0 0 10 2 4 48050102
-0 0 0 0 0 12 2 4 48060102
-0 0 0 0 0 14 2 4 48070102
-0 0 0 0 0 16 2 4 48080102
-0 0 0 0 0 18 2 4 48090102
+0 0 0 0 0 0 1 2 48000102
+0 0 0 0 0 1 1 2 48010102
+0 0 0 0 0 2 1 2 48020102
+0 0 0 0 0 3 1 2 48030102
+0 0 0 0 0 4 1 2 48040102
+0 0 0 0 0 5 1 2 48050102
+0 0 0 0 0 6 1 2 48060102
+0 0 0 0 0 7 1 2 48070102
+0 0 0 0 0 8 1 2 48080102
+0 0 0 0 0 9 1 2 48090102
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 4 48000102
-1 0 0 0 0 2 2 4 48010102
-1 0 0 0 0 4 2 4 48020102
-1 0 0 0 0 6 2 4 48030102
-1 0 0 0 0 8 2 4 48040102
-1 0 0 0 0 10 2 4 48050102
-1 0 0 0 0 12 2 4 48060102
-1 0 0 0 0 14 2 4 48070102
-1 0 0 0 0 16 2 4 48080102
-1 0 0 0 0 18 2 4 48090102
+1 0 0 0 0 0 1 2 48000102
+1 0 0 0 0 1 1 2 48010102
+1 0 0 0 0 2 1 2 48020102
+1 0 0 0 0 3 1 2 48030102
+1 0 0 0 0 4 1 2 48040102
+1 0 0 0 0 5 1 2 48050102
+1 0 0 0 0 6 1 2 48060102
+1 0 0 0 0 7 1 2 48070102
+1 0 0 0 0 8 1 2 48080102
+1 0 0 0 0 9 1 2 48090102
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-yz/fzy.yl b/CarpetAttic/Cart3dTest/test/axial-yz/fzy.yl
index 67b0bc825..6b7ccd0d2 100644
--- a/CarpetAttic/Cart3dTest/test/axial-yz/fzy.yl
+++ b/CarpetAttic/Cart3dTest/test/axial-yz/fzy.yl
@@ -1,32 +1,34 @@
 # CART3DTEST::fzy y (fzy)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 10 0 4 48050002
-0 0 0 0 0 10 2 4 48050102
-0 0 0 0 0 10 4 4 48050202
-0 0 0 0 0 10 6 4 48050302
-0 0 0 0 0 10 8 4 48050402
-0 0 0 0 0 10 10 4 48050502
-0 0 0 0 0 10 12 4 48050602
-0 0 0 0 0 10 14 4 48050702
-0 0 0 0 0 10 16 4 48050802
-0 0 0 0 0 10 18 4 48050902
+0 0 0 0 0 5 0 2 48050002
+0 0 0 0 0 5 1 2 48050102
+0 0 0 0 0 5 2 2 48050202
+0 0 0 0 0 5 3 2 48050302
+0 0 0 0 0 5 4 2 48050402
+0 0 0 0 0 5 5 2 48050502
+0 0 0 0 0 5 6 2 48050602
+0 0 0 0 0 5 7 2 48050702
+0 0 0 0 0 5 8 2 48050802
+0 0 0 0 0 5 9 2 48050902
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 10 0 4 -46050202
-1 0 0 0 0 10 2 4 48050102
-1 0 0 0 0 10 4 4 48050202
-1 0 0 0 0 10 6 4 48050302
-1 0 0 0 0 10 8 4 48050402
-1 0 0 0 0 10 10 4 48050502
-1 0 0 0 0 10 12 4 48050602
-1 0 0 0 0 10 14 4 48050702
-1 0 0 0 0 10 16 4 48050802
-1 0 0 0 0 10 18 4 48050902
+1 0 0 0 0 5 0 2 -46050202
+1 0 0 0 0 5 1 2 48050102
+1 0 0 0 0 5 2 2 48050202
+1 0 0 0 0 5 3 2 48050302
+1 0 0 0 0 5 4 2 48050402
+1 0 0 0 0 5 5 2 48050502
+1 0 0 0 0 5 6 2 48050602
+1 0 0 0 0 5 7 2 48050702
+1 0 0 0 0 5 8 2 48050802
+1 0 0 0 0 5 9 2 48050902
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-yz/fzy.zl b/CarpetAttic/Cart3dTest/test/axial-yz/fzy.zl
index 3cd48022b..1125774cb 100644
--- a/CarpetAttic/Cart3dTest/test/axial-yz/fzy.zl
+++ b/CarpetAttic/Cart3dTest/test/axial-yz/fzy.zl
@@ -1,32 +1,34 @@
 # CART3DTEST::fzy z (fzy)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 10 2 0 48050100
-0 0 0 0 0 10 2 2 48050101
-0 0 0 0 0 10 2 4 48050102
-0 0 0 0 0 10 2 6 48050103
-0 0 0 0 0 10 2 8 48050104
-0 0 0 0 0 10 2 10 48050105
-0 0 0 0 0 10 2 12 48050106
-0 0 0 0 0 10 2 14 48050107
-0 0 0 0 0 10 2 16 48050108
-0 0 0 0 0 10 2 18 48050109
+0 0 0 0 0 5 1 0 48050100
+0 0 0 0 0 5 1 1 48050101
+0 0 0 0 0 5 1 2 48050102
+0 0 0 0 0 5 1 3 48050103
+0 0 0 0 0 5 1 4 48050104
+0 0 0 0 0 5 1 5 48050105
+0 0 0 0 0 5 1 6 48050106
+0 0 0 0 0 5 1 7 48050107
+0 0 0 0 0 5 1 8 48050108
+0 0 0 0 0 5 1 9 48050109
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 10 2 0 48050102
-1 0 0 0 0 10 2 2 48050101
-1 0 0 0 0 10 2 4 48050102
-1 0 0 0 0 10 2 6 48050103
-1 0 0 0 0 10 2 8 48050104
-1 0 0 0 0 10 2 10 48050105
-1 0 0 0 0 10 2 12 48050106
-1 0 0 0 0 10 2 14 48050107
-1 0 0 0 0 10 2 16 48050108
-1 0 0 0 0 10 2 18 48050109
+1 0 0 0 0 5 1 0 48050102
+1 0 0 0 0 5 1 1 48050101
+1 0 0 0 0 5 1 2 48050102
+1 0 0 0 0 5 1 3 48050103
+1 0 0 0 0 5 1 4 48050104
+1 0 0 0 0 5 1 5 48050105
+1 0 0 0 0 5 1 6 48050106
+1 0 0 0 0 5 1 7 48050107
+1 0 0 0 0 5 1 8 48050108
+1 0 0 0 0 5 1 9 48050109
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-yz/fzz.xl b/CarpetAttic/Cart3dTest/test/axial-yz/fzz.xl
index 668074723..ee3f5002e 100644
--- a/CarpetAttic/Cart3dTest/test/axial-yz/fzz.xl
+++ b/CarpetAttic/Cart3dTest/test/axial-yz/fzz.xl
@@ -1,32 +1,34 @@
 # CART3DTEST::fzz x (fzz)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 4 49000102
-0 0 0 0 0 2 2 4 49010102
-0 0 0 0 0 4 2 4 49020102
-0 0 0 0 0 6 2 4 49030102
-0 0 0 0 0 8 2 4 49040102
-0 0 0 0 0 10 2 4 49050102
-0 0 0 0 0 12 2 4 49060102
-0 0 0 0 0 14 2 4 49070102
-0 0 0 0 0 16 2 4 49080102
-0 0 0 0 0 18 2 4 49090102
+0 0 0 0 0 0 1 2 49000102
+0 0 0 0 0 1 1 2 49010102
+0 0 0 0 0 2 1 2 49020102
+0 0 0 0 0 3 1 2 49030102
+0 0 0 0 0 4 1 2 49040102
+0 0 0 0 0 5 1 2 49050102
+0 0 0 0 0 6 1 2 49060102
+0 0 0 0 0 7 1 2 49070102
+0 0 0 0 0 8 1 2 49080102
+0 0 0 0 0 9 1 2 49090102
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 4 49000102
-1 0 0 0 0 2 2 4 49010102
-1 0 0 0 0 4 2 4 49020102
-1 0 0 0 0 6 2 4 49030102
-1 0 0 0 0 8 2 4 49040102
-1 0 0 0 0 10 2 4 49050102
-1 0 0 0 0 12 2 4 49060102
-1 0 0 0 0 14 2 4 49070102
-1 0 0 0 0 16 2 4 49080102
-1 0 0 0 0 18 2 4 49090102
+1 0 0 0 0 0 1 2 49000102
+1 0 0 0 0 1 1 2 49010102
+1 0 0 0 0 2 1 2 49020102
+1 0 0 0 0 3 1 2 49030102
+1 0 0 0 0 4 1 2 49040102
+1 0 0 0 0 5 1 2 49050102
+1 0 0 0 0 6 1 2 49060102
+1 0 0 0 0 7 1 2 49070102
+1 0 0 0 0 8 1 2 49080102
+1 0 0 0 0 9 1 2 49090102
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-yz/fzz.yl b/CarpetAttic/Cart3dTest/test/axial-yz/fzz.yl
index d606bdec7..bf4e52f7e 100644
--- a/CarpetAttic/Cart3dTest/test/axial-yz/fzz.yl
+++ b/CarpetAttic/Cart3dTest/test/axial-yz/fzz.yl
@@ -1,32 +1,34 @@
 # CART3DTEST::fzz y (fzz)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 10 0 4 49050002
-0 0 0 0 0 10 2 4 49050102
-0 0 0 0 0 10 4 4 49050202
-0 0 0 0 0 10 6 4 49050302
-0 0 0 0 0 10 8 4 49050402
-0 0 0 0 0 10 10 4 49050502
-0 0 0 0 0 10 12 4 49050602
-0 0 0 0 0 10 14 4 49050702
-0 0 0 0 0 10 16 4 49050802
-0 0 0 0 0 10 18 4 49050902
+0 0 0 0 0 5 0 2 49050002
+0 0 0 0 0 5 1 2 49050102
+0 0 0 0 0 5 2 2 49050202
+0 0 0 0 0 5 3 2 49050302
+0 0 0 0 0 5 4 2 49050402
+0 0 0 0 0 5 5 2 49050502
+0 0 0 0 0 5 6 2 49050602
+0 0 0 0 0 5 7 2 49050702
+0 0 0 0 0 5 8 2 49050802
+0 0 0 0 0 5 9 2 49050902
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 10 0 4 45050202
-1 0 0 0 0 10 2 4 49050102
-1 0 0 0 0 10 4 4 49050202
-1 0 0 0 0 10 6 4 49050302
-1 0 0 0 0 10 8 4 49050402
-1 0 0 0 0 10 10 4 49050502
-1 0 0 0 0 10 12 4 49050602
-1 0 0 0 0 10 14 4 49050702
-1 0 0 0 0 10 16 4 49050802
-1 0 0 0 0 10 18 4 49050902
+1 0 0 0 0 5 0 2 45050202
+1 0 0 0 0 5 1 2 49050102
+1 0 0 0 0 5 2 2 49050202
+1 0 0 0 0 5 3 2 49050302
+1 0 0 0 0 5 4 2 49050402
+1 0 0 0 0 5 5 2 49050502
+1 0 0 0 0 5 6 2 49050602
+1 0 0 0 0 5 7 2 49050702
+1 0 0 0 0 5 8 2 49050802
+1 0 0 0 0 5 9 2 49050902
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-yz/fzz.zl b/CarpetAttic/Cart3dTest/test/axial-yz/fzz.zl
index bd2ca900b..6f7322fa4 100644
--- a/CarpetAttic/Cart3dTest/test/axial-yz/fzz.zl
+++ b/CarpetAttic/Cart3dTest/test/axial-yz/fzz.zl
@@ -1,32 +1,34 @@
 # CART3DTEST::fzz z (fzz)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 10 2 0 49050100
-0 0 0 0 0 10 2 2 49050101
-0 0 0 0 0 10 2 4 49050102
-0 0 0 0 0 10 2 6 49050103
-0 0 0 0 0 10 2 8 49050104
-0 0 0 0 0 10 2 10 49050105
-0 0 0 0 0 10 2 12 49050106
-0 0 0 0 0 10 2 14 49050107
-0 0 0 0 0 10 2 16 49050108
-0 0 0 0 0 10 2 18 49050109
+0 0 0 0 0 5 1 0 49050100
+0 0 0 0 0 5 1 1 49050101
+0 0 0 0 0 5 1 2 49050102
+0 0 0 0 0 5 1 3 49050103
+0 0 0 0 0 5 1 4 49050104
+0 0 0 0 0 5 1 5 49050105
+0 0 0 0 0 5 1 6 49050106
+0 0 0 0 0 5 1 7 49050107
+0 0 0 0 0 5 1 8 49050108
+0 0 0 0 0 5 1 9 49050109
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 10 2 0 49050102
-1 0 0 0 0 10 2 2 49050101
-1 0 0 0 0 10 2 4 49050102
-1 0 0 0 0 10 2 6 49050103
-1 0 0 0 0 10 2 8 49050104
-1 0 0 0 0 10 2 10 49050105
-1 0 0 0 0 10 2 12 49050106
-1 0 0 0 0 10 2 14 49050107
-1 0 0 0 0 10 2 16 49050108
-1 0 0 0 0 10 2 18 49050109
+1 0 0 0 0 5 1 0 49050102
+1 0 0 0 0 5 1 1 49050101
+1 0 0 0 0 5 1 2 49050102
+1 0 0 0 0 5 1 3 49050103
+1 0 0 0 0 5 1 4 49050104
+1 0 0 0 0 5 1 5 49050105
+1 0 0 0 0 5 1 6 49050106
+1 0 0 0 0 5 1 7 49050107
+1 0 0 0 0 5 1 8 49050108
+1 0 0 0 0 5 1 9 49050109
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-yz/s.xl b/CarpetAttic/Cart3dTest/test/axial-yz/s.xl
index 335575cc6..4d130828b 100644
--- a/CarpetAttic/Cart3dTest/test/axial-yz/s.xl
+++ b/CarpetAttic/Cart3dTest/test/axial-yz/s.xl
@@ -1,32 +1,34 @@
 # CART3DTEST::s x (s)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 4 1000102
-0 0 0 0 0 2 2 4 1010102
-0 0 0 0 0 4 2 4 1020102
-0 0 0 0 0 6 2 4 1030102
-0 0 0 0 0 8 2 4 1040102
-0 0 0 0 0 10 2 4 1050102
-0 0 0 0 0 12 2 4 1060102
-0 0 0 0 0 14 2 4 1070102
-0 0 0 0 0 16 2 4 1080102
-0 0 0 0 0 18 2 4 1090102
+0 0 0 0 0 0 1 2 1000102
+0 0 0 0 0 1 1 2 1010102
+0 0 0 0 0 2 1 2 1020102
+0 0 0 0 0 3 1 2 1030102
+0 0 0 0 0 4 1 2 1040102
+0 0 0 0 0 5 1 2 1050102
+0 0 0 0 0 6 1 2 1060102
+0 0 0 0 0 7 1 2 1070102
+0 0 0 0 0 8 1 2 1080102
+0 0 0 0 0 9 1 2 1090102
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 4 1000102
-1 0 0 0 0 2 2 4 1010102
-1 0 0 0 0 4 2 4 1020102
-1 0 0 0 0 6 2 4 1030102
-1 0 0 0 0 8 2 4 1040102
-1 0 0 0 0 10 2 4 1050102
-1 0 0 0 0 12 2 4 1060102
-1 0 0 0 0 14 2 4 1070102
-1 0 0 0 0 16 2 4 1080102
-1 0 0 0 0 18 2 4 1090102
+1 0 0 0 0 0 1 2 1000102
+1 0 0 0 0 1 1 2 1010102
+1 0 0 0 0 2 1 2 1020102
+1 0 0 0 0 3 1 2 1030102
+1 0 0 0 0 4 1 2 1040102
+1 0 0 0 0 5 1 2 1050102
+1 0 0 0 0 6 1 2 1060102
+1 0 0 0 0 7 1 2 1070102
+1 0 0 0 0 8 1 2 1080102
+1 0 0 0 0 9 1 2 1090102
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-yz/s.yl b/CarpetAttic/Cart3dTest/test/axial-yz/s.yl
index 0bb6ce0da..69c29429e 100644
--- a/CarpetAttic/Cart3dTest/test/axial-yz/s.yl
+++ b/CarpetAttic/Cart3dTest/test/axial-yz/s.yl
@@ -1,32 +1,34 @@
 # CART3DTEST::s y (s)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 10 0 4 1050002
-0 0 0 0 0 10 2 4 1050102
-0 0 0 0 0 10 4 4 1050202
-0 0 0 0 0 10 6 4 1050302
-0 0 0 0 0 10 8 4 1050402
-0 0 0 0 0 10 10 4 1050502
-0 0 0 0 0 10 12 4 1050602
-0 0 0 0 0 10 14 4 1050702
-0 0 0 0 0 10 16 4 1050802
-0 0 0 0 0 10 18 4 1050902
+0 0 0 0 0 5 0 2 1050002
+0 0 0 0 0 5 1 2 1050102
+0 0 0 0 0 5 2 2 1050202
+0 0 0 0 0 5 3 2 1050302
+0 0 0 0 0 5 4 2 1050402
+0 0 0 0 0 5 5 2 1050502
+0 0 0 0 0 5 6 2 1050602
+0 0 0 0 0 5 7 2 1050702
+0 0 0 0 0 5 8 2 1050802
+0 0 0 0 0 5 9 2 1050902
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 10 0 4 1050202
-1 0 0 0 0 10 2 4 1050102
-1 0 0 0 0 10 4 4 1050202
-1 0 0 0 0 10 6 4 1050302
-1 0 0 0 0 10 8 4 1050402
-1 0 0 0 0 10 10 4 1050502
-1 0 0 0 0 10 12 4 1050602
-1 0 0 0 0 10 14 4 1050702
-1 0 0 0 0 10 16 4 1050802
-1 0 0 0 0 10 18 4 1050902
+1 0 0 0 0 5 0 2 1050202
+1 0 0 0 0 5 1 2 1050102
+1 0 0 0 0 5 2 2 1050202
+1 0 0 0 0 5 3 2 1050302
+1 0 0 0 0 5 4 2 1050402
+1 0 0 0 0 5 5 2 1050502
+1 0 0 0 0 5 6 2 1050602
+1 0 0 0 0 5 7 2 1050702
+1 0 0 0 0 5 8 2 1050802
+1 0 0 0 0 5 9 2 1050902
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-yz/s.zl b/CarpetAttic/Cart3dTest/test/axial-yz/s.zl
index 3778f241a..3f782647f 100644
--- a/CarpetAttic/Cart3dTest/test/axial-yz/s.zl
+++ b/CarpetAttic/Cart3dTest/test/axial-yz/s.zl
@@ -1,32 +1,34 @@
 # CART3DTEST::s z (s)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 10 2 0 1050100
-0 0 0 0 0 10 2 2 1050101
-0 0 0 0 0 10 2 4 1050102
-0 0 0 0 0 10 2 6 1050103
-0 0 0 0 0 10 2 8 1050104
-0 0 0 0 0 10 2 10 1050105
-0 0 0 0 0 10 2 12 1050106
-0 0 0 0 0 10 2 14 1050107
-0 0 0 0 0 10 2 16 1050108
-0 0 0 0 0 10 2 18 1050109
+0 0 0 0 0 5 1 0 1050100
+0 0 0 0 0 5 1 1 1050101
+0 0 0 0 0 5 1 2 1050102
+0 0 0 0 0 5 1 3 1050103
+0 0 0 0 0 5 1 4 1050104
+0 0 0 0 0 5 1 5 1050105
+0 0 0 0 0 5 1 6 1050106
+0 0 0 0 0 5 1 7 1050107
+0 0 0 0 0 5 1 8 1050108
+0 0 0 0 0 5 1 9 1050109
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 10 2 0 1050201
-1 0 0 0 0 10 2 2 1050101
-1 0 0 0 0 10 2 4 1050102
-1 0 0 0 0 10 2 6 1050103
-1 0 0 0 0 10 2 8 1050104
-1 0 0 0 0 10 2 10 1050105
-1 0 0 0 0 10 2 12 1050106
-1 0 0 0 0 10 2 14 1050107
-1 0 0 0 0 10 2 16 1050108
-1 0 0 0 0 10 2 18 1050109
+1 0 0 0 0 5 1 0 1050201
+1 0 0 0 0 5 1 1 1050101
+1 0 0 0 0 5 1 2 1050102
+1 0 0 0 0 5 1 3 1050103
+1 0 0 0 0 5 1 4 1050104
+1 0 0 0 0 5 1 5 1050105
+1 0 0 0 0 5 1 6 1050106
+1 0 0 0 0 5 1 7 1050107
+1 0 0 0 0 5 1 8 1050108
+1 0 0 0 0 5 1 9 1050109
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-yz/spher3d_r.xl b/CarpetAttic/Cart3dTest/test/axial-yz/spher3d_r.xl
index 1f1de34cc..8292b529d 100644
--- a/CarpetAttic/Cart3dTest/test/axial-yz/spher3d_r.xl
+++ b/CarpetAttic/Cart3dTest/test/axial-yz/spher3d_r.xl
@@ -1,32 +1,34 @@
 # GRID::spher3d_r x (spher3d_r)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 4 1.36656503687164
-0 0 0 0 0 2 2 4 1.07121426428143
-0 0 0 0 0 4 2 4 0.779422863405995
-0 0 0 0 0 6 2 4 0.49749371855331
-0 0 0 0 0 8 2 4 0.259807621135332
-0 0 0 0 0 10 2 4 0.259807621135332
-0 0 0 0 0 12 2 4 0.49749371855331
-0 0 0 0 0 14 2 4 0.779422863405995
-0 0 0 0 0 16 2 4 1.07121426428143
-0 0 0 0 0 18 2 4 1.36656503687164
+0 0 0 0 0 0 1 2 1.36656503687164
+0 0 0 0 0 1 1 2 1.07121426428143
+0 0 0 0 0 2 1 2 0.779422863405995
+0 0 0 0 0 3 1 2 0.49749371855331
+0 0 0 0 0 4 1 2 0.259807621135332
+0 0 0 0 0 5 1 2 0.259807621135332
+0 0 0 0 0 6 1 2 0.49749371855331
+0 0 0 0 0 7 1 2 0.779422863405995
+0 0 0 0 0 8 1 2 1.07121426428143
+0 0 0 0 0 9 1 2 1.36656503687164
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 4 1.36656503687164
-1 0 0 0 0 2 2 4 1.07121426428143
-1 0 0 0 0 4 2 4 0.779422863405995
-1 0 0 0 0 6 2 4 0.49749371855331
-1 0 0 0 0 8 2 4 0.259807621135332
-1 0 0 0 0 10 2 4 0.259807621135332
-1 0 0 0 0 12 2 4 0.49749371855331
-1 0 0 0 0 14 2 4 0.779422863405995
-1 0 0 0 0 16 2 4 1.07121426428143
-1 0 0 0 0 18 2 4 1.36656503687164
+1 0 0 0 0 0 1 2 1.36656503687164
+1 0 0 0 0 1 1 2 1.07121426428143
+1 0 0 0 0 2 1 2 0.779422863405995
+1 0 0 0 0 3 1 2 0.49749371855331
+1 0 0 0 0 4 1 2 0.259807621135332
+1 0 0 0 0 5 1 2 0.259807621135332
+1 0 0 0 0 6 1 2 0.49749371855331
+1 0 0 0 0 7 1 2 0.779422863405995
+1 0 0 0 0 8 1 2 1.07121426428143
+1 0 0 0 0 9 1 2 1.36656503687164
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-yz/spher3d_r.yl b/CarpetAttic/Cart3dTest/test/axial-yz/spher3d_r.yl
index e9cbce025..592f3c577 100644
--- a/CarpetAttic/Cart3dTest/test/axial-yz/spher3d_r.yl
+++ b/CarpetAttic/Cart3dTest/test/axial-yz/spher3d_r.yl
@@ -1,32 +1,34 @@
 # GRID::spher3d_r y (spher3d_r)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 10 0 4 0.259807621135332
-0 0 0 0 0 10 2 4 0.259807621135332
-0 0 0 0 0 10 4 4 0.49749371855331
-0 0 0 0 0 10 6 4 0.779422863405995
-0 0 0 0 0 10 8 4 1.07121426428143
-0 0 0 0 0 10 10 4 1.36656503687164
-0 0 0 0 0 10 12 4 1.66358047596141
-0 0 0 0 0 10 14 4 1.9615045245933
-0 0 0 0 0 10 16 4 2.2599778759979
-0 0 0 0 0 10 18 4 2.5588083163848
+0 0 0 0 0 5 0 2 0.259807621135332
+0 0 0 0 0 5 1 2 0.259807621135332
+0 0 0 0 0 5 2 2 0.49749371855331
+0 0 0 0 0 5 3 2 0.779422863405995
+0 0 0 0 0 5 4 2 1.07121426428143
+0 0 0 0 0 5 5 2 1.36656503687164
+0 0 0 0 0 5 6 2 1.66358047596141
+0 0 0 0 0 5 7 2 1.9615045245933
+0 0 0 0 0 5 8 2 2.2599778759979
+0 0 0 0 0 5 9 2 2.5588083163848
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 10 0 4 0.259807621135332
-1 0 0 0 0 10 2 4 0.259807621135332
-1 0 0 0 0 10 4 4 0.49749371855331
-1 0 0 0 0 10 6 4 0.779422863405995
-1 0 0 0 0 10 8 4 1.07121426428143
-1 0 0 0 0 10 10 4 1.36656503687164
-1 0 0 0 0 10 12 4 1.66358047596141
-1 0 0 0 0 10 14 4 1.9615045245933
-1 0 0 0 0 10 16 4 2.2599778759979
-1 0 0 0 0 10 18 4 2.5588083163848
+1 0 0 0 0 5 0 2 0.259807621135332
+1 0 0 0 0 5 1 2 0.259807621135332
+1 0 0 0 0 5 2 2 0.49749371855331
+1 0 0 0 0 5 3 2 0.779422863405995
+1 0 0 0 0 5 4 2 1.07121426428143
+1 0 0 0 0 5 5 2 1.36656503687164
+1 0 0 0 0 5 6 2 1.66358047596141
+1 0 0 0 0 5 7 2 1.9615045245933
+1 0 0 0 0 5 8 2 2.2599778759979
+1 0 0 0 0 5 9 2 2.5588083163848
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-yz/spher3d_r.zl b/CarpetAttic/Cart3dTest/test/axial-yz/spher3d_r.zl
index b8bbf3e03..351a9be24 100644
--- a/CarpetAttic/Cart3dTest/test/axial-yz/spher3d_r.zl
+++ b/CarpetAttic/Cart3dTest/test/axial-yz/spher3d_r.zl
@@ -1,32 +1,34 @@
 # GRID::spher3d_r z (spher3d_r)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 10 2 0 0.49749371855331
-0 0 0 0 0 10 2 2 0.259807621135332
-0 0 0 0 0 10 2 4 0.259807621135332
-0 0 0 0 0 10 2 6 0.49749371855331
-0 0 0 0 0 10 2 8 0.779422863405995
-0 0 0 0 0 10 2 10 1.07121426428143
-0 0 0 0 0 10 2 12 1.36656503687164
-0 0 0 0 0 10 2 14 1.66358047596141
-0 0 0 0 0 10 2 16 1.9615045245933
-0 0 0 0 0 10 2 18 2.2599778759979
+0 0 0 0 0 5 1 0 0.49749371855331
+0 0 0 0 0 5 1 1 0.259807621135332
+0 0 0 0 0 5 1 2 0.259807621135332
+0 0 0 0 0 5 1 3 0.49749371855331
+0 0 0 0 0 5 1 4 0.779422863405995
+0 0 0 0 0 5 1 5 1.07121426428143
+0 0 0 0 0 5 1 6 1.36656503687164
+0 0 0 0 0 5 1 7 1.66358047596141
+0 0 0 0 0 5 1 8 1.9615045245933
+0 0 0 0 0 5 1 9 2.2599778759979
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 10 2 0 0.49749371855331
-1 0 0 0 0 10 2 2 0.259807621135332
-1 0 0 0 0 10 2 4 0.259807621135332
-1 0 0 0 0 10 2 6 0.49749371855331
-1 0 0 0 0 10 2 8 0.779422863405995
-1 0 0 0 0 10 2 10 1.07121426428143
-1 0 0 0 0 10 2 12 1.36656503687164
-1 0 0 0 0 10 2 14 1.66358047596141
-1 0 0 0 0 10 2 16 1.9615045245933
-1 0 0 0 0 10 2 18 2.2599778759979
+1 0 0 0 0 5 1 0 0.49749371855331
+1 0 0 0 0 5 1 1 0.259807621135332
+1 0 0 0 0 5 1 2 0.259807621135332
+1 0 0 0 0 5 1 3 0.49749371855331
+1 0 0 0 0 5 1 4 0.779422863405995
+1 0 0 0 0 5 1 5 1.07121426428143
+1 0 0 0 0 5 1 6 1.36656503687164
+1 0 0 0 0 5 1 7 1.66358047596141
+1 0 0 0 0 5 1 8 1.9615045245933
+1 0 0 0 0 5 1 9 2.2599778759979
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-yz/txx.xl b/CarpetAttic/Cart3dTest/test/axial-yz/txx.xl
index 05b493de7..758bc5da2 100644
--- a/CarpetAttic/Cart3dTest/test/axial-yz/txx.xl
+++ b/CarpetAttic/Cart3dTest/test/axial-yz/txx.xl
@@ -1,32 +1,34 @@
 # CART3DTEST::txx x (txx)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 4 21000102
-0 0 0 0 0 2 2 4 21010102
-0 0 0 0 0 4 2 4 21020102
-0 0 0 0 0 6 2 4 21030102
-0 0 0 0 0 8 2 4 21040102
-0 0 0 0 0 10 2 4 21050102
-0 0 0 0 0 12 2 4 21060102
-0 0 0 0 0 14 2 4 21070102
-0 0 0 0 0 16 2 4 21080102
-0 0 0 0 0 18 2 4 21090102
+0 0 0 0 0 0 1 2 21000102
+0 0 0 0 0 1 1 2 21010102
+0 0 0 0 0 2 1 2 21020102
+0 0 0 0 0 3 1 2 21030102
+0 0 0 0 0 4 1 2 21040102
+0 0 0 0 0 5 1 2 21050102
+0 0 0 0 0 6 1 2 21060102
+0 0 0 0 0 7 1 2 21070102
+0 0 0 0 0 8 1 2 21080102
+0 0 0 0 0 9 1 2 21090102
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 4 21000102
-1 0 0 0 0 2 2 4 21010102
-1 0 0 0 0 4 2 4 21020102
-1 0 0 0 0 6 2 4 21030102
-1 0 0 0 0 8 2 4 21040102
-1 0 0 0 0 10 2 4 21050102
-1 0 0 0 0 12 2 4 21060102
-1 0 0 0 0 14 2 4 21070102
-1 0 0 0 0 16 2 4 21080102
-1 0 0 0 0 18 2 4 21090102
+1 0 0 0 0 0 1 2 21000102
+1 0 0 0 0 1 1 2 21010102
+1 0 0 0 0 2 1 2 21020102
+1 0 0 0 0 3 1 2 21030102
+1 0 0 0 0 4 1 2 21040102
+1 0 0 0 0 5 1 2 21050102
+1 0 0 0 0 6 1 2 21060102
+1 0 0 0 0 7 1 2 21070102
+1 0 0 0 0 8 1 2 21080102
+1 0 0 0 0 9 1 2 21090102
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-yz/txx.yl b/CarpetAttic/Cart3dTest/test/axial-yz/txx.yl
index 9e641b970..200ec576e 100644
--- a/CarpetAttic/Cart3dTest/test/axial-yz/txx.yl
+++ b/CarpetAttic/Cart3dTest/test/axial-yz/txx.yl
@@ -1,32 +1,34 @@
 # CART3DTEST::txx y (txx)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 10 0 4 21050002
-0 0 0 0 0 10 2 4 21050102
-0 0 0 0 0 10 4 4 21050202
-0 0 0 0 0 10 6 4 21050302
-0 0 0 0 0 10 8 4 21050402
-0 0 0 0 0 10 10 4 21050502
-0 0 0 0 0 10 12 4 21050602
-0 0 0 0 0 10 14 4 21050702
-0 0 0 0 0 10 16 4 21050802
-0 0 0 0 0 10 18 4 21050902
+0 0 0 0 0 5 0 2 21050002
+0 0 0 0 0 5 1 2 21050102
+0 0 0 0 0 5 2 2 21050202
+0 0 0 0 0 5 3 2 21050302
+0 0 0 0 0 5 4 2 21050402
+0 0 0 0 0 5 5 2 21050502
+0 0 0 0 0 5 6 2 21050602
+0 0 0 0 0 5 7 2 21050702
+0 0 0 0 0 5 8 2 21050802
+0 0 0 0 0 5 9 2 21050902
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 10 0 4 21050202
-1 0 0 0 0 10 2 4 21050102
-1 0 0 0 0 10 4 4 21050202
-1 0 0 0 0 10 6 4 21050302
-1 0 0 0 0 10 8 4 21050402
-1 0 0 0 0 10 10 4 21050502
-1 0 0 0 0 10 12 4 21050602
-1 0 0 0 0 10 14 4 21050702
-1 0 0 0 0 10 16 4 21050802
-1 0 0 0 0 10 18 4 21050902
+1 0 0 0 0 5 0 2 21050202
+1 0 0 0 0 5 1 2 21050102
+1 0 0 0 0 5 2 2 21050202
+1 0 0 0 0 5 3 2 21050302
+1 0 0 0 0 5 4 2 21050402
+1 0 0 0 0 5 5 2 21050502
+1 0 0 0 0 5 6 2 21050602
+1 0 0 0 0 5 7 2 21050702
+1 0 0 0 0 5 8 2 21050802
+1 0 0 0 0 5 9 2 21050902
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-yz/txx.zl b/CarpetAttic/Cart3dTest/test/axial-yz/txx.zl
index 0a5c00bde..e965bdba6 100644
--- a/CarpetAttic/Cart3dTest/test/axial-yz/txx.zl
+++ b/CarpetAttic/Cart3dTest/test/axial-yz/txx.zl
@@ -1,32 +1,34 @@
 # CART3DTEST::txx z (txx)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 10 2 0 21050100
-0 0 0 0 0 10 2 2 21050101
-0 0 0 0 0 10 2 4 21050102
-0 0 0 0 0 10 2 6 21050103
-0 0 0 0 0 10 2 8 21050104
-0 0 0 0 0 10 2 10 21050105
-0 0 0 0 0 10 2 12 21050106
-0 0 0 0 0 10 2 14 21050107
-0 0 0 0 0 10 2 16 21050108
-0 0 0 0 0 10 2 18 21050109
+0 0 0 0 0 5 1 0 21050100
+0 0 0 0 0 5 1 1 21050101
+0 0 0 0 0 5 1 2 21050102
+0 0 0 0 0 5 1 3 21050103
+0 0 0 0 0 5 1 4 21050104
+0 0 0 0 0 5 1 5 21050105
+0 0 0 0 0 5 1 6 21050106
+0 0 0 0 0 5 1 7 21050107
+0 0 0 0 0 5 1 8 21050108
+0 0 0 0 0 5 1 9 21050109
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 10 2 0 21050201
-1 0 0 0 0 10 2 2 21050101
-1 0 0 0 0 10 2 4 21050102
-1 0 0 0 0 10 2 6 21050103
-1 0 0 0 0 10 2 8 21050104
-1 0 0 0 0 10 2 10 21050105
-1 0 0 0 0 10 2 12 21050106
-1 0 0 0 0 10 2 14 21050107
-1 0 0 0 0 10 2 16 21050108
-1 0 0 0 0 10 2 18 21050109
+1 0 0 0 0 5 1 0 21050201
+1 0 0 0 0 5 1 1 21050101
+1 0 0 0 0 5 1 2 21050102
+1 0 0 0 0 5 1 3 21050103
+1 0 0 0 0 5 1 4 21050104
+1 0 0 0 0 5 1 5 21050105
+1 0 0 0 0 5 1 6 21050106
+1 0 0 0 0 5 1 7 21050107
+1 0 0 0 0 5 1 8 21050108
+1 0 0 0 0 5 1 9 21050109
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-yz/txy.xl b/CarpetAttic/Cart3dTest/test/axial-yz/txy.xl
index 3193f36d0..b2f469349 100644
--- a/CarpetAttic/Cart3dTest/test/axial-yz/txy.xl
+++ b/CarpetAttic/Cart3dTest/test/axial-yz/txy.xl
@@ -1,32 +1,34 @@
 # CART3DTEST::txy x (txy)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 4 22000102
-0 0 0 0 0 2 2 4 22010102
-0 0 0 0 0 4 2 4 22020102
-0 0 0 0 0 6 2 4 22030102
-0 0 0 0 0 8 2 4 22040102
-0 0 0 0 0 10 2 4 22050102
-0 0 0 0 0 12 2 4 22060102
-0 0 0 0 0 14 2 4 22070102
-0 0 0 0 0 16 2 4 22080102
-0 0 0 0 0 18 2 4 22090102
+0 0 0 0 0 0 1 2 22000102
+0 0 0 0 0 1 1 2 22010102
+0 0 0 0 0 2 1 2 22020102
+0 0 0 0 0 3 1 2 22030102
+0 0 0 0 0 4 1 2 22040102
+0 0 0 0 0 5 1 2 22050102
+0 0 0 0 0 6 1 2 22060102
+0 0 0 0 0 7 1 2 22070102
+0 0 0 0 0 8 1 2 22080102
+0 0 0 0 0 9 1 2 22090102
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 4 22000102
-1 0 0 0 0 2 2 4 22010102
-1 0 0 0 0 4 2 4 22020102
-1 0 0 0 0 6 2 4 22030102
-1 0 0 0 0 8 2 4 22040102
-1 0 0 0 0 10 2 4 22050102
-1 0 0 0 0 12 2 4 22060102
-1 0 0 0 0 14 2 4 22070102
-1 0 0 0 0 16 2 4 22080102
-1 0 0 0 0 18 2 4 22090102
+1 0 0 0 0 0 1 2 22000102
+1 0 0 0 0 1 1 2 22010102
+1 0 0 0 0 2 1 2 22020102
+1 0 0 0 0 3 1 2 22030102
+1 0 0 0 0 4 1 2 22040102
+1 0 0 0 0 5 1 2 22050102
+1 0 0 0 0 6 1 2 22060102
+1 0 0 0 0 7 1 2 22070102
+1 0 0 0 0 8 1 2 22080102
+1 0 0 0 0 9 1 2 22090102
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-yz/txy.yl b/CarpetAttic/Cart3dTest/test/axial-yz/txy.yl
index 44bd71396..6097cfe16 100644
--- a/CarpetAttic/Cart3dTest/test/axial-yz/txy.yl
+++ b/CarpetAttic/Cart3dTest/test/axial-yz/txy.yl
@@ -1,32 +1,34 @@
 # CART3DTEST::txy y (txy)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 10 0 4 22050002
-0 0 0 0 0 10 2 4 22050102
-0 0 0 0 0 10 4 4 22050202
-0 0 0 0 0 10 6 4 22050302
-0 0 0 0 0 10 8 4 22050402
-0 0 0 0 0 10 10 4 22050502
-0 0 0 0 0 10 12 4 22050602
-0 0 0 0 0 10 14 4 22050702
-0 0 0 0 0 10 16 4 22050802
-0 0 0 0 0 10 18 4 22050902
+0 0 0 0 0 5 0 2 22050002
+0 0 0 0 0 5 1 2 22050102
+0 0 0 0 0 5 2 2 22050202
+0 0 0 0 0 5 3 2 22050302
+0 0 0 0 0 5 4 2 22050402
+0 0 0 0 0 5 5 2 22050502
+0 0 0 0 0 5 6 2 22050602
+0 0 0 0 0 5 7 2 22050702
+0 0 0 0 0 5 8 2 22050802
+0 0 0 0 0 5 9 2 22050902
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 10 0 4 -23050202
-1 0 0 0 0 10 2 4 22050102
-1 0 0 0 0 10 4 4 22050202
-1 0 0 0 0 10 6 4 22050302
-1 0 0 0 0 10 8 4 22050402
-1 0 0 0 0 10 10 4 22050502
-1 0 0 0 0 10 12 4 22050602
-1 0 0 0 0 10 14 4 22050702
-1 0 0 0 0 10 16 4 22050802
-1 0 0 0 0 10 18 4 22050902
+1 0 0 0 0 5 0 2 -23050202
+1 0 0 0 0 5 1 2 22050102
+1 0 0 0 0 5 2 2 22050202
+1 0 0 0 0 5 3 2 22050302
+1 0 0 0 0 5 4 2 22050402
+1 0 0 0 0 5 5 2 22050502
+1 0 0 0 0 5 6 2 22050602
+1 0 0 0 0 5 7 2 22050702
+1 0 0 0 0 5 8 2 22050802
+1 0 0 0 0 5 9 2 22050902
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-yz/txy.zl b/CarpetAttic/Cart3dTest/test/axial-yz/txy.zl
index 54799fe86..87bb62083 100644
--- a/CarpetAttic/Cart3dTest/test/axial-yz/txy.zl
+++ b/CarpetAttic/Cart3dTest/test/axial-yz/txy.zl
@@ -1,32 +1,34 @@
 # CART3DTEST::txy z (txy)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 10 2 0 22050100
-0 0 0 0 0 10 2 2 22050101
-0 0 0 0 0 10 2 4 22050102
-0 0 0 0 0 10 2 6 22050103
-0 0 0 0 0 10 2 8 22050104
-0 0 0 0 0 10 2 10 22050105
-0 0 0 0 0 10 2 12 22050106
-0 0 0 0 0 10 2 14 22050107
-0 0 0 0 0 10 2 16 22050108
-0 0 0 0 0 10 2 18 22050109
+0 0 0 0 0 5 1 0 22050100
+0 0 0 0 0 5 1 1 22050101
+0 0 0 0 0 5 1 2 22050102
+0 0 0 0 0 5 1 3 22050103
+0 0 0 0 0 5 1 4 22050104
+0 0 0 0 0 5 1 5 22050105
+0 0 0 0 0 5 1 6 22050106
+0 0 0 0 0 5 1 7 22050107
+0 0 0 0 0 5 1 8 22050108
+0 0 0 0 0 5 1 9 22050109
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 10 2 0 23050201
-1 0 0 0 0 10 2 2 23050101
-1 0 0 0 0 10 2 4 22050102
-1 0 0 0 0 10 2 6 22050103
-1 0 0 0 0 10 2 8 22050104
-1 0 0 0 0 10 2 10 22050105
-1 0 0 0 0 10 2 12 22050106
-1 0 0 0 0 10 2 14 22050107
-1 0 0 0 0 10 2 16 22050108
-1 0 0 0 0 10 2 18 22050109
+1 0 0 0 0 5 1 0 23050201
+1 0 0 0 0 5 1 1 23050101
+1 0 0 0 0 5 1 2 22050102
+1 0 0 0 0 5 1 3 22050103
+1 0 0 0 0 5 1 4 22050104
+1 0 0 0 0 5 1 5 22050105
+1 0 0 0 0 5 1 6 22050106
+1 0 0 0 0 5 1 7 22050107
+1 0 0 0 0 5 1 8 22050108
+1 0 0 0 0 5 1 9 22050109
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-yz/txz.xl b/CarpetAttic/Cart3dTest/test/axial-yz/txz.xl
index bd4ec92d9..da3186e96 100644
--- a/CarpetAttic/Cart3dTest/test/axial-yz/txz.xl
+++ b/CarpetAttic/Cart3dTest/test/axial-yz/txz.xl
@@ -1,32 +1,34 @@
 # CART3DTEST::txz x (txz)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 4 23000102
-0 0 0 0 0 2 2 4 23010102
-0 0 0 0 0 4 2 4 23020102
-0 0 0 0 0 6 2 4 23030102
-0 0 0 0 0 8 2 4 23040102
-0 0 0 0 0 10 2 4 23050102
-0 0 0 0 0 12 2 4 23060102
-0 0 0 0 0 14 2 4 23070102
-0 0 0 0 0 16 2 4 23080102
-0 0 0 0 0 18 2 4 23090102
+0 0 0 0 0 0 1 2 23000102
+0 0 0 0 0 1 1 2 23010102
+0 0 0 0 0 2 1 2 23020102
+0 0 0 0 0 3 1 2 23030102
+0 0 0 0 0 4 1 2 23040102
+0 0 0 0 0 5 1 2 23050102
+0 0 0 0 0 6 1 2 23060102
+0 0 0 0 0 7 1 2 23070102
+0 0 0 0 0 8 1 2 23080102
+0 0 0 0 0 9 1 2 23090102
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 4 23000102
-1 0 0 0 0 2 2 4 23010102
-1 0 0 0 0 4 2 4 23020102
-1 0 0 0 0 6 2 4 23030102
-1 0 0 0 0 8 2 4 23040102
-1 0 0 0 0 10 2 4 23050102
-1 0 0 0 0 12 2 4 23060102
-1 0 0 0 0 14 2 4 23070102
-1 0 0 0 0 16 2 4 23080102
-1 0 0 0 0 18 2 4 23090102
+1 0 0 0 0 0 1 2 23000102
+1 0 0 0 0 1 1 2 23010102
+1 0 0 0 0 2 1 2 23020102
+1 0 0 0 0 3 1 2 23030102
+1 0 0 0 0 4 1 2 23040102
+1 0 0 0 0 5 1 2 23050102
+1 0 0 0 0 6 1 2 23060102
+1 0 0 0 0 7 1 2 23070102
+1 0 0 0 0 8 1 2 23080102
+1 0 0 0 0 9 1 2 23090102
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-yz/txz.yl b/CarpetAttic/Cart3dTest/test/axial-yz/txz.yl
index 88fb41584..a969ea9a5 100644
--- a/CarpetAttic/Cart3dTest/test/axial-yz/txz.yl
+++ b/CarpetAttic/Cart3dTest/test/axial-yz/txz.yl
@@ -1,32 +1,34 @@
 # CART3DTEST::txz y (txz)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 10 0 4 23050002
-0 0 0 0 0 10 2 4 23050102
-0 0 0 0 0 10 4 4 23050202
-0 0 0 0 0 10 6 4 23050302
-0 0 0 0 0 10 8 4 23050402
-0 0 0 0 0 10 10 4 23050502
-0 0 0 0 0 10 12 4 23050602
-0 0 0 0 0 10 14 4 23050702
-0 0 0 0 0 10 16 4 23050802
-0 0 0 0 0 10 18 4 23050902
+0 0 0 0 0 5 0 2 23050002
+0 0 0 0 0 5 1 2 23050102
+0 0 0 0 0 5 2 2 23050202
+0 0 0 0 0 5 3 2 23050302
+0 0 0 0 0 5 4 2 23050402
+0 0 0 0 0 5 5 2 23050502
+0 0 0 0 0 5 6 2 23050602
+0 0 0 0 0 5 7 2 23050702
+0 0 0 0 0 5 8 2 23050802
+0 0 0 0 0 5 9 2 23050902
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 10 0 4 22050202
-1 0 0 0 0 10 2 4 23050102
-1 0 0 0 0 10 4 4 23050202
-1 0 0 0 0 10 6 4 23050302
-1 0 0 0 0 10 8 4 23050402
-1 0 0 0 0 10 10 4 23050502
-1 0 0 0 0 10 12 4 23050602
-1 0 0 0 0 10 14 4 23050702
-1 0 0 0 0 10 16 4 23050802
-1 0 0 0 0 10 18 4 23050902
+1 0 0 0 0 5 0 2 22050202
+1 0 0 0 0 5 1 2 23050102
+1 0 0 0 0 5 2 2 23050202
+1 0 0 0 0 5 3 2 23050302
+1 0 0 0 0 5 4 2 23050402
+1 0 0 0 0 5 5 2 23050502
+1 0 0 0 0 5 6 2 23050602
+1 0 0 0 0 5 7 2 23050702
+1 0 0 0 0 5 8 2 23050802
+1 0 0 0 0 5 9 2 23050902
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-yz/txz.zl b/CarpetAttic/Cart3dTest/test/axial-yz/txz.zl
index ff9d0d70e..8540ef536 100644
--- a/CarpetAttic/Cart3dTest/test/axial-yz/txz.zl
+++ b/CarpetAttic/Cart3dTest/test/axial-yz/txz.zl
@@ -1,32 +1,34 @@
 # CART3DTEST::txz z (txz)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 10 2 0 23050100
-0 0 0 0 0 10 2 2 23050101
-0 0 0 0 0 10 2 4 23050102
-0 0 0 0 0 10 2 6 23050103
-0 0 0 0 0 10 2 8 23050104
-0 0 0 0 0 10 2 10 23050105
-0 0 0 0 0 10 2 12 23050106
-0 0 0 0 0 10 2 14 23050107
-0 0 0 0 0 10 2 16 23050108
-0 0 0 0 0 10 2 18 23050109
+0 0 0 0 0 5 1 0 23050100
+0 0 0 0 0 5 1 1 23050101
+0 0 0 0 0 5 1 2 23050102
+0 0 0 0 0 5 1 3 23050103
+0 0 0 0 0 5 1 4 23050104
+0 0 0 0 0 5 1 5 23050105
+0 0 0 0 0 5 1 6 23050106
+0 0 0 0 0 5 1 7 23050107
+0 0 0 0 0 5 1 8 23050108
+0 0 0 0 0 5 1 9 23050109
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 10 2 0 -23050102
-1 0 0 0 0 10 2 2 -23050101
-1 0 0 0 0 10 2 4 23050102
-1 0 0 0 0 10 2 6 23050103
-1 0 0 0 0 10 2 8 23050104
-1 0 0 0 0 10 2 10 23050105
-1 0 0 0 0 10 2 12 23050106
-1 0 0 0 0 10 2 14 23050107
-1 0 0 0 0 10 2 16 23050108
-1 0 0 0 0 10 2 18 23050109
+1 0 0 0 0 5 1 0 -23050102
+1 0 0 0 0 5 1 1 -23050101
+1 0 0 0 0 5 1 2 23050102
+1 0 0 0 0 5 1 3 23050103
+1 0 0 0 0 5 1 4 23050104
+1 0 0 0 0 5 1 5 23050105
+1 0 0 0 0 5 1 6 23050106
+1 0 0 0 0 5 1 7 23050107
+1 0 0 0 0 5 1 8 23050108
+1 0 0 0 0 5 1 9 23050109
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-yz/tyy.xl b/CarpetAttic/Cart3dTest/test/axial-yz/tyy.xl
index 0ee65f2ab..ea941f8c5 100644
--- a/CarpetAttic/Cart3dTest/test/axial-yz/tyy.xl
+++ b/CarpetAttic/Cart3dTest/test/axial-yz/tyy.xl
@@ -1,32 +1,34 @@
 # CART3DTEST::tyy x (tyy)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 4 24000102
-0 0 0 0 0 2 2 4 24010102
-0 0 0 0 0 4 2 4 24020102
-0 0 0 0 0 6 2 4 24030102
-0 0 0 0 0 8 2 4 24040102
-0 0 0 0 0 10 2 4 24050102
-0 0 0 0 0 12 2 4 24060102
-0 0 0 0 0 14 2 4 24070102
-0 0 0 0 0 16 2 4 24080102
-0 0 0 0 0 18 2 4 24090102
+0 0 0 0 0 0 1 2 24000102
+0 0 0 0 0 1 1 2 24010102
+0 0 0 0 0 2 1 2 24020102
+0 0 0 0 0 3 1 2 24030102
+0 0 0 0 0 4 1 2 24040102
+0 0 0 0 0 5 1 2 24050102
+0 0 0 0 0 6 1 2 24060102
+0 0 0 0 0 7 1 2 24070102
+0 0 0 0 0 8 1 2 24080102
+0 0 0 0 0 9 1 2 24090102
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 4 24000102
-1 0 0 0 0 2 2 4 24010102
-1 0 0 0 0 4 2 4 24020102
-1 0 0 0 0 6 2 4 24030102
-1 0 0 0 0 8 2 4 24040102
-1 0 0 0 0 10 2 4 24050102
-1 0 0 0 0 12 2 4 24060102
-1 0 0 0 0 14 2 4 24070102
-1 0 0 0 0 16 2 4 24080102
-1 0 0 0 0 18 2 4 24090102
+1 0 0 0 0 0 1 2 24000102
+1 0 0 0 0 1 1 2 24010102
+1 0 0 0 0 2 1 2 24020102
+1 0 0 0 0 3 1 2 24030102
+1 0 0 0 0 4 1 2 24040102
+1 0 0 0 0 5 1 2 24050102
+1 0 0 0 0 6 1 2 24060102
+1 0 0 0 0 7 1 2 24070102
+1 0 0 0 0 8 1 2 24080102
+1 0 0 0 0 9 1 2 24090102
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-yz/tyy.yl b/CarpetAttic/Cart3dTest/test/axial-yz/tyy.yl
index d312fae0a..b31d850d1 100644
--- a/CarpetAttic/Cart3dTest/test/axial-yz/tyy.yl
+++ b/CarpetAttic/Cart3dTest/test/axial-yz/tyy.yl
@@ -1,32 +1,34 @@
 # CART3DTEST::tyy y (tyy)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 10 0 4 24050002
-0 0 0 0 0 10 2 4 24050102
-0 0 0 0 0 10 4 4 24050202
-0 0 0 0 0 10 6 4 24050302
-0 0 0 0 0 10 8 4 24050402
-0 0 0 0 0 10 10 4 24050502
-0 0 0 0 0 10 12 4 24050602
-0 0 0 0 0 10 14 4 24050702
-0 0 0 0 0 10 16 4 24050802
-0 0 0 0 0 10 18 4 24050902
+0 0 0 0 0 5 0 2 24050002
+0 0 0 0 0 5 1 2 24050102
+0 0 0 0 0 5 2 2 24050202
+0 0 0 0 0 5 3 2 24050302
+0 0 0 0 0 5 4 2 24050402
+0 0 0 0 0 5 5 2 24050502
+0 0 0 0 0 5 6 2 24050602
+0 0 0 0 0 5 7 2 24050702
+0 0 0 0 0 5 8 2 24050802
+0 0 0 0 0 5 9 2 24050902
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 10 0 4 26050202
-1 0 0 0 0 10 2 4 24050102
-1 0 0 0 0 10 4 4 24050202
-1 0 0 0 0 10 6 4 24050302
-1 0 0 0 0 10 8 4 24050402
-1 0 0 0 0 10 10 4 24050502
-1 0 0 0 0 10 12 4 24050602
-1 0 0 0 0 10 14 4 24050702
-1 0 0 0 0 10 16 4 24050802
-1 0 0 0 0 10 18 4 24050902
+1 0 0 0 0 5 0 2 26050202
+1 0 0 0 0 5 1 2 24050102
+1 0 0 0 0 5 2 2 24050202
+1 0 0 0 0 5 3 2 24050302
+1 0 0 0 0 5 4 2 24050402
+1 0 0 0 0 5 5 2 24050502
+1 0 0 0 0 5 6 2 24050602
+1 0 0 0 0 5 7 2 24050702
+1 0 0 0 0 5 8 2 24050802
+1 0 0 0 0 5 9 2 24050902
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-yz/tyy.zl b/CarpetAttic/Cart3dTest/test/axial-yz/tyy.zl
index 67e691341..5a7078089 100644
--- a/CarpetAttic/Cart3dTest/test/axial-yz/tyy.zl
+++ b/CarpetAttic/Cart3dTest/test/axial-yz/tyy.zl
@@ -1,32 +1,34 @@
 # CART3DTEST::tyy z (tyy)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 10 2 0 24050100
-0 0 0 0 0 10 2 2 24050101
-0 0 0 0 0 10 2 4 24050102
-0 0 0 0 0 10 2 6 24050103
-0 0 0 0 0 10 2 8 24050104
-0 0 0 0 0 10 2 10 24050105
-0 0 0 0 0 10 2 12 24050106
-0 0 0 0 0 10 2 14 24050107
-0 0 0 0 0 10 2 16 24050108
-0 0 0 0 0 10 2 18 24050109
+0 0 0 0 0 5 1 0 24050100
+0 0 0 0 0 5 1 1 24050101
+0 0 0 0 0 5 1 2 24050102
+0 0 0 0 0 5 1 3 24050103
+0 0 0 0 0 5 1 4 24050104
+0 0 0 0 0 5 1 5 24050105
+0 0 0 0 0 5 1 6 24050106
+0 0 0 0 0 5 1 7 24050107
+0 0 0 0 0 5 1 8 24050108
+0 0 0 0 0 5 1 9 24050109
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 10 2 0 26050201
-1 0 0 0 0 10 2 2 26050101
-1 0 0 0 0 10 2 4 24050102
-1 0 0 0 0 10 2 6 24050103
-1 0 0 0 0 10 2 8 24050104
-1 0 0 0 0 10 2 10 24050105
-1 0 0 0 0 10 2 12 24050106
-1 0 0 0 0 10 2 14 24050107
-1 0 0 0 0 10 2 16 24050108
-1 0 0 0 0 10 2 18 24050109
+1 0 0 0 0 5 1 0 26050201
+1 0 0 0 0 5 1 1 26050101
+1 0 0 0 0 5 1 2 24050102
+1 0 0 0 0 5 1 3 24050103
+1 0 0 0 0 5 1 4 24050104
+1 0 0 0 0 5 1 5 24050105
+1 0 0 0 0 5 1 6 24050106
+1 0 0 0 0 5 1 7 24050107
+1 0 0 0 0 5 1 8 24050108
+1 0 0 0 0 5 1 9 24050109
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-yz/tyz.xl b/CarpetAttic/Cart3dTest/test/axial-yz/tyz.xl
index 0737d1bde..403a0ee5a 100644
--- a/CarpetAttic/Cart3dTest/test/axial-yz/tyz.xl
+++ b/CarpetAttic/Cart3dTest/test/axial-yz/tyz.xl
@@ -1,32 +1,34 @@
 # CART3DTEST::tyz x (tyz)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 4 25000102
-0 0 0 0 0 2 2 4 25010102
-0 0 0 0 0 4 2 4 25020102
-0 0 0 0 0 6 2 4 25030102
-0 0 0 0 0 8 2 4 25040102
-0 0 0 0 0 10 2 4 25050102
-0 0 0 0 0 12 2 4 25060102
-0 0 0 0 0 14 2 4 25070102
-0 0 0 0 0 16 2 4 25080102
-0 0 0 0 0 18 2 4 25090102
+0 0 0 0 0 0 1 2 25000102
+0 0 0 0 0 1 1 2 25010102
+0 0 0 0 0 2 1 2 25020102
+0 0 0 0 0 3 1 2 25030102
+0 0 0 0 0 4 1 2 25040102
+0 0 0 0 0 5 1 2 25050102
+0 0 0 0 0 6 1 2 25060102
+0 0 0 0 0 7 1 2 25070102
+0 0 0 0 0 8 1 2 25080102
+0 0 0 0 0 9 1 2 25090102
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 4 25000102
-1 0 0 0 0 2 2 4 25010102
-1 0 0 0 0 4 2 4 25020102
-1 0 0 0 0 6 2 4 25030102
-1 0 0 0 0 8 2 4 25040102
-1 0 0 0 0 10 2 4 25050102
-1 0 0 0 0 12 2 4 25060102
-1 0 0 0 0 14 2 4 25070102
-1 0 0 0 0 16 2 4 25080102
-1 0 0 0 0 18 2 4 25090102
+1 0 0 0 0 0 1 2 25000102
+1 0 0 0 0 1 1 2 25010102
+1 0 0 0 0 2 1 2 25020102
+1 0 0 0 0 3 1 2 25030102
+1 0 0 0 0 4 1 2 25040102
+1 0 0 0 0 5 1 2 25050102
+1 0 0 0 0 6 1 2 25060102
+1 0 0 0 0 7 1 2 25070102
+1 0 0 0 0 8 1 2 25080102
+1 0 0 0 0 9 1 2 25090102
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-yz/tyz.yl b/CarpetAttic/Cart3dTest/test/axial-yz/tyz.yl
index d1a0ed95b..46a085d2d 100644
--- a/CarpetAttic/Cart3dTest/test/axial-yz/tyz.yl
+++ b/CarpetAttic/Cart3dTest/test/axial-yz/tyz.yl
@@ -1,32 +1,34 @@
 # CART3DTEST::tyz y (tyz)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 10 0 4 25050002
-0 0 0 0 0 10 2 4 25050102
-0 0 0 0 0 10 4 4 25050202
-0 0 0 0 0 10 6 4 25050302
-0 0 0 0 0 10 8 4 25050402
-0 0 0 0 0 10 10 4 25050502
-0 0 0 0 0 10 12 4 25050602
-0 0 0 0 0 10 14 4 25050702
-0 0 0 0 0 10 16 4 25050802
-0 0 0 0 0 10 18 4 25050902
+0 0 0 0 0 5 0 2 25050002
+0 0 0 0 0 5 1 2 25050102
+0 0 0 0 0 5 2 2 25050202
+0 0 0 0 0 5 3 2 25050302
+0 0 0 0 0 5 4 2 25050402
+0 0 0 0 0 5 5 2 25050502
+0 0 0 0 0 5 6 2 25050602
+0 0 0 0 0 5 7 2 25050702
+0 0 0 0 0 5 8 2 25050802
+0 0 0 0 0 5 9 2 25050902
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 10 0 4 -25050202
-1 0 0 0 0 10 2 4 25050102
-1 0 0 0 0 10 4 4 25050202
-1 0 0 0 0 10 6 4 25050302
-1 0 0 0 0 10 8 4 25050402
-1 0 0 0 0 10 10 4 25050502
-1 0 0 0 0 10 12 4 25050602
-1 0 0 0 0 10 14 4 25050702
-1 0 0 0 0 10 16 4 25050802
-1 0 0 0 0 10 18 4 25050902
+1 0 0 0 0 5 0 2 -25050202
+1 0 0 0 0 5 1 2 25050102
+1 0 0 0 0 5 2 2 25050202
+1 0 0 0 0 5 3 2 25050302
+1 0 0 0 0 5 4 2 25050402
+1 0 0 0 0 5 5 2 25050502
+1 0 0 0 0 5 6 2 25050602
+1 0 0 0 0 5 7 2 25050702
+1 0 0 0 0 5 8 2 25050802
+1 0 0 0 0 5 9 2 25050902
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-yz/tyz.zl b/CarpetAttic/Cart3dTest/test/axial-yz/tyz.zl
index 0454420fd..f06b0e098 100644
--- a/CarpetAttic/Cart3dTest/test/axial-yz/tyz.zl
+++ b/CarpetAttic/Cart3dTest/test/axial-yz/tyz.zl
@@ -1,32 +1,34 @@
 # CART3DTEST::tyz z (tyz)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 10 2 0 25050100
-0 0 0 0 0 10 2 2 25050101
-0 0 0 0 0 10 2 4 25050102
-0 0 0 0 0 10 2 6 25050103
-0 0 0 0 0 10 2 8 25050104
-0 0 0 0 0 10 2 10 25050105
-0 0 0 0 0 10 2 12 25050106
-0 0 0 0 0 10 2 14 25050107
-0 0 0 0 0 10 2 16 25050108
-0 0 0 0 0 10 2 18 25050109
+0 0 0 0 0 5 1 0 25050100
+0 0 0 0 0 5 1 1 25050101
+0 0 0 0 0 5 1 2 25050102
+0 0 0 0 0 5 1 3 25050103
+0 0 0 0 0 5 1 4 25050104
+0 0 0 0 0 5 1 5 25050105
+0 0 0 0 0 5 1 6 25050106
+0 0 0 0 0 5 1 7 25050107
+0 0 0 0 0 5 1 8 25050108
+0 0 0 0 0 5 1 9 25050109
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 10 2 0 -25050201
-1 0 0 0 0 10 2 2 -25050101
-1 0 0 0 0 10 2 4 25050102
-1 0 0 0 0 10 2 6 25050103
-1 0 0 0 0 10 2 8 25050104
-1 0 0 0 0 10 2 10 25050105
-1 0 0 0 0 10 2 12 25050106
-1 0 0 0 0 10 2 14 25050107
-1 0 0 0 0 10 2 16 25050108
-1 0 0 0 0 10 2 18 25050109
+1 0 0 0 0 5 1 0 -25050201
+1 0 0 0 0 5 1 1 -25050101
+1 0 0 0 0 5 1 2 25050102
+1 0 0 0 0 5 1 3 25050103
+1 0 0 0 0 5 1 4 25050104
+1 0 0 0 0 5 1 5 25050105
+1 0 0 0 0 5 1 6 25050106
+1 0 0 0 0 5 1 7 25050107
+1 0 0 0 0 5 1 8 25050108
+1 0 0 0 0 5 1 9 25050109
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-yz/tzz.xl b/CarpetAttic/Cart3dTest/test/axial-yz/tzz.xl
index 4b7a0db11..9c42a9243 100644
--- a/CarpetAttic/Cart3dTest/test/axial-yz/tzz.xl
+++ b/CarpetAttic/Cart3dTest/test/axial-yz/tzz.xl
@@ -1,32 +1,34 @@
 # CART3DTEST::tzz x (tzz)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 4 26000102
-0 0 0 0 0 2 2 4 26010102
-0 0 0 0 0 4 2 4 26020102
-0 0 0 0 0 6 2 4 26030102
-0 0 0 0 0 8 2 4 26040102
-0 0 0 0 0 10 2 4 26050102
-0 0 0 0 0 12 2 4 26060102
-0 0 0 0 0 14 2 4 26070102
-0 0 0 0 0 16 2 4 26080102
-0 0 0 0 0 18 2 4 26090102
+0 0 0 0 0 0 1 2 26000102
+0 0 0 0 0 1 1 2 26010102
+0 0 0 0 0 2 1 2 26020102
+0 0 0 0 0 3 1 2 26030102
+0 0 0 0 0 4 1 2 26040102
+0 0 0 0 0 5 1 2 26050102
+0 0 0 0 0 6 1 2 26060102
+0 0 0 0 0 7 1 2 26070102
+0 0 0 0 0 8 1 2 26080102
+0 0 0 0 0 9 1 2 26090102
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 4 26000102
-1 0 0 0 0 2 2 4 26010102
-1 0 0 0 0 4 2 4 26020102
-1 0 0 0 0 6 2 4 26030102
-1 0 0 0 0 8 2 4 26040102
-1 0 0 0 0 10 2 4 26050102
-1 0 0 0 0 12 2 4 26060102
-1 0 0 0 0 14 2 4 26070102
-1 0 0 0 0 16 2 4 26080102
-1 0 0 0 0 18 2 4 26090102
+1 0 0 0 0 0 1 2 26000102
+1 0 0 0 0 1 1 2 26010102
+1 0 0 0 0 2 1 2 26020102
+1 0 0 0 0 3 1 2 26030102
+1 0 0 0 0 4 1 2 26040102
+1 0 0 0 0 5 1 2 26050102
+1 0 0 0 0 6 1 2 26060102
+1 0 0 0 0 7 1 2 26070102
+1 0 0 0 0 8 1 2 26080102
+1 0 0 0 0 9 1 2 26090102
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-yz/tzz.yl b/CarpetAttic/Cart3dTest/test/axial-yz/tzz.yl
index 76f6c2347..b128d7703 100644
--- a/CarpetAttic/Cart3dTest/test/axial-yz/tzz.yl
+++ b/CarpetAttic/Cart3dTest/test/axial-yz/tzz.yl
@@ -1,32 +1,34 @@
 # CART3DTEST::tzz y (tzz)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 10 0 4 26050002
-0 0 0 0 0 10 2 4 26050102
-0 0 0 0 0 10 4 4 26050202
-0 0 0 0 0 10 6 4 26050302
-0 0 0 0 0 10 8 4 26050402
-0 0 0 0 0 10 10 4 26050502
-0 0 0 0 0 10 12 4 26050602
-0 0 0 0 0 10 14 4 26050702
-0 0 0 0 0 10 16 4 26050802
-0 0 0 0 0 10 18 4 26050902
+0 0 0 0 0 5 0 2 26050002
+0 0 0 0 0 5 1 2 26050102
+0 0 0 0 0 5 2 2 26050202
+0 0 0 0 0 5 3 2 26050302
+0 0 0 0 0 5 4 2 26050402
+0 0 0 0 0 5 5 2 26050502
+0 0 0 0 0 5 6 2 26050602
+0 0 0 0 0 5 7 2 26050702
+0 0 0 0 0 5 8 2 26050802
+0 0 0 0 0 5 9 2 26050902
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 10 0 4 24050202
-1 0 0 0 0 10 2 4 26050102
-1 0 0 0 0 10 4 4 26050202
-1 0 0 0 0 10 6 4 26050302
-1 0 0 0 0 10 8 4 26050402
-1 0 0 0 0 10 10 4 26050502
-1 0 0 0 0 10 12 4 26050602
-1 0 0 0 0 10 14 4 26050702
-1 0 0 0 0 10 16 4 26050802
-1 0 0 0 0 10 18 4 26050902
+1 0 0 0 0 5 0 2 24050202
+1 0 0 0 0 5 1 2 26050102
+1 0 0 0 0 5 2 2 26050202
+1 0 0 0 0 5 3 2 26050302
+1 0 0 0 0 5 4 2 26050402
+1 0 0 0 0 5 5 2 26050502
+1 0 0 0 0 5 6 2 26050602
+1 0 0 0 0 5 7 2 26050702
+1 0 0 0 0 5 8 2 26050802
+1 0 0 0 0 5 9 2 26050902
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-yz/tzz.zl b/CarpetAttic/Cart3dTest/test/axial-yz/tzz.zl
index 78847df43..e76fc6a67 100644
--- a/CarpetAttic/Cart3dTest/test/axial-yz/tzz.zl
+++ b/CarpetAttic/Cart3dTest/test/axial-yz/tzz.zl
@@ -1,32 +1,34 @@
 # CART3DTEST::tzz z (tzz)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 10 2 0 26050100
-0 0 0 0 0 10 2 2 26050101
-0 0 0 0 0 10 2 4 26050102
-0 0 0 0 0 10 2 6 26050103
-0 0 0 0 0 10 2 8 26050104
-0 0 0 0 0 10 2 10 26050105
-0 0 0 0 0 10 2 12 26050106
-0 0 0 0 0 10 2 14 26050107
-0 0 0 0 0 10 2 16 26050108
-0 0 0 0 0 10 2 18 26050109
+0 0 0 0 0 5 1 0 26050100
+0 0 0 0 0 5 1 1 26050101
+0 0 0 0 0 5 1 2 26050102
+0 0 0 0 0 5 1 3 26050103
+0 0 0 0 0 5 1 4 26050104
+0 0 0 0 0 5 1 5 26050105
+0 0 0 0 0 5 1 6 26050106
+0 0 0 0 0 5 1 7 26050107
+0 0 0 0 0 5 1 8 26050108
+0 0 0 0 0 5 1 9 26050109
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 10 2 0 26050102
-1 0 0 0 0 10 2 2 26050101
-1 0 0 0 0 10 2 4 26050102
-1 0 0 0 0 10 2 6 26050103
-1 0 0 0 0 10 2 8 26050104
-1 0 0 0 0 10 2 10 26050105
-1 0 0 0 0 10 2 12 26050106
-1 0 0 0 0 10 2 14 26050107
-1 0 0 0 0 10 2 16 26050108
-1 0 0 0 0 10 2 18 26050109
+1 0 0 0 0 5 1 0 26050102
+1 0 0 0 0 5 1 1 26050101
+1 0 0 0 0 5 1 2 26050102
+1 0 0 0 0 5 1 3 26050103
+1 0 0 0 0 5 1 4 26050104
+1 0 0 0 0 5 1 5 26050105
+1 0 0 0 0 5 1 6 26050106
+1 0 0 0 0 5 1 7 26050107
+1 0 0 0 0 5 1 8 26050108
+1 0 0 0 0 5 1 9 26050109
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-yz/vx.xl b/CarpetAttic/Cart3dTest/test/axial-yz/vx.xl
index 914b010b6..71be3b196 100644
--- a/CarpetAttic/Cart3dTest/test/axial-yz/vx.xl
+++ b/CarpetAttic/Cart3dTest/test/axial-yz/vx.xl
@@ -1,32 +1,34 @@
 # CART3DTEST::vx x (vx)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 4 11000102
-0 0 0 0 0 2 2 4 11010102
-0 0 0 0 0 4 2 4 11020102
-0 0 0 0 0 6 2 4 11030102
-0 0 0 0 0 8 2 4 11040102
-0 0 0 0 0 10 2 4 11050102
-0 0 0 0 0 12 2 4 11060102
-0 0 0 0 0 14 2 4 11070102
-0 0 0 0 0 16 2 4 11080102
-0 0 0 0 0 18 2 4 11090102
+0 0 0 0 0 0 1 2 11000102
+0 0 0 0 0 1 1 2 11010102
+0 0 0 0 0 2 1 2 11020102
+0 0 0 0 0 3 1 2 11030102
+0 0 0 0 0 4 1 2 11040102
+0 0 0 0 0 5 1 2 11050102
+0 0 0 0 0 6 1 2 11060102
+0 0 0 0 0 7 1 2 11070102
+0 0 0 0 0 8 1 2 11080102
+0 0 0 0 0 9 1 2 11090102
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 4 11000102
-1 0 0 0 0 2 2 4 11010102
-1 0 0 0 0 4 2 4 11020102
-1 0 0 0 0 6 2 4 11030102
-1 0 0 0 0 8 2 4 11040102
-1 0 0 0 0 10 2 4 11050102
-1 0 0 0 0 12 2 4 11060102
-1 0 0 0 0 14 2 4 11070102
-1 0 0 0 0 16 2 4 11080102
-1 0 0 0 0 18 2 4 11090102
+1 0 0 0 0 0 1 2 11000102
+1 0 0 0 0 1 1 2 11010102
+1 0 0 0 0 2 1 2 11020102
+1 0 0 0 0 3 1 2 11030102
+1 0 0 0 0 4 1 2 11040102
+1 0 0 0 0 5 1 2 11050102
+1 0 0 0 0 6 1 2 11060102
+1 0 0 0 0 7 1 2 11070102
+1 0 0 0 0 8 1 2 11080102
+1 0 0 0 0 9 1 2 11090102
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-yz/vx.yl b/CarpetAttic/Cart3dTest/test/axial-yz/vx.yl
index 4668716f6..46a8dbfe5 100644
--- a/CarpetAttic/Cart3dTest/test/axial-yz/vx.yl
+++ b/CarpetAttic/Cart3dTest/test/axial-yz/vx.yl
@@ -1,32 +1,34 @@
 # CART3DTEST::vx y (vx)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 10 0 4 11050002
-0 0 0 0 0 10 2 4 11050102
-0 0 0 0 0 10 4 4 11050202
-0 0 0 0 0 10 6 4 11050302
-0 0 0 0 0 10 8 4 11050402
-0 0 0 0 0 10 10 4 11050502
-0 0 0 0 0 10 12 4 11050602
-0 0 0 0 0 10 14 4 11050702
-0 0 0 0 0 10 16 4 11050802
-0 0 0 0 0 10 18 4 11050902
+0 0 0 0 0 5 0 2 11050002
+0 0 0 0 0 5 1 2 11050102
+0 0 0 0 0 5 2 2 11050202
+0 0 0 0 0 5 3 2 11050302
+0 0 0 0 0 5 4 2 11050402
+0 0 0 0 0 5 5 2 11050502
+0 0 0 0 0 5 6 2 11050602
+0 0 0 0 0 5 7 2 11050702
+0 0 0 0 0 5 8 2 11050802
+0 0 0 0 0 5 9 2 11050902
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 10 0 4 11050202
-1 0 0 0 0 10 2 4 11050102
-1 0 0 0 0 10 4 4 11050202
-1 0 0 0 0 10 6 4 11050302
-1 0 0 0 0 10 8 4 11050402
-1 0 0 0 0 10 10 4 11050502
-1 0 0 0 0 10 12 4 11050602
-1 0 0 0 0 10 14 4 11050702
-1 0 0 0 0 10 16 4 11050802
-1 0 0 0 0 10 18 4 11050902
+1 0 0 0 0 5 0 2 11050202
+1 0 0 0 0 5 1 2 11050102
+1 0 0 0 0 5 2 2 11050202
+1 0 0 0 0 5 3 2 11050302
+1 0 0 0 0 5 4 2 11050402
+1 0 0 0 0 5 5 2 11050502
+1 0 0 0 0 5 6 2 11050602
+1 0 0 0 0 5 7 2 11050702
+1 0 0 0 0 5 8 2 11050802
+1 0 0 0 0 5 9 2 11050902
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-yz/vx.zl b/CarpetAttic/Cart3dTest/test/axial-yz/vx.zl
index 8cbcc077e..34f2e138c 100644
--- a/CarpetAttic/Cart3dTest/test/axial-yz/vx.zl
+++ b/CarpetAttic/Cart3dTest/test/axial-yz/vx.zl
@@ -1,32 +1,34 @@
 # CART3DTEST::vx z (vx)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 10 2 0 11050100
-0 0 0 0 0 10 2 2 11050101
-0 0 0 0 0 10 2 4 11050102
-0 0 0 0 0 10 2 6 11050103
-0 0 0 0 0 10 2 8 11050104
-0 0 0 0 0 10 2 10 11050105
-0 0 0 0 0 10 2 12 11050106
-0 0 0 0 0 10 2 14 11050107
-0 0 0 0 0 10 2 16 11050108
-0 0 0 0 0 10 2 18 11050109
+0 0 0 0 0 5 1 0 11050100
+0 0 0 0 0 5 1 1 11050101
+0 0 0 0 0 5 1 2 11050102
+0 0 0 0 0 5 1 3 11050103
+0 0 0 0 0 5 1 4 11050104
+0 0 0 0 0 5 1 5 11050105
+0 0 0 0 0 5 1 6 11050106
+0 0 0 0 0 5 1 7 11050107
+0 0 0 0 0 5 1 8 11050108
+0 0 0 0 0 5 1 9 11050109
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 10 2 0 11050201
-1 0 0 0 0 10 2 2 11050101
-1 0 0 0 0 10 2 4 11050102
-1 0 0 0 0 10 2 6 11050103
-1 0 0 0 0 10 2 8 11050104
-1 0 0 0 0 10 2 10 11050105
-1 0 0 0 0 10 2 12 11050106
-1 0 0 0 0 10 2 14 11050107
-1 0 0 0 0 10 2 16 11050108
-1 0 0 0 0 10 2 18 11050109
+1 0 0 0 0 5 1 0 11050201
+1 0 0 0 0 5 1 1 11050101
+1 0 0 0 0 5 1 2 11050102
+1 0 0 0 0 5 1 3 11050103
+1 0 0 0 0 5 1 4 11050104
+1 0 0 0 0 5 1 5 11050105
+1 0 0 0 0 5 1 6 11050106
+1 0 0 0 0 5 1 7 11050107
+1 0 0 0 0 5 1 8 11050108
+1 0 0 0 0 5 1 9 11050109
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-yz/vy.xl b/CarpetAttic/Cart3dTest/test/axial-yz/vy.xl
index 0300c9617..dcfd7a6da 100644
--- a/CarpetAttic/Cart3dTest/test/axial-yz/vy.xl
+++ b/CarpetAttic/Cart3dTest/test/axial-yz/vy.xl
@@ -1,32 +1,34 @@
 # CART3DTEST::vy x (vy)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 4 12000102
-0 0 0 0 0 2 2 4 12010102
-0 0 0 0 0 4 2 4 12020102
-0 0 0 0 0 6 2 4 12030102
-0 0 0 0 0 8 2 4 12040102
-0 0 0 0 0 10 2 4 12050102
-0 0 0 0 0 12 2 4 12060102
-0 0 0 0 0 14 2 4 12070102
-0 0 0 0 0 16 2 4 12080102
-0 0 0 0 0 18 2 4 12090102
+0 0 0 0 0 0 1 2 12000102
+0 0 0 0 0 1 1 2 12010102
+0 0 0 0 0 2 1 2 12020102
+0 0 0 0 0 3 1 2 12030102
+0 0 0 0 0 4 1 2 12040102
+0 0 0 0 0 5 1 2 12050102
+0 0 0 0 0 6 1 2 12060102
+0 0 0 0 0 7 1 2 12070102
+0 0 0 0 0 8 1 2 12080102
+0 0 0 0 0 9 1 2 12090102
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 4 12000102
-1 0 0 0 0 2 2 4 12010102
-1 0 0 0 0 4 2 4 12020102
-1 0 0 0 0 6 2 4 12030102
-1 0 0 0 0 8 2 4 12040102
-1 0 0 0 0 10 2 4 12050102
-1 0 0 0 0 12 2 4 12060102
-1 0 0 0 0 14 2 4 12070102
-1 0 0 0 0 16 2 4 12080102
-1 0 0 0 0 18 2 4 12090102
+1 0 0 0 0 0 1 2 12000102
+1 0 0 0 0 1 1 2 12010102
+1 0 0 0 0 2 1 2 12020102
+1 0 0 0 0 3 1 2 12030102
+1 0 0 0 0 4 1 2 12040102
+1 0 0 0 0 5 1 2 12050102
+1 0 0 0 0 6 1 2 12060102
+1 0 0 0 0 7 1 2 12070102
+1 0 0 0 0 8 1 2 12080102
+1 0 0 0 0 9 1 2 12090102
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-yz/vy.yl b/CarpetAttic/Cart3dTest/test/axial-yz/vy.yl
index 3730cb0d8..6641f0b73 100644
--- a/CarpetAttic/Cart3dTest/test/axial-yz/vy.yl
+++ b/CarpetAttic/Cart3dTest/test/axial-yz/vy.yl
@@ -1,32 +1,34 @@
 # CART3DTEST::vy y (vy)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 10 0 4 12050002
-0 0 0 0 0 10 2 4 12050102
-0 0 0 0 0 10 4 4 12050202
-0 0 0 0 0 10 6 4 12050302
-0 0 0 0 0 10 8 4 12050402
-0 0 0 0 0 10 10 4 12050502
-0 0 0 0 0 10 12 4 12050602
-0 0 0 0 0 10 14 4 12050702
-0 0 0 0 0 10 16 4 12050802
-0 0 0 0 0 10 18 4 12050902
+0 0 0 0 0 5 0 2 12050002
+0 0 0 0 0 5 1 2 12050102
+0 0 0 0 0 5 2 2 12050202
+0 0 0 0 0 5 3 2 12050302
+0 0 0 0 0 5 4 2 12050402
+0 0 0 0 0 5 5 2 12050502
+0 0 0 0 0 5 6 2 12050602
+0 0 0 0 0 5 7 2 12050702
+0 0 0 0 0 5 8 2 12050802
+0 0 0 0 0 5 9 2 12050902
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 10 0 4 -13050202
-1 0 0 0 0 10 2 4 12050102
-1 0 0 0 0 10 4 4 12050202
-1 0 0 0 0 10 6 4 12050302
-1 0 0 0 0 10 8 4 12050402
-1 0 0 0 0 10 10 4 12050502
-1 0 0 0 0 10 12 4 12050602
-1 0 0 0 0 10 14 4 12050702
-1 0 0 0 0 10 16 4 12050802
-1 0 0 0 0 10 18 4 12050902
+1 0 0 0 0 5 0 2 -13050202
+1 0 0 0 0 5 1 2 12050102
+1 0 0 0 0 5 2 2 12050202
+1 0 0 0 0 5 3 2 12050302
+1 0 0 0 0 5 4 2 12050402
+1 0 0 0 0 5 5 2 12050502
+1 0 0 0 0 5 6 2 12050602
+1 0 0 0 0 5 7 2 12050702
+1 0 0 0 0 5 8 2 12050802
+1 0 0 0 0 5 9 2 12050902
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-yz/vy.zl b/CarpetAttic/Cart3dTest/test/axial-yz/vy.zl
index eeed5900f..0fe372c21 100644
--- a/CarpetAttic/Cart3dTest/test/axial-yz/vy.zl
+++ b/CarpetAttic/Cart3dTest/test/axial-yz/vy.zl
@@ -1,32 +1,34 @@
 # CART3DTEST::vy z (vy)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 10 2 0 12050100
-0 0 0 0 0 10 2 2 12050101
-0 0 0 0 0 10 2 4 12050102
-0 0 0 0 0 10 2 6 12050103
-0 0 0 0 0 10 2 8 12050104
-0 0 0 0 0 10 2 10 12050105
-0 0 0 0 0 10 2 12 12050106
-0 0 0 0 0 10 2 14 12050107
-0 0 0 0 0 10 2 16 12050108
-0 0 0 0 0 10 2 18 12050109
+0 0 0 0 0 5 1 0 12050100
+0 0 0 0 0 5 1 1 12050101
+0 0 0 0 0 5 1 2 12050102
+0 0 0 0 0 5 1 3 12050103
+0 0 0 0 0 5 1 4 12050104
+0 0 0 0 0 5 1 5 12050105
+0 0 0 0 0 5 1 6 12050106
+0 0 0 0 0 5 1 7 12050107
+0 0 0 0 0 5 1 8 12050108
+0 0 0 0 0 5 1 9 12050109
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 10 2 0 13050201
-1 0 0 0 0 10 2 2 13050101
-1 0 0 0 0 10 2 4 12050102
-1 0 0 0 0 10 2 6 12050103
-1 0 0 0 0 10 2 8 12050104
-1 0 0 0 0 10 2 10 12050105
-1 0 0 0 0 10 2 12 12050106
-1 0 0 0 0 10 2 14 12050107
-1 0 0 0 0 10 2 16 12050108
-1 0 0 0 0 10 2 18 12050109
+1 0 0 0 0 5 1 0 13050201
+1 0 0 0 0 5 1 1 13050101
+1 0 0 0 0 5 1 2 12050102
+1 0 0 0 0 5 1 3 12050103
+1 0 0 0 0 5 1 4 12050104
+1 0 0 0 0 5 1 5 12050105
+1 0 0 0 0 5 1 6 12050106
+1 0 0 0 0 5 1 7 12050107
+1 0 0 0 0 5 1 8 12050108
+1 0 0 0 0 5 1 9 12050109
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-yz/vz.xl b/CarpetAttic/Cart3dTest/test/axial-yz/vz.xl
index 5b2be5a21..a8969fcb1 100644
--- a/CarpetAttic/Cart3dTest/test/axial-yz/vz.xl
+++ b/CarpetAttic/Cart3dTest/test/axial-yz/vz.xl
@@ -1,32 +1,34 @@
 # CART3DTEST::vz x (vz)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 4 13000102
-0 0 0 0 0 2 2 4 13010102
-0 0 0 0 0 4 2 4 13020102
-0 0 0 0 0 6 2 4 13030102
-0 0 0 0 0 8 2 4 13040102
-0 0 0 0 0 10 2 4 13050102
-0 0 0 0 0 12 2 4 13060102
-0 0 0 0 0 14 2 4 13070102
-0 0 0 0 0 16 2 4 13080102
-0 0 0 0 0 18 2 4 13090102
+0 0 0 0 0 0 1 2 13000102
+0 0 0 0 0 1 1 2 13010102
+0 0 0 0 0 2 1 2 13020102
+0 0 0 0 0 3 1 2 13030102
+0 0 0 0 0 4 1 2 13040102
+0 0 0 0 0 5 1 2 13050102
+0 0 0 0 0 6 1 2 13060102
+0 0 0 0 0 7 1 2 13070102
+0 0 0 0 0 8 1 2 13080102
+0 0 0 0 0 9 1 2 13090102
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 4 13000102
-1 0 0 0 0 2 2 4 13010102
-1 0 0 0 0 4 2 4 13020102
-1 0 0 0 0 6 2 4 13030102
-1 0 0 0 0 8 2 4 13040102
-1 0 0 0 0 10 2 4 13050102
-1 0 0 0 0 12 2 4 13060102
-1 0 0 0 0 14 2 4 13070102
-1 0 0 0 0 16 2 4 13080102
-1 0 0 0 0 18 2 4 13090102
+1 0 0 0 0 0 1 2 13000102
+1 0 0 0 0 1 1 2 13010102
+1 0 0 0 0 2 1 2 13020102
+1 0 0 0 0 3 1 2 13030102
+1 0 0 0 0 4 1 2 13040102
+1 0 0 0 0 5 1 2 13050102
+1 0 0 0 0 6 1 2 13060102
+1 0 0 0 0 7 1 2 13070102
+1 0 0 0 0 8 1 2 13080102
+1 0 0 0 0 9 1 2 13090102
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-yz/vz.yl b/CarpetAttic/Cart3dTest/test/axial-yz/vz.yl
index 351346c21..ad1ee3762 100644
--- a/CarpetAttic/Cart3dTest/test/axial-yz/vz.yl
+++ b/CarpetAttic/Cart3dTest/test/axial-yz/vz.yl
@@ -1,32 +1,34 @@
 # CART3DTEST::vz y (vz)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 10 0 4 13050002
-0 0 0 0 0 10 2 4 13050102
-0 0 0 0 0 10 4 4 13050202
-0 0 0 0 0 10 6 4 13050302
-0 0 0 0 0 10 8 4 13050402
-0 0 0 0 0 10 10 4 13050502
-0 0 0 0 0 10 12 4 13050602
-0 0 0 0 0 10 14 4 13050702
-0 0 0 0 0 10 16 4 13050802
-0 0 0 0 0 10 18 4 13050902
+0 0 0 0 0 5 0 2 13050002
+0 0 0 0 0 5 1 2 13050102
+0 0 0 0 0 5 2 2 13050202
+0 0 0 0 0 5 3 2 13050302
+0 0 0 0 0 5 4 2 13050402
+0 0 0 0 0 5 5 2 13050502
+0 0 0 0 0 5 6 2 13050602
+0 0 0 0 0 5 7 2 13050702
+0 0 0 0 0 5 8 2 13050802
+0 0 0 0 0 5 9 2 13050902
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 10 0 4 12050202
-1 0 0 0 0 10 2 4 13050102
-1 0 0 0 0 10 4 4 13050202
-1 0 0 0 0 10 6 4 13050302
-1 0 0 0 0 10 8 4 13050402
-1 0 0 0 0 10 10 4 13050502
-1 0 0 0 0 10 12 4 13050602
-1 0 0 0 0 10 14 4 13050702
-1 0 0 0 0 10 16 4 13050802
-1 0 0 0 0 10 18 4 13050902
+1 0 0 0 0 5 0 2 12050202
+1 0 0 0 0 5 1 2 13050102
+1 0 0 0 0 5 2 2 13050202
+1 0 0 0 0 5 3 2 13050302
+1 0 0 0 0 5 4 2 13050402
+1 0 0 0 0 5 5 2 13050502
+1 0 0 0 0 5 6 2 13050602
+1 0 0 0 0 5 7 2 13050702
+1 0 0 0 0 5 8 2 13050802
+1 0 0 0 0 5 9 2 13050902
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/axial-yz/vz.zl b/CarpetAttic/Cart3dTest/test/axial-yz/vz.zl
index 25bbc2111..1b6b95a58 100644
--- a/CarpetAttic/Cart3dTest/test/axial-yz/vz.zl
+++ b/CarpetAttic/Cart3dTest/test/axial-yz/vz.zl
@@ -1,32 +1,34 @@
 # CART3DTEST::vz z (vz)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 10 2 0 13050100
-0 0 0 0 0 10 2 2 13050101
-0 0 0 0 0 10 2 4 13050102
-0 0 0 0 0 10 2 6 13050103
-0 0 0 0 0 10 2 8 13050104
-0 0 0 0 0 10 2 10 13050105
-0 0 0 0 0 10 2 12 13050106
-0 0 0 0 0 10 2 14 13050107
-0 0 0 0 0 10 2 16 13050108
-0 0 0 0 0 10 2 18 13050109
+0 0 0 0 0 5 1 0 13050100
+0 0 0 0 0 5 1 1 13050101
+0 0 0 0 0 5 1 2 13050102
+0 0 0 0 0 5 1 3 13050103
+0 0 0 0 0 5 1 4 13050104
+0 0 0 0 0 5 1 5 13050105
+0 0 0 0 0 5 1 6 13050106
+0 0 0 0 0 5 1 7 13050107
+0 0 0 0 0 5 1 8 13050108
+0 0 0 0 0 5 1 9 13050109
+
+
 
-#
 # iteration 1
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 0 0 0 0 10 2 0 -13050102
-1 0 0 0 0 10 2 2 -13050101
-1 0 0 0 0 10 2 4 13050102
-1 0 0 0 0 10 2 6 13050103
-1 0 0 0 0 10 2 8 13050104
-1 0 0 0 0 10 2 10 13050105
-1 0 0 0 0 10 2 12 13050106
-1 0 0 0 0 10 2 14 13050107
-1 0 0 0 0 10 2 16 13050108
-1 0 0 0 0 10 2 18 13050109
+1 0 0 0 0 5 1 0 -13050102
+1 0 0 0 0 5 1 1 -13050101
+1 0 0 0 0 5 1 2 13050102
+1 0 0 0 0 5 1 3 13050103
+1 0 0 0 0 5 1 4 13050104
+1 0 0 0 0 5 1 5 13050105
+1 0 0 0 0 5 1 6 13050106
+1 0 0 0 0 5 1 7 13050107
+1 0 0 0 0 5 1 8 13050108
+1 0 0 0 0 5 1 9 13050109
+
+
 
diff --git a/CarpetExtra/WaveToyF77/par/wavetoyf77_rad_rl2.par b/CarpetExtra/WaveToyF77/par/wavetoyf77_rad_rl2.par
index 2198a8451..d53c7890f 100644
--- a/CarpetExtra/WaveToyF77/par/wavetoyf77_rad_rl2.par
+++ b/CarpetExtra/WaveToyF77/par/wavetoyf77_rad_rl2.par
@@ -7,11 +7,11 @@
 #   @enddesc
 # @@*/
 #
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyF77/par/Attic/wavetoyf77_rad_rl2.par,v 1.1 2001/03/12 16:54:25 eschnett Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyF77/par/Attic/wavetoyf77_rad_rl2.par,v 1.2 2001/03/13 13:07:32 eschnett Exp $
 
 ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetLib CarpetSlab IDScalarWave WaveToyF77"
 
-Cactus::cctk_itlast		= 120
+Cactus::cctk_itlast		= 1 # 120
  
 Time::dtfac			= 0.5
 
@@ -27,13 +27,13 @@ grid::dxyz			= 0.3
  
 IO::outdir			= "wavetoyf77_rad_rl2"
 
-IOBasic::outinfo_every		= 10
+IOBasic::outinfo_every		= 1 # 10
 #IOBasic::outinfo_vars		= "wavetoy::phi"
 
 #IOBasic::outScalar_every	= 2
 #IOBasic::outScalar_vars		= "wavetoy::phi"
 
-IOASCII::out1D_every		= 2
+IOASCII::out1D_every		= 1 # 2
 IOASCII::out1D_vars		= "wavetoy::phi grid::coordinates"
 
 WaveToyF77::bound		= radiation
diff --git a/CarpetExtra/WaveToyF77/src/WaveToy.F77 b/CarpetExtra/WaveToyF77/src/WaveToy.F77
index ec10a310c..310d15304 100644
--- a/CarpetExtra/WaveToyF77/src/WaveToy.F77
+++ b/CarpetExtra/WaveToyF77/src/WaveToy.F77
@@ -136,10 +136,6 @@ c     ---------------------
       sw(2) = 1
       sw(3) = 1
       
-c     Apply the symmetry boundary conditions on any coordinate axes
-c     -------------------------------------------------------------
-      call Cart3dSymGN (ierr, cctkGH, "wavetoy::scalarevolve")
-      
 c     Apply the outer boundary conditions
 c     -----------------------------------
       if (CCTK_EQUALS(bound, "flat")) then
@@ -159,4 +155,12 @@ c     -----------------------------------
         call CCTK_WARN (0, "Boundary conditions not applied - giving up!")
       end if
       
+c     Apply the symmetry boundary conditions on any coordinate axes
+c     -------------------------------------------------------------
+      call Cart3dSymGN (ierr, cctkGH, "wavetoy::scalarevolve")
+      
+      if (ierr .lt. 0)  then
+        call CCTK_WARN (0, "Boundary conditions not applied - giving up!")
+      end if
+      
       end
-- 
cgit v1.2.3