aboutsummaryrefslogtreecommitdiff
path: root/CarpetAttic/Cart3dTest/test/axial
diff options
context:
space:
mode:
Diffstat (limited to 'CarpetAttic/Cart3dTest/test/axial')
-rw-r--r--CarpetAttic/Cart3dTest/test/axial/ax.xl46
-rw-r--r--CarpetAttic/Cart3dTest/test/axial/ax.yl46
-rw-r--r--CarpetAttic/Cart3dTest/test/axial/ax.zl46
-rw-r--r--CarpetAttic/Cart3dTest/test/axial/ay.xl46
-rw-r--r--CarpetAttic/Cart3dTest/test/axial/ay.yl46
-rw-r--r--CarpetAttic/Cart3dTest/test/axial/ay.zl46
-rw-r--r--CarpetAttic/Cart3dTest/test/axial/az.xl46
-rw-r--r--CarpetAttic/Cart3dTest/test/axial/az.yl46
-rw-r--r--CarpetAttic/Cart3dTest/test/axial/az.zl46
-rw-r--r--CarpetAttic/Cart3dTest/test/axial/cart3d_x.xl46
-rw-r--r--CarpetAttic/Cart3dTest/test/axial/cart3d_x.yl46
-rw-r--r--CarpetAttic/Cart3dTest/test/axial/cart3d_x.zl46
-rw-r--r--CarpetAttic/Cart3dTest/test/axial/cart3d_y.xl46
-rw-r--r--CarpetAttic/Cart3dTest/test/axial/cart3d_y.yl46
-rw-r--r--CarpetAttic/Cart3dTest/test/axial/cart3d_y.zl46
-rw-r--r--CarpetAttic/Cart3dTest/test/axial/cart3d_z.xl46
-rw-r--r--CarpetAttic/Cart3dTest/test/axial/cart3d_z.yl46
-rw-r--r--CarpetAttic/Cart3dTest/test/axial/cart3d_z.zl46
-rw-r--r--CarpetAttic/Cart3dTest/test/axial/fxx.xl46
-rw-r--r--CarpetAttic/Cart3dTest/test/axial/fxx.yl46
-rw-r--r--CarpetAttic/Cart3dTest/test/axial/fxx.zl46
-rw-r--r--CarpetAttic/Cart3dTest/test/axial/fxy.xl46
-rw-r--r--CarpetAttic/Cart3dTest/test/axial/fxy.yl46
-rw-r--r--CarpetAttic/Cart3dTest/test/axial/fxy.zl46
-rw-r--r--CarpetAttic/Cart3dTest/test/axial/fxz.xl46
-rw-r--r--CarpetAttic/Cart3dTest/test/axial/fxz.yl46
-rw-r--r--CarpetAttic/Cart3dTest/test/axial/fxz.zl46
-rw-r--r--CarpetAttic/Cart3dTest/test/axial/fyx.xl46
-rw-r--r--CarpetAttic/Cart3dTest/test/axial/fyx.yl46
-rw-r--r--CarpetAttic/Cart3dTest/test/axial/fyx.zl46
-rw-r--r--CarpetAttic/Cart3dTest/test/axial/fyy.xl46
-rw-r--r--CarpetAttic/Cart3dTest/test/axial/fyy.yl46
-rw-r--r--CarpetAttic/Cart3dTest/test/axial/fyy.zl46
-rw-r--r--CarpetAttic/Cart3dTest/test/axial/fyz.xl46
-rw-r--r--CarpetAttic/Cart3dTest/test/axial/fyz.yl46
-rw-r--r--CarpetAttic/Cart3dTest/test/axial/fyz.zl46
-rw-r--r--CarpetAttic/Cart3dTest/test/axial/fzx.xl46
-rw-r--r--CarpetAttic/Cart3dTest/test/axial/fzx.yl46
-rw-r--r--CarpetAttic/Cart3dTest/test/axial/fzx.zl46
-rw-r--r--CarpetAttic/Cart3dTest/test/axial/fzy.xl46
-rw-r--r--CarpetAttic/Cart3dTest/test/axial/fzy.yl46
-rw-r--r--CarpetAttic/Cart3dTest/test/axial/fzy.zl46
-rw-r--r--CarpetAttic/Cart3dTest/test/axial/fzz.xl46
-rw-r--r--CarpetAttic/Cart3dTest/test/axial/fzz.yl46
-rw-r--r--CarpetAttic/Cart3dTest/test/axial/fzz.zl46
-rw-r--r--CarpetAttic/Cart3dTest/test/axial/s.xl46
-rw-r--r--CarpetAttic/Cart3dTest/test/axial/s.yl46
-rw-r--r--CarpetAttic/Cart3dTest/test/axial/s.zl46
-rw-r--r--CarpetAttic/Cart3dTest/test/axial/spher3d_r.xl46
-rw-r--r--CarpetAttic/Cart3dTest/test/axial/spher3d_r.yl46
-rw-r--r--CarpetAttic/Cart3dTest/test/axial/spher3d_r.zl46
-rw-r--r--CarpetAttic/Cart3dTest/test/axial/txx.xl46
-rw-r--r--CarpetAttic/Cart3dTest/test/axial/txx.yl46
-rw-r--r--CarpetAttic/Cart3dTest/test/axial/txx.zl46
-rw-r--r--CarpetAttic/Cart3dTest/test/axial/txy.xl46
-rw-r--r--CarpetAttic/Cart3dTest/test/axial/txy.yl46
-rw-r--r--CarpetAttic/Cart3dTest/test/axial/txy.zl46
-rw-r--r--CarpetAttic/Cart3dTest/test/axial/txz.xl46
-rw-r--r--CarpetAttic/Cart3dTest/test/axial/txz.yl46
-rw-r--r--CarpetAttic/Cart3dTest/test/axial/txz.zl46
-rw-r--r--CarpetAttic/Cart3dTest/test/axial/tyy.xl46
-rw-r--r--CarpetAttic/Cart3dTest/test/axial/tyy.yl46
-rw-r--r--CarpetAttic/Cart3dTest/test/axial/tyy.zl46
-rw-r--r--CarpetAttic/Cart3dTest/test/axial/tyz.xl46
-rw-r--r--CarpetAttic/Cart3dTest/test/axial/tyz.yl46
-rw-r--r--CarpetAttic/Cart3dTest/test/axial/tyz.zl46
-rw-r--r--CarpetAttic/Cart3dTest/test/axial/tzz.xl46
-rw-r--r--CarpetAttic/Cart3dTest/test/axial/tzz.yl46
-rw-r--r--CarpetAttic/Cart3dTest/test/axial/tzz.zl46
-rw-r--r--CarpetAttic/Cart3dTest/test/axial/vx.xl46
-rw-r--r--CarpetAttic/Cart3dTest/test/axial/vx.yl46
-rw-r--r--CarpetAttic/Cart3dTest/test/axial/vx.zl46
-rw-r--r--CarpetAttic/Cart3dTest/test/axial/vy.xl46
-rw-r--r--CarpetAttic/Cart3dTest/test/axial/vy.yl46
-rw-r--r--CarpetAttic/Cart3dTest/test/axial/vy.zl46
-rw-r--r--CarpetAttic/Cart3dTest/test/axial/vz.xl46
-rw-r--r--CarpetAttic/Cart3dTest/test/axial/vz.yl46
-rw-r--r--CarpetAttic/Cart3dTest/test/axial/vz.zl46
78 files changed, 1872 insertions, 1716 deletions
diff --git a/CarpetAttic/Cart3dTest/test/axial/ax.xl b/CarpetAttic/Cart3dTest/test/axial/ax.xl
index 9738e5282..f3c85f513 100644
--- a/CarpetAttic/Cart3dTest/test/axial/ax.xl
+++ b/CarpetAttic/Cart3dTest/test/axial/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 32010105
-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 32010105
+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/ax.yl b/CarpetAttic/Cart3dTest/test/axial/ax.yl
index 0b5c3a856..10079a923 100644
--- a/CarpetAttic/Cart3dTest/test/axial/ax.yl
+++ b/CarpetAttic/Cart3dTest/test/axial/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 2 0 10 31010005
-0 0 0 0 0 2 2 10 31010105
-0 0 0 0 0 2 4 10 31010205
-0 0 0 0 0 2 6 10 31010305
-0 0 0 0 0 2 8 10 31010405
-0 0 0 0 0 2 10 10 31010505
-0 0 0 0 0 2 12 10 31010605
-0 0 0 0 0 2 14 10 31010705
-0 0 0 0 0 2 16 10 31010805
-0 0 0 0 0 2 18 10 31010905
+0 0 0 0 0 1 0 5 31010005
+0 0 0 0 0 1 1 5 31010105
+0 0 0 0 0 1 2 5 31010205
+0 0 0 0 0 1 3 5 31010305
+0 0 0 0 0 1 4 5 31010405
+0 0 0 0 0 1 5 5 31010505
+0 0 0 0 0 1 6 5 31010605
+0 0 0 0 0 1 7 5 31010705
+0 0 0 0 0 1 8 5 31010805
+0 0 0 0 0 1 9 5 31010905
+
+
-#
# 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 2 0 10 -32010105
-1 0 0 0 0 2 2 10 31010105
-1 0 0 0 0 2 4 10 31010205
-1 0 0 0 0 2 6 10 31010305
-1 0 0 0 0 2 8 10 31010405
-1 0 0 0 0 2 10 10 31010505
-1 0 0 0 0 2 12 10 31010605
-1 0 0 0 0 2 14 10 31010705
-1 0 0 0 0 2 16 10 31010805
-1 0 0 0 0 2 18 10 31010905
+1 0 0 0 0 1 0 5 -32010105
+1 0 0 0 0 1 1 5 31010105
+1 0 0 0 0 1 2 5 31010205
+1 0 0 0 0 1 3 5 31010305
+1 0 0 0 0 1 4 5 31010405
+1 0 0 0 0 1 5 5 31010505
+1 0 0 0 0 1 6 5 31010605
+1 0 0 0 0 1 7 5 31010705
+1 0 0 0 0 1 8 5 31010805
+1 0 0 0 0 1 9 5 31010905
+
+
diff --git a/CarpetAttic/Cart3dTest/test/axial/ax.zl b/CarpetAttic/Cart3dTest/test/axial/ax.zl
index 4b1e9f58d..991b16d53 100644
--- a/CarpetAttic/Cart3dTest/test/axial/ax.zl
+++ b/CarpetAttic/Cart3dTest/test/axial/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 2 2 0 31010100
-0 0 0 0 0 2 2 2 31010101
-0 0 0 0 0 2 2 4 31010102
-0 0 0 0 0 2 2 6 31010103
-0 0 0 0 0 2 2 8 31010104
-0 0 0 0 0 2 2 10 31010105
-0 0 0 0 0 2 2 12 31010106
-0 0 0 0 0 2 2 14 31010107
-0 0 0 0 0 2 2 16 31010108
-0 0 0 0 0 2 2 18 31010109
+0 0 0 0 0 1 1 0 31010100
+0 0 0 0 0 1 1 1 31010101
+0 0 0 0 0 1 1 2 31010102
+0 0 0 0 0 1 1 3 31010103
+0 0 0 0 0 1 1 4 31010104
+0 0 0 0 0 1 1 5 31010105
+0 0 0 0 0 1 1 6 31010106
+0 0 0 0 0 1 1 7 31010107
+0 0 0 0 0 1 1 8 31010108
+0 0 0 0 0 1 1 9 31010109
+
+
-#
# 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 2 2 0 31010100
-1 0 0 0 0 2 2 2 31010101
-1 0 0 0 0 2 2 4 31010102
-1 0 0 0 0 2 2 6 31010103
-1 0 0 0 0 2 2 8 31010104
-1 0 0 0 0 2 2 10 31010105
-1 0 0 0 0 2 2 12 31010106
-1 0 0 0 0 2 2 14 31010107
-1 0 0 0 0 2 2 16 31010108
-1 0 0 0 0 2 2 18 31010109
+1 0 0 0 0 1 1 0 31010100
+1 0 0 0 0 1 1 1 31010101
+1 0 0 0 0 1 1 2 31010102
+1 0 0 0 0 1 1 3 31010103
+1 0 0 0 0 1 1 4 31010104
+1 0 0 0 0 1 1 5 31010105
+1 0 0 0 0 1 1 6 31010106
+1 0 0 0 0 1 1 7 31010107
+1 0 0 0 0 1 1 8 31010108
+1 0 0 0 0 1 1 9 31010109
+
+
diff --git a/CarpetAttic/Cart3dTest/test/axial/ay.xl b/CarpetAttic/Cart3dTest/test/axial/ay.xl
index 69735c0a4..8a7d8e673 100644
--- a/CarpetAttic/Cart3dTest/test/axial/ay.xl
+++ b/CarpetAttic/Cart3dTest/test/axial/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 -31010105
-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 -31010105
+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/ay.yl b/CarpetAttic/Cart3dTest/test/axial/ay.yl
index 7c2d642ab..c3d66a5d4 100644
--- a/CarpetAttic/Cart3dTest/test/axial/ay.yl
+++ b/CarpetAttic/Cart3dTest/test/axial/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 2 0 10 32010005
-0 0 0 0 0 2 2 10 32010105
-0 0 0 0 0 2 4 10 32010205
-0 0 0 0 0 2 6 10 32010305
-0 0 0 0 0 2 8 10 32010405
-0 0 0 0 0 2 10 10 32010505
-0 0 0 0 0 2 12 10 32010605
-0 0 0 0 0 2 14 10 32010705
-0 0 0 0 0 2 16 10 32010805
-0 0 0 0 0 2 18 10 32010905
+0 0 0 0 0 1 0 5 32010005
+0 0 0 0 0 1 1 5 32010105
+0 0 0 0 0 1 2 5 32010205
+0 0 0 0 0 1 3 5 32010305
+0 0 0 0 0 1 4 5 32010405
+0 0 0 0 0 1 5 5 32010505
+0 0 0 0 0 1 6 5 32010605
+0 0 0 0 0 1 7 5 32010705
+0 0 0 0 0 1 8 5 32010805
+0 0 0 0 0 1 9 5 32010905
+
+
-#
# 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 2 0 10 31010105
-1 0 0 0 0 2 2 10 32010105
-1 0 0 0 0 2 4 10 32010205
-1 0 0 0 0 2 6 10 32010305
-1 0 0 0 0 2 8 10 32010405
-1 0 0 0 0 2 10 10 32010505
-1 0 0 0 0 2 12 10 32010605
-1 0 0 0 0 2 14 10 32010705
-1 0 0 0 0 2 16 10 32010805
-1 0 0 0 0 2 18 10 32010905
+1 0 0 0 0 1 0 5 31010105
+1 0 0 0 0 1 1 5 32010105
+1 0 0 0 0 1 2 5 32010205
+1 0 0 0 0 1 3 5 32010305
+1 0 0 0 0 1 4 5 32010405
+1 0 0 0 0 1 5 5 32010505
+1 0 0 0 0 1 6 5 32010605
+1 0 0 0 0 1 7 5 32010705
+1 0 0 0 0 1 8 5 32010805
+1 0 0 0 0 1 9 5 32010905
+
+
diff --git a/CarpetAttic/Cart3dTest/test/axial/ay.zl b/CarpetAttic/Cart3dTest/test/axial/ay.zl
index 02f77629a..9025fd3da 100644
--- a/CarpetAttic/Cart3dTest/test/axial/ay.zl
+++ b/CarpetAttic/Cart3dTest/test/axial/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 2 2 0 32010100
-0 0 0 0 0 2 2 2 32010101
-0 0 0 0 0 2 2 4 32010102
-0 0 0 0 0 2 2 6 32010103
-0 0 0 0 0 2 2 8 32010104
-0 0 0 0 0 2 2 10 32010105
-0 0 0 0 0 2 2 12 32010106
-0 0 0 0 0 2 2 14 32010107
-0 0 0 0 0 2 2 16 32010108
-0 0 0 0 0 2 2 18 32010109
+0 0 0 0 0 1 1 0 32010100
+0 0 0 0 0 1 1 1 32010101
+0 0 0 0 0 1 1 2 32010102
+0 0 0 0 0 1 1 3 32010103
+0 0 0 0 0 1 1 4 32010104
+0 0 0 0 0 1 1 5 32010105
+0 0 0 0 0 1 1 6 32010106
+0 0 0 0 0 1 1 7 32010107
+0 0 0 0 0 1 1 8 32010108
+0 0 0 0 0 1 1 9 32010109
+
+
-#
# 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 2 2 0 32010100
-1 0 0 0 0 2 2 2 32010101
-1 0 0 0 0 2 2 4 32010102
-1 0 0 0 0 2 2 6 32010103
-1 0 0 0 0 2 2 8 32010104
-1 0 0 0 0 2 2 10 32010105
-1 0 0 0 0 2 2 12 32010106
-1 0 0 0 0 2 2 14 32010107
-1 0 0 0 0 2 2 16 32010108
-1 0 0 0 0 2 2 18 32010109
+1 0 0 0 0 1 1 0 32010100
+1 0 0 0 0 1 1 1 32010101
+1 0 0 0 0 1 1 2 32010102
+1 0 0 0 0 1 1 3 32010103
+1 0 0 0 0 1 1 4 32010104
+1 0 0 0 0 1 1 5 32010105
+1 0 0 0 0 1 1 6 32010106
+1 0 0 0 0 1 1 7 32010107
+1 0 0 0 0 1 1 8 32010108
+1 0 0 0 0 1 1 9 32010109
+
+
diff --git a/CarpetAttic/Cart3dTest/test/axial/az.xl b/CarpetAttic/Cart3dTest/test/axial/az.xl
index d055efa71..2bd8aaaa3 100644
--- a/CarpetAttic/Cart3dTest/test/axial/az.xl
+++ b/CarpetAttic/Cart3dTest/test/axial/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 33010105
-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 33010105
+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/az.yl b/CarpetAttic/Cart3dTest/test/axial/az.yl
index 035f6a5d4..cb2644b10 100644
--- a/CarpetAttic/Cart3dTest/test/axial/az.yl
+++ b/CarpetAttic/Cart3dTest/test/axial/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 2 0 10 33010005
-0 0 0 0 0 2 2 10 33010105
-0 0 0 0 0 2 4 10 33010205
-0 0 0 0 0 2 6 10 33010305
-0 0 0 0 0 2 8 10 33010405
-0 0 0 0 0 2 10 10 33010505
-0 0 0 0 0 2 12 10 33010605
-0 0 0 0 0 2 14 10 33010705
-0 0 0 0 0 2 16 10 33010805
-0 0 0 0 0 2 18 10 33010905
+0 0 0 0 0 1 0 5 33010005
+0 0 0 0 0 1 1 5 33010105
+0 0 0 0 0 1 2 5 33010205
+0 0 0 0 0 1 3 5 33010305
+0 0 0 0 0 1 4 5 33010405
+0 0 0 0 0 1 5 5 33010505
+0 0 0 0 0 1 6 5 33010605
+0 0 0 0 0 1 7 5 33010705
+0 0 0 0 0 1 8 5 33010805
+0 0 0 0 0 1 9 5 33010905
+
+
-#
# 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 2 0 10 33010105
-1 0 0 0 0 2 2 10 33010105
-1 0 0 0 0 2 4 10 33010205
-1 0 0 0 0 2 6 10 33010305
-1 0 0 0 0 2 8 10 33010405
-1 0 0 0 0 2 10 10 33010505
-1 0 0 0 0 2 12 10 33010605
-1 0 0 0 0 2 14 10 33010705
-1 0 0 0 0 2 16 10 33010805
-1 0 0 0 0 2 18 10 33010905
+1 0 0 0 0 1 0 5 33010105
+1 0 0 0 0 1 1 5 33010105
+1 0 0 0 0 1 2 5 33010205
+1 0 0 0 0 1 3 5 33010305
+1 0 0 0 0 1 4 5 33010405
+1 0 0 0 0 1 5 5 33010505
+1 0 0 0 0 1 6 5 33010605
+1 0 0 0 0 1 7 5 33010705
+1 0 0 0 0 1 8 5 33010805
+1 0 0 0 0 1 9 5 33010905
+
+
diff --git a/CarpetAttic/Cart3dTest/test/axial/az.zl b/CarpetAttic/Cart3dTest/test/axial/az.zl
index 8cccb326a..a17465fb8 100644
--- a/CarpetAttic/Cart3dTest/test/axial/az.zl
+++ b/CarpetAttic/Cart3dTest/test/axial/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 2 2 0 33010100
-0 0 0 0 0 2 2 2 33010101
-0 0 0 0 0 2 2 4 33010102
-0 0 0 0 0 2 2 6 33010103
-0 0 0 0 0 2 2 8 33010104
-0 0 0 0 0 2 2 10 33010105
-0 0 0 0 0 2 2 12 33010106
-0 0 0 0 0 2 2 14 33010107
-0 0 0 0 0 2 2 16 33010108
-0 0 0 0 0 2 2 18 33010109
+0 0 0 0 0 1 1 0 33010100
+0 0 0 0 0 1 1 1 33010101
+0 0 0 0 0 1 1 2 33010102
+0 0 0 0 0 1 1 3 33010103
+0 0 0 0 0 1 1 4 33010104
+0 0 0 0 0 1 1 5 33010105
+0 0 0 0 0 1 1 6 33010106
+0 0 0 0 0 1 1 7 33010107
+0 0 0 0 0 1 1 8 33010108
+0 0 0 0 0 1 1 9 33010109
+
+
-#
# 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 2 2 0 33010100
-1 0 0 0 0 2 2 2 33010101
-1 0 0 0 0 2 2 4 33010102
-1 0 0 0 0 2 2 6 33010103
-1 0 0 0 0 2 2 8 33010104
-1 0 0 0 0 2 2 10 33010105
-1 0 0 0 0 2 2 12 33010106
-1 0 0 0 0 2 2 14 33010107
-1 0 0 0 0 2 2 16 33010108
-1 0 0 0 0 2 2 18 33010109
+1 0 0 0 0 1 1 0 33010100
+1 0 0 0 0 1 1 1 33010101
+1 0 0 0 0 1 1 2 33010102
+1 0 0 0 0 1 1 3 33010103
+1 0 0 0 0 1 1 4 33010104
+1 0 0 0 0 1 1 5 33010105
+1 0 0 0 0 1 1 6 33010106
+1 0 0 0 0 1 1 7 33010107
+1 0 0 0 0 1 1 8 33010108
+1 0 0 0 0 1 1 9 33010109
+
+
diff --git a/CarpetAttic/Cart3dTest/test/axial/cart3d_x.xl b/CarpetAttic/Cart3dTest/test/axial/cart3d_x.xl
index 909110bd7..be86e5f0b 100644
--- a/CarpetAttic/Cart3dTest/test/axial/cart3d_x.xl
+++ b/CarpetAttic/Cart3dTest/test/axial/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.15
-0 0 0 0 0 4 2 10 0.45
-0 0 0 0 0 6 2 10 0.75
-0 0 0 0 0 8 2 10 1.05
-0 0 0 0 0 10 2 10 1.35
-0 0 0 0 0 12 2 10 1.65
-0 0 0 0 0 14 2 10 1.95
-0 0 0 0 0 16 2 10 2.25
-0 0 0 0 0 18 2 10 2.55
+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.45
+0 0 0 0 0 3 1 5 0.75
+0 0 0 0 0 4 1 5 1.05
+0 0 0 0 0 5 1 5 1.35
+0 0 0 0 0 6 1 5 1.65
+0 0 0 0 0 7 1 5 1.95
+0 0 0 0 0 8 1 5 2.25
+0 0 0 0 0 9 1 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 2 10 -0.15
-1 0 0 0 0 2 2 10 0.15
-1 0 0 0 0 4 2 10 0.45
-1 0 0 0 0 6 2 10 0.75
-1 0 0 0 0 8 2 10 1.05
-1 0 0 0 0 10 2 10 1.35
-1 0 0 0 0 12 2 10 1.65
-1 0 0 0 0 14 2 10 1.95
-1 0 0 0 0 16 2 10 2.25
-1 0 0 0 0 18 2 10 2.55
+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.45
+1 0 0 0 0 3 1 5 0.75
+1 0 0 0 0 4 1 5 1.05
+1 0 0 0 0 5 1 5 1.35
+1 0 0 0 0 6 1 5 1.65
+1 0 0 0 0 7 1 5 1.95
+1 0 0 0 0 8 1 5 2.25
+1 0 0 0 0 9 1 5 2.55
+
+
diff --git a/CarpetAttic/Cart3dTest/test/axial/cart3d_x.yl b/CarpetAttic/Cart3dTest/test/axial/cart3d_x.yl
index c962f316a..b8aa9ff5b 100644
--- a/CarpetAttic/Cart3dTest/test/axial/cart3d_x.yl
+++ b/CarpetAttic/Cart3dTest/test/axial/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 2 0 10 0.15
-0 0 0 0 0 2 2 10 0.15
-0 0 0 0 0 2 4 10 0.15
-0 0 0 0 0 2 6 10 0.15
-0 0 0 0 0 2 8 10 0.15
-0 0 0 0 0 2 10 10 0.15
-0 0 0 0 0 2 12 10 0.15
-0 0 0 0 0 2 14 10 0.15
-0 0 0 0 0 2 16 10 0.15
-0 0 0 0 0 2 18 10 0.15
+0 0 0 0 0 1 0 5 0.15
+0 0 0 0 0 1 1 5 0.15
+0 0 0 0 0 1 2 5 0.15
+0 0 0 0 0 1 3 5 0.15
+0 0 0 0 0 1 4 5 0.15
+0 0 0 0 0 1 5 5 0.15
+0 0 0 0 0 1 6 5 0.15
+0 0 0 0 0 1 7 5 0.15
+0 0 0 0 0 1 8 5 0.15
+0 0 0 0 0 1 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 2 0 10 0.15
-1 0 0 0 0 2 2 10 0.15
-1 0 0 0 0 2 4 10 0.15
-1 0 0 0 0 2 6 10 0.15
-1 0 0 0 0 2 8 10 0.15
-1 0 0 0 0 2 10 10 0.15
-1 0 0 0 0 2 12 10 0.15
-1 0 0 0 0 2 14 10 0.15
-1 0 0 0 0 2 16 10 0.15
-1 0 0 0 0 2 18 10 0.15
+1 0 0 0 0 1 0 5 0.15
+1 0 0 0 0 1 1 5 0.15
+1 0 0 0 0 1 2 5 0.15
+1 0 0 0 0 1 3 5 0.15
+1 0 0 0 0 1 4 5 0.15
+1 0 0 0 0 1 5 5 0.15
+1 0 0 0 0 1 6 5 0.15
+1 0 0 0 0 1 7 5 0.15
+1 0 0 0 0 1 8 5 0.15
+1 0 0 0 0 1 9 5 0.15
+
+
diff --git a/CarpetAttic/Cart3dTest/test/axial/cart3d_x.zl b/CarpetAttic/Cart3dTest/test/axial/cart3d_x.zl
index 457715f0b..07c4f329e 100644
--- a/CarpetAttic/Cart3dTest/test/axial/cart3d_x.zl
+++ b/CarpetAttic/Cart3dTest/test/axial/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 2 2 0 0.15
-0 0 0 0 0 2 2 2 0.15
-0 0 0 0 0 2 2 4 0.15
-0 0 0 0 0 2 2 6 0.15
-0 0 0 0 0 2 2 8 0.15
-0 0 0 0 0 2 2 10 0.15
-0 0 0 0 0 2 2 12 0.15
-0 0 0 0 0 2 2 14 0.15
-0 0 0 0 0 2 2 16 0.15
-0 0 0 0 0 2 2 18 0.15
+0 0 0 0 0 1 1 0 0.15
+0 0 0 0 0 1 1 1 0.15
+0 0 0 0 0 1 1 2 0.15
+0 0 0 0 0 1 1 3 0.15
+0 0 0 0 0 1 1 4 0.15
+0 0 0 0 0 1 1 5 0.15
+0 0 0 0 0 1 1 6 0.15
+0 0 0 0 0 1 1 7 0.15
+0 0 0 0 0 1 1 8 0.15
+0 0 0 0 0 1 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 2 2 0 0.15
-1 0 0 0 0 2 2 2 0.15
-1 0 0 0 0 2 2 4 0.15
-1 0 0 0 0 2 2 6 0.15
-1 0 0 0 0 2 2 8 0.15
-1 0 0 0 0 2 2 10 0.15
-1 0 0 0 0 2 2 12 0.15
-1 0 0 0 0 2 2 14 0.15
-1 0 0 0 0 2 2 16 0.15
-1 0 0 0 0 2 2 18 0.15
+1 0 0 0 0 1 1 0 0.15
+1 0 0 0 0 1 1 1 0.15
+1 0 0 0 0 1 1 2 0.15
+1 0 0 0 0 1 1 3 0.15
+1 0 0 0 0 1 1 4 0.15
+1 0 0 0 0 1 1 5 0.15
+1 0 0 0 0 1 1 6 0.15
+1 0 0 0 0 1 1 7 0.15
+1 0 0 0 0 1 1 8 0.15
+1 0 0 0 0 1 1 9 0.15
+
+
diff --git a/CarpetAttic/Cart3dTest/test/axial/cart3d_y.xl b/CarpetAttic/Cart3dTest/test/axial/cart3d_y.xl
index 09abf970a..e07fa99ab 100644
--- a/CarpetAttic/Cart3dTest/test/axial/cart3d_y.xl
+++ b/CarpetAttic/Cart3dTest/test/axial/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/cart3d_y.yl b/CarpetAttic/Cart3dTest/test/axial/cart3d_y.yl
index b1cdbb4de..2fda6291e 100644
--- a/CarpetAttic/Cart3dTest/test/axial/cart3d_y.yl
+++ b/CarpetAttic/Cart3dTest/test/axial/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 2 0 10 -0.15
-0 0 0 0 0 2 2 10 0.15
-0 0 0 0 0 2 4 10 0.45
-0 0 0 0 0 2 6 10 0.75
-0 0 0 0 0 2 8 10 1.05
-0 0 0 0 0 2 10 10 1.35
-0 0 0 0 0 2 12 10 1.65
-0 0 0 0 0 2 14 10 1.95
-0 0 0 0 0 2 16 10 2.25
-0 0 0 0 0 2 18 10 2.55
+0 0 0 0 0 1 0 5 -0.15
+0 0 0 0 0 1 1 5 0.15
+0 0 0 0 0 1 2 5 0.45
+0 0 0 0 0 1 3 5 0.75
+0 0 0 0 0 1 4 5 1.05
+0 0 0 0 0 1 5 5 1.35
+0 0 0 0 0 1 6 5 1.65
+0 0 0 0 0 1 7 5 1.95
+0 0 0 0 0 1 8 5 2.25
+0 0 0 0 0 1 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 2 0 10 -0.15
-1 0 0 0 0 2 2 10 0.15
-1 0 0 0 0 2 4 10 0.45
-1 0 0 0 0 2 6 10 0.75
-1 0 0 0 0 2 8 10 1.05
-1 0 0 0 0 2 10 10 1.35
-1 0 0 0 0 2 12 10 1.65
-1 0 0 0 0 2 14 10 1.95
-1 0 0 0 0 2 16 10 2.25
-1 0 0 0 0 2 18 10 2.55
+1 0 0 0 0 1 0 5 -0.15
+1 0 0 0 0 1 1 5 0.15
+1 0 0 0 0 1 2 5 0.45
+1 0 0 0 0 1 3 5 0.75
+1 0 0 0 0 1 4 5 1.05
+1 0 0 0 0 1 5 5 1.35
+1 0 0 0 0 1 6 5 1.65
+1 0 0 0 0 1 7 5 1.95
+1 0 0 0 0 1 8 5 2.25
+1 0 0 0 0 1 9 5 2.55
+
+
diff --git a/CarpetAttic/Cart3dTest/test/axial/cart3d_y.zl b/CarpetAttic/Cart3dTest/test/axial/cart3d_y.zl
index d69547ae4..cb2230be9 100644
--- a/CarpetAttic/Cart3dTest/test/axial/cart3d_y.zl
+++ b/CarpetAttic/Cart3dTest/test/axial/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 2 2 0 0.15
-0 0 0 0 0 2 2 2 0.15
-0 0 0 0 0 2 2 4 0.15
-0 0 0 0 0 2 2 6 0.15
-0 0 0 0 0 2 2 8 0.15
-0 0 0 0 0 2 2 10 0.15
-0 0 0 0 0 2 2 12 0.15
-0 0 0 0 0 2 2 14 0.15
-0 0 0 0 0 2 2 16 0.15
-0 0 0 0 0 2 2 18 0.15
+0 0 0 0 0 1 1 0 0.15
+0 0 0 0 0 1 1 1 0.15
+0 0 0 0 0 1 1 2 0.15
+0 0 0 0 0 1 1 3 0.15
+0 0 0 0 0 1 1 4 0.15
+0 0 0 0 0 1 1 5 0.15
+0 0 0 0 0 1 1 6 0.15
+0 0 0 0 0 1 1 7 0.15
+0 0 0 0 0 1 1 8 0.15
+0 0 0 0 0 1 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 2 2 0 0.15
-1 0 0 0 0 2 2 2 0.15
-1 0 0 0 0 2 2 4 0.15
-1 0 0 0 0 2 2 6 0.15
-1 0 0 0 0 2 2 8 0.15
-1 0 0 0 0 2 2 10 0.15
-1 0 0 0 0 2 2 12 0.15
-1 0 0 0 0 2 2 14 0.15
-1 0 0 0 0 2 2 16 0.15
-1 0 0 0 0 2 2 18 0.15
+1 0 0 0 0 1 1 0 0.15
+1 0 0 0 0 1 1 1 0.15
+1 0 0 0 0 1 1 2 0.15
+1 0 0 0 0 1 1 3 0.15
+1 0 0 0 0 1 1 4 0.15
+1 0 0 0 0 1 1 5 0.15
+1 0 0 0 0 1 1 6 0.15
+1 0 0 0 0 1 1 7 0.15
+1 0 0 0 0 1 1 8 0.15
+1 0 0 0 0 1 1 9 0.15
+
+
diff --git a/CarpetAttic/Cart3dTest/test/axial/cart3d_z.xl b/CarpetAttic/Cart3dTest/test/axial/cart3d_z.xl
index 99106802c..9718c560e 100644
--- a/CarpetAttic/Cart3dTest/test/axial/cart3d_z.xl
+++ b/CarpetAttic/Cart3dTest/test/axial/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/cart3d_z.yl b/CarpetAttic/Cart3dTest/test/axial/cart3d_z.yl
index c3e602384..3c2f5d12b 100644
--- a/CarpetAttic/Cart3dTest/test/axial/cart3d_z.yl
+++ b/CarpetAttic/Cart3dTest/test/axial/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 2 0 10 0.15
-0 0 0 0 0 2 2 10 0.15
-0 0 0 0 0 2 4 10 0.15
-0 0 0 0 0 2 6 10 0.15
-0 0 0 0 0 2 8 10 0.15
-0 0 0 0 0 2 10 10 0.15
-0 0 0 0 0 2 12 10 0.15
-0 0 0 0 0 2 14 10 0.15
-0 0 0 0 0 2 16 10 0.15
-0 0 0 0 0 2 18 10 0.15
+0 0 0 0 0 1 0 5 0.15
+0 0 0 0 0 1 1 5 0.15
+0 0 0 0 0 1 2 5 0.15
+0 0 0 0 0 1 3 5 0.15
+0 0 0 0 0 1 4 5 0.15
+0 0 0 0 0 1 5 5 0.15
+0 0 0 0 0 1 6 5 0.15
+0 0 0 0 0 1 7 5 0.15
+0 0 0 0 0 1 8 5 0.15
+0 0 0 0 0 1 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 2 0 10 0.15
-1 0 0 0 0 2 2 10 0.15
-1 0 0 0 0 2 4 10 0.15
-1 0 0 0 0 2 6 10 0.15
-1 0 0 0 0 2 8 10 0.15
-1 0 0 0 0 2 10 10 0.15
-1 0 0 0 0 2 12 10 0.15
-1 0 0 0 0 2 14 10 0.15
-1 0 0 0 0 2 16 10 0.15
-1 0 0 0 0 2 18 10 0.15
+1 0 0 0 0 1 0 5 0.15
+1 0 0 0 0 1 1 5 0.15
+1 0 0 0 0 1 2 5 0.15
+1 0 0 0 0 1 3 5 0.15
+1 0 0 0 0 1 4 5 0.15
+1 0 0 0 0 1 5 5 0.15
+1 0 0 0 0 1 6 5 0.15
+1 0 0 0 0 1 7 5 0.15
+1 0 0 0 0 1 8 5 0.15
+1 0 0 0 0 1 9 5 0.15
+
+
diff --git a/CarpetAttic/Cart3dTest/test/axial/cart3d_z.zl b/CarpetAttic/Cart3dTest/test/axial/cart3d_z.zl
index 2b482782a..58a9153c2 100644
--- a/CarpetAttic/Cart3dTest/test/axial/cart3d_z.zl
+++ b/CarpetAttic/Cart3dTest/test/axial/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 2 2 0 -1.35
-0 0 0 0 0 2 2 2 -1.05
-0 0 0 0 0 2 2 4 -0.75
-0 0 0 0 0 2 2 6 -0.45
-0 0 0 0 0 2 2 8 -0.15
-0 0 0 0 0 2 2 10 0.15
-0 0 0 0 0 2 2 12 0.45
-0 0 0 0 0 2 2 14 0.75
-0 0 0 0 0 2 2 16 1.05
-0 0 0 0 0 2 2 18 1.35
+0 0 0 0 0 1 1 0 -1.35
+0 0 0 0 0 1 1 1 -1.05
+0 0 0 0 0 1 1 2 -0.75
+0 0 0 0 0 1 1 3 -0.45
+0 0 0 0 0 1 1 4 -0.15
+0 0 0 0 0 1 1 5 0.15
+0 0 0 0 0 1 1 6 0.45
+0 0 0 0 0 1 1 7 0.75
+0 0 0 0 0 1 1 8 1.05
+0 0 0 0 0 1 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 2 2 0 -1.35
-1 0 0 0 0 2 2 2 -1.05
-1 0 0 0 0 2 2 4 -0.75
-1 0 0 0 0 2 2 6 -0.45
-1 0 0 0 0 2 2 8 -0.15
-1 0 0 0 0 2 2 10 0.15
-1 0 0 0 0 2 2 12 0.45
-1 0 0 0 0 2 2 14 0.75
-1 0 0 0 0 2 2 16 1.05
-1 0 0 0 0 2 2 18 1.35
+1 0 0 0 0 1 1 0 -1.35
+1 0 0 0 0 1 1 1 -1.05
+1 0 0 0 0 1 1 2 -0.75
+1 0 0 0 0 1 1 3 -0.45
+1 0 0 0 0 1 1 4 -0.15
+1 0 0 0 0 1 1 5 0.15
+1 0 0 0 0 1 1 6 0.45
+1 0 0 0 0 1 1 7 0.75
+1 0 0 0 0 1 1 8 1.05
+1 0 0 0 0 1 1 9 1.35
+
+
diff --git a/CarpetAttic/Cart3dTest/test/axial/fxx.xl b/CarpetAttic/Cart3dTest/test/axial/fxx.xl
index 13d1c7443..bcc48f9a8 100644
--- a/CarpetAttic/Cart3dTest/test/axial/fxx.xl
+++ b/CarpetAttic/Cart3dTest/test/axial/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 45010105
-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 45010105
+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/fxx.yl b/CarpetAttic/Cart3dTest/test/axial/fxx.yl
index a9ec3c450..3d882b6f4 100644
--- a/CarpetAttic/Cart3dTest/test/axial/fxx.yl
+++ b/CarpetAttic/Cart3dTest/test/axial/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 2 0 10 41010005
-0 0 0 0 0 2 2 10 41010105
-0 0 0 0 0 2 4 10 41010205
-0 0 0 0 0 2 6 10 41010305
-0 0 0 0 0 2 8 10 41010405
-0 0 0 0 0 2 10 10 41010505
-0 0 0 0 0 2 12 10 41010605
-0 0 0 0 0 2 14 10 41010705
-0 0 0 0 0 2 16 10 41010805
-0 0 0 0 0 2 18 10 41010905
+0 0 0 0 0 1 0 5 41010005
+0 0 0 0 0 1 1 5 41010105
+0 0 0 0 0 1 2 5 41010205
+0 0 0 0 0 1 3 5 41010305
+0 0 0 0 0 1 4 5 41010405
+0 0 0 0 0 1 5 5 41010505
+0 0 0 0 0 1 6 5 41010605
+0 0 0 0 0 1 7 5 41010705
+0 0 0 0 0 1 8 5 41010805
+0 0 0 0 0 1 9 5 41010905
+
+
-#
# 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 2 0 10 45010105
-1 0 0 0 0 2 2 10 41010105
-1 0 0 0 0 2 4 10 41010205
-1 0 0 0 0 2 6 10 41010305
-1 0 0 0 0 2 8 10 41010405
-1 0 0 0 0 2 10 10 41010505
-1 0 0 0 0 2 12 10 41010605
-1 0 0 0 0 2 14 10 41010705
-1 0 0 0 0 2 16 10 41010805
-1 0 0 0 0 2 18 10 41010905
+1 0 0 0 0 1 0 5 45010105
+1 0 0 0 0 1 1 5 41010105
+1 0 0 0 0 1 2 5 41010205
+1 0 0 0 0 1 3 5 41010305
+1 0 0 0 0 1 4 5 41010405
+1 0 0 0 0 1 5 5 41010505
+1 0 0 0 0 1 6 5 41010605
+1 0 0 0 0 1 7 5 41010705
+1 0 0 0 0 1 8 5 41010805
+1 0 0 0 0 1 9 5 41010905
+
+
diff --git a/CarpetAttic/Cart3dTest/test/axial/fxx.zl b/CarpetAttic/Cart3dTest/test/axial/fxx.zl
index 4c490b63d..949f19951 100644
--- a/CarpetAttic/Cart3dTest/test/axial/fxx.zl
+++ b/CarpetAttic/Cart3dTest/test/axial/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 2 2 0 41010100
-0 0 0 0 0 2 2 2 41010101
-0 0 0 0 0 2 2 4 41010102
-0 0 0 0 0 2 2 6 41010103
-0 0 0 0 0 2 2 8 41010104
-0 0 0 0 0 2 2 10 41010105
-0 0 0 0 0 2 2 12 41010106
-0 0 0 0 0 2 2 14 41010107
-0 0 0 0 0 2 2 16 41010108
-0 0 0 0 0 2 2 18 41010109
+0 0 0 0 0 1 1 0 41010100
+0 0 0 0 0 1 1 1 41010101
+0 0 0 0 0 1 1 2 41010102
+0 0 0 0 0 1 1 3 41010103
+0 0 0 0 0 1 1 4 41010104
+0 0 0 0 0 1 1 5 41010105
+0 0 0 0 0 1 1 6 41010106
+0 0 0 0 0 1 1 7 41010107
+0 0 0 0 0 1 1 8 41010108
+0 0 0 0 0 1 1 9 41010109
+
+
-#
# 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 2 2 0 41010100
-1 0 0 0 0 2 2 2 41010101
-1 0 0 0 0 2 2 4 41010102
-1 0 0 0 0 2 2 6 41010103
-1 0 0 0 0 2 2 8 41010104
-1 0 0 0 0 2 2 10 41010105
-1 0 0 0 0 2 2 12 41010106
-1 0 0 0 0 2 2 14 41010107
-1 0 0 0 0 2 2 16 41010108
-1 0 0 0 0 2 2 18 41010109
+1 0 0 0 0 1 1 0 41010100
+1 0 0 0 0 1 1 1 41010101
+1 0 0 0 0 1 1 2 41010102
+1 0 0 0 0 1 1 3 41010103
+1 0 0 0 0 1 1 4 41010104
+1 0 0 0 0 1 1 5 41010105
+1 0 0 0 0 1 1 6 41010106
+1 0 0 0 0 1 1 7 41010107
+1 0 0 0 0 1 1 8 41010108
+1 0 0 0 0 1 1 9 41010109
+
+
diff --git a/CarpetAttic/Cart3dTest/test/axial/fxy.xl b/CarpetAttic/Cart3dTest/test/axial/fxy.xl
index 60e9ad0a0..cd98efca1 100644
--- a/CarpetAttic/Cart3dTest/test/axial/fxy.xl
+++ b/CarpetAttic/Cart3dTest/test/axial/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 -44010105
-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 -44010105
+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/fxy.yl b/CarpetAttic/Cart3dTest/test/axial/fxy.yl
index 4e674cfa0..41782ef25 100644
--- a/CarpetAttic/Cart3dTest/test/axial/fxy.yl
+++ b/CarpetAttic/Cart3dTest/test/axial/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 2 0 10 42010005
-0 0 0 0 0 2 2 10 42010105
-0 0 0 0 0 2 4 10 42010205
-0 0 0 0 0 2 6 10 42010305
-0 0 0 0 0 2 8 10 42010405
-0 0 0 0 0 2 10 10 42010505
-0 0 0 0 0 2 12 10 42010605
-0 0 0 0 0 2 14 10 42010705
-0 0 0 0 0 2 16 10 42010805
-0 0 0 0 0 2 18 10 42010905
+0 0 0 0 0 1 0 5 42010005
+0 0 0 0 0 1 1 5 42010105
+0 0 0 0 0 1 2 5 42010205
+0 0 0 0 0 1 3 5 42010305
+0 0 0 0 0 1 4 5 42010405
+0 0 0 0 0 1 5 5 42010505
+0 0 0 0 0 1 6 5 42010605
+0 0 0 0 0 1 7 5 42010705
+0 0 0 0 0 1 8 5 42010805
+0 0 0 0 0 1 9 5 42010905
+
+
-#
# 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 2 0 10 -44010105
-1 0 0 0 0 2 2 10 42010105
-1 0 0 0 0 2 4 10 42010205
-1 0 0 0 0 2 6 10 42010305
-1 0 0 0 0 2 8 10 42010405
-1 0 0 0 0 2 10 10 42010505
-1 0 0 0 0 2 12 10 42010605
-1 0 0 0 0 2 14 10 42010705
-1 0 0 0 0 2 16 10 42010805
-1 0 0 0 0 2 18 10 42010905
+1 0 0 0 0 1 0 5 -44010105
+1 0 0 0 0 1 1 5 42010105
+1 0 0 0 0 1 2 5 42010205
+1 0 0 0 0 1 3 5 42010305
+1 0 0 0 0 1 4 5 42010405
+1 0 0 0 0 1 5 5 42010505
+1 0 0 0 0 1 6 5 42010605
+1 0 0 0 0 1 7 5 42010705
+1 0 0 0 0 1 8 5 42010805
+1 0 0 0 0 1 9 5 42010905
+
+
diff --git a/CarpetAttic/Cart3dTest/test/axial/fxy.zl b/CarpetAttic/Cart3dTest/test/axial/fxy.zl
index 82154e0dd..3d7460b4b 100644
--- a/CarpetAttic/Cart3dTest/test/axial/fxy.zl
+++ b/CarpetAttic/Cart3dTest/test/axial/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 2 2 0 42010100
-0 0 0 0 0 2 2 2 42010101
-0 0 0 0 0 2 2 4 42010102
-0 0 0 0 0 2 2 6 42010103
-0 0 0 0 0 2 2 8 42010104
-0 0 0 0 0 2 2 10 42010105
-0 0 0 0 0 2 2 12 42010106
-0 0 0 0 0 2 2 14 42010107
-0 0 0 0 0 2 2 16 42010108
-0 0 0 0 0 2 2 18 42010109
+0 0 0 0 0 1 1 0 42010100
+0 0 0 0 0 1 1 1 42010101
+0 0 0 0 0 1 1 2 42010102
+0 0 0 0 0 1 1 3 42010103
+0 0 0 0 0 1 1 4 42010104
+0 0 0 0 0 1 1 5 42010105
+0 0 0 0 0 1 1 6 42010106
+0 0 0 0 0 1 1 7 42010107
+0 0 0 0 0 1 1 8 42010108
+0 0 0 0 0 1 1 9 42010109
+
+
-#
# 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 2 2 0 42010100
-1 0 0 0 0 2 2 2 42010101
-1 0 0 0 0 2 2 4 42010102
-1 0 0 0 0 2 2 6 42010103
-1 0 0 0 0 2 2 8 42010104
-1 0 0 0 0 2 2 10 42010105
-1 0 0 0 0 2 2 12 42010106
-1 0 0 0 0 2 2 14 42010107
-1 0 0 0 0 2 2 16 42010108
-1 0 0 0 0 2 2 18 42010109
+1 0 0 0 0 1 1 0 42010100
+1 0 0 0 0 1 1 1 42010101
+1 0 0 0 0 1 1 2 42010102
+1 0 0 0 0 1 1 3 42010103
+1 0 0 0 0 1 1 4 42010104
+1 0 0 0 0 1 1 5 42010105
+1 0 0 0 0 1 1 6 42010106
+1 0 0 0 0 1 1 7 42010107
+1 0 0 0 0 1 1 8 42010108
+1 0 0 0 0 1 1 9 42010109
+
+
diff --git a/CarpetAttic/Cart3dTest/test/axial/fxz.xl b/CarpetAttic/Cart3dTest/test/axial/fxz.xl
index 78fe1c3ca..b0adf78ed 100644
--- a/CarpetAttic/Cart3dTest/test/axial/fxz.xl
+++ b/CarpetAttic/Cart3dTest/test/axial/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 -46010105
-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 -46010105
+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/fxz.yl b/CarpetAttic/Cart3dTest/test/axial/fxz.yl
index f8538c146..39dd69e69 100644
--- a/CarpetAttic/Cart3dTest/test/axial/fxz.yl
+++ b/CarpetAttic/Cart3dTest/test/axial/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 2 0 10 43010005
-0 0 0 0 0 2 2 10 43010105
-0 0 0 0 0 2 4 10 43010205
-0 0 0 0 0 2 6 10 43010305
-0 0 0 0 0 2 8 10 43010405
-0 0 0 0 0 2 10 10 43010505
-0 0 0 0 0 2 12 10 43010605
-0 0 0 0 0 2 14 10 43010705
-0 0 0 0 0 2 16 10 43010805
-0 0 0 0 0 2 18 10 43010905
+0 0 0 0 0 1 0 5 43010005
+0 0 0 0 0 1 1 5 43010105
+0 0 0 0 0 1 2 5 43010205
+0 0 0 0 0 1 3 5 43010305
+0 0 0 0 0 1 4 5 43010405
+0 0 0 0 0 1 5 5 43010505
+0 0 0 0 0 1 6 5 43010605
+0 0 0 0 0 1 7 5 43010705
+0 0 0 0 0 1 8 5 43010805
+0 0 0 0 0 1 9 5 43010905
+
+
-#
# 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 2 0 10 46010105
-1 0 0 0 0 2 2 10 43010105
-1 0 0 0 0 2 4 10 43010205
-1 0 0 0 0 2 6 10 43010305
-1 0 0 0 0 2 8 10 43010405
-1 0 0 0 0 2 10 10 43010505
-1 0 0 0 0 2 12 10 43010605
-1 0 0 0 0 2 14 10 43010705
-1 0 0 0 0 2 16 10 43010805
-1 0 0 0 0 2 18 10 43010905
+1 0 0 0 0 1 0 5 46010105
+1 0 0 0 0 1 1 5 43010105
+1 0 0 0 0 1 2 5 43010205
+1 0 0 0 0 1 3 5 43010305
+1 0 0 0 0 1 4 5 43010405
+1 0 0 0 0 1 5 5 43010505
+1 0 0 0 0 1 6 5 43010605
+1 0 0 0 0 1 7 5 43010705
+1 0 0 0 0 1 8 5 43010805
+1 0 0 0 0 1 9 5 43010905
+
+
diff --git a/CarpetAttic/Cart3dTest/test/axial/fxz.zl b/CarpetAttic/Cart3dTest/test/axial/fxz.zl
index c23a541de..737ebb3c7 100644
--- a/CarpetAttic/Cart3dTest/test/axial/fxz.zl
+++ b/CarpetAttic/Cart3dTest/test/axial/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 2 2 0 43010100
-0 0 0 0 0 2 2 2 43010101
-0 0 0 0 0 2 2 4 43010102
-0 0 0 0 0 2 2 6 43010103
-0 0 0 0 0 2 2 8 43010104
-0 0 0 0 0 2 2 10 43010105
-0 0 0 0 0 2 2 12 43010106
-0 0 0 0 0 2 2 14 43010107
-0 0 0 0 0 2 2 16 43010108
-0 0 0 0 0 2 2 18 43010109
+0 0 0 0 0 1 1 0 43010100
+0 0 0 0 0 1 1 1 43010101
+0 0 0 0 0 1 1 2 43010102
+0 0 0 0 0 1 1 3 43010103
+0 0 0 0 0 1 1 4 43010104
+0 0 0 0 0 1 1 5 43010105
+0 0 0 0 0 1 1 6 43010106
+0 0 0 0 0 1 1 7 43010107
+0 0 0 0 0 1 1 8 43010108
+0 0 0 0 0 1 1 9 43010109
+
+
-#
# 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 2 2 0 43010100
-1 0 0 0 0 2 2 2 43010101
-1 0 0 0 0 2 2 4 43010102
-1 0 0 0 0 2 2 6 43010103
-1 0 0 0 0 2 2 8 43010104
-1 0 0 0 0 2 2 10 43010105
-1 0 0 0 0 2 2 12 43010106
-1 0 0 0 0 2 2 14 43010107
-1 0 0 0 0 2 2 16 43010108
-1 0 0 0 0 2 2 18 43010109
+1 0 0 0 0 1 1 0 43010100
+1 0 0 0 0 1 1 1 43010101
+1 0 0 0 0 1 1 2 43010102
+1 0 0 0 0 1 1 3 43010103
+1 0 0 0 0 1 1 4 43010104
+1 0 0 0 0 1 1 5 43010105
+1 0 0 0 0 1 1 6 43010106
+1 0 0 0 0 1 1 7 43010107
+1 0 0 0 0 1 1 8 43010108
+1 0 0 0 0 1 1 9 43010109
+
+
diff --git a/CarpetAttic/Cart3dTest/test/axial/fyx.xl b/CarpetAttic/Cart3dTest/test/axial/fyx.xl
index b2390f765..a0119eed8 100644
--- a/CarpetAttic/Cart3dTest/test/axial/fyx.xl
+++ b/CarpetAttic/Cart3dTest/test/axial/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 -42010105
-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 -42010105
+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/fyx.yl b/CarpetAttic/Cart3dTest/test/axial/fyx.yl
index e51b4a828..6e88a9f25 100644
--- a/CarpetAttic/Cart3dTest/test/axial/fyx.yl
+++ b/CarpetAttic/Cart3dTest/test/axial/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 2 0 10 44010005
-0 0 0 0 0 2 2 10 44010105
-0 0 0 0 0 2 4 10 44010205
-0 0 0 0 0 2 6 10 44010305
-0 0 0 0 0 2 8 10 44010405
-0 0 0 0 0 2 10 10 44010505
-0 0 0 0 0 2 12 10 44010605
-0 0 0 0 0 2 14 10 44010705
-0 0 0 0 0 2 16 10 44010805
-0 0 0 0 0 2 18 10 44010905
+0 0 0 0 0 1 0 5 44010005
+0 0 0 0 0 1 1 5 44010105
+0 0 0 0 0 1 2 5 44010205
+0 0 0 0 0 1 3 5 44010305
+0 0 0 0 0 1 4 5 44010405
+0 0 0 0 0 1 5 5 44010505
+0 0 0 0 0 1 6 5 44010605
+0 0 0 0 0 1 7 5 44010705
+0 0 0 0 0 1 8 5 44010805
+0 0 0 0 0 1 9 5 44010905
+
+
-#
# 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 2 0 10 -42010105
-1 0 0 0 0 2 2 10 44010105
-1 0 0 0 0 2 4 10 44010205
-1 0 0 0 0 2 6 10 44010305
-1 0 0 0 0 2 8 10 44010405
-1 0 0 0 0 2 10 10 44010505
-1 0 0 0 0 2 12 10 44010605
-1 0 0 0 0 2 14 10 44010705
-1 0 0 0 0 2 16 10 44010805
-1 0 0 0 0 2 18 10 44010905
+1 0 0 0 0 1 0 5 -42010105
+1 0 0 0 0 1 1 5 44010105
+1 0 0 0 0 1 2 5 44010205
+1 0 0 0 0 1 3 5 44010305
+1 0 0 0 0 1 4 5 44010405
+1 0 0 0 0 1 5 5 44010505
+1 0 0 0 0 1 6 5 44010605
+1 0 0 0 0 1 7 5 44010705
+1 0 0 0 0 1 8 5 44010805
+1 0 0 0 0 1 9 5 44010905
+
+
diff --git a/CarpetAttic/Cart3dTest/test/axial/fyx.zl b/CarpetAttic/Cart3dTest/test/axial/fyx.zl
index 94974c9dc..aac384030 100644
--- a/CarpetAttic/Cart3dTest/test/axial/fyx.zl
+++ b/CarpetAttic/Cart3dTest/test/axial/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 2 2 0 44010100
-0 0 0 0 0 2 2 2 44010101
-0 0 0 0 0 2 2 4 44010102
-0 0 0 0 0 2 2 6 44010103
-0 0 0 0 0 2 2 8 44010104
-0 0 0 0 0 2 2 10 44010105
-0 0 0 0 0 2 2 12 44010106
-0 0 0 0 0 2 2 14 44010107
-0 0 0 0 0 2 2 16 44010108
-0 0 0 0 0 2 2 18 44010109
+0 0 0 0 0 1 1 0 44010100
+0 0 0 0 0 1 1 1 44010101
+0 0 0 0 0 1 1 2 44010102
+0 0 0 0 0 1 1 3 44010103
+0 0 0 0 0 1 1 4 44010104
+0 0 0 0 0 1 1 5 44010105
+0 0 0 0 0 1 1 6 44010106
+0 0 0 0 0 1 1 7 44010107
+0 0 0 0 0 1 1 8 44010108
+0 0 0 0 0 1 1 9 44010109
+
+
-#
# 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 2 2 0 44010100
-1 0 0 0 0 2 2 2 44010101
-1 0 0 0 0 2 2 4 44010102
-1 0 0 0 0 2 2 6 44010103
-1 0 0 0 0 2 2 8 44010104
-1 0 0 0 0 2 2 10 44010105
-1 0 0 0 0 2 2 12 44010106
-1 0 0 0 0 2 2 14 44010107
-1 0 0 0 0 2 2 16 44010108
-1 0 0 0 0 2 2 18 44010109
+1 0 0 0 0 1 1 0 44010100
+1 0 0 0 0 1 1 1 44010101
+1 0 0 0 0 1 1 2 44010102
+1 0 0 0 0 1 1 3 44010103
+1 0 0 0 0 1 1 4 44010104
+1 0 0 0 0 1 1 5 44010105
+1 0 0 0 0 1 1 6 44010106
+1 0 0 0 0 1 1 7 44010107
+1 0 0 0 0 1 1 8 44010108
+1 0 0 0 0 1 1 9 44010109
+
+
diff --git a/CarpetAttic/Cart3dTest/test/axial/fyy.xl b/CarpetAttic/Cart3dTest/test/axial/fyy.xl
index 168702cc0..dc7e89b52 100644
--- a/CarpetAttic/Cart3dTest/test/axial/fyy.xl
+++ b/CarpetAttic/Cart3dTest/test/axial/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 41010105
-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 41010105
+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/fyy.yl b/CarpetAttic/Cart3dTest/test/axial/fyy.yl
index b036fd54d..37f4b855e 100644
--- a/CarpetAttic/Cart3dTest/test/axial/fyy.yl
+++ b/CarpetAttic/Cart3dTest/test/axial/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 2 0 10 45010005
-0 0 0 0 0 2 2 10 45010105
-0 0 0 0 0 2 4 10 45010205
-0 0 0 0 0 2 6 10 45010305
-0 0 0 0 0 2 8 10 45010405
-0 0 0 0 0 2 10 10 45010505
-0 0 0 0 0 2 12 10 45010605
-0 0 0 0 0 2 14 10 45010705
-0 0 0 0 0 2 16 10 45010805
-0 0 0 0 0 2 18 10 45010905
+0 0 0 0 0 1 0 5 45010005
+0 0 0 0 0 1 1 5 45010105
+0 0 0 0 0 1 2 5 45010205
+0 0 0 0 0 1 3 5 45010305
+0 0 0 0 0 1 4 5 45010405
+0 0 0 0 0 1 5 5 45010505
+0 0 0 0 0 1 6 5 45010605
+0 0 0 0 0 1 7 5 45010705
+0 0 0 0 0 1 8 5 45010805
+0 0 0 0 0 1 9 5 45010905
+
+
-#
# 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 2 0 10 41010105
-1 0 0 0 0 2 2 10 45010105
-1 0 0 0 0 2 4 10 45010205
-1 0 0 0 0 2 6 10 45010305
-1 0 0 0 0 2 8 10 45010405
-1 0 0 0 0 2 10 10 45010505
-1 0 0 0 0 2 12 10 45010605
-1 0 0 0 0 2 14 10 45010705
-1 0 0 0 0 2 16 10 45010805
-1 0 0 0 0 2 18 10 45010905
+1 0 0 0 0 1 0 5 41010105
+1 0 0 0 0 1 1 5 45010105
+1 0 0 0 0 1 2 5 45010205
+1 0 0 0 0 1 3 5 45010305
+1 0 0 0 0 1 4 5 45010405
+1 0 0 0 0 1 5 5 45010505
+1 0 0 0 0 1 6 5 45010605
+1 0 0 0 0 1 7 5 45010705
+1 0 0 0 0 1 8 5 45010805
+1 0 0 0 0 1 9 5 45010905
+
+
diff --git a/CarpetAttic/Cart3dTest/test/axial/fyy.zl b/CarpetAttic/Cart3dTest/test/axial/fyy.zl
index a370cda0b..e0f198dc3 100644
--- a/CarpetAttic/Cart3dTest/test/axial/fyy.zl
+++ b/CarpetAttic/Cart3dTest/test/axial/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 2 2 0 45010100
-0 0 0 0 0 2 2 2 45010101
-0 0 0 0 0 2 2 4 45010102
-0 0 0 0 0 2 2 6 45010103
-0 0 0 0 0 2 2 8 45010104
-0 0 0 0 0 2 2 10 45010105
-0 0 0 0 0 2 2 12 45010106
-0 0 0 0 0 2 2 14 45010107
-0 0 0 0 0 2 2 16 45010108
-0 0 0 0 0 2 2 18 45010109
+0 0 0 0 0 1 1 0 45010100
+0 0 0 0 0 1 1 1 45010101
+0 0 0 0 0 1 1 2 45010102
+0 0 0 0 0 1 1 3 45010103
+0 0 0 0 0 1 1 4 45010104
+0 0 0 0 0 1 1 5 45010105
+0 0 0 0 0 1 1 6 45010106
+0 0 0 0 0 1 1 7 45010107
+0 0 0 0 0 1 1 8 45010108
+0 0 0 0 0 1 1 9 45010109
+
+
-#
# 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 2 2 0 45010100
-1 0 0 0 0 2 2 2 45010101
-1 0 0 0 0 2 2 4 45010102
-1 0 0 0 0 2 2 6 45010103
-1 0 0 0 0 2 2 8 45010104
-1 0 0 0 0 2 2 10 45010105
-1 0 0 0 0 2 2 12 45010106
-1 0 0 0 0 2 2 14 45010107
-1 0 0 0 0 2 2 16 45010108
-1 0 0 0 0 2 2 18 45010109
+1 0 0 0 0 1 1 0 45010100
+1 0 0 0 0 1 1 1 45010101
+1 0 0 0 0 1 1 2 45010102
+1 0 0 0 0 1 1 3 45010103
+1 0 0 0 0 1 1 4 45010104
+1 0 0 0 0 1 1 5 45010105
+1 0 0 0 0 1 1 6 45010106
+1 0 0 0 0 1 1 7 45010107
+1 0 0 0 0 1 1 8 45010108
+1 0 0 0 0 1 1 9 45010109
+
+
diff --git a/CarpetAttic/Cart3dTest/test/axial/fyz.xl b/CarpetAttic/Cart3dTest/test/axial/fyz.xl
index 2b44fe923..a1bad1e9d 100644
--- a/CarpetAttic/Cart3dTest/test/axial/fyz.xl
+++ b/CarpetAttic/Cart3dTest/test/axial/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 43010105
-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 43010105
+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/fyz.yl b/CarpetAttic/Cart3dTest/test/axial/fyz.yl
index 11b39a77b..9fbf16adf 100644
--- a/CarpetAttic/Cart3dTest/test/axial/fyz.yl
+++ b/CarpetAttic/Cart3dTest/test/axial/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 2 0 10 46010005
-0 0 0 0 0 2 2 10 46010105
-0 0 0 0 0 2 4 10 46010205
-0 0 0 0 0 2 6 10 46010305
-0 0 0 0 0 2 8 10 46010405
-0 0 0 0 0 2 10 10 46010505
-0 0 0 0 0 2 12 10 46010605
-0 0 0 0 0 2 14 10 46010705
-0 0 0 0 0 2 16 10 46010805
-0 0 0 0 0 2 18 10 46010905
+0 0 0 0 0 1 0 5 46010005
+0 0 0 0 0 1 1 5 46010105
+0 0 0 0 0 1 2 5 46010205
+0 0 0 0 0 1 3 5 46010305
+0 0 0 0 0 1 4 5 46010405
+0 0 0 0 0 1 5 5 46010505
+0 0 0 0 0 1 6 5 46010605
+0 0 0 0 0 1 7 5 46010705
+0 0 0 0 0 1 8 5 46010805
+0 0 0 0 0 1 9 5 46010905
+
+
-#
# 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 2 0 10 -43010105
-1 0 0 0 0 2 2 10 46010105
-1 0 0 0 0 2 4 10 46010205
-1 0 0 0 0 2 6 10 46010305
-1 0 0 0 0 2 8 10 46010405
-1 0 0 0 0 2 10 10 46010505
-1 0 0 0 0 2 12 10 46010605
-1 0 0 0 0 2 14 10 46010705
-1 0 0 0 0 2 16 10 46010805
-1 0 0 0 0 2 18 10 46010905
+1 0 0 0 0 1 0 5 -43010105
+1 0 0 0 0 1 1 5 46010105
+1 0 0 0 0 1 2 5 46010205
+1 0 0 0 0 1 3 5 46010305
+1 0 0 0 0 1 4 5 46010405
+1 0 0 0 0 1 5 5 46010505
+1 0 0 0 0 1 6 5 46010605
+1 0 0 0 0 1 7 5 46010705
+1 0 0 0 0 1 8 5 46010805
+1 0 0 0 0 1 9 5 46010905
+
+
diff --git a/CarpetAttic/Cart3dTest/test/axial/fyz.zl b/CarpetAttic/Cart3dTest/test/axial/fyz.zl
index ea530c4df..8278a5c90 100644
--- a/CarpetAttic/Cart3dTest/test/axial/fyz.zl
+++ b/CarpetAttic/Cart3dTest/test/axial/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 2 2 0 46010100
-0 0 0 0 0 2 2 2 46010101
-0 0 0 0 0 2 2 4 46010102
-0 0 0 0 0 2 2 6 46010103
-0 0 0 0 0 2 2 8 46010104
-0 0 0 0 0 2 2 10 46010105
-0 0 0 0 0 2 2 12 46010106
-0 0 0 0 0 2 2 14 46010107
-0 0 0 0 0 2 2 16 46010108
-0 0 0 0 0 2 2 18 46010109
+0 0 0 0 0 1 1 0 46010100
+0 0 0 0 0 1 1 1 46010101
+0 0 0 0 0 1 1 2 46010102
+0 0 0 0 0 1 1 3 46010103
+0 0 0 0 0 1 1 4 46010104
+0 0 0 0 0 1 1 5 46010105
+0 0 0 0 0 1 1 6 46010106
+0 0 0 0 0 1 1 7 46010107
+0 0 0 0 0 1 1 8 46010108
+0 0 0 0 0 1 1 9 46010109
+
+
-#
# 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 2 2 0 46010100
-1 0 0 0 0 2 2 2 46010101
-1 0 0 0 0 2 2 4 46010102
-1 0 0 0 0 2 2 6 46010103
-1 0 0 0 0 2 2 8 46010104
-1 0 0 0 0 2 2 10 46010105
-1 0 0 0 0 2 2 12 46010106
-1 0 0 0 0 2 2 14 46010107
-1 0 0 0 0 2 2 16 46010108
-1 0 0 0 0 2 2 18 46010109
+1 0 0 0 0 1 1 0 46010100
+1 0 0 0 0 1 1 1 46010101
+1 0 0 0 0 1 1 2 46010102
+1 0 0 0 0 1 1 3 46010103
+1 0 0 0 0 1 1 4 46010104
+1 0 0 0 0 1 1 5 46010105
+1 0 0 0 0 1 1 6 46010106
+1 0 0 0 0 1 1 7 46010107
+1 0 0 0 0 1 1 8 46010108
+1 0 0 0 0 1 1 9 46010109
+
+
diff --git a/CarpetAttic/Cart3dTest/test/axial/fzx.xl b/CarpetAttic/Cart3dTest/test/axial/fzx.xl
index 8bdfdff22..83c842bbf 100644
--- a/CarpetAttic/Cart3dTest/test/axial/fzx.xl
+++ b/CarpetAttic/Cart3dTest/test/axial/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 -48010105
-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 -48010105
+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/fzx.yl b/CarpetAttic/Cart3dTest/test/axial/fzx.yl
index 0715d49ca..b20bbcd21 100644
--- a/CarpetAttic/Cart3dTest/test/axial/fzx.yl
+++ b/CarpetAttic/Cart3dTest/test/axial/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 2 0 10 47010005
-0 0 0 0 0 2 2 10 47010105
-0 0 0 0 0 2 4 10 47010205
-0 0 0 0 0 2 6 10 47010305
-0 0 0 0 0 2 8 10 47010405
-0 0 0 0 0 2 10 10 47010505
-0 0 0 0 0 2 12 10 47010605
-0 0 0 0 0 2 14 10 47010705
-0 0 0 0 0 2 16 10 47010805
-0 0 0 0 0 2 18 10 47010905
+0 0 0 0 0 1 0 5 47010005
+0 0 0 0 0 1 1 5 47010105
+0 0 0 0 0 1 2 5 47010205
+0 0 0 0 0 1 3 5 47010305
+0 0 0 0 0 1 4 5 47010405
+0 0 0 0 0 1 5 5 47010505
+0 0 0 0 0 1 6 5 47010605
+0 0 0 0 0 1 7 5 47010705
+0 0 0 0 0 1 8 5 47010805
+0 0 0 0 0 1 9 5 47010905
+
+
-#
# 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 2 0 10 48010105
-1 0 0 0 0 2 2 10 47010105
-1 0 0 0 0 2 4 10 47010205
-1 0 0 0 0 2 6 10 47010305
-1 0 0 0 0 2 8 10 47010405
-1 0 0 0 0 2 10 10 47010505
-1 0 0 0 0 2 12 10 47010605
-1 0 0 0 0 2 14 10 47010705
-1 0 0 0 0 2 16 10 47010805
-1 0 0 0 0 2 18 10 47010905
+1 0 0 0 0 1 0 5 48010105
+1 0 0 0 0 1 1 5 47010105
+1 0 0 0 0 1 2 5 47010205
+1 0 0 0 0 1 3 5 47010305
+1 0 0 0 0 1 4 5 47010405
+1 0 0 0 0 1 5 5 47010505
+1 0 0 0 0 1 6 5 47010605
+1 0 0 0 0 1 7 5 47010705
+1 0 0 0 0 1 8 5 47010805
+1 0 0 0 0 1 9 5 47010905
+
+
diff --git a/CarpetAttic/Cart3dTest/test/axial/fzx.zl b/CarpetAttic/Cart3dTest/test/axial/fzx.zl
index f62f874f4..754e781d3 100644
--- a/CarpetAttic/Cart3dTest/test/axial/fzx.zl
+++ b/CarpetAttic/Cart3dTest/test/axial/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 2 2 0 47010100
-0 0 0 0 0 2 2 2 47010101
-0 0 0 0 0 2 2 4 47010102
-0 0 0 0 0 2 2 6 47010103
-0 0 0 0 0 2 2 8 47010104
-0 0 0 0 0 2 2 10 47010105
-0 0 0 0 0 2 2 12 47010106
-0 0 0 0 0 2 2 14 47010107
-0 0 0 0 0 2 2 16 47010108
-0 0 0 0 0 2 2 18 47010109
+0 0 0 0 0 1 1 0 47010100
+0 0 0 0 0 1 1 1 47010101
+0 0 0 0 0 1 1 2 47010102
+0 0 0 0 0 1 1 3 47010103
+0 0 0 0 0 1 1 4 47010104
+0 0 0 0 0 1 1 5 47010105
+0 0 0 0 0 1 1 6 47010106
+0 0 0 0 0 1 1 7 47010107
+0 0 0 0 0 1 1 8 47010108
+0 0 0 0 0 1 1 9 47010109
+
+
-#
# 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 2 2 0 47010100
-1 0 0 0 0 2 2 2 47010101
-1 0 0 0 0 2 2 4 47010102
-1 0 0 0 0 2 2 6 47010103
-1 0 0 0 0 2 2 8 47010104
-1 0 0 0 0 2 2 10 47010105
-1 0 0 0 0 2 2 12 47010106
-1 0 0 0 0 2 2 14 47010107
-1 0 0 0 0 2 2 16 47010108
-1 0 0 0 0 2 2 18 47010109
+1 0 0 0 0 1 1 0 47010100
+1 0 0 0 0 1 1 1 47010101
+1 0 0 0 0 1 1 2 47010102
+1 0 0 0 0 1 1 3 47010103
+1 0 0 0 0 1 1 4 47010104
+1 0 0 0 0 1 1 5 47010105
+1 0 0 0 0 1 1 6 47010106
+1 0 0 0 0 1 1 7 47010107
+1 0 0 0 0 1 1 8 47010108
+1 0 0 0 0 1 1 9 47010109
+
+
diff --git a/CarpetAttic/Cart3dTest/test/axial/fzy.xl b/CarpetAttic/Cart3dTest/test/axial/fzy.xl
index a68524c43..d35a45ec5 100644
--- a/CarpetAttic/Cart3dTest/test/axial/fzy.xl
+++ b/CarpetAttic/Cart3dTest/test/axial/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 47010105
-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 47010105
+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/fzy.yl b/CarpetAttic/Cart3dTest/test/axial/fzy.yl
index e9a1664e7..882a7e3da 100644
--- a/CarpetAttic/Cart3dTest/test/axial/fzy.yl
+++ b/CarpetAttic/Cart3dTest/test/axial/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 2 0 10 48010005
-0 0 0 0 0 2 2 10 48010105
-0 0 0 0 0 2 4 10 48010205
-0 0 0 0 0 2 6 10 48010305
-0 0 0 0 0 2 8 10 48010405
-0 0 0 0 0 2 10 10 48010505
-0 0 0 0 0 2 12 10 48010605
-0 0 0 0 0 2 14 10 48010705
-0 0 0 0 0 2 16 10 48010805
-0 0 0 0 0 2 18 10 48010905
+0 0 0 0 0 1 0 5 48010005
+0 0 0 0 0 1 1 5 48010105
+0 0 0 0 0 1 2 5 48010205
+0 0 0 0 0 1 3 5 48010305
+0 0 0 0 0 1 4 5 48010405
+0 0 0 0 0 1 5 5 48010505
+0 0 0 0 0 1 6 5 48010605
+0 0 0 0 0 1 7 5 48010705
+0 0 0 0 0 1 8 5 48010805
+0 0 0 0 0 1 9 5 48010905
+
+
-#
# 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 2 0 10 -47010105
-1 0 0 0 0 2 2 10 48010105
-1 0 0 0 0 2 4 10 48010205
-1 0 0 0 0 2 6 10 48010305
-1 0 0 0 0 2 8 10 48010405
-1 0 0 0 0 2 10 10 48010505
-1 0 0 0 0 2 12 10 48010605
-1 0 0 0 0 2 14 10 48010705
-1 0 0 0 0 2 16 10 48010805
-1 0 0 0 0 2 18 10 48010905
+1 0 0 0 0 1 0 5 -47010105
+1 0 0 0 0 1 1 5 48010105
+1 0 0 0 0 1 2 5 48010205
+1 0 0 0 0 1 3 5 48010305
+1 0 0 0 0 1 4 5 48010405
+1 0 0 0 0 1 5 5 48010505
+1 0 0 0 0 1 6 5 48010605
+1 0 0 0 0 1 7 5 48010705
+1 0 0 0 0 1 8 5 48010805
+1 0 0 0 0 1 9 5 48010905
+
+
diff --git a/CarpetAttic/Cart3dTest/test/axial/fzy.zl b/CarpetAttic/Cart3dTest/test/axial/fzy.zl
index 75e15acb2..797b88129 100644
--- a/CarpetAttic/Cart3dTest/test/axial/fzy.zl
+++ b/CarpetAttic/Cart3dTest/test/axial/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 2 2 0 48010100
-0 0 0 0 0 2 2 2 48010101
-0 0 0 0 0 2 2 4 48010102
-0 0 0 0 0 2 2 6 48010103
-0 0 0 0 0 2 2 8 48010104
-0 0 0 0 0 2 2 10 48010105
-0 0 0 0 0 2 2 12 48010106
-0 0 0 0 0 2 2 14 48010107
-0 0 0 0 0 2 2 16 48010108
-0 0 0 0 0 2 2 18 48010109
+0 0 0 0 0 1 1 0 48010100
+0 0 0 0 0 1 1 1 48010101
+0 0 0 0 0 1 1 2 48010102
+0 0 0 0 0 1 1 3 48010103
+0 0 0 0 0 1 1 4 48010104
+0 0 0 0 0 1 1 5 48010105
+0 0 0 0 0 1 1 6 48010106
+0 0 0 0 0 1 1 7 48010107
+0 0 0 0 0 1 1 8 48010108
+0 0 0 0 0 1 1 9 48010109
+
+
-#
# 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 2 2 0 48010100
-1 0 0 0 0 2 2 2 48010101
-1 0 0 0 0 2 2 4 48010102
-1 0 0 0 0 2 2 6 48010103
-1 0 0 0 0 2 2 8 48010104
-1 0 0 0 0 2 2 10 48010105
-1 0 0 0 0 2 2 12 48010106
-1 0 0 0 0 2 2 14 48010107
-1 0 0 0 0 2 2 16 48010108
-1 0 0 0 0 2 2 18 48010109
+1 0 0 0 0 1 1 0 48010100
+1 0 0 0 0 1 1 1 48010101
+1 0 0 0 0 1 1 2 48010102
+1 0 0 0 0 1 1 3 48010103
+1 0 0 0 0 1 1 4 48010104
+1 0 0 0 0 1 1 5 48010105
+1 0 0 0 0 1 1 6 48010106
+1 0 0 0 0 1 1 7 48010107
+1 0 0 0 0 1 1 8 48010108
+1 0 0 0 0 1 1 9 48010109
+
+
diff --git a/CarpetAttic/Cart3dTest/test/axial/fzz.xl b/CarpetAttic/Cart3dTest/test/axial/fzz.xl
index e6f3cac08..2bee1adf5 100644
--- a/CarpetAttic/Cart3dTest/test/axial/fzz.xl
+++ b/CarpetAttic/Cart3dTest/test/axial/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 49010105
-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 49010105
+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/fzz.yl b/CarpetAttic/Cart3dTest/test/axial/fzz.yl
index a823fd0d3..64e1f44d3 100644
--- a/CarpetAttic/Cart3dTest/test/axial/fzz.yl
+++ b/CarpetAttic/Cart3dTest/test/axial/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 2 0 10 49010005
-0 0 0 0 0 2 2 10 49010105
-0 0 0 0 0 2 4 10 49010205
-0 0 0 0 0 2 6 10 49010305
-0 0 0 0 0 2 8 10 49010405
-0 0 0 0 0 2 10 10 49010505
-0 0 0 0 0 2 12 10 49010605
-0 0 0 0 0 2 14 10 49010705
-0 0 0 0 0 2 16 10 49010805
-0 0 0 0 0 2 18 10 49010905
+0 0 0 0 0 1 0 5 49010005
+0 0 0 0 0 1 1 5 49010105
+0 0 0 0 0 1 2 5 49010205
+0 0 0 0 0 1 3 5 49010305
+0 0 0 0 0 1 4 5 49010405
+0 0 0 0 0 1 5 5 49010505
+0 0 0 0 0 1 6 5 49010605
+0 0 0 0 0 1 7 5 49010705
+0 0 0 0 0 1 8 5 49010805
+0 0 0 0 0 1 9 5 49010905
+
+
-#
# 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 2 0 10 49010105
-1 0 0 0 0 2 2 10 49010105
-1 0 0 0 0 2 4 10 49010205
-1 0 0 0 0 2 6 10 49010305
-1 0 0 0 0 2 8 10 49010405
-1 0 0 0 0 2 10 10 49010505
-1 0 0 0 0 2 12 10 49010605
-1 0 0 0 0 2 14 10 49010705
-1 0 0 0 0 2 16 10 49010805
-1 0 0 0 0 2 18 10 49010905
+1 0 0 0 0 1 0 5 49010105
+1 0 0 0 0 1 1 5 49010105
+1 0 0 0 0 1 2 5 49010205
+1 0 0 0 0 1 3 5 49010305
+1 0 0 0 0 1 4 5 49010405
+1 0 0 0 0 1 5 5 49010505
+1 0 0 0 0 1 6 5 49010605
+1 0 0 0 0 1 7 5 49010705
+1 0 0 0 0 1 8 5 49010805
+1 0 0 0 0 1 9 5 49010905
+
+
diff --git a/CarpetAttic/Cart3dTest/test/axial/fzz.zl b/CarpetAttic/Cart3dTest/test/axial/fzz.zl
index 047b97960..7938772ff 100644
--- a/CarpetAttic/Cart3dTest/test/axial/fzz.zl
+++ b/CarpetAttic/Cart3dTest/test/axial/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 2 2 0 49010100
-0 0 0 0 0 2 2 2 49010101
-0 0 0 0 0 2 2 4 49010102
-0 0 0 0 0 2 2 6 49010103
-0 0 0 0 0 2 2 8 49010104
-0 0 0 0 0 2 2 10 49010105
-0 0 0 0 0 2 2 12 49010106
-0 0 0 0 0 2 2 14 49010107
-0 0 0 0 0 2 2 16 49010108
-0 0 0 0 0 2 2 18 49010109
+0 0 0 0 0 1 1 0 49010100
+0 0 0 0 0 1 1 1 49010101
+0 0 0 0 0 1 1 2 49010102
+0 0 0 0 0 1 1 3 49010103
+0 0 0 0 0 1 1 4 49010104
+0 0 0 0 0 1 1 5 49010105
+0 0 0 0 0 1 1 6 49010106
+0 0 0 0 0 1 1 7 49010107
+0 0 0 0 0 1 1 8 49010108
+0 0 0 0 0 1 1 9 49010109
+
+
-#
# 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 2 2 0 49010100
-1 0 0 0 0 2 2 2 49010101
-1 0 0 0 0 2 2 4 49010102
-1 0 0 0 0 2 2 6 49010103
-1 0 0 0 0 2 2 8 49010104
-1 0 0 0 0 2 2 10 49010105
-1 0 0 0 0 2 2 12 49010106
-1 0 0 0 0 2 2 14 49010107
-1 0 0 0 0 2 2 16 49010108
-1 0 0 0 0 2 2 18 49010109
+1 0 0 0 0 1 1 0 49010100
+1 0 0 0 0 1 1 1 49010101
+1 0 0 0 0 1 1 2 49010102
+1 0 0 0 0 1 1 3 49010103
+1 0 0 0 0 1 1 4 49010104
+1 0 0 0 0 1 1 5 49010105
+1 0 0 0 0 1 1 6 49010106
+1 0 0 0 0 1 1 7 49010107
+1 0 0 0 0 1 1 8 49010108
+1 0 0 0 0 1 1 9 49010109
+
+
diff --git a/CarpetAttic/Cart3dTest/test/axial/s.xl b/CarpetAttic/Cart3dTest/test/axial/s.xl
index a826e64df..6f44c81d5 100644
--- a/CarpetAttic/Cart3dTest/test/axial/s.xl
+++ b/CarpetAttic/Cart3dTest/test/axial/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 1010105
-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 1010105
+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/s.yl b/CarpetAttic/Cart3dTest/test/axial/s.yl
index cb41428dc..56b5a8a68 100644
--- a/CarpetAttic/Cart3dTest/test/axial/s.yl
+++ b/CarpetAttic/Cart3dTest/test/axial/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 2 0 10 1010005
-0 0 0 0 0 2 2 10 1010105
-0 0 0 0 0 2 4 10 1010205
-0 0 0 0 0 2 6 10 1010305
-0 0 0 0 0 2 8 10 1010405
-0 0 0 0 0 2 10 10 1010505
-0 0 0 0 0 2 12 10 1010605
-0 0 0 0 0 2 14 10 1010705
-0 0 0 0 0 2 16 10 1010805
-0 0 0 0 0 2 18 10 1010905
+0 0 0 0 0 1 0 5 1010005
+0 0 0 0 0 1 1 5 1010105
+0 0 0 0 0 1 2 5 1010205
+0 0 0 0 0 1 3 5 1010305
+0 0 0 0 0 1 4 5 1010405
+0 0 0 0 0 1 5 5 1010505
+0 0 0 0 0 1 6 5 1010605
+0 0 0 0 0 1 7 5 1010705
+0 0 0 0 0 1 8 5 1010805
+0 0 0 0 0 1 9 5 1010905
+
+
-#
# 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 2 0 10 1010105
-1 0 0 0 0 2 2 10 1010105
-1 0 0 0 0 2 4 10 1010205
-1 0 0 0 0 2 6 10 1010305
-1 0 0 0 0 2 8 10 1010405
-1 0 0 0 0 2 10 10 1010505
-1 0 0 0 0 2 12 10 1010605
-1 0 0 0 0 2 14 10 1010705
-1 0 0 0 0 2 16 10 1010805
-1 0 0 0 0 2 18 10 1010905
+1 0 0 0 0 1 0 5 1010105
+1 0 0 0 0 1 1 5 1010105
+1 0 0 0 0 1 2 5 1010205
+1 0 0 0 0 1 3 5 1010305
+1 0 0 0 0 1 4 5 1010405
+1 0 0 0 0 1 5 5 1010505
+1 0 0 0 0 1 6 5 1010605
+1 0 0 0 0 1 7 5 1010705
+1 0 0 0 0 1 8 5 1010805
+1 0 0 0 0 1 9 5 1010905
+
+
diff --git a/CarpetAttic/Cart3dTest/test/axial/s.zl b/CarpetAttic/Cart3dTest/test/axial/s.zl
index b46f8ab97..ecff867a9 100644
--- a/CarpetAttic/Cart3dTest/test/axial/s.zl
+++ b/CarpetAttic/Cart3dTest/test/axial/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 2 2 0 1010100
-0 0 0 0 0 2 2 2 1010101
-0 0 0 0 0 2 2 4 1010102
-0 0 0 0 0 2 2 6 1010103
-0 0 0 0 0 2 2 8 1010104
-0 0 0 0 0 2 2 10 1010105
-0 0 0 0 0 2 2 12 1010106
-0 0 0 0 0 2 2 14 1010107
-0 0 0 0 0 2 2 16 1010108
-0 0 0 0 0 2 2 18 1010109
+0 0 0 0 0 1 1 0 1010100
+0 0 0 0 0 1 1 1 1010101
+0 0 0 0 0 1 1 2 1010102
+0 0 0 0 0 1 1 3 1010103
+0 0 0 0 0 1 1 4 1010104
+0 0 0 0 0 1 1 5 1010105
+0 0 0 0 0 1 1 6 1010106
+0 0 0 0 0 1 1 7 1010107
+0 0 0 0 0 1 1 8 1010108
+0 0 0 0 0 1 1 9 1010109
+
+
-#
# 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 2 2 0 1010100
-1 0 0 0 0 2 2 2 1010101
-1 0 0 0 0 2 2 4 1010102
-1 0 0 0 0 2 2 6 1010103
-1 0 0 0 0 2 2 8 1010104
-1 0 0 0 0 2 2 10 1010105
-1 0 0 0 0 2 2 12 1010106
-1 0 0 0 0 2 2 14 1010107
-1 0 0 0 0 2 2 16 1010108
-1 0 0 0 0 2 2 18 1010109
+1 0 0 0 0 1 1 0 1010100
+1 0 0 0 0 1 1 1 1010101
+1 0 0 0 0 1 1 2 1010102
+1 0 0 0 0 1 1 3 1010103
+1 0 0 0 0 1 1 4 1010104
+1 0 0 0 0 1 1 5 1010105
+1 0 0 0 0 1 1 6 1010106
+1 0 0 0 0 1 1 7 1010107
+1 0 0 0 0 1 1 8 1010108
+1 0 0 0 0 1 1 9 1010109
+
+
diff --git a/CarpetAttic/Cart3dTest/test/axial/spher3d_r.xl b/CarpetAttic/Cart3dTest/test/axial/spher3d_r.xl
index 6c10636b9..06617f607 100644
--- a/CarpetAttic/Cart3dTest/test/axial/spher3d_r.xl
+++ b/CarpetAttic/Cart3dTest/test/axial/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.259807621135332
-0 0 0 0 0 4 2 10 0.49749371855331
-0 0 0 0 0 6 2 10 0.779422863405995
-0 0 0 0 0 8 2 10 1.07121426428143
-0 0 0 0 0 10 2 10 1.36656503687164
-0 0 0 0 0 12 2 10 1.66358047596141
-0 0 0 0 0 14 2 10 1.9615045245933
-0 0 0 0 0 16 2 10 2.2599778759979
-0 0 0 0 0 18 2 10 2.5588083163848
+0 0 0 0 0 0 1 5 0.259807621135332
+0 0 0 0 0 1 1 5 0.259807621135332
+0 0 0 0 0 2 1 5 0.49749371855331
+0 0 0 0 0 3 1 5 0.779422863405995
+0 0 0 0 0 4 1 5 1.07121426428143
+0 0 0 0 0 5 1 5 1.36656503687164
+0 0 0 0 0 6 1 5 1.66358047596141
+0 0 0 0 0 7 1 5 1.9615045245933
+0 0 0 0 0 8 1 5 2.2599778759979
+0 0 0 0 0 9 1 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 2 10 0.259807621135332
-1 0 0 0 0 2 2 10 0.259807621135332
-1 0 0 0 0 4 2 10 0.49749371855331
-1 0 0 0 0 6 2 10 0.779422863405995
-1 0 0 0 0 8 2 10 1.07121426428143
-1 0 0 0 0 10 2 10 1.36656503687164
-1 0 0 0 0 12 2 10 1.66358047596141
-1 0 0 0 0 14 2 10 1.9615045245933
-1 0 0 0 0 16 2 10 2.2599778759979
-1 0 0 0 0 18 2 10 2.5588083163848
+1 0 0 0 0 0 1 5 0.259807621135332
+1 0 0 0 0 1 1 5 0.259807621135332
+1 0 0 0 0 2 1 5 0.49749371855331
+1 0 0 0 0 3 1 5 0.779422863405995
+1 0 0 0 0 4 1 5 1.07121426428143
+1 0 0 0 0 5 1 5 1.36656503687164
+1 0 0 0 0 6 1 5 1.66358047596141
+1 0 0 0 0 7 1 5 1.9615045245933
+1 0 0 0 0 8 1 5 2.2599778759979
+1 0 0 0 0 9 1 5 2.5588083163848
+
+
diff --git a/CarpetAttic/Cart3dTest/test/axial/spher3d_r.yl b/CarpetAttic/Cart3dTest/test/axial/spher3d_r.yl
index feb0cd4a5..1330e241c 100644
--- a/CarpetAttic/Cart3dTest/test/axial/spher3d_r.yl
+++ b/CarpetAttic/Cart3dTest/test/axial/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 2 0 10 0.259807621135332
-0 0 0 0 0 2 2 10 0.259807621135332
-0 0 0 0 0 2 4 10 0.49749371855331
-0 0 0 0 0 2 6 10 0.779422863405995
-0 0 0 0 0 2 8 10 1.07121426428143
-0 0 0 0 0 2 10 10 1.36656503687164
-0 0 0 0 0 2 12 10 1.66358047596141
-0 0 0 0 0 2 14 10 1.9615045245933
-0 0 0 0 0 2 16 10 2.2599778759979
-0 0 0 0 0 2 18 10 2.5588083163848
+0 0 0 0 0 1 0 5 0.259807621135332
+0 0 0 0 0 1 1 5 0.259807621135332
+0 0 0 0 0 1 2 5 0.49749371855331
+0 0 0 0 0 1 3 5 0.779422863405995
+0 0 0 0 0 1 4 5 1.07121426428143
+0 0 0 0 0 1 5 5 1.36656503687164
+0 0 0 0 0 1 6 5 1.66358047596141
+0 0 0 0 0 1 7 5 1.9615045245933
+0 0 0 0 0 1 8 5 2.2599778759979
+0 0 0 0 0 1 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 2 0 10 0.259807621135332
-1 0 0 0 0 2 2 10 0.259807621135332
-1 0 0 0 0 2 4 10 0.49749371855331
-1 0 0 0 0 2 6 10 0.779422863405995
-1 0 0 0 0 2 8 10 1.07121426428143
-1 0 0 0 0 2 10 10 1.36656503687164
-1 0 0 0 0 2 12 10 1.66358047596141
-1 0 0 0 0 2 14 10 1.9615045245933
-1 0 0 0 0 2 16 10 2.2599778759979
-1 0 0 0 0 2 18 10 2.5588083163848
+1 0 0 0 0 1 0 5 0.259807621135332
+1 0 0 0 0 1 1 5 0.259807621135332
+1 0 0 0 0 1 2 5 0.49749371855331
+1 0 0 0 0 1 3 5 0.779422863405995
+1 0 0 0 0 1 4 5 1.07121426428143
+1 0 0 0 0 1 5 5 1.36656503687164
+1 0 0 0 0 1 6 5 1.66358047596141
+1 0 0 0 0 1 7 5 1.9615045245933
+1 0 0 0 0 1 8 5 2.2599778759979
+1 0 0 0 0 1 9 5 2.5588083163848
+
+
diff --git a/CarpetAttic/Cart3dTest/test/axial/spher3d_r.zl b/CarpetAttic/Cart3dTest/test/axial/spher3d_r.zl
index 48609f0e4..3d57bddf6 100644
--- a/CarpetAttic/Cart3dTest/test/axial/spher3d_r.zl
+++ b/CarpetAttic/Cart3dTest/test/axial/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 2 2 0 1.36656503687164
-0 0 0 0 0 2 2 2 1.07121426428143
-0 0 0 0 0 2 2 4 0.779422863405995
-0 0 0 0 0 2 2 6 0.49749371855331
-0 0 0 0 0 2 2 8 0.259807621135332
-0 0 0 0 0 2 2 10 0.259807621135332
-0 0 0 0 0 2 2 12 0.49749371855331
-0 0 0 0 0 2 2 14 0.779422863405995
-0 0 0 0 0 2 2 16 1.07121426428143
-0 0 0 0 0 2 2 18 1.36656503687164
+0 0 0 0 0 1 1 0 1.36656503687164
+0 0 0 0 0 1 1 1 1.07121426428143
+0 0 0 0 0 1 1 2 0.779422863405995
+0 0 0 0 0 1 1 3 0.49749371855331
+0 0 0 0 0 1 1 4 0.259807621135332
+0 0 0 0 0 1 1 5 0.259807621135332
+0 0 0 0 0 1 1 6 0.49749371855331
+0 0 0 0 0 1 1 7 0.779422863405995
+0 0 0 0 0 1 1 8 1.07121426428143
+0 0 0 0 0 1 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 2 2 0 1.36656503687164
-1 0 0 0 0 2 2 2 1.07121426428143
-1 0 0 0 0 2 2 4 0.779422863405995
-1 0 0 0 0 2 2 6 0.49749371855331
-1 0 0 0 0 2 2 8 0.259807621135332
-1 0 0 0 0 2 2 10 0.259807621135332
-1 0 0 0 0 2 2 12 0.49749371855331
-1 0 0 0 0 2 2 14 0.779422863405995
-1 0 0 0 0 2 2 16 1.07121426428143
-1 0 0 0 0 2 2 18 1.36656503687164
+1 0 0 0 0 1 1 0 1.36656503687164
+1 0 0 0 0 1 1 1 1.07121426428143
+1 0 0 0 0 1 1 2 0.779422863405995
+1 0 0 0 0 1 1 3 0.49749371855331
+1 0 0 0 0 1 1 4 0.259807621135332
+1 0 0 0 0 1 1 5 0.259807621135332
+1 0 0 0 0 1 1 6 0.49749371855331
+1 0 0 0 0 1 1 7 0.779422863405995
+1 0 0 0 0 1 1 8 1.07121426428143
+1 0 0 0 0 1 1 9 1.36656503687164
+
+
diff --git a/CarpetAttic/Cart3dTest/test/axial/txx.xl b/CarpetAttic/Cart3dTest/test/axial/txx.xl
index a19488338..5e0ce86aa 100644
--- a/CarpetAttic/Cart3dTest/test/axial/txx.xl
+++ b/CarpetAttic/Cart3dTest/test/axial/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 24010105
-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 24010105
+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/txx.yl b/CarpetAttic/Cart3dTest/test/axial/txx.yl
index 3cf792cc2..eaf0d1c4b 100644
--- a/CarpetAttic/Cart3dTest/test/axial/txx.yl
+++ b/CarpetAttic/Cart3dTest/test/axial/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 2 0 10 21010005
-0 0 0 0 0 2 2 10 21010105
-0 0 0 0 0 2 4 10 21010205
-0 0 0 0 0 2 6 10 21010305
-0 0 0 0 0 2 8 10 21010405
-0 0 0 0 0 2 10 10 21010505
-0 0 0 0 0 2 12 10 21010605
-0 0 0 0 0 2 14 10 21010705
-0 0 0 0 0 2 16 10 21010805
-0 0 0 0 0 2 18 10 21010905
+0 0 0 0 0 1 0 5 21010005
+0 0 0 0 0 1 1 5 21010105
+0 0 0 0 0 1 2 5 21010205
+0 0 0 0 0 1 3 5 21010305
+0 0 0 0 0 1 4 5 21010405
+0 0 0 0 0 1 5 5 21010505
+0 0 0 0 0 1 6 5 21010605
+0 0 0 0 0 1 7 5 21010705
+0 0 0 0 0 1 8 5 21010805
+0 0 0 0 0 1 9 5 21010905
+
+
-#
# 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 2 0 10 24010105
-1 0 0 0 0 2 2 10 21010105
-1 0 0 0 0 2 4 10 21010205
-1 0 0 0 0 2 6 10 21010305
-1 0 0 0 0 2 8 10 21010405
-1 0 0 0 0 2 10 10 21010505
-1 0 0 0 0 2 12 10 21010605
-1 0 0 0 0 2 14 10 21010705
-1 0 0 0 0 2 16 10 21010805
-1 0 0 0 0 2 18 10 21010905
+1 0 0 0 0 1 0 5 24010105
+1 0 0 0 0 1 1 5 21010105
+1 0 0 0 0 1 2 5 21010205
+1 0 0 0 0 1 3 5 21010305
+1 0 0 0 0 1 4 5 21010405
+1 0 0 0 0 1 5 5 21010505
+1 0 0 0 0 1 6 5 21010605
+1 0 0 0 0 1 7 5 21010705
+1 0 0 0 0 1 8 5 21010805
+1 0 0 0 0 1 9 5 21010905
+
+
diff --git a/CarpetAttic/Cart3dTest/test/axial/txx.zl b/CarpetAttic/Cart3dTest/test/axial/txx.zl
index f45cdcbbd..8b232a5d2 100644
--- a/CarpetAttic/Cart3dTest/test/axial/txx.zl
+++ b/CarpetAttic/Cart3dTest/test/axial/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 2 2 0 21010100
-0 0 0 0 0 2 2 2 21010101
-0 0 0 0 0 2 2 4 21010102
-0 0 0 0 0 2 2 6 21010103
-0 0 0 0 0 2 2 8 21010104
-0 0 0 0 0 2 2 10 21010105
-0 0 0 0 0 2 2 12 21010106
-0 0 0 0 0 2 2 14 21010107
-0 0 0 0 0 2 2 16 21010108
-0 0 0 0 0 2 2 18 21010109
+0 0 0 0 0 1 1 0 21010100
+0 0 0 0 0 1 1 1 21010101
+0 0 0 0 0 1 1 2 21010102
+0 0 0 0 0 1 1 3 21010103
+0 0 0 0 0 1 1 4 21010104
+0 0 0 0 0 1 1 5 21010105
+0 0 0 0 0 1 1 6 21010106
+0 0 0 0 0 1 1 7 21010107
+0 0 0 0 0 1 1 8 21010108
+0 0 0 0 0 1 1 9 21010109
+
+
-#
# 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 2 2 0 21010100
-1 0 0 0 0 2 2 2 21010101
-1 0 0 0 0 2 2 4 21010102
-1 0 0 0 0 2 2 6 21010103
-1 0 0 0 0 2 2 8 21010104
-1 0 0 0 0 2 2 10 21010105
-1 0 0 0 0 2 2 12 21010106
-1 0 0 0 0 2 2 14 21010107
-1 0 0 0 0 2 2 16 21010108
-1 0 0 0 0 2 2 18 21010109
+1 0 0 0 0 1 1 0 21010100
+1 0 0 0 0 1 1 1 21010101
+1 0 0 0 0 1 1 2 21010102
+1 0 0 0 0 1 1 3 21010103
+1 0 0 0 0 1 1 4 21010104
+1 0 0 0 0 1 1 5 21010105
+1 0 0 0 0 1 1 6 21010106
+1 0 0 0 0 1 1 7 21010107
+1 0 0 0 0 1 1 8 21010108
+1 0 0 0 0 1 1 9 21010109
+
+
diff --git a/CarpetAttic/Cart3dTest/test/axial/txy.xl b/CarpetAttic/Cart3dTest/test/axial/txy.xl
index 7662a27af..d5ab6c669 100644
--- a/CarpetAttic/Cart3dTest/test/axial/txy.xl
+++ b/CarpetAttic/Cart3dTest/test/axial/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 -22010105
-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 -22010105
+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/txy.yl b/CarpetAttic/Cart3dTest/test/axial/txy.yl
index 2aa98927f..39c046f5b 100644
--- a/CarpetAttic/Cart3dTest/test/axial/txy.yl
+++ b/CarpetAttic/Cart3dTest/test/axial/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 2 0 10 22010005
-0 0 0 0 0 2 2 10 22010105
-0 0 0 0 0 2 4 10 22010205
-0 0 0 0 0 2 6 10 22010305
-0 0 0 0 0 2 8 10 22010405
-0 0 0 0 0 2 10 10 22010505
-0 0 0 0 0 2 12 10 22010605
-0 0 0 0 0 2 14 10 22010705
-0 0 0 0 0 2 16 10 22010805
-0 0 0 0 0 2 18 10 22010905
+0 0 0 0 0 1 0 5 22010005
+0 0 0 0 0 1 1 5 22010105
+0 0 0 0 0 1 2 5 22010205
+0 0 0 0 0 1 3 5 22010305
+0 0 0 0 0 1 4 5 22010405
+0 0 0 0 0 1 5 5 22010505
+0 0 0 0 0 1 6 5 22010605
+0 0 0 0 0 1 7 5 22010705
+0 0 0 0 0 1 8 5 22010805
+0 0 0 0 0 1 9 5 22010905
+
+
-#
# 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 2 0 10 -22010105
-1 0 0 0 0 2 2 10 22010105
-1 0 0 0 0 2 4 10 22010205
-1 0 0 0 0 2 6 10 22010305
-1 0 0 0 0 2 8 10 22010405
-1 0 0 0 0 2 10 10 22010505
-1 0 0 0 0 2 12 10 22010605
-1 0 0 0 0 2 14 10 22010705
-1 0 0 0 0 2 16 10 22010805
-1 0 0 0 0 2 18 10 22010905
+1 0 0 0 0 1 0 5 -22010105
+1 0 0 0 0 1 1 5 22010105
+1 0 0 0 0 1 2 5 22010205
+1 0 0 0 0 1 3 5 22010305
+1 0 0 0 0 1 4 5 22010405
+1 0 0 0 0 1 5 5 22010505
+1 0 0 0 0 1 6 5 22010605
+1 0 0 0 0 1 7 5 22010705
+1 0 0 0 0 1 8 5 22010805
+1 0 0 0 0 1 9 5 22010905
+
+
diff --git a/CarpetAttic/Cart3dTest/test/axial/txy.zl b/CarpetAttic/Cart3dTest/test/axial/txy.zl
index 2a9d9eed1..088dc0f42 100644
--- a/CarpetAttic/Cart3dTest/test/axial/txy.zl
+++ b/CarpetAttic/Cart3dTest/test/axial/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 2 2 0 22010100
-0 0 0 0 0 2 2 2 22010101
-0 0 0 0 0 2 2 4 22010102
-0 0 0 0 0 2 2 6 22010103
-0 0 0 0 0 2 2 8 22010104
-0 0 0 0 0 2 2 10 22010105
-0 0 0 0 0 2 2 12 22010106
-0 0 0 0 0 2 2 14 22010107
-0 0 0 0 0 2 2 16 22010108
-0 0 0 0 0 2 2 18 22010109
+0 0 0 0 0 1 1 0 22010100
+0 0 0 0 0 1 1 1 22010101
+0 0 0 0 0 1 1 2 22010102
+0 0 0 0 0 1 1 3 22010103
+0 0 0 0 0 1 1 4 22010104
+0 0 0 0 0 1 1 5 22010105
+0 0 0 0 0 1 1 6 22010106
+0 0 0 0 0 1 1 7 22010107
+0 0 0 0 0 1 1 8 22010108
+0 0 0 0 0 1 1 9 22010109
+
+
-#
# 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 2 2 0 22010100
-1 0 0 0 0 2 2 2 22010101
-1 0 0 0 0 2 2 4 22010102
-1 0 0 0 0 2 2 6 22010103
-1 0 0 0 0 2 2 8 22010104
-1 0 0 0 0 2 2 10 22010105
-1 0 0 0 0 2 2 12 22010106
-1 0 0 0 0 2 2 14 22010107
-1 0 0 0 0 2 2 16 22010108
-1 0 0 0 0 2 2 18 22010109
+1 0 0 0 0 1 1 0 22010100
+1 0 0 0 0 1 1 1 22010101
+1 0 0 0 0 1 1 2 22010102
+1 0 0 0 0 1 1 3 22010103
+1 0 0 0 0 1 1 4 22010104
+1 0 0 0 0 1 1 5 22010105
+1 0 0 0 0 1 1 6 22010106
+1 0 0 0 0 1 1 7 22010107
+1 0 0 0 0 1 1 8 22010108
+1 0 0 0 0 1 1 9 22010109
+
+
diff --git a/CarpetAttic/Cart3dTest/test/axial/txz.xl b/CarpetAttic/Cart3dTest/test/axial/txz.xl
index 758062fc6..b169805c8 100644
--- a/CarpetAttic/Cart3dTest/test/axial/txz.xl
+++ b/CarpetAttic/Cart3dTest/test/axial/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 -25010105
-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 -25010105
+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/txz.yl b/CarpetAttic/Cart3dTest/test/axial/txz.yl
index c4d1ad903..4ca41bca3 100644
--- a/CarpetAttic/Cart3dTest/test/axial/txz.yl
+++ b/CarpetAttic/Cart3dTest/test/axial/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 2 0 10 23010005
-0 0 0 0 0 2 2 10 23010105
-0 0 0 0 0 2 4 10 23010205
-0 0 0 0 0 2 6 10 23010305
-0 0 0 0 0 2 8 10 23010405
-0 0 0 0 0 2 10 10 23010505
-0 0 0 0 0 2 12 10 23010605
-0 0 0 0 0 2 14 10 23010705
-0 0 0 0 0 2 16 10 23010805
-0 0 0 0 0 2 18 10 23010905
+0 0 0 0 0 1 0 5 23010005
+0 0 0 0 0 1 1 5 23010105
+0 0 0 0 0 1 2 5 23010205
+0 0 0 0 0 1 3 5 23010305
+0 0 0 0 0 1 4 5 23010405
+0 0 0 0 0 1 5 5 23010505
+0 0 0 0 0 1 6 5 23010605
+0 0 0 0 0 1 7 5 23010705
+0 0 0 0 0 1 8 5 23010805
+0 0 0 0 0 1 9 5 23010905
+
+
-#
# 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 2 0 10 25010105
-1 0 0 0 0 2 2 10 23010105
-1 0 0 0 0 2 4 10 23010205
-1 0 0 0 0 2 6 10 23010305
-1 0 0 0 0 2 8 10 23010405
-1 0 0 0 0 2 10 10 23010505
-1 0 0 0 0 2 12 10 23010605
-1 0 0 0 0 2 14 10 23010705
-1 0 0 0 0 2 16 10 23010805
-1 0 0 0 0 2 18 10 23010905
+1 0 0 0 0 1 0 5 25010105
+1 0 0 0 0 1 1 5 23010105
+1 0 0 0 0 1 2 5 23010205
+1 0 0 0 0 1 3 5 23010305
+1 0 0 0 0 1 4 5 23010405
+1 0 0 0 0 1 5 5 23010505
+1 0 0 0 0 1 6 5 23010605
+1 0 0 0 0 1 7 5 23010705
+1 0 0 0 0 1 8 5 23010805
+1 0 0 0 0 1 9 5 23010905
+
+
diff --git a/CarpetAttic/Cart3dTest/test/axial/txz.zl b/CarpetAttic/Cart3dTest/test/axial/txz.zl
index 8af48a54a..31c60f77e 100644
--- a/CarpetAttic/Cart3dTest/test/axial/txz.zl
+++ b/CarpetAttic/Cart3dTest/test/axial/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 2 2 0 23010100
-0 0 0 0 0 2 2 2 23010101
-0 0 0 0 0 2 2 4 23010102
-0 0 0 0 0 2 2 6 23010103
-0 0 0 0 0 2 2 8 23010104
-0 0 0 0 0 2 2 10 23010105
-0 0 0 0 0 2 2 12 23010106
-0 0 0 0 0 2 2 14 23010107
-0 0 0 0 0 2 2 16 23010108
-0 0 0 0 0 2 2 18 23010109
+0 0 0 0 0 1 1 0 23010100
+0 0 0 0 0 1 1 1 23010101
+0 0 0 0 0 1 1 2 23010102
+0 0 0 0 0 1 1 3 23010103
+0 0 0 0 0 1 1 4 23010104
+0 0 0 0 0 1 1 5 23010105
+0 0 0 0 0 1 1 6 23010106
+0 0 0 0 0 1 1 7 23010107
+0 0 0 0 0 1 1 8 23010108
+0 0 0 0 0 1 1 9 23010109
+
+
-#
# 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 2 2 0 23010100
-1 0 0 0 0 2 2 2 23010101
-1 0 0 0 0 2 2 4 23010102
-1 0 0 0 0 2 2 6 23010103
-1 0 0 0 0 2 2 8 23010104
-1 0 0 0 0 2 2 10 23010105
-1 0 0 0 0 2 2 12 23010106
-1 0 0 0 0 2 2 14 23010107
-1 0 0 0 0 2 2 16 23010108
-1 0 0 0 0 2 2 18 23010109
+1 0 0 0 0 1 1 0 23010100
+1 0 0 0 0 1 1 1 23010101
+1 0 0 0 0 1 1 2 23010102
+1 0 0 0 0 1 1 3 23010103
+1 0 0 0 0 1 1 4 23010104
+1 0 0 0 0 1 1 5 23010105
+1 0 0 0 0 1 1 6 23010106
+1 0 0 0 0 1 1 7 23010107
+1 0 0 0 0 1 1 8 23010108
+1 0 0 0 0 1 1 9 23010109
+
+
diff --git a/CarpetAttic/Cart3dTest/test/axial/tyy.xl b/CarpetAttic/Cart3dTest/test/axial/tyy.xl
index d32d56b4c..5a4004448 100644
--- a/CarpetAttic/Cart3dTest/test/axial/tyy.xl
+++ b/CarpetAttic/Cart3dTest/test/axial/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 21010105
-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 21010105
+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/tyy.yl b/CarpetAttic/Cart3dTest/test/axial/tyy.yl
index 6c51eed4f..342b2e2e2 100644
--- a/CarpetAttic/Cart3dTest/test/axial/tyy.yl
+++ b/CarpetAttic/Cart3dTest/test/axial/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 2 0 10 24010005
-0 0 0 0 0 2 2 10 24010105
-0 0 0 0 0 2 4 10 24010205
-0 0 0 0 0 2 6 10 24010305
-0 0 0 0 0 2 8 10 24010405
-0 0 0 0 0 2 10 10 24010505
-0 0 0 0 0 2 12 10 24010605
-0 0 0 0 0 2 14 10 24010705
-0 0 0 0 0 2 16 10 24010805
-0 0 0 0 0 2 18 10 24010905
+0 0 0 0 0 1 0 5 24010005
+0 0 0 0 0 1 1 5 24010105
+0 0 0 0 0 1 2 5 24010205
+0 0 0 0 0 1 3 5 24010305
+0 0 0 0 0 1 4 5 24010405
+0 0 0 0 0 1 5 5 24010505
+0 0 0 0 0 1 6 5 24010605
+0 0 0 0 0 1 7 5 24010705
+0 0 0 0 0 1 8 5 24010805
+0 0 0 0 0 1 9 5 24010905
+
+
-#
# 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 2 0 10 21010105
-1 0 0 0 0 2 2 10 24010105
-1 0 0 0 0 2 4 10 24010205
-1 0 0 0 0 2 6 10 24010305
-1 0 0 0 0 2 8 10 24010405
-1 0 0 0 0 2 10 10 24010505
-1 0 0 0 0 2 12 10 24010605
-1 0 0 0 0 2 14 10 24010705
-1 0 0 0 0 2 16 10 24010805
-1 0 0 0 0 2 18 10 24010905
+1 0 0 0 0 1 0 5 21010105
+1 0 0 0 0 1 1 5 24010105
+1 0 0 0 0 1 2 5 24010205
+1 0 0 0 0 1 3 5 24010305
+1 0 0 0 0 1 4 5 24010405
+1 0 0 0 0 1 5 5 24010505
+1 0 0 0 0 1 6 5 24010605
+1 0 0 0 0 1 7 5 24010705
+1 0 0 0 0 1 8 5 24010805
+1 0 0 0 0 1 9 5 24010905
+
+
diff --git a/CarpetAttic/Cart3dTest/test/axial/tyy.zl b/CarpetAttic/Cart3dTest/test/axial/tyy.zl
index 263f09c05..99058da70 100644
--- a/CarpetAttic/Cart3dTest/test/axial/tyy.zl
+++ b/CarpetAttic/Cart3dTest/test/axial/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 2 2 0 24010100
-0 0 0 0 0 2 2 2 24010101
-0 0 0 0 0 2 2 4 24010102
-0 0 0 0 0 2 2 6 24010103
-0 0 0 0 0 2 2 8 24010104
-0 0 0 0 0 2 2 10 24010105
-0 0 0 0 0 2 2 12 24010106
-0 0 0 0 0 2 2 14 24010107
-0 0 0 0 0 2 2 16 24010108
-0 0 0 0 0 2 2 18 24010109
+0 0 0 0 0 1 1 0 24010100
+0 0 0 0 0 1 1 1 24010101
+0 0 0 0 0 1 1 2 24010102
+0 0 0 0 0 1 1 3 24010103
+0 0 0 0 0 1 1 4 24010104
+0 0 0 0 0 1 1 5 24010105
+0 0 0 0 0 1 1 6 24010106
+0 0 0 0 0 1 1 7 24010107
+0 0 0 0 0 1 1 8 24010108
+0 0 0 0 0 1 1 9 24010109
+
+
-#
# 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 2 2 0 24010100
-1 0 0 0 0 2 2 2 24010101
-1 0 0 0 0 2 2 4 24010102
-1 0 0 0 0 2 2 6 24010103
-1 0 0 0 0 2 2 8 24010104
-1 0 0 0 0 2 2 10 24010105
-1 0 0 0 0 2 2 12 24010106
-1 0 0 0 0 2 2 14 24010107
-1 0 0 0 0 2 2 16 24010108
-1 0 0 0 0 2 2 18 24010109
+1 0 0 0 0 1 1 0 24010100
+1 0 0 0 0 1 1 1 24010101
+1 0 0 0 0 1 1 2 24010102
+1 0 0 0 0 1 1 3 24010103
+1 0 0 0 0 1 1 4 24010104
+1 0 0 0 0 1 1 5 24010105
+1 0 0 0 0 1 1 6 24010106
+1 0 0 0 0 1 1 7 24010107
+1 0 0 0 0 1 1 8 24010108
+1 0 0 0 0 1 1 9 24010109
+
+
diff --git a/CarpetAttic/Cart3dTest/test/axial/tyz.xl b/CarpetAttic/Cart3dTest/test/axial/tyz.xl
index 15e387b57..3e161221f 100644
--- a/CarpetAttic/Cart3dTest/test/axial/tyz.xl
+++ b/CarpetAttic/Cart3dTest/test/axial/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 23010105
-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 23010105
+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/tyz.yl b/CarpetAttic/Cart3dTest/test/axial/tyz.yl
index b0453a394..9aac76422 100644
--- a/CarpetAttic/Cart3dTest/test/axial/tyz.yl
+++ b/CarpetAttic/Cart3dTest/test/axial/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 2 0 10 25010005
-0 0 0 0 0 2 2 10 25010105
-0 0 0 0 0 2 4 10 25010205
-0 0 0 0 0 2 6 10 25010305
-0 0 0 0 0 2 8 10 25010405
-0 0 0 0 0 2 10 10 25010505
-0 0 0 0 0 2 12 10 25010605
-0 0 0 0 0 2 14 10 25010705
-0 0 0 0 0 2 16 10 25010805
-0 0 0 0 0 2 18 10 25010905
+0 0 0 0 0 1 0 5 25010005
+0 0 0 0 0 1 1 5 25010105
+0 0 0 0 0 1 2 5 25010205
+0 0 0 0 0 1 3 5 25010305
+0 0 0 0 0 1 4 5 25010405
+0 0 0 0 0 1 5 5 25010505
+0 0 0 0 0 1 6 5 25010605
+0 0 0 0 0 1 7 5 25010705
+0 0 0 0 0 1 8 5 25010805
+0 0 0 0 0 1 9 5 25010905
+
+
-#
# 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 2 0 10 -23010105
-1 0 0 0 0 2 2 10 25010105
-1 0 0 0 0 2 4 10 25010205
-1 0 0 0 0 2 6 10 25010305
-1 0 0 0 0 2 8 10 25010405
-1 0 0 0 0 2 10 10 25010505
-1 0 0 0 0 2 12 10 25010605
-1 0 0 0 0 2 14 10 25010705
-1 0 0 0 0 2 16 10 25010805
-1 0 0 0 0 2 18 10 25010905
+1 0 0 0 0 1 0 5 -23010105
+1 0 0 0 0 1 1 5 25010105
+1 0 0 0 0 1 2 5 25010205
+1 0 0 0 0 1 3 5 25010305
+1 0 0 0 0 1 4 5 25010405
+1 0 0 0 0 1 5 5 25010505
+1 0 0 0 0 1 6 5 25010605
+1 0 0 0 0 1 7 5 25010705
+1 0 0 0 0 1 8 5 25010805
+1 0 0 0 0 1 9 5 25010905
+
+
diff --git a/CarpetAttic/Cart3dTest/test/axial/tyz.zl b/CarpetAttic/Cart3dTest/test/axial/tyz.zl
index c781a069d..e68a368f9 100644
--- a/CarpetAttic/Cart3dTest/test/axial/tyz.zl
+++ b/CarpetAttic/Cart3dTest/test/axial/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 2 2 0 25010100
-0 0 0 0 0 2 2 2 25010101
-0 0 0 0 0 2 2 4 25010102
-0 0 0 0 0 2 2 6 25010103
-0 0 0 0 0 2 2 8 25010104
-0 0 0 0 0 2 2 10 25010105
-0 0 0 0 0 2 2 12 25010106
-0 0 0 0 0 2 2 14 25010107
-0 0 0 0 0 2 2 16 25010108
-0 0 0 0 0 2 2 18 25010109
+0 0 0 0 0 1 1 0 25010100
+0 0 0 0 0 1 1 1 25010101
+0 0 0 0 0 1 1 2 25010102
+0 0 0 0 0 1 1 3 25010103
+0 0 0 0 0 1 1 4 25010104
+0 0 0 0 0 1 1 5 25010105
+0 0 0 0 0 1 1 6 25010106
+0 0 0 0 0 1 1 7 25010107
+0 0 0 0 0 1 1 8 25010108
+0 0 0 0 0 1 1 9 25010109
+
+
-#
# 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 2 2 0 25010100
-1 0 0 0 0 2 2 2 25010101
-1 0 0 0 0 2 2 4 25010102
-1 0 0 0 0 2 2 6 25010103
-1 0 0 0 0 2 2 8 25010104
-1 0 0 0 0 2 2 10 25010105
-1 0 0 0 0 2 2 12 25010106
-1 0 0 0 0 2 2 14 25010107
-1 0 0 0 0 2 2 16 25010108
-1 0 0 0 0 2 2 18 25010109
+1 0 0 0 0 1 1 0 25010100
+1 0 0 0 0 1 1 1 25010101
+1 0 0 0 0 1 1 2 25010102
+1 0 0 0 0 1 1 3 25010103
+1 0 0 0 0 1 1 4 25010104
+1 0 0 0 0 1 1 5 25010105
+1 0 0 0 0 1 1 6 25010106
+1 0 0 0 0 1 1 7 25010107
+1 0 0 0 0 1 1 8 25010108
+1 0 0 0 0 1 1 9 25010109
+
+
diff --git a/CarpetAttic/Cart3dTest/test/axial/tzz.xl b/CarpetAttic/Cart3dTest/test/axial/tzz.xl
index 922f374fe..2a6c37dc0 100644
--- a/CarpetAttic/Cart3dTest/test/axial/tzz.xl
+++ b/CarpetAttic/Cart3dTest/test/axial/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 26010105
-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 26010105
+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/tzz.yl b/CarpetAttic/Cart3dTest/test/axial/tzz.yl
index 06095a3e7..31a81b3ca 100644
--- a/CarpetAttic/Cart3dTest/test/axial/tzz.yl
+++ b/CarpetAttic/Cart3dTest/test/axial/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 2 0 10 26010005
-0 0 0 0 0 2 2 10 26010105
-0 0 0 0 0 2 4 10 26010205
-0 0 0 0 0 2 6 10 26010305
-0 0 0 0 0 2 8 10 26010405
-0 0 0 0 0 2 10 10 26010505
-0 0 0 0 0 2 12 10 26010605
-0 0 0 0 0 2 14 10 26010705
-0 0 0 0 0 2 16 10 26010805
-0 0 0 0 0 2 18 10 26010905
+0 0 0 0 0 1 0 5 26010005
+0 0 0 0 0 1 1 5 26010105
+0 0 0 0 0 1 2 5 26010205
+0 0 0 0 0 1 3 5 26010305
+0 0 0 0 0 1 4 5 26010405
+0 0 0 0 0 1 5 5 26010505
+0 0 0 0 0 1 6 5 26010605
+0 0 0 0 0 1 7 5 26010705
+0 0 0 0 0 1 8 5 26010805
+0 0 0 0 0 1 9 5 26010905
+
+
-#
# 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 2 0 10 26010105
-1 0 0 0 0 2 2 10 26010105
-1 0 0 0 0 2 4 10 26010205
-1 0 0 0 0 2 6 10 26010305
-1 0 0 0 0 2 8 10 26010405
-1 0 0 0 0 2 10 10 26010505
-1 0 0 0 0 2 12 10 26010605
-1 0 0 0 0 2 14 10 26010705
-1 0 0 0 0 2 16 10 26010805
-1 0 0 0 0 2 18 10 26010905
+1 0 0 0 0 1 0 5 26010105
+1 0 0 0 0 1 1 5 26010105
+1 0 0 0 0 1 2 5 26010205
+1 0 0 0 0 1 3 5 26010305
+1 0 0 0 0 1 4 5 26010405
+1 0 0 0 0 1 5 5 26010505
+1 0 0 0 0 1 6 5 26010605
+1 0 0 0 0 1 7 5 26010705
+1 0 0 0 0 1 8 5 26010805
+1 0 0 0 0 1 9 5 26010905
+
+
diff --git a/CarpetAttic/Cart3dTest/test/axial/tzz.zl b/CarpetAttic/Cart3dTest/test/axial/tzz.zl
index 695fa5bf5..b57e0686c 100644
--- a/CarpetAttic/Cart3dTest/test/axial/tzz.zl
+++ b/CarpetAttic/Cart3dTest/test/axial/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 2 2 0 26010100
-0 0 0 0 0 2 2 2 26010101
-0 0 0 0 0 2 2 4 26010102
-0 0 0 0 0 2 2 6 26010103
-0 0 0 0 0 2 2 8 26010104
-0 0 0 0 0 2 2 10 26010105
-0 0 0 0 0 2 2 12 26010106
-0 0 0 0 0 2 2 14 26010107
-0 0 0 0 0 2 2 16 26010108
-0 0 0 0 0 2 2 18 26010109
+0 0 0 0 0 1 1 0 26010100
+0 0 0 0 0 1 1 1 26010101
+0 0 0 0 0 1 1 2 26010102
+0 0 0 0 0 1 1 3 26010103
+0 0 0 0 0 1 1 4 26010104
+0 0 0 0 0 1 1 5 26010105
+0 0 0 0 0 1 1 6 26010106
+0 0 0 0 0 1 1 7 26010107
+0 0 0 0 0 1 1 8 26010108
+0 0 0 0 0 1 1 9 26010109
+
+
-#
# 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 2 2 0 26010100
-1 0 0 0 0 2 2 2 26010101
-1 0 0 0 0 2 2 4 26010102
-1 0 0 0 0 2 2 6 26010103
-1 0 0 0 0 2 2 8 26010104
-1 0 0 0 0 2 2 10 26010105
-1 0 0 0 0 2 2 12 26010106
-1 0 0 0 0 2 2 14 26010107
-1 0 0 0 0 2 2 16 26010108
-1 0 0 0 0 2 2 18 26010109
+1 0 0 0 0 1 1 0 26010100
+1 0 0 0 0 1 1 1 26010101
+1 0 0 0 0 1 1 2 26010102
+1 0 0 0 0 1 1 3 26010103
+1 0 0 0 0 1 1 4 26010104
+1 0 0 0 0 1 1 5 26010105
+1 0 0 0 0 1 1 6 26010106
+1 0 0 0 0 1 1 7 26010107
+1 0 0 0 0 1 1 8 26010108
+1 0 0 0 0 1 1 9 26010109
+
+
diff --git a/CarpetAttic/Cart3dTest/test/axial/vx.xl b/CarpetAttic/Cart3dTest/test/axial/vx.xl
index b68f76c16..1d1f5ee9c 100644
--- a/CarpetAttic/Cart3dTest/test/axial/vx.xl
+++ b/CarpetAttic/Cart3dTest/test/axial/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 -12010105
-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 -12010105
+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/vx.yl b/CarpetAttic/Cart3dTest/test/axial/vx.yl
index 91d1a18f8..a22ccb9bf 100644
--- a/CarpetAttic/Cart3dTest/test/axial/vx.yl
+++ b/CarpetAttic/Cart3dTest/test/axial/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 2 0 10 11010005
-0 0 0 0 0 2 2 10 11010105
-0 0 0 0 0 2 4 10 11010205
-0 0 0 0 0 2 6 10 11010305
-0 0 0 0 0 2 8 10 11010405
-0 0 0 0 0 2 10 10 11010505
-0 0 0 0 0 2 12 10 11010605
-0 0 0 0 0 2 14 10 11010705
-0 0 0 0 0 2 16 10 11010805
-0 0 0 0 0 2 18 10 11010905
+0 0 0 0 0 1 0 5 11010005
+0 0 0 0 0 1 1 5 11010105
+0 0 0 0 0 1 2 5 11010205
+0 0 0 0 0 1 3 5 11010305
+0 0 0 0 0 1 4 5 11010405
+0 0 0 0 0 1 5 5 11010505
+0 0 0 0 0 1 6 5 11010605
+0 0 0 0 0 1 7 5 11010705
+0 0 0 0 0 1 8 5 11010805
+0 0 0 0 0 1 9 5 11010905
+
+
-#
# 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 2 0 10 12010105
-1 0 0 0 0 2 2 10 11010105
-1 0 0 0 0 2 4 10 11010205
-1 0 0 0 0 2 6 10 11010305
-1 0 0 0 0 2 8 10 11010405
-1 0 0 0 0 2 10 10 11010505
-1 0 0 0 0 2 12 10 11010605
-1 0 0 0 0 2 14 10 11010705
-1 0 0 0 0 2 16 10 11010805
-1 0 0 0 0 2 18 10 11010905
+1 0 0 0 0 1 0 5 12010105
+1 0 0 0 0 1 1 5 11010105
+1 0 0 0 0 1 2 5 11010205
+1 0 0 0 0 1 3 5 11010305
+1 0 0 0 0 1 4 5 11010405
+1 0 0 0 0 1 5 5 11010505
+1 0 0 0 0 1 6 5 11010605
+1 0 0 0 0 1 7 5 11010705
+1 0 0 0 0 1 8 5 11010805
+1 0 0 0 0 1 9 5 11010905
+
+
diff --git a/CarpetAttic/Cart3dTest/test/axial/vx.zl b/CarpetAttic/Cart3dTest/test/axial/vx.zl
index 23eecd06b..71aa1c4ad 100644
--- a/CarpetAttic/Cart3dTest/test/axial/vx.zl
+++ b/CarpetAttic/Cart3dTest/test/axial/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 2 2 0 11010100
-0 0 0 0 0 2 2 2 11010101
-0 0 0 0 0 2 2 4 11010102
-0 0 0 0 0 2 2 6 11010103
-0 0 0 0 0 2 2 8 11010104
-0 0 0 0 0 2 2 10 11010105
-0 0 0 0 0 2 2 12 11010106
-0 0 0 0 0 2 2 14 11010107
-0 0 0 0 0 2 2 16 11010108
-0 0 0 0 0 2 2 18 11010109
+0 0 0 0 0 1 1 0 11010100
+0 0 0 0 0 1 1 1 11010101
+0 0 0 0 0 1 1 2 11010102
+0 0 0 0 0 1 1 3 11010103
+0 0 0 0 0 1 1 4 11010104
+0 0 0 0 0 1 1 5 11010105
+0 0 0 0 0 1 1 6 11010106
+0 0 0 0 0 1 1 7 11010107
+0 0 0 0 0 1 1 8 11010108
+0 0 0 0 0 1 1 9 11010109
+
+
-#
# 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 2 2 0 11010100
-1 0 0 0 0 2 2 2 11010101
-1 0 0 0 0 2 2 4 11010102
-1 0 0 0 0 2 2 6 11010103
-1 0 0 0 0 2 2 8 11010104
-1 0 0 0 0 2 2 10 11010105
-1 0 0 0 0 2 2 12 11010106
-1 0 0 0 0 2 2 14 11010107
-1 0 0 0 0 2 2 16 11010108
-1 0 0 0 0 2 2 18 11010109
+1 0 0 0 0 1 1 0 11010100
+1 0 0 0 0 1 1 1 11010101
+1 0 0 0 0 1 1 2 11010102
+1 0 0 0 0 1 1 3 11010103
+1 0 0 0 0 1 1 4 11010104
+1 0 0 0 0 1 1 5 11010105
+1 0 0 0 0 1 1 6 11010106
+1 0 0 0 0 1 1 7 11010107
+1 0 0 0 0 1 1 8 11010108
+1 0 0 0 0 1 1 9 11010109
+
+
diff --git a/CarpetAttic/Cart3dTest/test/axial/vy.xl b/CarpetAttic/Cart3dTest/test/axial/vy.xl
index c04b05a51..0bb3592ee 100644
--- a/CarpetAttic/Cart3dTest/test/axial/vy.xl
+++ b/CarpetAttic/Cart3dTest/test/axial/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 11010105
-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 11010105
+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/vy.yl b/CarpetAttic/Cart3dTest/test/axial/vy.yl
index 8f7e0aefc..071b9caf8 100644
--- a/CarpetAttic/Cart3dTest/test/axial/vy.yl
+++ b/CarpetAttic/Cart3dTest/test/axial/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 2 0 10 12010005
-0 0 0 0 0 2 2 10 12010105
-0 0 0 0 0 2 4 10 12010205
-0 0 0 0 0 2 6 10 12010305
-0 0 0 0 0 2 8 10 12010405
-0 0 0 0 0 2 10 10 12010505
-0 0 0 0 0 2 12 10 12010605
-0 0 0 0 0 2 14 10 12010705
-0 0 0 0 0 2 16 10 12010805
-0 0 0 0 0 2 18 10 12010905
+0 0 0 0 0 1 0 5 12010005
+0 0 0 0 0 1 1 5 12010105
+0 0 0 0 0 1 2 5 12010205
+0 0 0 0 0 1 3 5 12010305
+0 0 0 0 0 1 4 5 12010405
+0 0 0 0 0 1 5 5 12010505
+0 0 0 0 0 1 6 5 12010605
+0 0 0 0 0 1 7 5 12010705
+0 0 0 0 0 1 8 5 12010805
+0 0 0 0 0 1 9 5 12010905
+
+
-#
# 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 2 0 10 -11010105
-1 0 0 0 0 2 2 10 12010105
-1 0 0 0 0 2 4 10 12010205
-1 0 0 0 0 2 6 10 12010305
-1 0 0 0 0 2 8 10 12010405
-1 0 0 0 0 2 10 10 12010505
-1 0 0 0 0 2 12 10 12010605
-1 0 0 0 0 2 14 10 12010705
-1 0 0 0 0 2 16 10 12010805
-1 0 0 0 0 2 18 10 12010905
+1 0 0 0 0 1 0 5 -11010105
+1 0 0 0 0 1 1 5 12010105
+1 0 0 0 0 1 2 5 12010205
+1 0 0 0 0 1 3 5 12010305
+1 0 0 0 0 1 4 5 12010405
+1 0 0 0 0 1 5 5 12010505
+1 0 0 0 0 1 6 5 12010605
+1 0 0 0 0 1 7 5 12010705
+1 0 0 0 0 1 8 5 12010805
+1 0 0 0 0 1 9 5 12010905
+
+
diff --git a/CarpetAttic/Cart3dTest/test/axial/vy.zl b/CarpetAttic/Cart3dTest/test/axial/vy.zl
index 8c10206d6..7eb4d9f75 100644
--- a/CarpetAttic/Cart3dTest/test/axial/vy.zl
+++ b/CarpetAttic/Cart3dTest/test/axial/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 2 2 0 12010100
-0 0 0 0 0 2 2 2 12010101
-0 0 0 0 0 2 2 4 12010102
-0 0 0 0 0 2 2 6 12010103
-0 0 0 0 0 2 2 8 12010104
-0 0 0 0 0 2 2 10 12010105
-0 0 0 0 0 2 2 12 12010106
-0 0 0 0 0 2 2 14 12010107
-0 0 0 0 0 2 2 16 12010108
-0 0 0 0 0 2 2 18 12010109
+0 0 0 0 0 1 1 0 12010100
+0 0 0 0 0 1 1 1 12010101
+0 0 0 0 0 1 1 2 12010102
+0 0 0 0 0 1 1 3 12010103
+0 0 0 0 0 1 1 4 12010104
+0 0 0 0 0 1 1 5 12010105
+0 0 0 0 0 1 1 6 12010106
+0 0 0 0 0 1 1 7 12010107
+0 0 0 0 0 1 1 8 12010108
+0 0 0 0 0 1 1 9 12010109
+
+
-#
# 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 2 2 0 12010100
-1 0 0 0 0 2 2 2 12010101
-1 0 0 0 0 2 2 4 12010102
-1 0 0 0 0 2 2 6 12010103
-1 0 0 0 0 2 2 8 12010104
-1 0 0 0 0 2 2 10 12010105
-1 0 0 0 0 2 2 12 12010106
-1 0 0 0 0 2 2 14 12010107
-1 0 0 0 0 2 2 16 12010108
-1 0 0 0 0 2 2 18 12010109
+1 0 0 0 0 1 1 0 12010100
+1 0 0 0 0 1 1 1 12010101
+1 0 0 0 0 1 1 2 12010102
+1 0 0 0 0 1 1 3 12010103
+1 0 0 0 0 1 1 4 12010104
+1 0 0 0 0 1 1 5 12010105
+1 0 0 0 0 1 1 6 12010106
+1 0 0 0 0 1 1 7 12010107
+1 0 0 0 0 1 1 8 12010108
+1 0 0 0 0 1 1 9 12010109
+
+
diff --git a/CarpetAttic/Cart3dTest/test/axial/vz.xl b/CarpetAttic/Cart3dTest/test/axial/vz.xl
index 7a48e6232..e8ea18918 100644
--- a/CarpetAttic/Cart3dTest/test/axial/vz.xl
+++ b/CarpetAttic/Cart3dTest/test/axial/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 13010105
-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 13010105
+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/vz.yl b/CarpetAttic/Cart3dTest/test/axial/vz.yl
index a8c8ae23e..95d96e5d4 100644
--- a/CarpetAttic/Cart3dTest/test/axial/vz.yl
+++ b/CarpetAttic/Cart3dTest/test/axial/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 2 0 10 13010005
-0 0 0 0 0 2 2 10 13010105
-0 0 0 0 0 2 4 10 13010205
-0 0 0 0 0 2 6 10 13010305
-0 0 0 0 0 2 8 10 13010405
-0 0 0 0 0 2 10 10 13010505
-0 0 0 0 0 2 12 10 13010605
-0 0 0 0 0 2 14 10 13010705
-0 0 0 0 0 2 16 10 13010805
-0 0 0 0 0 2 18 10 13010905
+0 0 0 0 0 1 0 5 13010005
+0 0 0 0 0 1 1 5 13010105
+0 0 0 0 0 1 2 5 13010205
+0 0 0 0 0 1 3 5 13010305
+0 0 0 0 0 1 4 5 13010405
+0 0 0 0 0 1 5 5 13010505
+0 0 0 0 0 1 6 5 13010605
+0 0 0 0 0 1 7 5 13010705
+0 0 0 0 0 1 8 5 13010805
+0 0 0 0 0 1 9 5 13010905
+
+
-#
# 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 2 0 10 13010105
-1 0 0 0 0 2 2 10 13010105
-1 0 0 0 0 2 4 10 13010205
-1 0 0 0 0 2 6 10 13010305
-1 0 0 0 0 2 8 10 13010405
-1 0 0 0 0 2 10 10 13010505
-1 0 0 0 0 2 12 10 13010605
-1 0 0 0 0 2 14 10 13010705
-1 0 0 0 0 2 16 10 13010805
-1 0 0 0 0 2 18 10 13010905
+1 0 0 0 0 1 0 5 13010105
+1 0 0 0 0 1 1 5 13010105
+1 0 0 0 0 1 2 5 13010205
+1 0 0 0 0 1 3 5 13010305
+1 0 0 0 0 1 4 5 13010405
+1 0 0 0 0 1 5 5 13010505
+1 0 0 0 0 1 6 5 13010605
+1 0 0 0 0 1 7 5 13010705
+1 0 0 0 0 1 8 5 13010805
+1 0 0 0 0 1 9 5 13010905
+
+
diff --git a/CarpetAttic/Cart3dTest/test/axial/vz.zl b/CarpetAttic/Cart3dTest/test/axial/vz.zl
index 1db6c380f..ece3004cb 100644
--- a/CarpetAttic/Cart3dTest/test/axial/vz.zl
+++ b/CarpetAttic/Cart3dTest/test/axial/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 2 2 0 13010100
-0 0 0 0 0 2 2 2 13010101
-0 0 0 0 0 2 2 4 13010102
-0 0 0 0 0 2 2 6 13010103
-0 0 0 0 0 2 2 8 13010104
-0 0 0 0 0 2 2 10 13010105
-0 0 0 0 0 2 2 12 13010106
-0 0 0 0 0 2 2 14 13010107
-0 0 0 0 0 2 2 16 13010108
-0 0 0 0 0 2 2 18 13010109
+0 0 0 0 0 1 1 0 13010100
+0 0 0 0 0 1 1 1 13010101
+0 0 0 0 0 1 1 2 13010102
+0 0 0 0 0 1 1 3 13010103
+0 0 0 0 0 1 1 4 13010104
+0 0 0 0 0 1 1 5 13010105
+0 0 0 0 0 1 1 6 13010106
+0 0 0 0 0 1 1 7 13010107
+0 0 0 0 0 1 1 8 13010108
+0 0 0 0 0 1 1 9 13010109
+
+
-#
# 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 2 2 0 13010100
-1 0 0 0 0 2 2 2 13010101
-1 0 0 0 0 2 2 4 13010102
-1 0 0 0 0 2 2 6 13010103
-1 0 0 0 0 2 2 8 13010104
-1 0 0 0 0 2 2 10 13010105
-1 0 0 0 0 2 2 12 13010106
-1 0 0 0 0 2 2 14 13010107
-1 0 0 0 0 2 2 16 13010108
-1 0 0 0 0 2 2 18 13010109
+1 0 0 0 0 1 1 0 13010100
+1 0 0 0 0 1 1 1 13010101
+1 0 0 0 0 1 1 2 13010102
+1 0 0 0 0 1 1 3 13010103
+1 0 0 0 0 1 1 4 13010104
+1 0 0 0 0 1 1 5 13010105
+1 0 0 0 0 1 1 6 13010106
+1 0 0 0 0 1 1 7 13010107
+1 0 0 0 0 1 1 8 13010108
+1 0 0 0 0 1 1 9 13010109
+
+