aboutsummaryrefslogtreecommitdiff
path: root/CarpetAttic/Cart3dTest/test/octant
diff options
context:
space:
mode:
Diffstat (limited to 'CarpetAttic/Cart3dTest/test/octant')
-rw-r--r--CarpetAttic/Cart3dTest/test/octant/ax.xl46
-rw-r--r--CarpetAttic/Cart3dTest/test/octant/ax.yl46
-rw-r--r--CarpetAttic/Cart3dTest/test/octant/ax.zl46
-rw-r--r--CarpetAttic/Cart3dTest/test/octant/ay.xl46
-rw-r--r--CarpetAttic/Cart3dTest/test/octant/ay.yl46
-rw-r--r--CarpetAttic/Cart3dTest/test/octant/ay.zl46
-rw-r--r--CarpetAttic/Cart3dTest/test/octant/az.xl46
-rw-r--r--CarpetAttic/Cart3dTest/test/octant/az.yl46
-rw-r--r--CarpetAttic/Cart3dTest/test/octant/az.zl46
-rw-r--r--CarpetAttic/Cart3dTest/test/octant/cart3d_x.xl46
-rw-r--r--CarpetAttic/Cart3dTest/test/octant/cart3d_x.yl46
-rw-r--r--CarpetAttic/Cart3dTest/test/octant/cart3d_x.zl46
-rw-r--r--CarpetAttic/Cart3dTest/test/octant/cart3d_y.xl46
-rw-r--r--CarpetAttic/Cart3dTest/test/octant/cart3d_y.yl46
-rw-r--r--CarpetAttic/Cart3dTest/test/octant/cart3d_y.zl46
-rw-r--r--CarpetAttic/Cart3dTest/test/octant/cart3d_z.xl46
-rw-r--r--CarpetAttic/Cart3dTest/test/octant/cart3d_z.yl46
-rw-r--r--CarpetAttic/Cart3dTest/test/octant/cart3d_z.zl46
-rw-r--r--CarpetAttic/Cart3dTest/test/octant/fxx.xl46
-rw-r--r--CarpetAttic/Cart3dTest/test/octant/fxx.yl46
-rw-r--r--CarpetAttic/Cart3dTest/test/octant/fxx.zl46
-rw-r--r--CarpetAttic/Cart3dTest/test/octant/fxy.xl46
-rw-r--r--CarpetAttic/Cart3dTest/test/octant/fxy.yl46
-rw-r--r--CarpetAttic/Cart3dTest/test/octant/fxy.zl46
-rw-r--r--CarpetAttic/Cart3dTest/test/octant/fxz.xl46
-rw-r--r--CarpetAttic/Cart3dTest/test/octant/fxz.yl46
-rw-r--r--CarpetAttic/Cart3dTest/test/octant/fxz.zl46
-rw-r--r--CarpetAttic/Cart3dTest/test/octant/fyx.xl46
-rw-r--r--CarpetAttic/Cart3dTest/test/octant/fyx.yl46
-rw-r--r--CarpetAttic/Cart3dTest/test/octant/fyx.zl46
-rw-r--r--CarpetAttic/Cart3dTest/test/octant/fyy.xl46
-rw-r--r--CarpetAttic/Cart3dTest/test/octant/fyy.yl46
-rw-r--r--CarpetAttic/Cart3dTest/test/octant/fyy.zl46
-rw-r--r--CarpetAttic/Cart3dTest/test/octant/fyz.xl46
-rw-r--r--CarpetAttic/Cart3dTest/test/octant/fyz.yl46
-rw-r--r--CarpetAttic/Cart3dTest/test/octant/fyz.zl46
-rw-r--r--CarpetAttic/Cart3dTest/test/octant/fzx.xl46
-rw-r--r--CarpetAttic/Cart3dTest/test/octant/fzx.yl46
-rw-r--r--CarpetAttic/Cart3dTest/test/octant/fzx.zl46
-rw-r--r--CarpetAttic/Cart3dTest/test/octant/fzy.xl46
-rw-r--r--CarpetAttic/Cart3dTest/test/octant/fzy.yl46
-rw-r--r--CarpetAttic/Cart3dTest/test/octant/fzy.zl46
-rw-r--r--CarpetAttic/Cart3dTest/test/octant/fzz.xl46
-rw-r--r--CarpetAttic/Cart3dTest/test/octant/fzz.yl46
-rw-r--r--CarpetAttic/Cart3dTest/test/octant/fzz.zl46
-rw-r--r--CarpetAttic/Cart3dTest/test/octant/s.xl46
-rw-r--r--CarpetAttic/Cart3dTest/test/octant/s.yl46
-rw-r--r--CarpetAttic/Cart3dTest/test/octant/s.zl46
-rw-r--r--CarpetAttic/Cart3dTest/test/octant/spher3d_r.xl46
-rw-r--r--CarpetAttic/Cart3dTest/test/octant/spher3d_r.yl46
-rw-r--r--CarpetAttic/Cart3dTest/test/octant/spher3d_r.zl46
-rw-r--r--CarpetAttic/Cart3dTest/test/octant/txx.xl46
-rw-r--r--CarpetAttic/Cart3dTest/test/octant/txx.yl46
-rw-r--r--CarpetAttic/Cart3dTest/test/octant/txx.zl46
-rw-r--r--CarpetAttic/Cart3dTest/test/octant/txy.xl46
-rw-r--r--CarpetAttic/Cart3dTest/test/octant/txy.yl46
-rw-r--r--CarpetAttic/Cart3dTest/test/octant/txy.zl46
-rw-r--r--CarpetAttic/Cart3dTest/test/octant/txz.xl46
-rw-r--r--CarpetAttic/Cart3dTest/test/octant/txz.yl46
-rw-r--r--CarpetAttic/Cart3dTest/test/octant/txz.zl46
-rw-r--r--CarpetAttic/Cart3dTest/test/octant/tyy.xl46
-rw-r--r--CarpetAttic/Cart3dTest/test/octant/tyy.yl46
-rw-r--r--CarpetAttic/Cart3dTest/test/octant/tyy.zl46
-rw-r--r--CarpetAttic/Cart3dTest/test/octant/tyz.xl46
-rw-r--r--CarpetAttic/Cart3dTest/test/octant/tyz.yl46
-rw-r--r--CarpetAttic/Cart3dTest/test/octant/tyz.zl46
-rw-r--r--CarpetAttic/Cart3dTest/test/octant/tzz.xl46
-rw-r--r--CarpetAttic/Cart3dTest/test/octant/tzz.yl46
-rw-r--r--CarpetAttic/Cart3dTest/test/octant/tzz.zl46
-rw-r--r--CarpetAttic/Cart3dTest/test/octant/vx.xl46
-rw-r--r--CarpetAttic/Cart3dTest/test/octant/vx.yl46
-rw-r--r--CarpetAttic/Cart3dTest/test/octant/vx.zl46
-rw-r--r--CarpetAttic/Cart3dTest/test/octant/vy.xl46
-rw-r--r--CarpetAttic/Cart3dTest/test/octant/vy.yl46
-rw-r--r--CarpetAttic/Cart3dTest/test/octant/vy.zl46
-rw-r--r--CarpetAttic/Cart3dTest/test/octant/vz.xl46
-rw-r--r--CarpetAttic/Cart3dTest/test/octant/vz.yl46
-rw-r--r--CarpetAttic/Cart3dTest/test/octant/vz.zl46
78 files changed, 1872 insertions, 1716 deletions
diff --git a/CarpetAttic/Cart3dTest/test/octant/ax.xl b/CarpetAttic/Cart3dTest/test/octant/ax.xl
index 86c4d7bb7..8dd8e5c6f 100644
--- a/CarpetAttic/Cart3dTest/test/octant/ax.xl
+++ b/CarpetAttic/Cart3dTest/test/octant/ax.xl
@@ -1,32 +1,34 @@
# CART3DTEST::ax x (ax)
#
-#
# iteration 0
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 4 31000102
-0 0 0 0 0 2 2 4 31010102
-0 0 0 0 0 4 2 4 31020102
-0 0 0 0 0 6 2 4 31030102
-0 0 0 0 0 8 2 4 31040102
-0 0 0 0 0 10 2 4 31050102
-0 0 0 0 0 12 2 4 31060102
-0 0 0 0 0 14 2 4 31070102
-0 0 0 0 0 16 2 4 31080102
-0 0 0 0 0 18 2 4 31090102
+0 0 0 0 0 0 1 2 31000102
+0 0 0 0 0 1 1 2 31010102
+0 0 0 0 0 2 1 2 31020102
+0 0 0 0 0 3 1 2 31030102
+0 0 0 0 0 4 1 2 31040102
+0 0 0 0 0 5 1 2 31050102
+0 0 0 0 0 6 1 2 31060102
+0 0 0 0 0 7 1 2 31070102
+0 0 0 0 0 8 1 2 31080102
+0 0 0 0 0 9 1 2 31090102
+
+
-#
# iteration 1
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 4 31000102
-1 0 0 0 0 2 2 4 31010102
-1 0 0 0 0 4 2 4 31020102
-1 0 0 0 0 6 2 4 31030102
-1 0 0 0 0 8 2 4 31040102
-1 0 0 0 0 10 2 4 31050102
-1 0 0 0 0 12 2 4 31060102
-1 0 0 0 0 14 2 4 31070102
-1 0 0 0 0 16 2 4 31080102
-1 0 0 0 0 18 2 4 31090102
+1 0 0 0 0 0 1 2 31000102
+1 0 0 0 0 1 1 2 31010102
+1 0 0 0 0 2 1 2 31020102
+1 0 0 0 0 3 1 2 31030102
+1 0 0 0 0 4 1 2 31040102
+1 0 0 0 0 5 1 2 31050102
+1 0 0 0 0 6 1 2 31060102
+1 0 0 0 0 7 1 2 31070102
+1 0 0 0 0 8 1 2 31080102
+1 0 0 0 0 9 1 2 31090102
+
+
diff --git a/CarpetAttic/Cart3dTest/test/octant/ax.yl b/CarpetAttic/Cart3dTest/test/octant/ax.yl
index bc8b76416..aa4a6ba5d 100644
--- a/CarpetAttic/Cart3dTest/test/octant/ax.yl
+++ b/CarpetAttic/Cart3dTest/test/octant/ax.yl
@@ -1,32 +1,34 @@
# CART3DTEST::ax y (ax)
#
-#
# iteration 0
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-0 0 0 0 0 0 0 4 31000002
-0 0 0 0 0 0 2 4 31000102
-0 0 0 0 0 0 4 4 31000202
-0 0 0 0 0 0 6 4 31000302
-0 0 0 0 0 0 8 4 31000402
-0 0 0 0 0 0 10 4 31000502
-0 0 0 0 0 0 12 4 31000602
-0 0 0 0 0 0 14 4 31000702
-0 0 0 0 0 0 16 4 31000802
-0 0 0 0 0 0 18 4 31000902
+0 0 0 0 0 0 0 2 31000002
+0 0 0 0 0 0 1 2 31000102
+0 0 0 0 0 0 2 2 31000202
+0 0 0 0 0 0 3 2 31000302
+0 0 0 0 0 0 4 2 31000402
+0 0 0 0 0 0 5 2 31000502
+0 0 0 0 0 0 6 2 31000602
+0 0 0 0 0 0 7 2 31000702
+0 0 0 0 0 0 8 2 31000802
+0 0 0 0 0 0 9 2 31000902
+
+
-#
# iteration 1
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-1 0 0 0 0 0 0 4 -31000102
-1 0 0 0 0 0 2 4 31000102
-1 0 0 0 0 0 4 4 31000202
-1 0 0 0 0 0 6 4 31000302
-1 0 0 0 0 0 8 4 31000402
-1 0 0 0 0 0 10 4 31000502
-1 0 0 0 0 0 12 4 31000602
-1 0 0 0 0 0 14 4 31000702
-1 0 0 0 0 0 16 4 31000802
-1 0 0 0 0 0 18 4 31000902
+1 0 0 0 0 0 0 2 -31000102
+1 0 0 0 0 0 1 2 31000102
+1 0 0 0 0 0 2 2 31000202
+1 0 0 0 0 0 3 2 31000302
+1 0 0 0 0 0 4 2 31000402
+1 0 0 0 0 0 5 2 31000502
+1 0 0 0 0 0 6 2 31000602
+1 0 0 0 0 0 7 2 31000702
+1 0 0 0 0 0 8 2 31000802
+1 0 0 0 0 0 9 2 31000902
+
+
diff --git a/CarpetAttic/Cart3dTest/test/octant/ax.zl b/CarpetAttic/Cart3dTest/test/octant/ax.zl
index 9f2e4c1b5..af2c77d03 100644
--- a/CarpetAttic/Cart3dTest/test/octant/ax.zl
+++ b/CarpetAttic/Cart3dTest/test/octant/ax.zl
@@ -1,32 +1,34 @@
# CART3DTEST::ax z (ax)
#
-#
# iteration 0
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 0 31000100
-0 0 0 0 0 0 2 2 31000101
-0 0 0 0 0 0 2 4 31000102
-0 0 0 0 0 0 2 6 31000103
-0 0 0 0 0 0 2 8 31000104
-0 0 0 0 0 0 2 10 31000105
-0 0 0 0 0 0 2 12 31000106
-0 0 0 0 0 0 2 14 31000107
-0 0 0 0 0 0 2 16 31000108
-0 0 0 0 0 0 2 18 31000109
+0 0 0 0 0 0 1 0 31000100
+0 0 0 0 0 0 1 1 31000101
+0 0 0 0 0 0 1 2 31000102
+0 0 0 0 0 0 1 3 31000103
+0 0 0 0 0 0 1 4 31000104
+0 0 0 0 0 0 1 5 31000105
+0 0 0 0 0 0 1 6 31000106
+0 0 0 0 0 0 1 7 31000107
+0 0 0 0 0 0 1 8 31000108
+0 0 0 0 0 0 1 9 31000109
+
+
-#
# iteration 1
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 0 -31000103
-1 0 0 0 0 0 2 2 -31000102
-1 0 0 0 0 0 2 4 31000102
-1 0 0 0 0 0 2 6 31000103
-1 0 0 0 0 0 2 8 31000104
-1 0 0 0 0 0 2 10 31000105
-1 0 0 0 0 0 2 12 31000106
-1 0 0 0 0 0 2 14 31000107
-1 0 0 0 0 0 2 16 31000108
-1 0 0 0 0 0 2 18 31000109
+1 0 0 0 0 0 1 0 -31000103
+1 0 0 0 0 0 1 1 -31000102
+1 0 0 0 0 0 1 2 31000102
+1 0 0 0 0 0 1 3 31000103
+1 0 0 0 0 0 1 4 31000104
+1 0 0 0 0 0 1 5 31000105
+1 0 0 0 0 0 1 6 31000106
+1 0 0 0 0 0 1 7 31000107
+1 0 0 0 0 0 1 8 31000108
+1 0 0 0 0 0 1 9 31000109
+
+
diff --git a/CarpetAttic/Cart3dTest/test/octant/ay.xl b/CarpetAttic/Cart3dTest/test/octant/ay.xl
index 1ed08090e..0a23fdefd 100644
--- a/CarpetAttic/Cart3dTest/test/octant/ay.xl
+++ b/CarpetAttic/Cart3dTest/test/octant/ay.xl
@@ -1,32 +1,34 @@
# CART3DTEST::ay x (ay)
#
-#
# iteration 0
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 4 32000102
-0 0 0 0 0 2 2 4 32010102
-0 0 0 0 0 4 2 4 32020102
-0 0 0 0 0 6 2 4 32030102
-0 0 0 0 0 8 2 4 32040102
-0 0 0 0 0 10 2 4 32050102
-0 0 0 0 0 12 2 4 32060102
-0 0 0 0 0 14 2 4 32070102
-0 0 0 0 0 16 2 4 32080102
-0 0 0 0 0 18 2 4 32090102
+0 0 0 0 0 0 1 2 32000102
+0 0 0 0 0 1 1 2 32010102
+0 0 0 0 0 2 1 2 32020102
+0 0 0 0 0 3 1 2 32030102
+0 0 0 0 0 4 1 2 32040102
+0 0 0 0 0 5 1 2 32050102
+0 0 0 0 0 6 1 2 32060102
+0 0 0 0 0 7 1 2 32070102
+0 0 0 0 0 8 1 2 32080102
+0 0 0 0 0 9 1 2 32090102
+
+
-#
# iteration 1
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 4 32000102
-1 0 0 0 0 2 2 4 32010102
-1 0 0 0 0 4 2 4 32020102
-1 0 0 0 0 6 2 4 32030102
-1 0 0 0 0 8 2 4 32040102
-1 0 0 0 0 10 2 4 32050102
-1 0 0 0 0 12 2 4 32060102
-1 0 0 0 0 14 2 4 32070102
-1 0 0 0 0 16 2 4 32080102
-1 0 0 0 0 18 2 4 32090102
+1 0 0 0 0 0 1 2 32000102
+1 0 0 0 0 1 1 2 32010102
+1 0 0 0 0 2 1 2 32020102
+1 0 0 0 0 3 1 2 32030102
+1 0 0 0 0 4 1 2 32040102
+1 0 0 0 0 5 1 2 32050102
+1 0 0 0 0 6 1 2 32060102
+1 0 0 0 0 7 1 2 32070102
+1 0 0 0 0 8 1 2 32080102
+1 0 0 0 0 9 1 2 32090102
+
+
diff --git a/CarpetAttic/Cart3dTest/test/octant/ay.yl b/CarpetAttic/Cart3dTest/test/octant/ay.yl
index 1d3c521f9..c06545e68 100644
--- a/CarpetAttic/Cart3dTest/test/octant/ay.yl
+++ b/CarpetAttic/Cart3dTest/test/octant/ay.yl
@@ -1,32 +1,34 @@
# CART3DTEST::ay y (ay)
#
-#
# iteration 0
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-0 0 0 0 0 0 0 4 32000002
-0 0 0 0 0 0 2 4 32000102
-0 0 0 0 0 0 4 4 32000202
-0 0 0 0 0 0 6 4 32000302
-0 0 0 0 0 0 8 4 32000402
-0 0 0 0 0 0 10 4 32000502
-0 0 0 0 0 0 12 4 32000602
-0 0 0 0 0 0 14 4 32000702
-0 0 0 0 0 0 16 4 32000802
-0 0 0 0 0 0 18 4 32000902
+0 0 0 0 0 0 0 2 32000002
+0 0 0 0 0 0 1 2 32000102
+0 0 0 0 0 0 2 2 32000202
+0 0 0 0 0 0 3 2 32000302
+0 0 0 0 0 0 4 2 32000402
+0 0 0 0 0 0 5 2 32000502
+0 0 0 0 0 0 6 2 32000602
+0 0 0 0 0 0 7 2 32000702
+0 0 0 0 0 0 8 2 32000802
+0 0 0 0 0 0 9 2 32000902
+
+
-#
# iteration 1
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-1 0 0 0 0 0 0 4 32000102
-1 0 0 0 0 0 2 4 32000102
-1 0 0 0 0 0 4 4 32000202
-1 0 0 0 0 0 6 4 32000302
-1 0 0 0 0 0 8 4 32000402
-1 0 0 0 0 0 10 4 32000502
-1 0 0 0 0 0 12 4 32000602
-1 0 0 0 0 0 14 4 32000702
-1 0 0 0 0 0 16 4 32000802
-1 0 0 0 0 0 18 4 32000902
+1 0 0 0 0 0 0 2 32000102
+1 0 0 0 0 0 1 2 32000102
+1 0 0 0 0 0 2 2 32000202
+1 0 0 0 0 0 3 2 32000302
+1 0 0 0 0 0 4 2 32000402
+1 0 0 0 0 0 5 2 32000502
+1 0 0 0 0 0 6 2 32000602
+1 0 0 0 0 0 7 2 32000702
+1 0 0 0 0 0 8 2 32000802
+1 0 0 0 0 0 9 2 32000902
+
+
diff --git a/CarpetAttic/Cart3dTest/test/octant/ay.zl b/CarpetAttic/Cart3dTest/test/octant/ay.zl
index 11293e31f..8ec533c91 100644
--- a/CarpetAttic/Cart3dTest/test/octant/ay.zl
+++ b/CarpetAttic/Cart3dTest/test/octant/ay.zl
@@ -1,32 +1,34 @@
# CART3DTEST::ay z (ay)
#
-#
# iteration 0
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 0 32000100
-0 0 0 0 0 0 2 2 32000101
-0 0 0 0 0 0 2 4 32000102
-0 0 0 0 0 0 2 6 32000103
-0 0 0 0 0 0 2 8 32000104
-0 0 0 0 0 0 2 10 32000105
-0 0 0 0 0 0 2 12 32000106
-0 0 0 0 0 0 2 14 32000107
-0 0 0 0 0 0 2 16 32000108
-0 0 0 0 0 0 2 18 32000109
+0 0 0 0 0 0 1 0 32000100
+0 0 0 0 0 0 1 1 32000101
+0 0 0 0 0 0 1 2 32000102
+0 0 0 0 0 0 1 3 32000103
+0 0 0 0 0 0 1 4 32000104
+0 0 0 0 0 0 1 5 32000105
+0 0 0 0 0 0 1 6 32000106
+0 0 0 0 0 0 1 7 32000107
+0 0 0 0 0 0 1 8 32000108
+0 0 0 0 0 0 1 9 32000109
+
+
-#
# iteration 1
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 0 -32000103
-1 0 0 0 0 0 2 2 -32000102
-1 0 0 0 0 0 2 4 32000102
-1 0 0 0 0 0 2 6 32000103
-1 0 0 0 0 0 2 8 32000104
-1 0 0 0 0 0 2 10 32000105
-1 0 0 0 0 0 2 12 32000106
-1 0 0 0 0 0 2 14 32000107
-1 0 0 0 0 0 2 16 32000108
-1 0 0 0 0 0 2 18 32000109
+1 0 0 0 0 0 1 0 -32000103
+1 0 0 0 0 0 1 1 -32000102
+1 0 0 0 0 0 1 2 32000102
+1 0 0 0 0 0 1 3 32000103
+1 0 0 0 0 0 1 4 32000104
+1 0 0 0 0 0 1 5 32000105
+1 0 0 0 0 0 1 6 32000106
+1 0 0 0 0 0 1 7 32000107
+1 0 0 0 0 0 1 8 32000108
+1 0 0 0 0 0 1 9 32000109
+
+
diff --git a/CarpetAttic/Cart3dTest/test/octant/az.xl b/CarpetAttic/Cart3dTest/test/octant/az.xl
index 02cd21c69..f3620a409 100644
--- a/CarpetAttic/Cart3dTest/test/octant/az.xl
+++ b/CarpetAttic/Cart3dTest/test/octant/az.xl
@@ -1,32 +1,34 @@
# CART3DTEST::az x (az)
#
-#
# iteration 0
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 4 33000102
-0 0 0 0 0 2 2 4 33010102
-0 0 0 0 0 4 2 4 33020102
-0 0 0 0 0 6 2 4 33030102
-0 0 0 0 0 8 2 4 33040102
-0 0 0 0 0 10 2 4 33050102
-0 0 0 0 0 12 2 4 33060102
-0 0 0 0 0 14 2 4 33070102
-0 0 0 0 0 16 2 4 33080102
-0 0 0 0 0 18 2 4 33090102
+0 0 0 0 0 0 1 2 33000102
+0 0 0 0 0 1 1 2 33010102
+0 0 0 0 0 2 1 2 33020102
+0 0 0 0 0 3 1 2 33030102
+0 0 0 0 0 4 1 2 33040102
+0 0 0 0 0 5 1 2 33050102
+0 0 0 0 0 6 1 2 33060102
+0 0 0 0 0 7 1 2 33070102
+0 0 0 0 0 8 1 2 33080102
+0 0 0 0 0 9 1 2 33090102
+
+
-#
# iteration 1
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 4 33000102
-1 0 0 0 0 2 2 4 33010102
-1 0 0 0 0 4 2 4 33020102
-1 0 0 0 0 6 2 4 33030102
-1 0 0 0 0 8 2 4 33040102
-1 0 0 0 0 10 2 4 33050102
-1 0 0 0 0 12 2 4 33060102
-1 0 0 0 0 14 2 4 33070102
-1 0 0 0 0 16 2 4 33080102
-1 0 0 0 0 18 2 4 33090102
+1 0 0 0 0 0 1 2 33000102
+1 0 0 0 0 1 1 2 33010102
+1 0 0 0 0 2 1 2 33020102
+1 0 0 0 0 3 1 2 33030102
+1 0 0 0 0 4 1 2 33040102
+1 0 0 0 0 5 1 2 33050102
+1 0 0 0 0 6 1 2 33060102
+1 0 0 0 0 7 1 2 33070102
+1 0 0 0 0 8 1 2 33080102
+1 0 0 0 0 9 1 2 33090102
+
+
diff --git a/CarpetAttic/Cart3dTest/test/octant/az.yl b/CarpetAttic/Cart3dTest/test/octant/az.yl
index 94095204f..3aedf25fb 100644
--- a/CarpetAttic/Cart3dTest/test/octant/az.yl
+++ b/CarpetAttic/Cart3dTest/test/octant/az.yl
@@ -1,32 +1,34 @@
# CART3DTEST::az y (az)
#
-#
# iteration 0
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-0 0 0 0 0 0 0 4 33000002
-0 0 0 0 0 0 2 4 33000102
-0 0 0 0 0 0 4 4 33000202
-0 0 0 0 0 0 6 4 33000302
-0 0 0 0 0 0 8 4 33000402
-0 0 0 0 0 0 10 4 33000502
-0 0 0 0 0 0 12 4 33000602
-0 0 0 0 0 0 14 4 33000702
-0 0 0 0 0 0 16 4 33000802
-0 0 0 0 0 0 18 4 33000902
+0 0 0 0 0 0 0 2 33000002
+0 0 0 0 0 0 1 2 33000102
+0 0 0 0 0 0 2 2 33000202
+0 0 0 0 0 0 3 2 33000302
+0 0 0 0 0 0 4 2 33000402
+0 0 0 0 0 0 5 2 33000502
+0 0 0 0 0 0 6 2 33000602
+0 0 0 0 0 0 7 2 33000702
+0 0 0 0 0 0 8 2 33000802
+0 0 0 0 0 0 9 2 33000902
+
+
-#
# iteration 1
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-1 0 0 0 0 0 0 4 -33000102
-1 0 0 0 0 0 2 4 33000102
-1 0 0 0 0 0 4 4 33000202
-1 0 0 0 0 0 6 4 33000302
-1 0 0 0 0 0 8 4 33000402
-1 0 0 0 0 0 10 4 33000502
-1 0 0 0 0 0 12 4 33000602
-1 0 0 0 0 0 14 4 33000702
-1 0 0 0 0 0 16 4 33000802
-1 0 0 0 0 0 18 4 33000902
+1 0 0 0 0 0 0 2 -33000102
+1 0 0 0 0 0 1 2 33000102
+1 0 0 0 0 0 2 2 33000202
+1 0 0 0 0 0 3 2 33000302
+1 0 0 0 0 0 4 2 33000402
+1 0 0 0 0 0 5 2 33000502
+1 0 0 0 0 0 6 2 33000602
+1 0 0 0 0 0 7 2 33000702
+1 0 0 0 0 0 8 2 33000802
+1 0 0 0 0 0 9 2 33000902
+
+
diff --git a/CarpetAttic/Cart3dTest/test/octant/az.zl b/CarpetAttic/Cart3dTest/test/octant/az.zl
index a16799e7d..97912d068 100644
--- a/CarpetAttic/Cart3dTest/test/octant/az.zl
+++ b/CarpetAttic/Cart3dTest/test/octant/az.zl
@@ -1,32 +1,34 @@
# CART3DTEST::az z (az)
#
-#
# iteration 0
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 0 33000100
-0 0 0 0 0 0 2 2 33000101
-0 0 0 0 0 0 2 4 33000102
-0 0 0 0 0 0 2 6 33000103
-0 0 0 0 0 0 2 8 33000104
-0 0 0 0 0 0 2 10 33000105
-0 0 0 0 0 0 2 12 33000106
-0 0 0 0 0 0 2 14 33000107
-0 0 0 0 0 0 2 16 33000108
-0 0 0 0 0 0 2 18 33000109
+0 0 0 0 0 0 1 0 33000100
+0 0 0 0 0 0 1 1 33000101
+0 0 0 0 0 0 1 2 33000102
+0 0 0 0 0 0 1 3 33000103
+0 0 0 0 0 0 1 4 33000104
+0 0 0 0 0 0 1 5 33000105
+0 0 0 0 0 0 1 6 33000106
+0 0 0 0 0 0 1 7 33000107
+0 0 0 0 0 0 1 8 33000108
+0 0 0 0 0 0 1 9 33000109
+
+
-#
# iteration 1
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 0 33000103
-1 0 0 0 0 0 2 2 33000102
-1 0 0 0 0 0 2 4 33000102
-1 0 0 0 0 0 2 6 33000103
-1 0 0 0 0 0 2 8 33000104
-1 0 0 0 0 0 2 10 33000105
-1 0 0 0 0 0 2 12 33000106
-1 0 0 0 0 0 2 14 33000107
-1 0 0 0 0 0 2 16 33000108
-1 0 0 0 0 0 2 18 33000109
+1 0 0 0 0 0 1 0 33000103
+1 0 0 0 0 0 1 1 33000102
+1 0 0 0 0 0 1 2 33000102
+1 0 0 0 0 0 1 3 33000103
+1 0 0 0 0 0 1 4 33000104
+1 0 0 0 0 0 1 5 33000105
+1 0 0 0 0 0 1 6 33000106
+1 0 0 0 0 0 1 7 33000107
+1 0 0 0 0 0 1 8 33000108
+1 0 0 0 0 0 1 9 33000109
+
+
diff --git a/CarpetAttic/Cart3dTest/test/octant/cart3d_x.xl b/CarpetAttic/Cart3dTest/test/octant/cart3d_x.xl
index 71c079f57..22bbe6acf 100644
--- a/CarpetAttic/Cart3dTest/test/octant/cart3d_x.xl
+++ b/CarpetAttic/Cart3dTest/test/octant/cart3d_x.xl
@@ -1,32 +1,34 @@
# GRID::cart3d_x x (cart3d_x)
#
-#
# iteration 0
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 4 0.15
-0 0 0 0 0 2 2 4 0.45
-0 0 0 0 0 4 2 4 0.75
-0 0 0 0 0 6 2 4 1.05
-0 0 0 0 0 8 2 4 1.35
-0 0 0 0 0 10 2 4 1.65
-0 0 0 0 0 12 2 4 1.95
-0 0 0 0 0 14 2 4 2.25
-0 0 0 0 0 16 2 4 2.55
-0 0 0 0 0 18 2 4 2.85
+0 0 0 0 0 0 1 2 0.15
+0 0 0 0 0 1 1 2 0.45
+0 0 0 0 0 2 1 2 0.75
+0 0 0 0 0 3 1 2 1.05
+0 0 0 0 0 4 1 2 1.35
+0 0 0 0 0 5 1 2 1.65
+0 0 0 0 0 6 1 2 1.95
+0 0 0 0 0 7 1 2 2.25
+0 0 0 0 0 8 1 2 2.55
+0 0 0 0 0 9 1 2 2.85
+
+
-#
# iteration 1
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 4 0.15
-1 0 0 0 0 2 2 4 0.45
-1 0 0 0 0 4 2 4 0.75
-1 0 0 0 0 6 2 4 1.05
-1 0 0 0 0 8 2 4 1.35
-1 0 0 0 0 10 2 4 1.65
-1 0 0 0 0 12 2 4 1.95
-1 0 0 0 0 14 2 4 2.25
-1 0 0 0 0 16 2 4 2.55
-1 0 0 0 0 18 2 4 2.85
+1 0 0 0 0 0 1 2 0.15
+1 0 0 0 0 1 1 2 0.45
+1 0 0 0 0 2 1 2 0.75
+1 0 0 0 0 3 1 2 1.05
+1 0 0 0 0 4 1 2 1.35
+1 0 0 0 0 5 1 2 1.65
+1 0 0 0 0 6 1 2 1.95
+1 0 0 0 0 7 1 2 2.25
+1 0 0 0 0 8 1 2 2.55
+1 0 0 0 0 9 1 2 2.85
+
+
diff --git a/CarpetAttic/Cart3dTest/test/octant/cart3d_x.yl b/CarpetAttic/Cart3dTest/test/octant/cart3d_x.yl
index 553154ac4..fab75e1a2 100644
--- a/CarpetAttic/Cart3dTest/test/octant/cart3d_x.yl
+++ b/CarpetAttic/Cart3dTest/test/octant/cart3d_x.yl
@@ -1,32 +1,34 @@
# GRID::cart3d_x y (cart3d_x)
#
-#
# iteration 0
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-0 0 0 0 0 0 0 4 0.15
-0 0 0 0 0 0 2 4 0.15
-0 0 0 0 0 0 4 4 0.15
-0 0 0 0 0 0 6 4 0.15
-0 0 0 0 0 0 8 4 0.15
-0 0 0 0 0 0 10 4 0.15
-0 0 0 0 0 0 12 4 0.15
-0 0 0 0 0 0 14 4 0.15
-0 0 0 0 0 0 16 4 0.15
-0 0 0 0 0 0 18 4 0.15
+0 0 0 0 0 0 0 2 0.15
+0 0 0 0 0 0 1 2 0.15
+0 0 0 0 0 0 2 2 0.15
+0 0 0 0 0 0 3 2 0.15
+0 0 0 0 0 0 4 2 0.15
+0 0 0 0 0 0 5 2 0.15
+0 0 0 0 0 0 6 2 0.15
+0 0 0 0 0 0 7 2 0.15
+0 0 0 0 0 0 8 2 0.15
+0 0 0 0 0 0 9 2 0.15
+
+
-#
# iteration 1
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-1 0 0 0 0 0 0 4 0.15
-1 0 0 0 0 0 2 4 0.15
-1 0 0 0 0 0 4 4 0.15
-1 0 0 0 0 0 6 4 0.15
-1 0 0 0 0 0 8 4 0.15
-1 0 0 0 0 0 10 4 0.15
-1 0 0 0 0 0 12 4 0.15
-1 0 0 0 0 0 14 4 0.15
-1 0 0 0 0 0 16 4 0.15
-1 0 0 0 0 0 18 4 0.15
+1 0 0 0 0 0 0 2 0.15
+1 0 0 0 0 0 1 2 0.15
+1 0 0 0 0 0 2 2 0.15
+1 0 0 0 0 0 3 2 0.15
+1 0 0 0 0 0 4 2 0.15
+1 0 0 0 0 0 5 2 0.15
+1 0 0 0 0 0 6 2 0.15
+1 0 0 0 0 0 7 2 0.15
+1 0 0 0 0 0 8 2 0.15
+1 0 0 0 0 0 9 2 0.15
+
+
diff --git a/CarpetAttic/Cart3dTest/test/octant/cart3d_x.zl b/CarpetAttic/Cart3dTest/test/octant/cart3d_x.zl
index a9378c5d0..3920c211d 100644
--- a/CarpetAttic/Cart3dTest/test/octant/cart3d_x.zl
+++ b/CarpetAttic/Cart3dTest/test/octant/cart3d_x.zl
@@ -1,32 +1,34 @@
# GRID::cart3d_x z (cart3d_x)
#
-#
# iteration 0
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 0 0.15
-0 0 0 0 0 0 2 2 0.15
-0 0 0 0 0 0 2 4 0.15
-0 0 0 0 0 0 2 6 0.15
-0 0 0 0 0 0 2 8 0.15
-0 0 0 0 0 0 2 10 0.15
-0 0 0 0 0 0 2 12 0.15
-0 0 0 0 0 0 2 14 0.15
-0 0 0 0 0 0 2 16 0.15
-0 0 0 0 0 0 2 18 0.15
+0 0 0 0 0 0 1 0 0.15
+0 0 0 0 0 0 1 1 0.15
+0 0 0 0 0 0 1 2 0.15
+0 0 0 0 0 0 1 3 0.15
+0 0 0 0 0 0 1 4 0.15
+0 0 0 0 0 0 1 5 0.15
+0 0 0 0 0 0 1 6 0.15
+0 0 0 0 0 0 1 7 0.15
+0 0 0 0 0 0 1 8 0.15
+0 0 0 0 0 0 1 9 0.15
+
+
-#
# iteration 1
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 0 0.15
-1 0 0 0 0 0 2 2 0.15
-1 0 0 0 0 0 2 4 0.15
-1 0 0 0 0 0 2 6 0.15
-1 0 0 0 0 0 2 8 0.15
-1 0 0 0 0 0 2 10 0.15
-1 0 0 0 0 0 2 12 0.15
-1 0 0 0 0 0 2 14 0.15
-1 0 0 0 0 0 2 16 0.15
-1 0 0 0 0 0 2 18 0.15
+1 0 0 0 0 0 1 0 0.15
+1 0 0 0 0 0 1 1 0.15
+1 0 0 0 0 0 1 2 0.15
+1 0 0 0 0 0 1 3 0.15
+1 0 0 0 0 0 1 4 0.15
+1 0 0 0 0 0 1 5 0.15
+1 0 0 0 0 0 1 6 0.15
+1 0 0 0 0 0 1 7 0.15
+1 0 0 0 0 0 1 8 0.15
+1 0 0 0 0 0 1 9 0.15
+
+
diff --git a/CarpetAttic/Cart3dTest/test/octant/cart3d_y.xl b/CarpetAttic/Cart3dTest/test/octant/cart3d_y.xl
index 7aeca332a..27036592d 100644
--- a/CarpetAttic/Cart3dTest/test/octant/cart3d_y.xl
+++ b/CarpetAttic/Cart3dTest/test/octant/cart3d_y.xl
@@ -1,32 +1,34 @@
# GRID::cart3d_y x (cart3d_y)
#
-#
# iteration 0
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 4 0.15
-0 0 0 0 0 2 2 4 0.15
-0 0 0 0 0 4 2 4 0.15
-0 0 0 0 0 6 2 4 0.15
-0 0 0 0 0 8 2 4 0.15
-0 0 0 0 0 10 2 4 0.15
-0 0 0 0 0 12 2 4 0.15
-0 0 0 0 0 14 2 4 0.15
-0 0 0 0 0 16 2 4 0.15
-0 0 0 0 0 18 2 4 0.15
+0 0 0 0 0 0 1 2 0.15
+0 0 0 0 0 1 1 2 0.15
+0 0 0 0 0 2 1 2 0.15
+0 0 0 0 0 3 1 2 0.15
+0 0 0 0 0 4 1 2 0.15
+0 0 0 0 0 5 1 2 0.15
+0 0 0 0 0 6 1 2 0.15
+0 0 0 0 0 7 1 2 0.15
+0 0 0 0 0 8 1 2 0.15
+0 0 0 0 0 9 1 2 0.15
+
+
-#
# iteration 1
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 4 0.15
-1 0 0 0 0 2 2 4 0.15
-1 0 0 0 0 4 2 4 0.15
-1 0 0 0 0 6 2 4 0.15
-1 0 0 0 0 8 2 4 0.15
-1 0 0 0 0 10 2 4 0.15
-1 0 0 0 0 12 2 4 0.15
-1 0 0 0 0 14 2 4 0.15
-1 0 0 0 0 16 2 4 0.15
-1 0 0 0 0 18 2 4 0.15
+1 0 0 0 0 0 1 2 0.15
+1 0 0 0 0 1 1 2 0.15
+1 0 0 0 0 2 1 2 0.15
+1 0 0 0 0 3 1 2 0.15
+1 0 0 0 0 4 1 2 0.15
+1 0 0 0 0 5 1 2 0.15
+1 0 0 0 0 6 1 2 0.15
+1 0 0 0 0 7 1 2 0.15
+1 0 0 0 0 8 1 2 0.15
+1 0 0 0 0 9 1 2 0.15
+
+
diff --git a/CarpetAttic/Cart3dTest/test/octant/cart3d_y.yl b/CarpetAttic/Cart3dTest/test/octant/cart3d_y.yl
index c72d0c3a6..c74c2bde5 100644
--- a/CarpetAttic/Cart3dTest/test/octant/cart3d_y.yl
+++ b/CarpetAttic/Cart3dTest/test/octant/cart3d_y.yl
@@ -1,32 +1,34 @@
# GRID::cart3d_y y (cart3d_y)
#
-#
# iteration 0
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-0 0 0 0 0 0 0 4 -0.15
-0 0 0 0 0 0 2 4 0.15
-0 0 0 0 0 0 4 4 0.45
-0 0 0 0 0 0 6 4 0.75
-0 0 0 0 0 0 8 4 1.05
-0 0 0 0 0 0 10 4 1.35
-0 0 0 0 0 0 12 4 1.65
-0 0 0 0 0 0 14 4 1.95
-0 0 0 0 0 0 16 4 2.25
-0 0 0 0 0 0 18 4 2.55
+0 0 0 0 0 0 0 2 -0.15
+0 0 0 0 0 0 1 2 0.15
+0 0 0 0 0 0 2 2 0.45
+0 0 0 0 0 0 3 2 0.75
+0 0 0 0 0 0 4 2 1.05
+0 0 0 0 0 0 5 2 1.35
+0 0 0 0 0 0 6 2 1.65
+0 0 0 0 0 0 7 2 1.95
+0 0 0 0 0 0 8 2 2.25
+0 0 0 0 0 0 9 2 2.55
+
+
-#
# iteration 1
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-1 0 0 0 0 0 0 4 -0.15
-1 0 0 0 0 0 2 4 0.15
-1 0 0 0 0 0 4 4 0.45
-1 0 0 0 0 0 6 4 0.75
-1 0 0 0 0 0 8 4 1.05
-1 0 0 0 0 0 10 4 1.35
-1 0 0 0 0 0 12 4 1.65
-1 0 0 0 0 0 14 4 1.95
-1 0 0 0 0 0 16 4 2.25
-1 0 0 0 0 0 18 4 2.55
+1 0 0 0 0 0 0 2 -0.15
+1 0 0 0 0 0 1 2 0.15
+1 0 0 0 0 0 2 2 0.45
+1 0 0 0 0 0 3 2 0.75
+1 0 0 0 0 0 4 2 1.05
+1 0 0 0 0 0 5 2 1.35
+1 0 0 0 0 0 6 2 1.65
+1 0 0 0 0 0 7 2 1.95
+1 0 0 0 0 0 8 2 2.25
+1 0 0 0 0 0 9 2 2.55
+
+
diff --git a/CarpetAttic/Cart3dTest/test/octant/cart3d_y.zl b/CarpetAttic/Cart3dTest/test/octant/cart3d_y.zl
index f0d8742c0..1325581cd 100644
--- a/CarpetAttic/Cart3dTest/test/octant/cart3d_y.zl
+++ b/CarpetAttic/Cart3dTest/test/octant/cart3d_y.zl
@@ -1,32 +1,34 @@
# GRID::cart3d_y z (cart3d_y)
#
-#
# iteration 0
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 0 0.15
-0 0 0 0 0 0 2 2 0.15
-0 0 0 0 0 0 2 4 0.15
-0 0 0 0 0 0 2 6 0.15
-0 0 0 0 0 0 2 8 0.15
-0 0 0 0 0 0 2 10 0.15
-0 0 0 0 0 0 2 12 0.15
-0 0 0 0 0 0 2 14 0.15
-0 0 0 0 0 0 2 16 0.15
-0 0 0 0 0 0 2 18 0.15
+0 0 0 0 0 0 1 0 0.15
+0 0 0 0 0 0 1 1 0.15
+0 0 0 0 0 0 1 2 0.15
+0 0 0 0 0 0 1 3 0.15
+0 0 0 0 0 0 1 4 0.15
+0 0 0 0 0 0 1 5 0.15
+0 0 0 0 0 0 1 6 0.15
+0 0 0 0 0 0 1 7 0.15
+0 0 0 0 0 0 1 8 0.15
+0 0 0 0 0 0 1 9 0.15
+
+
-#
# iteration 1
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 0 0.15
-1 0 0 0 0 0 2 2 0.15
-1 0 0 0 0 0 2 4 0.15
-1 0 0 0 0 0 2 6 0.15
-1 0 0 0 0 0 2 8 0.15
-1 0 0 0 0 0 2 10 0.15
-1 0 0 0 0 0 2 12 0.15
-1 0 0 0 0 0 2 14 0.15
-1 0 0 0 0 0 2 16 0.15
-1 0 0 0 0 0 2 18 0.15
+1 0 0 0 0 0 1 0 0.15
+1 0 0 0 0 0 1 1 0.15
+1 0 0 0 0 0 1 2 0.15
+1 0 0 0 0 0 1 3 0.15
+1 0 0 0 0 0 1 4 0.15
+1 0 0 0 0 0 1 5 0.15
+1 0 0 0 0 0 1 6 0.15
+1 0 0 0 0 0 1 7 0.15
+1 0 0 0 0 0 1 8 0.15
+1 0 0 0 0 0 1 9 0.15
+
+
diff --git a/CarpetAttic/Cart3dTest/test/octant/cart3d_z.xl b/CarpetAttic/Cart3dTest/test/octant/cart3d_z.xl
index e3e938cf3..e6951854e 100644
--- a/CarpetAttic/Cart3dTest/test/octant/cart3d_z.xl
+++ b/CarpetAttic/Cart3dTest/test/octant/cart3d_z.xl
@@ -1,32 +1,34 @@
# GRID::cart3d_z x (cart3d_z)
#
-#
# iteration 0
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 4 0.15
-0 0 0 0 0 2 2 4 0.15
-0 0 0 0 0 4 2 4 0.15
-0 0 0 0 0 6 2 4 0.15
-0 0 0 0 0 8 2 4 0.15
-0 0 0 0 0 10 2 4 0.15
-0 0 0 0 0 12 2 4 0.15
-0 0 0 0 0 14 2 4 0.15
-0 0 0 0 0 16 2 4 0.15
-0 0 0 0 0 18 2 4 0.15
+0 0 0 0 0 0 1 2 0.15
+0 0 0 0 0 1 1 2 0.15
+0 0 0 0 0 2 1 2 0.15
+0 0 0 0 0 3 1 2 0.15
+0 0 0 0 0 4 1 2 0.15
+0 0 0 0 0 5 1 2 0.15
+0 0 0 0 0 6 1 2 0.15
+0 0 0 0 0 7 1 2 0.15
+0 0 0 0 0 8 1 2 0.15
+0 0 0 0 0 9 1 2 0.15
+
+
-#
# iteration 1
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 4 0.15
-1 0 0 0 0 2 2 4 0.15
-1 0 0 0 0 4 2 4 0.15
-1 0 0 0 0 6 2 4 0.15
-1 0 0 0 0 8 2 4 0.15
-1 0 0 0 0 10 2 4 0.15
-1 0 0 0 0 12 2 4 0.15
-1 0 0 0 0 14 2 4 0.15
-1 0 0 0 0 16 2 4 0.15
-1 0 0 0 0 18 2 4 0.15
+1 0 0 0 0 0 1 2 0.15
+1 0 0 0 0 1 1 2 0.15
+1 0 0 0 0 2 1 2 0.15
+1 0 0 0 0 3 1 2 0.15
+1 0 0 0 0 4 1 2 0.15
+1 0 0 0 0 5 1 2 0.15
+1 0 0 0 0 6 1 2 0.15
+1 0 0 0 0 7 1 2 0.15
+1 0 0 0 0 8 1 2 0.15
+1 0 0 0 0 9 1 2 0.15
+
+
diff --git a/CarpetAttic/Cart3dTest/test/octant/cart3d_z.yl b/CarpetAttic/Cart3dTest/test/octant/cart3d_z.yl
index 40794f9e8..18e371387 100644
--- a/CarpetAttic/Cart3dTest/test/octant/cart3d_z.yl
+++ b/CarpetAttic/Cart3dTest/test/octant/cart3d_z.yl
@@ -1,32 +1,34 @@
# GRID::cart3d_z y (cart3d_z)
#
-#
# iteration 0
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-0 0 0 0 0 0 0 4 0.15
-0 0 0 0 0 0 2 4 0.15
-0 0 0 0 0 0 4 4 0.15
-0 0 0 0 0 0 6 4 0.15
-0 0 0 0 0 0 8 4 0.15
-0 0 0 0 0 0 10 4 0.15
-0 0 0 0 0 0 12 4 0.15
-0 0 0 0 0 0 14 4 0.15
-0 0 0 0 0 0 16 4 0.15
-0 0 0 0 0 0 18 4 0.15
+0 0 0 0 0 0 0 2 0.15
+0 0 0 0 0 0 1 2 0.15
+0 0 0 0 0 0 2 2 0.15
+0 0 0 0 0 0 3 2 0.15
+0 0 0 0 0 0 4 2 0.15
+0 0 0 0 0 0 5 2 0.15
+0 0 0 0 0 0 6 2 0.15
+0 0 0 0 0 0 7 2 0.15
+0 0 0 0 0 0 8 2 0.15
+0 0 0 0 0 0 9 2 0.15
+
+
-#
# iteration 1
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-1 0 0 0 0 0 0 4 0.15
-1 0 0 0 0 0 2 4 0.15
-1 0 0 0 0 0 4 4 0.15
-1 0 0 0 0 0 6 4 0.15
-1 0 0 0 0 0 8 4 0.15
-1 0 0 0 0 0 10 4 0.15
-1 0 0 0 0 0 12 4 0.15
-1 0 0 0 0 0 14 4 0.15
-1 0 0 0 0 0 16 4 0.15
-1 0 0 0 0 0 18 4 0.15
+1 0 0 0 0 0 0 2 0.15
+1 0 0 0 0 0 1 2 0.15
+1 0 0 0 0 0 2 2 0.15
+1 0 0 0 0 0 3 2 0.15
+1 0 0 0 0 0 4 2 0.15
+1 0 0 0 0 0 5 2 0.15
+1 0 0 0 0 0 6 2 0.15
+1 0 0 0 0 0 7 2 0.15
+1 0 0 0 0 0 8 2 0.15
+1 0 0 0 0 0 9 2 0.15
+
+
diff --git a/CarpetAttic/Cart3dTest/test/octant/cart3d_z.zl b/CarpetAttic/Cart3dTest/test/octant/cart3d_z.zl
index cf90d6e18..99a89a4c7 100644
--- a/CarpetAttic/Cart3dTest/test/octant/cart3d_z.zl
+++ b/CarpetAttic/Cart3dTest/test/octant/cart3d_z.zl
@@ -1,32 +1,34 @@
# GRID::cart3d_z z (cart3d_z)
#
-#
# iteration 0
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 0 -0.45
-0 0 0 0 0 0 2 2 -0.15
-0 0 0 0 0 0 2 4 0.15
-0 0 0 0 0 0 2 6 0.45
-0 0 0 0 0 0 2 8 0.75
-0 0 0 0 0 0 2 10 1.05
-0 0 0 0 0 0 2 12 1.35
-0 0 0 0 0 0 2 14 1.65
-0 0 0 0 0 0 2 16 1.95
-0 0 0 0 0 0 2 18 2.25
+0 0 0 0 0 0 1 0 -0.45
+0 0 0 0 0 0 1 1 -0.15
+0 0 0 0 0 0 1 2 0.15
+0 0 0 0 0 0 1 3 0.45
+0 0 0 0 0 0 1 4 0.75
+0 0 0 0 0 0 1 5 1.05
+0 0 0 0 0 0 1 6 1.35
+0 0 0 0 0 0 1 7 1.65
+0 0 0 0 0 0 1 8 1.95
+0 0 0 0 0 0 1 9 2.25
+
+
-#
# iteration 1
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 0 -0.45
-1 0 0 0 0 0 2 2 -0.15
-1 0 0 0 0 0 2 4 0.15
-1 0 0 0 0 0 2 6 0.45
-1 0 0 0 0 0 2 8 0.75
-1 0 0 0 0 0 2 10 1.05
-1 0 0 0 0 0 2 12 1.35
-1 0 0 0 0 0 2 14 1.65
-1 0 0 0 0 0 2 16 1.95
-1 0 0 0 0 0 2 18 2.25
+1 0 0 0 0 0 1 0 -0.45
+1 0 0 0 0 0 1 1 -0.15
+1 0 0 0 0 0 1 2 0.15
+1 0 0 0 0 0 1 3 0.45
+1 0 0 0 0 0 1 4 0.75
+1 0 0 0 0 0 1 5 1.05
+1 0 0 0 0 0 1 6 1.35
+1 0 0 0 0 0 1 7 1.65
+1 0 0 0 0 0 1 8 1.95
+1 0 0 0 0 0 1 9 2.25
+
+
diff --git a/CarpetAttic/Cart3dTest/test/octant/fxx.xl b/CarpetAttic/Cart3dTest/test/octant/fxx.xl
index 423953b4b..bb3587def 100644
--- a/CarpetAttic/Cart3dTest/test/octant/fxx.xl
+++ b/CarpetAttic/Cart3dTest/test/octant/fxx.xl
@@ -1,32 +1,34 @@
# CART3DTEST::fxx x (fxx)
#
-#
# iteration 0
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 4 41000102
-0 0 0 0 0 2 2 4 41010102
-0 0 0 0 0 4 2 4 41020102
-0 0 0 0 0 6 2 4 41030102
-0 0 0 0 0 8 2 4 41040102
-0 0 0 0 0 10 2 4 41050102
-0 0 0 0 0 12 2 4 41060102
-0 0 0 0 0 14 2 4 41070102
-0 0 0 0 0 16 2 4 41080102
-0 0 0 0 0 18 2 4 41090102
+0 0 0 0 0 0 1 2 41000102
+0 0 0 0 0 1 1 2 41010102
+0 0 0 0 0 2 1 2 41020102
+0 0 0 0 0 3 1 2 41030102
+0 0 0 0 0 4 1 2 41040102
+0 0 0 0 0 5 1 2 41050102
+0 0 0 0 0 6 1 2 41060102
+0 0 0 0 0 7 1 2 41070102
+0 0 0 0 0 8 1 2 41080102
+0 0 0 0 0 9 1 2 41090102
+
+
-#
# iteration 1
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 4 41000102
-1 0 0 0 0 2 2 4 41010102
-1 0 0 0 0 4 2 4 41020102
-1 0 0 0 0 6 2 4 41030102
-1 0 0 0 0 8 2 4 41040102
-1 0 0 0 0 10 2 4 41050102
-1 0 0 0 0 12 2 4 41060102
-1 0 0 0 0 14 2 4 41070102
-1 0 0 0 0 16 2 4 41080102
-1 0 0 0 0 18 2 4 41090102
+1 0 0 0 0 0 1 2 41000102
+1 0 0 0 0 1 1 2 41010102
+1 0 0 0 0 2 1 2 41020102
+1 0 0 0 0 3 1 2 41030102
+1 0 0 0 0 4 1 2 41040102
+1 0 0 0 0 5 1 2 41050102
+1 0 0 0 0 6 1 2 41060102
+1 0 0 0 0 7 1 2 41070102
+1 0 0 0 0 8 1 2 41080102
+1 0 0 0 0 9 1 2 41090102
+
+
diff --git a/CarpetAttic/Cart3dTest/test/octant/fxx.yl b/CarpetAttic/Cart3dTest/test/octant/fxx.yl
index 052e35c50..772124b44 100644
--- a/CarpetAttic/Cart3dTest/test/octant/fxx.yl
+++ b/CarpetAttic/Cart3dTest/test/octant/fxx.yl
@@ -1,32 +1,34 @@
# CART3DTEST::fxx y (fxx)
#
-#
# iteration 0
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-0 0 0 0 0 0 0 4 41000002
-0 0 0 0 0 0 2 4 41000102
-0 0 0 0 0 0 4 4 41000202
-0 0 0 0 0 0 6 4 41000302
-0 0 0 0 0 0 8 4 41000402
-0 0 0 0 0 0 10 4 41000502
-0 0 0 0 0 0 12 4 41000602
-0 0 0 0 0 0 14 4 41000702
-0 0 0 0 0 0 16 4 41000802
-0 0 0 0 0 0 18 4 41000902
+0 0 0 0 0 0 0 2 41000002
+0 0 0 0 0 0 1 2 41000102
+0 0 0 0 0 0 2 2 41000202
+0 0 0 0 0 0 3 2 41000302
+0 0 0 0 0 0 4 2 41000402
+0 0 0 0 0 0 5 2 41000502
+0 0 0 0 0 0 6 2 41000602
+0 0 0 0 0 0 7 2 41000702
+0 0 0 0 0 0 8 2 41000802
+0 0 0 0 0 0 9 2 41000902
+
+
-#
# iteration 1
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-1 0 0 0 0 0 0 4 41000102
-1 0 0 0 0 0 2 4 41000102
-1 0 0 0 0 0 4 4 41000202
-1 0 0 0 0 0 6 4 41000302
-1 0 0 0 0 0 8 4 41000402
-1 0 0 0 0 0 10 4 41000502
-1 0 0 0 0 0 12 4 41000602
-1 0 0 0 0 0 14 4 41000702
-1 0 0 0 0 0 16 4 41000802
-1 0 0 0 0 0 18 4 41000902
+1 0 0 0 0 0 0 2 41000102
+1 0 0 0 0 0 1 2 41000102
+1 0 0 0 0 0 2 2 41000202
+1 0 0 0 0 0 3 2 41000302
+1 0 0 0 0 0 4 2 41000402
+1 0 0 0 0 0 5 2 41000502
+1 0 0 0 0 0 6 2 41000602
+1 0 0 0 0 0 7 2 41000702
+1 0 0 0 0 0 8 2 41000802
+1 0 0 0 0 0 9 2 41000902
+
+
diff --git a/CarpetAttic/Cart3dTest/test/octant/fxx.zl b/CarpetAttic/Cart3dTest/test/octant/fxx.zl
index 168bf4a56..53e1fe356 100644
--- a/CarpetAttic/Cart3dTest/test/octant/fxx.zl
+++ b/CarpetAttic/Cart3dTest/test/octant/fxx.zl
@@ -1,32 +1,34 @@
# CART3DTEST::fxx z (fxx)
#
-#
# iteration 0
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 0 41000100
-0 0 0 0 0 0 2 2 41000101
-0 0 0 0 0 0 2 4 41000102
-0 0 0 0 0 0 2 6 41000103
-0 0 0 0 0 0 2 8 41000104
-0 0 0 0 0 0 2 10 41000105
-0 0 0 0 0 0 2 12 41000106
-0 0 0 0 0 0 2 14 41000107
-0 0 0 0 0 0 2 16 41000108
-0 0 0 0 0 0 2 18 41000109
+0 0 0 0 0 0 1 0 41000100
+0 0 0 0 0 0 1 1 41000101
+0 0 0 0 0 0 1 2 41000102
+0 0 0 0 0 0 1 3 41000103
+0 0 0 0 0 0 1 4 41000104
+0 0 0 0 0 0 1 5 41000105
+0 0 0 0 0 0 1 6 41000106
+0 0 0 0 0 0 1 7 41000107
+0 0 0 0 0 0 1 8 41000108
+0 0 0 0 0 0 1 9 41000109
+
+
-#
# iteration 1
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 0 41000103
-1 0 0 0 0 0 2 2 41000102
-1 0 0 0 0 0 2 4 41000102
-1 0 0 0 0 0 2 6 41000103
-1 0 0 0 0 0 2 8 41000104
-1 0 0 0 0 0 2 10 41000105
-1 0 0 0 0 0 2 12 41000106
-1 0 0 0 0 0 2 14 41000107
-1 0 0 0 0 0 2 16 41000108
-1 0 0 0 0 0 2 18 41000109
+1 0 0 0 0 0 1 0 41000103
+1 0 0 0 0 0 1 1 41000102
+1 0 0 0 0 0 1 2 41000102
+1 0 0 0 0 0 1 3 41000103
+1 0 0 0 0 0 1 4 41000104
+1 0 0 0 0 0 1 5 41000105
+1 0 0 0 0 0 1 6 41000106
+1 0 0 0 0 0 1 7 41000107
+1 0 0 0 0 0 1 8 41000108
+1 0 0 0 0 0 1 9 41000109
+
+
diff --git a/CarpetAttic/Cart3dTest/test/octant/fxy.xl b/CarpetAttic/Cart3dTest/test/octant/fxy.xl
index 728f7e726..e5581373a 100644
--- a/CarpetAttic/Cart3dTest/test/octant/fxy.xl
+++ b/CarpetAttic/Cart3dTest/test/octant/fxy.xl
@@ -1,32 +1,34 @@
# CART3DTEST::fxy x (fxy)
#
-#
# iteration 0
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 4 42000102
-0 0 0 0 0 2 2 4 42010102
-0 0 0 0 0 4 2 4 42020102
-0 0 0 0 0 6 2 4 42030102
-0 0 0 0 0 8 2 4 42040102
-0 0 0 0 0 10 2 4 42050102
-0 0 0 0 0 12 2 4 42060102
-0 0 0 0 0 14 2 4 42070102
-0 0 0 0 0 16 2 4 42080102
-0 0 0 0 0 18 2 4 42090102
+0 0 0 0 0 0 1 2 42000102
+0 0 0 0 0 1 1 2 42010102
+0 0 0 0 0 2 1 2 42020102
+0 0 0 0 0 3 1 2 42030102
+0 0 0 0 0 4 1 2 42040102
+0 0 0 0 0 5 1 2 42050102
+0 0 0 0 0 6 1 2 42060102
+0 0 0 0 0 7 1 2 42070102
+0 0 0 0 0 8 1 2 42080102
+0 0 0 0 0 9 1 2 42090102
+
+
-#
# iteration 1
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 4 42000102
-1 0 0 0 0 2 2 4 42010102
-1 0 0 0 0 4 2 4 42020102
-1 0 0 0 0 6 2 4 42030102
-1 0 0 0 0 8 2 4 42040102
-1 0 0 0 0 10 2 4 42050102
-1 0 0 0 0 12 2 4 42060102
-1 0 0 0 0 14 2 4 42070102
-1 0 0 0 0 16 2 4 42080102
-1 0 0 0 0 18 2 4 42090102
+1 0 0 0 0 0 1 2 42000102
+1 0 0 0 0 1 1 2 42010102
+1 0 0 0 0 2 1 2 42020102
+1 0 0 0 0 3 1 2 42030102
+1 0 0 0 0 4 1 2 42040102
+1 0 0 0 0 5 1 2 42050102
+1 0 0 0 0 6 1 2 42060102
+1 0 0 0 0 7 1 2 42070102
+1 0 0 0 0 8 1 2 42080102
+1 0 0 0 0 9 1 2 42090102
+
+
diff --git a/CarpetAttic/Cart3dTest/test/octant/fxy.yl b/CarpetAttic/Cart3dTest/test/octant/fxy.yl
index 189d8f0de..1f59e92da 100644
--- a/CarpetAttic/Cart3dTest/test/octant/fxy.yl
+++ b/CarpetAttic/Cart3dTest/test/octant/fxy.yl
@@ -1,32 +1,34 @@
# CART3DTEST::fxy y (fxy)
#
-#
# iteration 0
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-0 0 0 0 0 0 0 4 42000002
-0 0 0 0 0 0 2 4 42000102
-0 0 0 0 0 0 4 4 42000202
-0 0 0 0 0 0 6 4 42000302
-0 0 0 0 0 0 8 4 42000402
-0 0 0 0 0 0 10 4 42000502
-0 0 0 0 0 0 12 4 42000602
-0 0 0 0 0 0 14 4 42000702
-0 0 0 0 0 0 16 4 42000802
-0 0 0 0 0 0 18 4 42000902
+0 0 0 0 0 0 0 2 42000002
+0 0 0 0 0 0 1 2 42000102
+0 0 0 0 0 0 2 2 42000202
+0 0 0 0 0 0 3 2 42000302
+0 0 0 0 0 0 4 2 42000402
+0 0 0 0 0 0 5 2 42000502
+0 0 0 0 0 0 6 2 42000602
+0 0 0 0 0 0 7 2 42000702
+0 0 0 0 0 0 8 2 42000802
+0 0 0 0 0 0 9 2 42000902
+
+
-#
# iteration 1
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-1 0 0 0 0 0 0 4 -42000102
-1 0 0 0 0 0 2 4 42000102
-1 0 0 0 0 0 4 4 42000202
-1 0 0 0 0 0 6 4 42000302
-1 0 0 0 0 0 8 4 42000402
-1 0 0 0 0 0 10 4 42000502
-1 0 0 0 0 0 12 4 42000602
-1 0 0 0 0 0 14 4 42000702
-1 0 0 0 0 0 16 4 42000802
-1 0 0 0 0 0 18 4 42000902
+1 0 0 0 0 0 0 2 -42000102
+1 0 0 0 0 0 1 2 42000102
+1 0 0 0 0 0 2 2 42000202
+1 0 0 0 0 0 3 2 42000302
+1 0 0 0 0 0 4 2 42000402
+1 0 0 0 0 0 5 2 42000502
+1 0 0 0 0 0 6 2 42000602
+1 0 0 0 0 0 7 2 42000702
+1 0 0 0 0 0 8 2 42000802
+1 0 0 0 0 0 9 2 42000902
+
+
diff --git a/CarpetAttic/Cart3dTest/test/octant/fxy.zl b/CarpetAttic/Cart3dTest/test/octant/fxy.zl
index b2361cd0f..f0fd92291 100644
--- a/CarpetAttic/Cart3dTest/test/octant/fxy.zl
+++ b/CarpetAttic/Cart3dTest/test/octant/fxy.zl
@@ -1,32 +1,34 @@
# CART3DTEST::fxy z (fxy)
#
-#
# iteration 0
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 0 42000100
-0 0 0 0 0 0 2 2 42000101
-0 0 0 0 0 0 2 4 42000102
-0 0 0 0 0 0 2 6 42000103
-0 0 0 0 0 0 2 8 42000104
-0 0 0 0 0 0 2 10 42000105
-0 0 0 0 0 0 2 12 42000106
-0 0 0 0 0 0 2 14 42000107
-0 0 0 0 0 0 2 16 42000108
-0 0 0 0 0 0 2 18 42000109
+0 0 0 0 0 0 1 0 42000100
+0 0 0 0 0 0 1 1 42000101
+0 0 0 0 0 0 1 2 42000102
+0 0 0 0 0 0 1 3 42000103
+0 0 0 0 0 0 1 4 42000104
+0 0 0 0 0 0 1 5 42000105
+0 0 0 0 0 0 1 6 42000106
+0 0 0 0 0 0 1 7 42000107
+0 0 0 0 0 0 1 8 42000108
+0 0 0 0 0 0 1 9 42000109
+
+
-#
# iteration 1
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 0 42000103
-1 0 0 0 0 0 2 2 42000102
-1 0 0 0 0 0 2 4 42000102
-1 0 0 0 0 0 2 6 42000103
-1 0 0 0 0 0 2 8 42000104
-1 0 0 0 0 0 2 10 42000105
-1 0 0 0 0 0 2 12 42000106
-1 0 0 0 0 0 2 14 42000107
-1 0 0 0 0 0 2 16 42000108
-1 0 0 0 0 0 2 18 42000109
+1 0 0 0 0 0 1 0 42000103
+1 0 0 0 0 0 1 1 42000102
+1 0 0 0 0 0 1 2 42000102
+1 0 0 0 0 0 1 3 42000103
+1 0 0 0 0 0 1 4 42000104
+1 0 0 0 0 0 1 5 42000105
+1 0 0 0 0 0 1 6 42000106
+1 0 0 0 0 0 1 7 42000107
+1 0 0 0 0 0 1 8 42000108
+1 0 0 0 0 0 1 9 42000109
+
+
diff --git a/CarpetAttic/Cart3dTest/test/octant/fxz.xl b/CarpetAttic/Cart3dTest/test/octant/fxz.xl
index b65002cdd..f21c7d9c4 100644
--- a/CarpetAttic/Cart3dTest/test/octant/fxz.xl
+++ b/CarpetAttic/Cart3dTest/test/octant/fxz.xl
@@ -1,32 +1,34 @@
# CART3DTEST::fxz x (fxz)
#
-#
# iteration 0
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 4 43000102
-0 0 0 0 0 2 2 4 43010102
-0 0 0 0 0 4 2 4 43020102
-0 0 0 0 0 6 2 4 43030102
-0 0 0 0 0 8 2 4 43040102
-0 0 0 0 0 10 2 4 43050102
-0 0 0 0 0 12 2 4 43060102
-0 0 0 0 0 14 2 4 43070102
-0 0 0 0 0 16 2 4 43080102
-0 0 0 0 0 18 2 4 43090102
+0 0 0 0 0 0 1 2 43000102
+0 0 0 0 0 1 1 2 43010102
+0 0 0 0 0 2 1 2 43020102
+0 0 0 0 0 3 1 2 43030102
+0 0 0 0 0 4 1 2 43040102
+0 0 0 0 0 5 1 2 43050102
+0 0 0 0 0 6 1 2 43060102
+0 0 0 0 0 7 1 2 43070102
+0 0 0 0 0 8 1 2 43080102
+0 0 0 0 0 9 1 2 43090102
+
+
-#
# iteration 1
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 4 43000102
-1 0 0 0 0 2 2 4 43010102
-1 0 0 0 0 4 2 4 43020102
-1 0 0 0 0 6 2 4 43030102
-1 0 0 0 0 8 2 4 43040102
-1 0 0 0 0 10 2 4 43050102
-1 0 0 0 0 12 2 4 43060102
-1 0 0 0 0 14 2 4 43070102
-1 0 0 0 0 16 2 4 43080102
-1 0 0 0 0 18 2 4 43090102
+1 0 0 0 0 0 1 2 43000102
+1 0 0 0 0 1 1 2 43010102
+1 0 0 0 0 2 1 2 43020102
+1 0 0 0 0 3 1 2 43030102
+1 0 0 0 0 4 1 2 43040102
+1 0 0 0 0 5 1 2 43050102
+1 0 0 0 0 6 1 2 43060102
+1 0 0 0 0 7 1 2 43070102
+1 0 0 0 0 8 1 2 43080102
+1 0 0 0 0 9 1 2 43090102
+
+
diff --git a/CarpetAttic/Cart3dTest/test/octant/fxz.yl b/CarpetAttic/Cart3dTest/test/octant/fxz.yl
index f02e07de2..dbddee7d5 100644
--- a/CarpetAttic/Cart3dTest/test/octant/fxz.yl
+++ b/CarpetAttic/Cart3dTest/test/octant/fxz.yl
@@ -1,32 +1,34 @@
# CART3DTEST::fxz y (fxz)
#
-#
# iteration 0
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-0 0 0 0 0 0 0 4 43000002
-0 0 0 0 0 0 2 4 43000102
-0 0 0 0 0 0 4 4 43000202
-0 0 0 0 0 0 6 4 43000302
-0 0 0 0 0 0 8 4 43000402
-0 0 0 0 0 0 10 4 43000502
-0 0 0 0 0 0 12 4 43000602
-0 0 0 0 0 0 14 4 43000702
-0 0 0 0 0 0 16 4 43000802
-0 0 0 0 0 0 18 4 43000902
+0 0 0 0 0 0 0 2 43000002
+0 0 0 0 0 0 1 2 43000102
+0 0 0 0 0 0 2 2 43000202
+0 0 0 0 0 0 3 2 43000302
+0 0 0 0 0 0 4 2 43000402
+0 0 0 0 0 0 5 2 43000502
+0 0 0 0 0 0 6 2 43000602
+0 0 0 0 0 0 7 2 43000702
+0 0 0 0 0 0 8 2 43000802
+0 0 0 0 0 0 9 2 43000902
+
+
-#
# iteration 1
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-1 0 0 0 0 0 0 4 43000102
-1 0 0 0 0 0 2 4 43000102
-1 0 0 0 0 0 4 4 43000202
-1 0 0 0 0 0 6 4 43000302
-1 0 0 0 0 0 8 4 43000402
-1 0 0 0 0 0 10 4 43000502
-1 0 0 0 0 0 12 4 43000602
-1 0 0 0 0 0 14 4 43000702
-1 0 0 0 0 0 16 4 43000802
-1 0 0 0 0 0 18 4 43000902
+1 0 0 0 0 0 0 2 43000102
+1 0 0 0 0 0 1 2 43000102
+1 0 0 0 0 0 2 2 43000202
+1 0 0 0 0 0 3 2 43000302
+1 0 0 0 0 0 4 2 43000402
+1 0 0 0 0 0 5 2 43000502
+1 0 0 0 0 0 6 2 43000602
+1 0 0 0 0 0 7 2 43000702
+1 0 0 0 0 0 8 2 43000802
+1 0 0 0 0 0 9 2 43000902
+
+
diff --git a/CarpetAttic/Cart3dTest/test/octant/fxz.zl b/CarpetAttic/Cart3dTest/test/octant/fxz.zl
index c12b20dd8..295d9dc7f 100644
--- a/CarpetAttic/Cart3dTest/test/octant/fxz.zl
+++ b/CarpetAttic/Cart3dTest/test/octant/fxz.zl
@@ -1,32 +1,34 @@
# CART3DTEST::fxz z (fxz)
#
-#
# iteration 0
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 0 43000100
-0 0 0 0 0 0 2 2 43000101
-0 0 0 0 0 0 2 4 43000102
-0 0 0 0 0 0 2 6 43000103
-0 0 0 0 0 0 2 8 43000104
-0 0 0 0 0 0 2 10 43000105
-0 0 0 0 0 0 2 12 43000106
-0 0 0 0 0 0 2 14 43000107
-0 0 0 0 0 0 2 16 43000108
-0 0 0 0 0 0 2 18 43000109
+0 0 0 0 0 0 1 0 43000100
+0 0 0 0 0 0 1 1 43000101
+0 0 0 0 0 0 1 2 43000102
+0 0 0 0 0 0 1 3 43000103
+0 0 0 0 0 0 1 4 43000104
+0 0 0 0 0 0 1 5 43000105
+0 0 0 0 0 0 1 6 43000106
+0 0 0 0 0 0 1 7 43000107
+0 0 0 0 0 0 1 8 43000108
+0 0 0 0 0 0 1 9 43000109
+
+
-#
# iteration 1
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 0 -43000103
-1 0 0 0 0 0 2 2 -43000102
-1 0 0 0 0 0 2 4 43000102
-1 0 0 0 0 0 2 6 43000103
-1 0 0 0 0 0 2 8 43000104
-1 0 0 0 0 0 2 10 43000105
-1 0 0 0 0 0 2 12 43000106
-1 0 0 0 0 0 2 14 43000107
-1 0 0 0 0 0 2 16 43000108
-1 0 0 0 0 0 2 18 43000109
+1 0 0 0 0 0 1 0 -43000103
+1 0 0 0 0 0 1 1 -43000102
+1 0 0 0 0 0 1 2 43000102
+1 0 0 0 0 0 1 3 43000103
+1 0 0 0 0 0 1 4 43000104
+1 0 0 0 0 0 1 5 43000105
+1 0 0 0 0 0 1 6 43000106
+1 0 0 0 0 0 1 7 43000107
+1 0 0 0 0 0 1 8 43000108
+1 0 0 0 0 0 1 9 43000109
+
+
diff --git a/CarpetAttic/Cart3dTest/test/octant/fyx.xl b/CarpetAttic/Cart3dTest/test/octant/fyx.xl
index a83f71fa8..29d37aa19 100644
--- a/CarpetAttic/Cart3dTest/test/octant/fyx.xl
+++ b/CarpetAttic/Cart3dTest/test/octant/fyx.xl
@@ -1,32 +1,34 @@
# CART3DTEST::fyx x (fyx)
#
-#
# iteration 0
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 4 44000102
-0 0 0 0 0 2 2 4 44010102
-0 0 0 0 0 4 2 4 44020102
-0 0 0 0 0 6 2 4 44030102
-0 0 0 0 0 8 2 4 44040102
-0 0 0 0 0 10 2 4 44050102
-0 0 0 0 0 12 2 4 44060102
-0 0 0 0 0 14 2 4 44070102
-0 0 0 0 0 16 2 4 44080102
-0 0 0 0 0 18 2 4 44090102
+0 0 0 0 0 0 1 2 44000102
+0 0 0 0 0 1 1 2 44010102
+0 0 0 0 0 2 1 2 44020102
+0 0 0 0 0 3 1 2 44030102
+0 0 0 0 0 4 1 2 44040102
+0 0 0 0 0 5 1 2 44050102
+0 0 0 0 0 6 1 2 44060102
+0 0 0 0 0 7 1 2 44070102
+0 0 0 0 0 8 1 2 44080102
+0 0 0 0 0 9 1 2 44090102
+
+
-#
# iteration 1
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 4 44000102
-1 0 0 0 0 2 2 4 44010102
-1 0 0 0 0 4 2 4 44020102
-1 0 0 0 0 6 2 4 44030102
-1 0 0 0 0 8 2 4 44040102
-1 0 0 0 0 10 2 4 44050102
-1 0 0 0 0 12 2 4 44060102
-1 0 0 0 0 14 2 4 44070102
-1 0 0 0 0 16 2 4 44080102
-1 0 0 0 0 18 2 4 44090102
+1 0 0 0 0 0 1 2 44000102
+1 0 0 0 0 1 1 2 44010102
+1 0 0 0 0 2 1 2 44020102
+1 0 0 0 0 3 1 2 44030102
+1 0 0 0 0 4 1 2 44040102
+1 0 0 0 0 5 1 2 44050102
+1 0 0 0 0 6 1 2 44060102
+1 0 0 0 0 7 1 2 44070102
+1 0 0 0 0 8 1 2 44080102
+1 0 0 0 0 9 1 2 44090102
+
+
diff --git a/CarpetAttic/Cart3dTest/test/octant/fyx.yl b/CarpetAttic/Cart3dTest/test/octant/fyx.yl
index 9c8c4cbe5..4fb83fcc6 100644
--- a/CarpetAttic/Cart3dTest/test/octant/fyx.yl
+++ b/CarpetAttic/Cart3dTest/test/octant/fyx.yl
@@ -1,32 +1,34 @@
# CART3DTEST::fyx y (fyx)
#
-#
# iteration 0
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-0 0 0 0 0 0 0 4 44000002
-0 0 0 0 0 0 2 4 44000102
-0 0 0 0 0 0 4 4 44000202
-0 0 0 0 0 0 6 4 44000302
-0 0 0 0 0 0 8 4 44000402
-0 0 0 0 0 0 10 4 44000502
-0 0 0 0 0 0 12 4 44000602
-0 0 0 0 0 0 14 4 44000702
-0 0 0 0 0 0 16 4 44000802
-0 0 0 0 0 0 18 4 44000902
+0 0 0 0 0 0 0 2 44000002
+0 0 0 0 0 0 1 2 44000102
+0 0 0 0 0 0 2 2 44000202
+0 0 0 0 0 0 3 2 44000302
+0 0 0 0 0 0 4 2 44000402
+0 0 0 0 0 0 5 2 44000502
+0 0 0 0 0 0 6 2 44000602
+0 0 0 0 0 0 7 2 44000702
+0 0 0 0 0 0 8 2 44000802
+0 0 0 0 0 0 9 2 44000902
+
+
-#
# iteration 1
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-1 0 0 0 0 0 0 4 -44000102
-1 0 0 0 0 0 2 4 44000102
-1 0 0 0 0 0 4 4 44000202
-1 0 0 0 0 0 6 4 44000302
-1 0 0 0 0 0 8 4 44000402
-1 0 0 0 0 0 10 4 44000502
-1 0 0 0 0 0 12 4 44000602
-1 0 0 0 0 0 14 4 44000702
-1 0 0 0 0 0 16 4 44000802
-1 0 0 0 0 0 18 4 44000902
+1 0 0 0 0 0 0 2 -44000102
+1 0 0 0 0 0 1 2 44000102
+1 0 0 0 0 0 2 2 44000202
+1 0 0 0 0 0 3 2 44000302
+1 0 0 0 0 0 4 2 44000402
+1 0 0 0 0 0 5 2 44000502
+1 0 0 0 0 0 6 2 44000602
+1 0 0 0 0 0 7 2 44000702
+1 0 0 0 0 0 8 2 44000802
+1 0 0 0 0 0 9 2 44000902
+
+
diff --git a/CarpetAttic/Cart3dTest/test/octant/fyx.zl b/CarpetAttic/Cart3dTest/test/octant/fyx.zl
index 27c361b59..5555b7562 100644
--- a/CarpetAttic/Cart3dTest/test/octant/fyx.zl
+++ b/CarpetAttic/Cart3dTest/test/octant/fyx.zl
@@ -1,32 +1,34 @@
# CART3DTEST::fyx z (fyx)
#
-#
# iteration 0
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 0 44000100
-0 0 0 0 0 0 2 2 44000101
-0 0 0 0 0 0 2 4 44000102
-0 0 0 0 0 0 2 6 44000103
-0 0 0 0 0 0 2 8 44000104
-0 0 0 0 0 0 2 10 44000105
-0 0 0 0 0 0 2 12 44000106
-0 0 0 0 0 0 2 14 44000107
-0 0 0 0 0 0 2 16 44000108
-0 0 0 0 0 0 2 18 44000109
+0 0 0 0 0 0 1 0 44000100
+0 0 0 0 0 0 1 1 44000101
+0 0 0 0 0 0 1 2 44000102
+0 0 0 0 0 0 1 3 44000103
+0 0 0 0 0 0 1 4 44000104
+0 0 0 0 0 0 1 5 44000105
+0 0 0 0 0 0 1 6 44000106
+0 0 0 0 0 0 1 7 44000107
+0 0 0 0 0 0 1 8 44000108
+0 0 0 0 0 0 1 9 44000109
+
+
-#
# iteration 1
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 0 44000103
-1 0 0 0 0 0 2 2 44000102
-1 0 0 0 0 0 2 4 44000102
-1 0 0 0 0 0 2 6 44000103
-1 0 0 0 0 0 2 8 44000104
-1 0 0 0 0 0 2 10 44000105
-1 0 0 0 0 0 2 12 44000106
-1 0 0 0 0 0 2 14 44000107
-1 0 0 0 0 0 2 16 44000108
-1 0 0 0 0 0 2 18 44000109
+1 0 0 0 0 0 1 0 44000103
+1 0 0 0 0 0 1 1 44000102
+1 0 0 0 0 0 1 2 44000102
+1 0 0 0 0 0 1 3 44000103
+1 0 0 0 0 0 1 4 44000104
+1 0 0 0 0 0 1 5 44000105
+1 0 0 0 0 0 1 6 44000106
+1 0 0 0 0 0 1 7 44000107
+1 0 0 0 0 0 1 8 44000108
+1 0 0 0 0 0 1 9 44000109
+
+
diff --git a/CarpetAttic/Cart3dTest/test/octant/fyy.xl b/CarpetAttic/Cart3dTest/test/octant/fyy.xl
index fa30e66f7..4c99ee513 100644
--- a/CarpetAttic/Cart3dTest/test/octant/fyy.xl
+++ b/CarpetAttic/Cart3dTest/test/octant/fyy.xl
@@ -1,32 +1,34 @@
# CART3DTEST::fyy x (fyy)
#
-#
# iteration 0
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 4 45000102
-0 0 0 0 0 2 2 4 45010102
-0 0 0 0 0 4 2 4 45020102
-0 0 0 0 0 6 2 4 45030102
-0 0 0 0 0 8 2 4 45040102
-0 0 0 0 0 10 2 4 45050102
-0 0 0 0 0 12 2 4 45060102
-0 0 0 0 0 14 2 4 45070102
-0 0 0 0 0 16 2 4 45080102
-0 0 0 0 0 18 2 4 45090102
+0 0 0 0 0 0 1 2 45000102
+0 0 0 0 0 1 1 2 45010102
+0 0 0 0 0 2 1 2 45020102
+0 0 0 0 0 3 1 2 45030102
+0 0 0 0 0 4 1 2 45040102
+0 0 0 0 0 5 1 2 45050102
+0 0 0 0 0 6 1 2 45060102
+0 0 0 0 0 7 1 2 45070102
+0 0 0 0 0 8 1 2 45080102
+0 0 0 0 0 9 1 2 45090102
+
+
-#
# iteration 1
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 4 45000102
-1 0 0 0 0 2 2 4 45010102
-1 0 0 0 0 4 2 4 45020102
-1 0 0 0 0 6 2 4 45030102
-1 0 0 0 0 8 2 4 45040102
-1 0 0 0 0 10 2 4 45050102
-1 0 0 0 0 12 2 4 45060102
-1 0 0 0 0 14 2 4 45070102
-1 0 0 0 0 16 2 4 45080102
-1 0 0 0 0 18 2 4 45090102
+1 0 0 0 0 0 1 2 45000102
+1 0 0 0 0 1 1 2 45010102
+1 0 0 0 0 2 1 2 45020102
+1 0 0 0 0 3 1 2 45030102
+1 0 0 0 0 4 1 2 45040102
+1 0 0 0 0 5 1 2 45050102
+1 0 0 0 0 6 1 2 45060102
+1 0 0 0 0 7 1 2 45070102
+1 0 0 0 0 8 1 2 45080102
+1 0 0 0 0 9 1 2 45090102
+
+
diff --git a/CarpetAttic/Cart3dTest/test/octant/fyy.yl b/CarpetAttic/Cart3dTest/test/octant/fyy.yl
index 6569af235..fa9aa1f77 100644
--- a/CarpetAttic/Cart3dTest/test/octant/fyy.yl
+++ b/CarpetAttic/Cart3dTest/test/octant/fyy.yl
@@ -1,32 +1,34 @@
# CART3DTEST::fyy y (fyy)
#
-#
# iteration 0
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-0 0 0 0 0 0 0 4 45000002
-0 0 0 0 0 0 2 4 45000102
-0 0 0 0 0 0 4 4 45000202
-0 0 0 0 0 0 6 4 45000302
-0 0 0 0 0 0 8 4 45000402
-0 0 0 0 0 0 10 4 45000502
-0 0 0 0 0 0 12 4 45000602
-0 0 0 0 0 0 14 4 45000702
-0 0 0 0 0 0 16 4 45000802
-0 0 0 0 0 0 18 4 45000902
+0 0 0 0 0 0 0 2 45000002
+0 0 0 0 0 0 1 2 45000102
+0 0 0 0 0 0 2 2 45000202
+0 0 0 0 0 0 3 2 45000302
+0 0 0 0 0 0 4 2 45000402
+0 0 0 0 0 0 5 2 45000502
+0 0 0 0 0 0 6 2 45000602
+0 0 0 0 0 0 7 2 45000702
+0 0 0 0 0 0 8 2 45000802
+0 0 0 0 0 0 9 2 45000902
+
+
-#
# iteration 1
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-1 0 0 0 0 0 0 4 45000102
-1 0 0 0 0 0 2 4 45000102
-1 0 0 0 0 0 4 4 45000202
-1 0 0 0 0 0 6 4 45000302
-1 0 0 0 0 0 8 4 45000402
-1 0 0 0 0 0 10 4 45000502
-1 0 0 0 0 0 12 4 45000602
-1 0 0 0 0 0 14 4 45000702
-1 0 0 0 0 0 16 4 45000802
-1 0 0 0 0 0 18 4 45000902
+1 0 0 0 0 0 0 2 45000102
+1 0 0 0 0 0 1 2 45000102
+1 0 0 0 0 0 2 2 45000202
+1 0 0 0 0 0 3 2 45000302
+1 0 0 0 0 0 4 2 45000402
+1 0 0 0 0 0 5 2 45000502
+1 0 0 0 0 0 6 2 45000602
+1 0 0 0 0 0 7 2 45000702
+1 0 0 0 0 0 8 2 45000802
+1 0 0 0 0 0 9 2 45000902
+
+
diff --git a/CarpetAttic/Cart3dTest/test/octant/fyy.zl b/CarpetAttic/Cart3dTest/test/octant/fyy.zl
index d4e173d84..b96e2d846 100644
--- a/CarpetAttic/Cart3dTest/test/octant/fyy.zl
+++ b/CarpetAttic/Cart3dTest/test/octant/fyy.zl
@@ -1,32 +1,34 @@
# CART3DTEST::fyy z (fyy)
#
-#
# iteration 0
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 0 45000100
-0 0 0 0 0 0 2 2 45000101
-0 0 0 0 0 0 2 4 45000102
-0 0 0 0 0 0 2 6 45000103
-0 0 0 0 0 0 2 8 45000104
-0 0 0 0 0 0 2 10 45000105
-0 0 0 0 0 0 2 12 45000106
-0 0 0 0 0 0 2 14 45000107
-0 0 0 0 0 0 2 16 45000108
-0 0 0 0 0 0 2 18 45000109
+0 0 0 0 0 0 1 0 45000100
+0 0 0 0 0 0 1 1 45000101
+0 0 0 0 0 0 1 2 45000102
+0 0 0 0 0 0 1 3 45000103
+0 0 0 0 0 0 1 4 45000104
+0 0 0 0 0 0 1 5 45000105
+0 0 0 0 0 0 1 6 45000106
+0 0 0 0 0 0 1 7 45000107
+0 0 0 0 0 0 1 8 45000108
+0 0 0 0 0 0 1 9 45000109
+
+
-#
# iteration 1
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 0 45000103
-1 0 0 0 0 0 2 2 45000102
-1 0 0 0 0 0 2 4 45000102
-1 0 0 0 0 0 2 6 45000103
-1 0 0 0 0 0 2 8 45000104
-1 0 0 0 0 0 2 10 45000105
-1 0 0 0 0 0 2 12 45000106
-1 0 0 0 0 0 2 14 45000107
-1 0 0 0 0 0 2 16 45000108
-1 0 0 0 0 0 2 18 45000109
+1 0 0 0 0 0 1 0 45000103
+1 0 0 0 0 0 1 1 45000102
+1 0 0 0 0 0 1 2 45000102
+1 0 0 0 0 0 1 3 45000103
+1 0 0 0 0 0 1 4 45000104
+1 0 0 0 0 0 1 5 45000105
+1 0 0 0 0 0 1 6 45000106
+1 0 0 0 0 0 1 7 45000107
+1 0 0 0 0 0 1 8 45000108
+1 0 0 0 0 0 1 9 45000109
+
+
diff --git a/CarpetAttic/Cart3dTest/test/octant/fyz.xl b/CarpetAttic/Cart3dTest/test/octant/fyz.xl
index fbe4d125e..63279046f 100644
--- a/CarpetAttic/Cart3dTest/test/octant/fyz.xl
+++ b/CarpetAttic/Cart3dTest/test/octant/fyz.xl
@@ -1,32 +1,34 @@
# CART3DTEST::fyz x (fyz)
#
-#
# iteration 0
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 4 46000102
-0 0 0 0 0 2 2 4 46010102
-0 0 0 0 0 4 2 4 46020102
-0 0 0 0 0 6 2 4 46030102
-0 0 0 0 0 8 2 4 46040102
-0 0 0 0 0 10 2 4 46050102
-0 0 0 0 0 12 2 4 46060102
-0 0 0 0 0 14 2 4 46070102
-0 0 0 0 0 16 2 4 46080102
-0 0 0 0 0 18 2 4 46090102
+0 0 0 0 0 0 1 2 46000102
+0 0 0 0 0 1 1 2 46010102
+0 0 0 0 0 2 1 2 46020102
+0 0 0 0 0 3 1 2 46030102
+0 0 0 0 0 4 1 2 46040102
+0 0 0 0 0 5 1 2 46050102
+0 0 0 0 0 6 1 2 46060102
+0 0 0 0 0 7 1 2 46070102
+0 0 0 0 0 8 1 2 46080102
+0 0 0 0 0 9 1 2 46090102
+
+
-#
# iteration 1
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 4 46000102
-1 0 0 0 0 2 2 4 46010102
-1 0 0 0 0 4 2 4 46020102
-1 0 0 0 0 6 2 4 46030102
-1 0 0 0 0 8 2 4 46040102
-1 0 0 0 0 10 2 4 46050102
-1 0 0 0 0 12 2 4 46060102
-1 0 0 0 0 14 2 4 46070102
-1 0 0 0 0 16 2 4 46080102
-1 0 0 0 0 18 2 4 46090102
+1 0 0 0 0 0 1 2 46000102
+1 0 0 0 0 1 1 2 46010102
+1 0 0 0 0 2 1 2 46020102
+1 0 0 0 0 3 1 2 46030102
+1 0 0 0 0 4 1 2 46040102
+1 0 0 0 0 5 1 2 46050102
+1 0 0 0 0 6 1 2 46060102
+1 0 0 0 0 7 1 2 46070102
+1 0 0 0 0 8 1 2 46080102
+1 0 0 0 0 9 1 2 46090102
+
+
diff --git a/CarpetAttic/Cart3dTest/test/octant/fyz.yl b/CarpetAttic/Cart3dTest/test/octant/fyz.yl
index 33314c244..99e1178d6 100644
--- a/CarpetAttic/Cart3dTest/test/octant/fyz.yl
+++ b/CarpetAttic/Cart3dTest/test/octant/fyz.yl
@@ -1,32 +1,34 @@
# CART3DTEST::fyz y (fyz)
#
-#
# iteration 0
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-0 0 0 0 0 0 0 4 46000002
-0 0 0 0 0 0 2 4 46000102
-0 0 0 0 0 0 4 4 46000202
-0 0 0 0 0 0 6 4 46000302
-0 0 0 0 0 0 8 4 46000402
-0 0 0 0 0 0 10 4 46000502
-0 0 0 0 0 0 12 4 46000602
-0 0 0 0 0 0 14 4 46000702
-0 0 0 0 0 0 16 4 46000802
-0 0 0 0 0 0 18 4 46000902
+0 0 0 0 0 0 0 2 46000002
+0 0 0 0 0 0 1 2 46000102
+0 0 0 0 0 0 2 2 46000202
+0 0 0 0 0 0 3 2 46000302
+0 0 0 0 0 0 4 2 46000402
+0 0 0 0 0 0 5 2 46000502
+0 0 0 0 0 0 6 2 46000602
+0 0 0 0 0 0 7 2 46000702
+0 0 0 0 0 0 8 2 46000802
+0 0 0 0 0 0 9 2 46000902
+
+
-#
# iteration 1
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-1 0 0 0 0 0 0 4 -46000102
-1 0 0 0 0 0 2 4 46000102
-1 0 0 0 0 0 4 4 46000202
-1 0 0 0 0 0 6 4 46000302
-1 0 0 0 0 0 8 4 46000402
-1 0 0 0 0 0 10 4 46000502
-1 0 0 0 0 0 12 4 46000602
-1 0 0 0 0 0 14 4 46000702
-1 0 0 0 0 0 16 4 46000802
-1 0 0 0 0 0 18 4 46000902
+1 0 0 0 0 0 0 2 -46000102
+1 0 0 0 0 0 1 2 46000102
+1 0 0 0 0 0 2 2 46000202
+1 0 0 0 0 0 3 2 46000302
+1 0 0 0 0 0 4 2 46000402
+1 0 0 0 0 0 5 2 46000502
+1 0 0 0 0 0 6 2 46000602
+1 0 0 0 0 0 7 2 46000702
+1 0 0 0 0 0 8 2 46000802
+1 0 0 0 0 0 9 2 46000902
+
+
diff --git a/CarpetAttic/Cart3dTest/test/octant/fyz.zl b/CarpetAttic/Cart3dTest/test/octant/fyz.zl
index 1d43d5111..56cf066b9 100644
--- a/CarpetAttic/Cart3dTest/test/octant/fyz.zl
+++ b/CarpetAttic/Cart3dTest/test/octant/fyz.zl
@@ -1,32 +1,34 @@
# CART3DTEST::fyz z (fyz)
#
-#
# iteration 0
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 0 46000100
-0 0 0 0 0 0 2 2 46000101
-0 0 0 0 0 0 2 4 46000102
-0 0 0 0 0 0 2 6 46000103
-0 0 0 0 0 0 2 8 46000104
-0 0 0 0 0 0 2 10 46000105
-0 0 0 0 0 0 2 12 46000106
-0 0 0 0 0 0 2 14 46000107
-0 0 0 0 0 0 2 16 46000108
-0 0 0 0 0 0 2 18 46000109
+0 0 0 0 0 0 1 0 46000100
+0 0 0 0 0 0 1 1 46000101
+0 0 0 0 0 0 1 2 46000102
+0 0 0 0 0 0 1 3 46000103
+0 0 0 0 0 0 1 4 46000104
+0 0 0 0 0 0 1 5 46000105
+0 0 0 0 0 0 1 6 46000106
+0 0 0 0 0 0 1 7 46000107
+0 0 0 0 0 0 1 8 46000108
+0 0 0 0 0 0 1 9 46000109
+
+
-#
# iteration 1
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 0 -46000103
-1 0 0 0 0 0 2 2 -46000102
-1 0 0 0 0 0 2 4 46000102
-1 0 0 0 0 0 2 6 46000103
-1 0 0 0 0 0 2 8 46000104
-1 0 0 0 0 0 2 10 46000105
-1 0 0 0 0 0 2 12 46000106
-1 0 0 0 0 0 2 14 46000107
-1 0 0 0 0 0 2 16 46000108
-1 0 0 0 0 0 2 18 46000109
+1 0 0 0 0 0 1 0 -46000103
+1 0 0 0 0 0 1 1 -46000102
+1 0 0 0 0 0 1 2 46000102
+1 0 0 0 0 0 1 3 46000103
+1 0 0 0 0 0 1 4 46000104
+1 0 0 0 0 0 1 5 46000105
+1 0 0 0 0 0 1 6 46000106
+1 0 0 0 0 0 1 7 46000107
+1 0 0 0 0 0 1 8 46000108
+1 0 0 0 0 0 1 9 46000109
+
+
diff --git a/CarpetAttic/Cart3dTest/test/octant/fzx.xl b/CarpetAttic/Cart3dTest/test/octant/fzx.xl
index 635f72c29..77ebb762b 100644
--- a/CarpetAttic/Cart3dTest/test/octant/fzx.xl
+++ b/CarpetAttic/Cart3dTest/test/octant/fzx.xl
@@ -1,32 +1,34 @@
# CART3DTEST::fzx x (fzx)
#
-#
# iteration 0
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 4 47000102
-0 0 0 0 0 2 2 4 47010102
-0 0 0 0 0 4 2 4 47020102
-0 0 0 0 0 6 2 4 47030102
-0 0 0 0 0 8 2 4 47040102
-0 0 0 0 0 10 2 4 47050102
-0 0 0 0 0 12 2 4 47060102
-0 0 0 0 0 14 2 4 47070102
-0 0 0 0 0 16 2 4 47080102
-0 0 0 0 0 18 2 4 47090102
+0 0 0 0 0 0 1 2 47000102
+0 0 0 0 0 1 1 2 47010102
+0 0 0 0 0 2 1 2 47020102
+0 0 0 0 0 3 1 2 47030102
+0 0 0 0 0 4 1 2 47040102
+0 0 0 0 0 5 1 2 47050102
+0 0 0 0 0 6 1 2 47060102
+0 0 0 0 0 7 1 2 47070102
+0 0 0 0 0 8 1 2 47080102
+0 0 0 0 0 9 1 2 47090102
+
+
-#
# iteration 1
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 4 47000102
-1 0 0 0 0 2 2 4 47010102
-1 0 0 0 0 4 2 4 47020102
-1 0 0 0 0 6 2 4 47030102
-1 0 0 0 0 8 2 4 47040102
-1 0 0 0 0 10 2 4 47050102
-1 0 0 0 0 12 2 4 47060102
-1 0 0 0 0 14 2 4 47070102
-1 0 0 0 0 16 2 4 47080102
-1 0 0 0 0 18 2 4 47090102
+1 0 0 0 0 0 1 2 47000102
+1 0 0 0 0 1 1 2 47010102
+1 0 0 0 0 2 1 2 47020102
+1 0 0 0 0 3 1 2 47030102
+1 0 0 0 0 4 1 2 47040102
+1 0 0 0 0 5 1 2 47050102
+1 0 0 0 0 6 1 2 47060102
+1 0 0 0 0 7 1 2 47070102
+1 0 0 0 0 8 1 2 47080102
+1 0 0 0 0 9 1 2 47090102
+
+
diff --git a/CarpetAttic/Cart3dTest/test/octant/fzx.yl b/CarpetAttic/Cart3dTest/test/octant/fzx.yl
index d038c4093..04a7c2525 100644
--- a/CarpetAttic/Cart3dTest/test/octant/fzx.yl
+++ b/CarpetAttic/Cart3dTest/test/octant/fzx.yl
@@ -1,32 +1,34 @@
# CART3DTEST::fzx y (fzx)
#
-#
# iteration 0
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-0 0 0 0 0 0 0 4 47000002
-0 0 0 0 0 0 2 4 47000102
-0 0 0 0 0 0 4 4 47000202
-0 0 0 0 0 0 6 4 47000302
-0 0 0 0 0 0 8 4 47000402
-0 0 0 0 0 0 10 4 47000502
-0 0 0 0 0 0 12 4 47000602
-0 0 0 0 0 0 14 4 47000702
-0 0 0 0 0 0 16 4 47000802
-0 0 0 0 0 0 18 4 47000902
+0 0 0 0 0 0 0 2 47000002
+0 0 0 0 0 0 1 2 47000102
+0 0 0 0 0 0 2 2 47000202
+0 0 0 0 0 0 3 2 47000302
+0 0 0 0 0 0 4 2 47000402
+0 0 0 0 0 0 5 2 47000502
+0 0 0 0 0 0 6 2 47000602
+0 0 0 0 0 0 7 2 47000702
+0 0 0 0 0 0 8 2 47000802
+0 0 0 0 0 0 9 2 47000902
+
+
-#
# iteration 1
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-1 0 0 0 0 0 0 4 47000102
-1 0 0 0 0 0 2 4 47000102
-1 0 0 0 0 0 4 4 47000202
-1 0 0 0 0 0 6 4 47000302
-1 0 0 0 0 0 8 4 47000402
-1 0 0 0 0 0 10 4 47000502
-1 0 0 0 0 0 12 4 47000602
-1 0 0 0 0 0 14 4 47000702
-1 0 0 0 0 0 16 4 47000802
-1 0 0 0 0 0 18 4 47000902
+1 0 0 0 0 0 0 2 47000102
+1 0 0 0 0 0 1 2 47000102
+1 0 0 0 0 0 2 2 47000202
+1 0 0 0 0 0 3 2 47000302
+1 0 0 0 0 0 4 2 47000402
+1 0 0 0 0 0 5 2 47000502
+1 0 0 0 0 0 6 2 47000602
+1 0 0 0 0 0 7 2 47000702
+1 0 0 0 0 0 8 2 47000802
+1 0 0 0 0 0 9 2 47000902
+
+
diff --git a/CarpetAttic/Cart3dTest/test/octant/fzx.zl b/CarpetAttic/Cart3dTest/test/octant/fzx.zl
index 4dad36c6b..024a64af4 100644
--- a/CarpetAttic/Cart3dTest/test/octant/fzx.zl
+++ b/CarpetAttic/Cart3dTest/test/octant/fzx.zl
@@ -1,32 +1,34 @@
# CART3DTEST::fzx z (fzx)
#
-#
# iteration 0
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 0 47000100
-0 0 0 0 0 0 2 2 47000101
-0 0 0 0 0 0 2 4 47000102
-0 0 0 0 0 0 2 6 47000103
-0 0 0 0 0 0 2 8 47000104
-0 0 0 0 0 0 2 10 47000105
-0 0 0 0 0 0 2 12 47000106
-0 0 0 0 0 0 2 14 47000107
-0 0 0 0 0 0 2 16 47000108
-0 0 0 0 0 0 2 18 47000109
+0 0 0 0 0 0 1 0 47000100
+0 0 0 0 0 0 1 1 47000101
+0 0 0 0 0 0 1 2 47000102
+0 0 0 0 0 0 1 3 47000103
+0 0 0 0 0 0 1 4 47000104
+0 0 0 0 0 0 1 5 47000105
+0 0 0 0 0 0 1 6 47000106
+0 0 0 0 0 0 1 7 47000107
+0 0 0 0 0 0 1 8 47000108
+0 0 0 0 0 0 1 9 47000109
+
+
-#
# iteration 1
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 0 -47000103
-1 0 0 0 0 0 2 2 -47000102
-1 0 0 0 0 0 2 4 47000102
-1 0 0 0 0 0 2 6 47000103
-1 0 0 0 0 0 2 8 47000104
-1 0 0 0 0 0 2 10 47000105
-1 0 0 0 0 0 2 12 47000106
-1 0 0 0 0 0 2 14 47000107
-1 0 0 0 0 0 2 16 47000108
-1 0 0 0 0 0 2 18 47000109
+1 0 0 0 0 0 1 0 -47000103
+1 0 0 0 0 0 1 1 -47000102
+1 0 0 0 0 0 1 2 47000102
+1 0 0 0 0 0 1 3 47000103
+1 0 0 0 0 0 1 4 47000104
+1 0 0 0 0 0 1 5 47000105
+1 0 0 0 0 0 1 6 47000106
+1 0 0 0 0 0 1 7 47000107
+1 0 0 0 0 0 1 8 47000108
+1 0 0 0 0 0 1 9 47000109
+
+
diff --git a/CarpetAttic/Cart3dTest/test/octant/fzy.xl b/CarpetAttic/Cart3dTest/test/octant/fzy.xl
index 2378068ed..ef9d32810 100644
--- a/CarpetAttic/Cart3dTest/test/octant/fzy.xl
+++ b/CarpetAttic/Cart3dTest/test/octant/fzy.xl
@@ -1,32 +1,34 @@
# CART3DTEST::fzy x (fzy)
#
-#
# iteration 0
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 4 48000102
-0 0 0 0 0 2 2 4 48010102
-0 0 0 0 0 4 2 4 48020102
-0 0 0 0 0 6 2 4 48030102
-0 0 0 0 0 8 2 4 48040102
-0 0 0 0 0 10 2 4 48050102
-0 0 0 0 0 12 2 4 48060102
-0 0 0 0 0 14 2 4 48070102
-0 0 0 0 0 16 2 4 48080102
-0 0 0 0 0 18 2 4 48090102
+0 0 0 0 0 0 1 2 48000102
+0 0 0 0 0 1 1 2 48010102
+0 0 0 0 0 2 1 2 48020102
+0 0 0 0 0 3 1 2 48030102
+0 0 0 0 0 4 1 2 48040102
+0 0 0 0 0 5 1 2 48050102
+0 0 0 0 0 6 1 2 48060102
+0 0 0 0 0 7 1 2 48070102
+0 0 0 0 0 8 1 2 48080102
+0 0 0 0 0 9 1 2 48090102
+
+
-#
# iteration 1
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 4 48000102
-1 0 0 0 0 2 2 4 48010102
-1 0 0 0 0 4 2 4 48020102
-1 0 0 0 0 6 2 4 48030102
-1 0 0 0 0 8 2 4 48040102
-1 0 0 0 0 10 2 4 48050102
-1 0 0 0 0 12 2 4 48060102
-1 0 0 0 0 14 2 4 48070102
-1 0 0 0 0 16 2 4 48080102
-1 0 0 0 0 18 2 4 48090102
+1 0 0 0 0 0 1 2 48000102
+1 0 0 0 0 1 1 2 48010102
+1 0 0 0 0 2 1 2 48020102
+1 0 0 0 0 3 1 2 48030102
+1 0 0 0 0 4 1 2 48040102
+1 0 0 0 0 5 1 2 48050102
+1 0 0 0 0 6 1 2 48060102
+1 0 0 0 0 7 1 2 48070102
+1 0 0 0 0 8 1 2 48080102
+1 0 0 0 0 9 1 2 48090102
+
+
diff --git a/CarpetAttic/Cart3dTest/test/octant/fzy.yl b/CarpetAttic/Cart3dTest/test/octant/fzy.yl
index 2cd3da9b0..839db63ae 100644
--- a/CarpetAttic/Cart3dTest/test/octant/fzy.yl
+++ b/CarpetAttic/Cart3dTest/test/octant/fzy.yl
@@ -1,32 +1,34 @@
# CART3DTEST::fzy y (fzy)
#
-#
# iteration 0
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-0 0 0 0 0 0 0 4 48000002
-0 0 0 0 0 0 2 4 48000102
-0 0 0 0 0 0 4 4 48000202
-0 0 0 0 0 0 6 4 48000302
-0 0 0 0 0 0 8 4 48000402
-0 0 0 0 0 0 10 4 48000502
-0 0 0 0 0 0 12 4 48000602
-0 0 0 0 0 0 14 4 48000702
-0 0 0 0 0 0 16 4 48000802
-0 0 0 0 0 0 18 4 48000902
+0 0 0 0 0 0 0 2 48000002
+0 0 0 0 0 0 1 2 48000102
+0 0 0 0 0 0 2 2 48000202
+0 0 0 0 0 0 3 2 48000302
+0 0 0 0 0 0 4 2 48000402
+0 0 0 0 0 0 5 2 48000502
+0 0 0 0 0 0 6 2 48000602
+0 0 0 0 0 0 7 2 48000702
+0 0 0 0 0 0 8 2 48000802
+0 0 0 0 0 0 9 2 48000902
+
+
-#
# iteration 1
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-1 0 0 0 0 0 0 4 -48000102
-1 0 0 0 0 0 2 4 48000102
-1 0 0 0 0 0 4 4 48000202
-1 0 0 0 0 0 6 4 48000302
-1 0 0 0 0 0 8 4 48000402
-1 0 0 0 0 0 10 4 48000502
-1 0 0 0 0 0 12 4 48000602
-1 0 0 0 0 0 14 4 48000702
-1 0 0 0 0 0 16 4 48000802
-1 0 0 0 0 0 18 4 48000902
+1 0 0 0 0 0 0 2 -48000102
+1 0 0 0 0 0 1 2 48000102
+1 0 0 0 0 0 2 2 48000202
+1 0 0 0 0 0 3 2 48000302
+1 0 0 0 0 0 4 2 48000402
+1 0 0 0 0 0 5 2 48000502
+1 0 0 0 0 0 6 2 48000602
+1 0 0 0 0 0 7 2 48000702
+1 0 0 0 0 0 8 2 48000802
+1 0 0 0 0 0 9 2 48000902
+
+
diff --git a/CarpetAttic/Cart3dTest/test/octant/fzy.zl b/CarpetAttic/Cart3dTest/test/octant/fzy.zl
index accaa03d3..4b0e6deab 100644
--- a/CarpetAttic/Cart3dTest/test/octant/fzy.zl
+++ b/CarpetAttic/Cart3dTest/test/octant/fzy.zl
@@ -1,32 +1,34 @@
# CART3DTEST::fzy z (fzy)
#
-#
# iteration 0
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 0 48000100
-0 0 0 0 0 0 2 2 48000101
-0 0 0 0 0 0 2 4 48000102
-0 0 0 0 0 0 2 6 48000103
-0 0 0 0 0 0 2 8 48000104
-0 0 0 0 0 0 2 10 48000105
-0 0 0 0 0 0 2 12 48000106
-0 0 0 0 0 0 2 14 48000107
-0 0 0 0 0 0 2 16 48000108
-0 0 0 0 0 0 2 18 48000109
+0 0 0 0 0 0 1 0 48000100
+0 0 0 0 0 0 1 1 48000101
+0 0 0 0 0 0 1 2 48000102
+0 0 0 0 0 0 1 3 48000103
+0 0 0 0 0 0 1 4 48000104
+0 0 0 0 0 0 1 5 48000105
+0 0 0 0 0 0 1 6 48000106
+0 0 0 0 0 0 1 7 48000107
+0 0 0 0 0 0 1 8 48000108
+0 0 0 0 0 0 1 9 48000109
+
+
-#
# iteration 1
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 0 -48000103
-1 0 0 0 0 0 2 2 -48000102
-1 0 0 0 0 0 2 4 48000102
-1 0 0 0 0 0 2 6 48000103
-1 0 0 0 0 0 2 8 48000104
-1 0 0 0 0 0 2 10 48000105
-1 0 0 0 0 0 2 12 48000106
-1 0 0 0 0 0 2 14 48000107
-1 0 0 0 0 0 2 16 48000108
-1 0 0 0 0 0 2 18 48000109
+1 0 0 0 0 0 1 0 -48000103
+1 0 0 0 0 0 1 1 -48000102
+1 0 0 0 0 0 1 2 48000102
+1 0 0 0 0 0 1 3 48000103
+1 0 0 0 0 0 1 4 48000104
+1 0 0 0 0 0 1 5 48000105
+1 0 0 0 0 0 1 6 48000106
+1 0 0 0 0 0 1 7 48000107
+1 0 0 0 0 0 1 8 48000108
+1 0 0 0 0 0 1 9 48000109
+
+
diff --git a/CarpetAttic/Cart3dTest/test/octant/fzz.xl b/CarpetAttic/Cart3dTest/test/octant/fzz.xl
index 668074723..ee3f5002e 100644
--- a/CarpetAttic/Cart3dTest/test/octant/fzz.xl
+++ b/CarpetAttic/Cart3dTest/test/octant/fzz.xl
@@ -1,32 +1,34 @@
# CART3DTEST::fzz x (fzz)
#
-#
# iteration 0
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 4 49000102
-0 0 0 0 0 2 2 4 49010102
-0 0 0 0 0 4 2 4 49020102
-0 0 0 0 0 6 2 4 49030102
-0 0 0 0 0 8 2 4 49040102
-0 0 0 0 0 10 2 4 49050102
-0 0 0 0 0 12 2 4 49060102
-0 0 0 0 0 14 2 4 49070102
-0 0 0 0 0 16 2 4 49080102
-0 0 0 0 0 18 2 4 49090102
+0 0 0 0 0 0 1 2 49000102
+0 0 0 0 0 1 1 2 49010102
+0 0 0 0 0 2 1 2 49020102
+0 0 0 0 0 3 1 2 49030102
+0 0 0 0 0 4 1 2 49040102
+0 0 0 0 0 5 1 2 49050102
+0 0 0 0 0 6 1 2 49060102
+0 0 0 0 0 7 1 2 49070102
+0 0 0 0 0 8 1 2 49080102
+0 0 0 0 0 9 1 2 49090102
+
+
-#
# iteration 1
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 4 49000102
-1 0 0 0 0 2 2 4 49010102
-1 0 0 0 0 4 2 4 49020102
-1 0 0 0 0 6 2 4 49030102
-1 0 0 0 0 8 2 4 49040102
-1 0 0 0 0 10 2 4 49050102
-1 0 0 0 0 12 2 4 49060102
-1 0 0 0 0 14 2 4 49070102
-1 0 0 0 0 16 2 4 49080102
-1 0 0 0 0 18 2 4 49090102
+1 0 0 0 0 0 1 2 49000102
+1 0 0 0 0 1 1 2 49010102
+1 0 0 0 0 2 1 2 49020102
+1 0 0 0 0 3 1 2 49030102
+1 0 0 0 0 4 1 2 49040102
+1 0 0 0 0 5 1 2 49050102
+1 0 0 0 0 6 1 2 49060102
+1 0 0 0 0 7 1 2 49070102
+1 0 0 0 0 8 1 2 49080102
+1 0 0 0 0 9 1 2 49090102
+
+
diff --git a/CarpetAttic/Cart3dTest/test/octant/fzz.yl b/CarpetAttic/Cart3dTest/test/octant/fzz.yl
index fd047262a..955da7993 100644
--- a/CarpetAttic/Cart3dTest/test/octant/fzz.yl
+++ b/CarpetAttic/Cart3dTest/test/octant/fzz.yl
@@ -1,32 +1,34 @@
# CART3DTEST::fzz y (fzz)
#
-#
# iteration 0
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-0 0 0 0 0 0 0 4 49000002
-0 0 0 0 0 0 2 4 49000102
-0 0 0 0 0 0 4 4 49000202
-0 0 0 0 0 0 6 4 49000302
-0 0 0 0 0 0 8 4 49000402
-0 0 0 0 0 0 10 4 49000502
-0 0 0 0 0 0 12 4 49000602
-0 0 0 0 0 0 14 4 49000702
-0 0 0 0 0 0 16 4 49000802
-0 0 0 0 0 0 18 4 49000902
+0 0 0 0 0 0 0 2 49000002
+0 0 0 0 0 0 1 2 49000102
+0 0 0 0 0 0 2 2 49000202
+0 0 0 0 0 0 3 2 49000302
+0 0 0 0 0 0 4 2 49000402
+0 0 0 0 0 0 5 2 49000502
+0 0 0 0 0 0 6 2 49000602
+0 0 0 0 0 0 7 2 49000702
+0 0 0 0 0 0 8 2 49000802
+0 0 0 0 0 0 9 2 49000902
+
+
-#
# iteration 1
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-1 0 0 0 0 0 0 4 49000102
-1 0 0 0 0 0 2 4 49000102
-1 0 0 0 0 0 4 4 49000202
-1 0 0 0 0 0 6 4 49000302
-1 0 0 0 0 0 8 4 49000402
-1 0 0 0 0 0 10 4 49000502
-1 0 0 0 0 0 12 4 49000602
-1 0 0 0 0 0 14 4 49000702
-1 0 0 0 0 0 16 4 49000802
-1 0 0 0 0 0 18 4 49000902
+1 0 0 0 0 0 0 2 49000102
+1 0 0 0 0 0 1 2 49000102
+1 0 0 0 0 0 2 2 49000202
+1 0 0 0 0 0 3 2 49000302
+1 0 0 0 0 0 4 2 49000402
+1 0 0 0 0 0 5 2 49000502
+1 0 0 0 0 0 6 2 49000602
+1 0 0 0 0 0 7 2 49000702
+1 0 0 0 0 0 8 2 49000802
+1 0 0 0 0 0 9 2 49000902
+
+
diff --git a/CarpetAttic/Cart3dTest/test/octant/fzz.zl b/CarpetAttic/Cart3dTest/test/octant/fzz.zl
index 2aa034108..045833d97 100644
--- a/CarpetAttic/Cart3dTest/test/octant/fzz.zl
+++ b/CarpetAttic/Cart3dTest/test/octant/fzz.zl
@@ -1,32 +1,34 @@
# CART3DTEST::fzz z (fzz)
#
-#
# iteration 0
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 0 49000100
-0 0 0 0 0 0 2 2 49000101
-0 0 0 0 0 0 2 4 49000102
-0 0 0 0 0 0 2 6 49000103
-0 0 0 0 0 0 2 8 49000104
-0 0 0 0 0 0 2 10 49000105
-0 0 0 0 0 0 2 12 49000106
-0 0 0 0 0 0 2 14 49000107
-0 0 0 0 0 0 2 16 49000108
-0 0 0 0 0 0 2 18 49000109
+0 0 0 0 0 0 1 0 49000100
+0 0 0 0 0 0 1 1 49000101
+0 0 0 0 0 0 1 2 49000102
+0 0 0 0 0 0 1 3 49000103
+0 0 0 0 0 0 1 4 49000104
+0 0 0 0 0 0 1 5 49000105
+0 0 0 0 0 0 1 6 49000106
+0 0 0 0 0 0 1 7 49000107
+0 0 0 0 0 0 1 8 49000108
+0 0 0 0 0 0 1 9 49000109
+
+
-#
# iteration 1
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 0 49000103
-1 0 0 0 0 0 2 2 49000102
-1 0 0 0 0 0 2 4 49000102
-1 0 0 0 0 0 2 6 49000103
-1 0 0 0 0 0 2 8 49000104
-1 0 0 0 0 0 2 10 49000105
-1 0 0 0 0 0 2 12 49000106
-1 0 0 0 0 0 2 14 49000107
-1 0 0 0 0 0 2 16 49000108
-1 0 0 0 0 0 2 18 49000109
+1 0 0 0 0 0 1 0 49000103
+1 0 0 0 0 0 1 1 49000102
+1 0 0 0 0 0 1 2 49000102
+1 0 0 0 0 0 1 3 49000103
+1 0 0 0 0 0 1 4 49000104
+1 0 0 0 0 0 1 5 49000105
+1 0 0 0 0 0 1 6 49000106
+1 0 0 0 0 0 1 7 49000107
+1 0 0 0 0 0 1 8 49000108
+1 0 0 0 0 0 1 9 49000109
+
+
diff --git a/CarpetAttic/Cart3dTest/test/octant/s.xl b/CarpetAttic/Cart3dTest/test/octant/s.xl
index 335575cc6..4d130828b 100644
--- a/CarpetAttic/Cart3dTest/test/octant/s.xl
+++ b/CarpetAttic/Cart3dTest/test/octant/s.xl
@@ -1,32 +1,34 @@
# CART3DTEST::s x (s)
#
-#
# iteration 0
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 4 1000102
-0 0 0 0 0 2 2 4 1010102
-0 0 0 0 0 4 2 4 1020102
-0 0 0 0 0 6 2 4 1030102
-0 0 0 0 0 8 2 4 1040102
-0 0 0 0 0 10 2 4 1050102
-0 0 0 0 0 12 2 4 1060102
-0 0 0 0 0 14 2 4 1070102
-0 0 0 0 0 16 2 4 1080102
-0 0 0 0 0 18 2 4 1090102
+0 0 0 0 0 0 1 2 1000102
+0 0 0 0 0 1 1 2 1010102
+0 0 0 0 0 2 1 2 1020102
+0 0 0 0 0 3 1 2 1030102
+0 0 0 0 0 4 1 2 1040102
+0 0 0 0 0 5 1 2 1050102
+0 0 0 0 0 6 1 2 1060102
+0 0 0 0 0 7 1 2 1070102
+0 0 0 0 0 8 1 2 1080102
+0 0 0 0 0 9 1 2 1090102
+
+
-#
# iteration 1
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 4 1000102
-1 0 0 0 0 2 2 4 1010102
-1 0 0 0 0 4 2 4 1020102
-1 0 0 0 0 6 2 4 1030102
-1 0 0 0 0 8 2 4 1040102
-1 0 0 0 0 10 2 4 1050102
-1 0 0 0 0 12 2 4 1060102
-1 0 0 0 0 14 2 4 1070102
-1 0 0 0 0 16 2 4 1080102
-1 0 0 0 0 18 2 4 1090102
+1 0 0 0 0 0 1 2 1000102
+1 0 0 0 0 1 1 2 1010102
+1 0 0 0 0 2 1 2 1020102
+1 0 0 0 0 3 1 2 1030102
+1 0 0 0 0 4 1 2 1040102
+1 0 0 0 0 5 1 2 1050102
+1 0 0 0 0 6 1 2 1060102
+1 0 0 0 0 7 1 2 1070102
+1 0 0 0 0 8 1 2 1080102
+1 0 0 0 0 9 1 2 1090102
+
+
diff --git a/CarpetAttic/Cart3dTest/test/octant/s.yl b/CarpetAttic/Cart3dTest/test/octant/s.yl
index 9a81c2271..90afa5242 100644
--- a/CarpetAttic/Cart3dTest/test/octant/s.yl
+++ b/CarpetAttic/Cart3dTest/test/octant/s.yl
@@ -1,32 +1,34 @@
# CART3DTEST::s y (s)
#
-#
# iteration 0
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-0 0 0 0 0 0 0 4 1000002
-0 0 0 0 0 0 2 4 1000102
-0 0 0 0 0 0 4 4 1000202
-0 0 0 0 0 0 6 4 1000302
-0 0 0 0 0 0 8 4 1000402
-0 0 0 0 0 0 10 4 1000502
-0 0 0 0 0 0 12 4 1000602
-0 0 0 0 0 0 14 4 1000702
-0 0 0 0 0 0 16 4 1000802
-0 0 0 0 0 0 18 4 1000902
+0 0 0 0 0 0 0 2 1000002
+0 0 0 0 0 0 1 2 1000102
+0 0 0 0 0 0 2 2 1000202
+0 0 0 0 0 0 3 2 1000302
+0 0 0 0 0 0 4 2 1000402
+0 0 0 0 0 0 5 2 1000502
+0 0 0 0 0 0 6 2 1000602
+0 0 0 0 0 0 7 2 1000702
+0 0 0 0 0 0 8 2 1000802
+0 0 0 0 0 0 9 2 1000902
+
+
-#
# iteration 1
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-1 0 0 0 0 0 0 4 1000102
-1 0 0 0 0 0 2 4 1000102
-1 0 0 0 0 0 4 4 1000202
-1 0 0 0 0 0 6 4 1000302
-1 0 0 0 0 0 8 4 1000402
-1 0 0 0 0 0 10 4 1000502
-1 0 0 0 0 0 12 4 1000602
-1 0 0 0 0 0 14 4 1000702
-1 0 0 0 0 0 16 4 1000802
-1 0 0 0 0 0 18 4 1000902
+1 0 0 0 0 0 0 2 1000102
+1 0 0 0 0 0 1 2 1000102
+1 0 0 0 0 0 2 2 1000202
+1 0 0 0 0 0 3 2 1000302
+1 0 0 0 0 0 4 2 1000402
+1 0 0 0 0 0 5 2 1000502
+1 0 0 0 0 0 6 2 1000602
+1 0 0 0 0 0 7 2 1000702
+1 0 0 0 0 0 8 2 1000802
+1 0 0 0 0 0 9 2 1000902
+
+
diff --git a/CarpetAttic/Cart3dTest/test/octant/s.zl b/CarpetAttic/Cart3dTest/test/octant/s.zl
index 07c1c72d2..d77401f61 100644
--- a/CarpetAttic/Cart3dTest/test/octant/s.zl
+++ b/CarpetAttic/Cart3dTest/test/octant/s.zl
@@ -1,32 +1,34 @@
# CART3DTEST::s z (s)
#
-#
# iteration 0
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 0 1000100
-0 0 0 0 0 0 2 2 1000101
-0 0 0 0 0 0 2 4 1000102
-0 0 0 0 0 0 2 6 1000103
-0 0 0 0 0 0 2 8 1000104
-0 0 0 0 0 0 2 10 1000105
-0 0 0 0 0 0 2 12 1000106
-0 0 0 0 0 0 2 14 1000107
-0 0 0 0 0 0 2 16 1000108
-0 0 0 0 0 0 2 18 1000109
+0 0 0 0 0 0 1 0 1000100
+0 0 0 0 0 0 1 1 1000101
+0 0 0 0 0 0 1 2 1000102
+0 0 0 0 0 0 1 3 1000103
+0 0 0 0 0 0 1 4 1000104
+0 0 0 0 0 0 1 5 1000105
+0 0 0 0 0 0 1 6 1000106
+0 0 0 0 0 0 1 7 1000107
+0 0 0 0 0 0 1 8 1000108
+0 0 0 0 0 0 1 9 1000109
+
+
-#
# iteration 1
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 0 1000103
-1 0 0 0 0 0 2 2 1000102
-1 0 0 0 0 0 2 4 1000102
-1 0 0 0 0 0 2 6 1000103
-1 0 0 0 0 0 2 8 1000104
-1 0 0 0 0 0 2 10 1000105
-1 0 0 0 0 0 2 12 1000106
-1 0 0 0 0 0 2 14 1000107
-1 0 0 0 0 0 2 16 1000108
-1 0 0 0 0 0 2 18 1000109
+1 0 0 0 0 0 1 0 1000103
+1 0 0 0 0 0 1 1 1000102
+1 0 0 0 0 0 1 2 1000102
+1 0 0 0 0 0 1 3 1000103
+1 0 0 0 0 0 1 4 1000104
+1 0 0 0 0 0 1 5 1000105
+1 0 0 0 0 0 1 6 1000106
+1 0 0 0 0 0 1 7 1000107
+1 0 0 0 0 0 1 8 1000108
+1 0 0 0 0 0 1 9 1000109
+
+
diff --git a/CarpetAttic/Cart3dTest/test/octant/spher3d_r.xl b/CarpetAttic/Cart3dTest/test/octant/spher3d_r.xl
index ef187d2df..dcd9d5780 100644
--- a/CarpetAttic/Cart3dTest/test/octant/spher3d_r.xl
+++ b/CarpetAttic/Cart3dTest/test/octant/spher3d_r.xl
@@ -1,32 +1,34 @@
# GRID::spher3d_r x (spher3d_r)
#
-#
# iteration 0
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 4 0.259807621135332
-0 0 0 0 0 2 2 4 0.49749371855331
-0 0 0 0 0 4 2 4 0.779422863405995
-0 0 0 0 0 6 2 4 1.07121426428143
-0 0 0 0 0 8 2 4 1.36656503687164
-0 0 0 0 0 10 2 4 1.66358047596141
-0 0 0 0 0 12 2 4 1.9615045245933
-0 0 0 0 0 14 2 4 2.2599778759979
-0 0 0 0 0 16 2 4 2.5588083163848
-0 0 0 0 0 18 2 4 2.85788383248865
+0 0 0 0 0 0 1 2 0.259807621135332
+0 0 0 0 0 1 1 2 0.49749371855331
+0 0 0 0 0 2 1 2 0.779422863405995
+0 0 0 0 0 3 1 2 1.07121426428143
+0 0 0 0 0 4 1 2 1.36656503687164
+0 0 0 0 0 5 1 2 1.66358047596141
+0 0 0 0 0 6 1 2 1.9615045245933
+0 0 0 0 0 7 1 2 2.2599778759979
+0 0 0 0 0 8 1 2 2.5588083163848
+0 0 0 0 0 9 1 2 2.85788383248865
+
+
-#
# iteration 1
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 4 0.259807621135332
-1 0 0 0 0 2 2 4 0.49749371855331
-1 0 0 0 0 4 2 4 0.779422863405995
-1 0 0 0 0 6 2 4 1.07121426428143
-1 0 0 0 0 8 2 4 1.36656503687164
-1 0 0 0 0 10 2 4 1.66358047596141
-1 0 0 0 0 12 2 4 1.9615045245933
-1 0 0 0 0 14 2 4 2.2599778759979
-1 0 0 0 0 16 2 4 2.5588083163848
-1 0 0 0 0 18 2 4 2.85788383248865
+1 0 0 0 0 0 1 2 0.259807621135332
+1 0 0 0 0 1 1 2 0.49749371855331
+1 0 0 0 0 2 1 2 0.779422863405995
+1 0 0 0 0 3 1 2 1.07121426428143
+1 0 0 0 0 4 1 2 1.36656503687164
+1 0 0 0 0 5 1 2 1.66358047596141
+1 0 0 0 0 6 1 2 1.9615045245933
+1 0 0 0 0 7 1 2 2.2599778759979
+1 0 0 0 0 8 1 2 2.5588083163848
+1 0 0 0 0 9 1 2 2.85788383248865
+
+
diff --git a/CarpetAttic/Cart3dTest/test/octant/spher3d_r.yl b/CarpetAttic/Cart3dTest/test/octant/spher3d_r.yl
index f3323aae6..f6173a532 100644
--- a/CarpetAttic/Cart3dTest/test/octant/spher3d_r.yl
+++ b/CarpetAttic/Cart3dTest/test/octant/spher3d_r.yl
@@ -1,32 +1,34 @@
# GRID::spher3d_r y (spher3d_r)
#
-#
# iteration 0
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-0 0 0 0 0 0 0 4 0.259807621135332
-0 0 0 0 0 0 2 4 0.259807621135332
-0 0 0 0 0 0 4 4 0.49749371855331
-0 0 0 0 0 0 6 4 0.779422863405995
-0 0 0 0 0 0 8 4 1.07121426428143
-0 0 0 0 0 0 10 4 1.36656503687164
-0 0 0 0 0 0 12 4 1.66358047596141
-0 0 0 0 0 0 14 4 1.9615045245933
-0 0 0 0 0 0 16 4 2.2599778759979
-0 0 0 0 0 0 18 4 2.5588083163848
+0 0 0 0 0 0 0 2 0.259807621135332
+0 0 0 0 0 0 1 2 0.259807621135332
+0 0 0 0 0 0 2 2 0.49749371855331
+0 0 0 0 0 0 3 2 0.779422863405995
+0 0 0 0 0 0 4 2 1.07121426428143
+0 0 0 0 0 0 5 2 1.36656503687164
+0 0 0 0 0 0 6 2 1.66358047596141
+0 0 0 0 0 0 7 2 1.9615045245933
+0 0 0 0 0 0 8 2 2.2599778759979
+0 0 0 0 0 0 9 2 2.5588083163848
+
+
-#
# iteration 1
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-1 0 0 0 0 0 0 4 0.259807621135332
-1 0 0 0 0 0 2 4 0.259807621135332
-1 0 0 0 0 0 4 4 0.49749371855331
-1 0 0 0 0 0 6 4 0.779422863405995
-1 0 0 0 0 0 8 4 1.07121426428143
-1 0 0 0 0 0 10 4 1.36656503687164
-1 0 0 0 0 0 12 4 1.66358047596141
-1 0 0 0 0 0 14 4 1.9615045245933
-1 0 0 0 0 0 16 4 2.2599778759979
-1 0 0 0 0 0 18 4 2.5588083163848
+1 0 0 0 0 0 0 2 0.259807621135332
+1 0 0 0 0 0 1 2 0.259807621135332
+1 0 0 0 0 0 2 2 0.49749371855331
+1 0 0 0 0 0 3 2 0.779422863405995
+1 0 0 0 0 0 4 2 1.07121426428143
+1 0 0 0 0 0 5 2 1.36656503687164
+1 0 0 0 0 0 6 2 1.66358047596141
+1 0 0 0 0 0 7 2 1.9615045245933
+1 0 0 0 0 0 8 2 2.2599778759979
+1 0 0 0 0 0 9 2 2.5588083163848
+
+
diff --git a/CarpetAttic/Cart3dTest/test/octant/spher3d_r.zl b/CarpetAttic/Cart3dTest/test/octant/spher3d_r.zl
index b7b206615..444df2582 100644
--- a/CarpetAttic/Cart3dTest/test/octant/spher3d_r.zl
+++ b/CarpetAttic/Cart3dTest/test/octant/spher3d_r.zl
@@ -1,32 +1,34 @@
# GRID::spher3d_r z (spher3d_r)
#
-#
# iteration 0
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 0 0.49749371855331
-0 0 0 0 0 0 2 2 0.259807621135332
-0 0 0 0 0 0 2 4 0.259807621135332
-0 0 0 0 0 0 2 6 0.49749371855331
-0 0 0 0 0 0 2 8 0.779422863405995
-0 0 0 0 0 0 2 10 1.07121426428143
-0 0 0 0 0 0 2 12 1.36656503687164
-0 0 0 0 0 0 2 14 1.66358047596141
-0 0 0 0 0 0 2 16 1.9615045245933
-0 0 0 0 0 0 2 18 2.2599778759979
+0 0 0 0 0 0 1 0 0.49749371855331
+0 0 0 0 0 0 1 1 0.259807621135332
+0 0 0 0 0 0 1 2 0.259807621135332
+0 0 0 0 0 0 1 3 0.49749371855331
+0 0 0 0 0 0 1 4 0.779422863405995
+0 0 0 0 0 0 1 5 1.07121426428143
+0 0 0 0 0 0 1 6 1.36656503687164
+0 0 0 0 0 0 1 7 1.66358047596141
+0 0 0 0 0 0 1 8 1.9615045245933
+0 0 0 0 0 0 1 9 2.2599778759979
+
+
-#
# iteration 1
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 0 0.49749371855331
-1 0 0 0 0 0 2 2 0.259807621135332
-1 0 0 0 0 0 2 4 0.259807621135332
-1 0 0 0 0 0 2 6 0.49749371855331
-1 0 0 0 0 0 2 8 0.779422863405995
-1 0 0 0 0 0 2 10 1.07121426428143
-1 0 0 0 0 0 2 12 1.36656503687164
-1 0 0 0 0 0 2 14 1.66358047596141
-1 0 0 0 0 0 2 16 1.9615045245933
-1 0 0 0 0 0 2 18 2.2599778759979
+1 0 0 0 0 0 1 0 0.49749371855331
+1 0 0 0 0 0 1 1 0.259807621135332
+1 0 0 0 0 0 1 2 0.259807621135332
+1 0 0 0 0 0 1 3 0.49749371855331
+1 0 0 0 0 0 1 4 0.779422863405995
+1 0 0 0 0 0 1 5 1.07121426428143
+1 0 0 0 0 0 1 6 1.36656503687164
+1 0 0 0 0 0 1 7 1.66358047596141
+1 0 0 0 0 0 1 8 1.9615045245933
+1 0 0 0 0 0 1 9 2.2599778759979
+
+
diff --git a/CarpetAttic/Cart3dTest/test/octant/txx.xl b/CarpetAttic/Cart3dTest/test/octant/txx.xl
index 05b493de7..758bc5da2 100644
--- a/CarpetAttic/Cart3dTest/test/octant/txx.xl
+++ b/CarpetAttic/Cart3dTest/test/octant/txx.xl
@@ -1,32 +1,34 @@
# CART3DTEST::txx x (txx)
#
-#
# iteration 0
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 4 21000102
-0 0 0 0 0 2 2 4 21010102
-0 0 0 0 0 4 2 4 21020102
-0 0 0 0 0 6 2 4 21030102
-0 0 0 0 0 8 2 4 21040102
-0 0 0 0 0 10 2 4 21050102
-0 0 0 0 0 12 2 4 21060102
-0 0 0 0 0 14 2 4 21070102
-0 0 0 0 0 16 2 4 21080102
-0 0 0 0 0 18 2 4 21090102
+0 0 0 0 0 0 1 2 21000102
+0 0 0 0 0 1 1 2 21010102
+0 0 0 0 0 2 1 2 21020102
+0 0 0 0 0 3 1 2 21030102
+0 0 0 0 0 4 1 2 21040102
+0 0 0 0 0 5 1 2 21050102
+0 0 0 0 0 6 1 2 21060102
+0 0 0 0 0 7 1 2 21070102
+0 0 0 0 0 8 1 2 21080102
+0 0 0 0 0 9 1 2 21090102
+
+
-#
# iteration 1
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 4 21000102
-1 0 0 0 0 2 2 4 21010102
-1 0 0 0 0 4 2 4 21020102
-1 0 0 0 0 6 2 4 21030102
-1 0 0 0 0 8 2 4 21040102
-1 0 0 0 0 10 2 4 21050102
-1 0 0 0 0 12 2 4 21060102
-1 0 0 0 0 14 2 4 21070102
-1 0 0 0 0 16 2 4 21080102
-1 0 0 0 0 18 2 4 21090102
+1 0 0 0 0 0 1 2 21000102
+1 0 0 0 0 1 1 2 21010102
+1 0 0 0 0 2 1 2 21020102
+1 0 0 0 0 3 1 2 21030102
+1 0 0 0 0 4 1 2 21040102
+1 0 0 0 0 5 1 2 21050102
+1 0 0 0 0 6 1 2 21060102
+1 0 0 0 0 7 1 2 21070102
+1 0 0 0 0 8 1 2 21080102
+1 0 0 0 0 9 1 2 21090102
+
+
diff --git a/CarpetAttic/Cart3dTest/test/octant/txx.yl b/CarpetAttic/Cart3dTest/test/octant/txx.yl
index 48dfe5dcd..b0c7a28ba 100644
--- a/CarpetAttic/Cart3dTest/test/octant/txx.yl
+++ b/CarpetAttic/Cart3dTest/test/octant/txx.yl
@@ -1,32 +1,34 @@
# CART3DTEST::txx y (txx)
#
-#
# iteration 0
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-0 0 0 0 0 0 0 4 21000002
-0 0 0 0 0 0 2 4 21000102
-0 0 0 0 0 0 4 4 21000202
-0 0 0 0 0 0 6 4 21000302
-0 0 0 0 0 0 8 4 21000402
-0 0 0 0 0 0 10 4 21000502
-0 0 0 0 0 0 12 4 21000602
-0 0 0 0 0 0 14 4 21000702
-0 0 0 0 0 0 16 4 21000802
-0 0 0 0 0 0 18 4 21000902
+0 0 0 0 0 0 0 2 21000002
+0 0 0 0 0 0 1 2 21000102
+0 0 0 0 0 0 2 2 21000202
+0 0 0 0 0 0 3 2 21000302
+0 0 0 0 0 0 4 2 21000402
+0 0 0 0 0 0 5 2 21000502
+0 0 0 0 0 0 6 2 21000602
+0 0 0 0 0 0 7 2 21000702
+0 0 0 0 0 0 8 2 21000802
+0 0 0 0 0 0 9 2 21000902
+
+
-#
# iteration 1
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-1 0 0 0 0 0 0 4 21000102
-1 0 0 0 0 0 2 4 21000102
-1 0 0 0 0 0 4 4 21000202
-1 0 0 0 0 0 6 4 21000302
-1 0 0 0 0 0 8 4 21000402
-1 0 0 0 0 0 10 4 21000502
-1 0 0 0 0 0 12 4 21000602
-1 0 0 0 0 0 14 4 21000702
-1 0 0 0 0 0 16 4 21000802
-1 0 0 0 0 0 18 4 21000902
+1 0 0 0 0 0 0 2 21000102
+1 0 0 0 0 0 1 2 21000102
+1 0 0 0 0 0 2 2 21000202
+1 0 0 0 0 0 3 2 21000302
+1 0 0 0 0 0 4 2 21000402
+1 0 0 0 0 0 5 2 21000502
+1 0 0 0 0 0 6 2 21000602
+1 0 0 0 0 0 7 2 21000702
+1 0 0 0 0 0 8 2 21000802
+1 0 0 0 0 0 9 2 21000902
+
+
diff --git a/CarpetAttic/Cart3dTest/test/octant/txx.zl b/CarpetAttic/Cart3dTest/test/octant/txx.zl
index c6d66960b..63d707040 100644
--- a/CarpetAttic/Cart3dTest/test/octant/txx.zl
+++ b/CarpetAttic/Cart3dTest/test/octant/txx.zl
@@ -1,32 +1,34 @@
# CART3DTEST::txx z (txx)
#
-#
# iteration 0
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 0 21000100
-0 0 0 0 0 0 2 2 21000101
-0 0 0 0 0 0 2 4 21000102
-0 0 0 0 0 0 2 6 21000103
-0 0 0 0 0 0 2 8 21000104
-0 0 0 0 0 0 2 10 21000105
-0 0 0 0 0 0 2 12 21000106
-0 0 0 0 0 0 2 14 21000107
-0 0 0 0 0 0 2 16 21000108
-0 0 0 0 0 0 2 18 21000109
+0 0 0 0 0 0 1 0 21000100
+0 0 0 0 0 0 1 1 21000101
+0 0 0 0 0 0 1 2 21000102
+0 0 0 0 0 0 1 3 21000103
+0 0 0 0 0 0 1 4 21000104
+0 0 0 0 0 0 1 5 21000105
+0 0 0 0 0 0 1 6 21000106
+0 0 0 0 0 0 1 7 21000107
+0 0 0 0 0 0 1 8 21000108
+0 0 0 0 0 0 1 9 21000109
+
+
-#
# iteration 1
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 0 21000103
-1 0 0 0 0 0 2 2 21000102
-1 0 0 0 0 0 2 4 21000102
-1 0 0 0 0 0 2 6 21000103
-1 0 0 0 0 0 2 8 21000104
-1 0 0 0 0 0 2 10 21000105
-1 0 0 0 0 0 2 12 21000106
-1 0 0 0 0 0 2 14 21000107
-1 0 0 0 0 0 2 16 21000108
-1 0 0 0 0 0 2 18 21000109
+1 0 0 0 0 0 1 0 21000103
+1 0 0 0 0 0 1 1 21000102
+1 0 0 0 0 0 1 2 21000102
+1 0 0 0 0 0 1 3 21000103
+1 0 0 0 0 0 1 4 21000104
+1 0 0 0 0 0 1 5 21000105
+1 0 0 0 0 0 1 6 21000106
+1 0 0 0 0 0 1 7 21000107
+1 0 0 0 0 0 1 8 21000108
+1 0 0 0 0 0 1 9 21000109
+
+
diff --git a/CarpetAttic/Cart3dTest/test/octant/txy.xl b/CarpetAttic/Cart3dTest/test/octant/txy.xl
index 3193f36d0..b2f469349 100644
--- a/CarpetAttic/Cart3dTest/test/octant/txy.xl
+++ b/CarpetAttic/Cart3dTest/test/octant/txy.xl
@@ -1,32 +1,34 @@
# CART3DTEST::txy x (txy)
#
-#
# iteration 0
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 4 22000102
-0 0 0 0 0 2 2 4 22010102
-0 0 0 0 0 4 2 4 22020102
-0 0 0 0 0 6 2 4 22030102
-0 0 0 0 0 8 2 4 22040102
-0 0 0 0 0 10 2 4 22050102
-0 0 0 0 0 12 2 4 22060102
-0 0 0 0 0 14 2 4 22070102
-0 0 0 0 0 16 2 4 22080102
-0 0 0 0 0 18 2 4 22090102
+0 0 0 0 0 0 1 2 22000102
+0 0 0 0 0 1 1 2 22010102
+0 0 0 0 0 2 1 2 22020102
+0 0 0 0 0 3 1 2 22030102
+0 0 0 0 0 4 1 2 22040102
+0 0 0 0 0 5 1 2 22050102
+0 0 0 0 0 6 1 2 22060102
+0 0 0 0 0 7 1 2 22070102
+0 0 0 0 0 8 1 2 22080102
+0 0 0 0 0 9 1 2 22090102
+
+
-#
# iteration 1
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 4 22000102
-1 0 0 0 0 2 2 4 22010102
-1 0 0 0 0 4 2 4 22020102
-1 0 0 0 0 6 2 4 22030102
-1 0 0 0 0 8 2 4 22040102
-1 0 0 0 0 10 2 4 22050102
-1 0 0 0 0 12 2 4 22060102
-1 0 0 0 0 14 2 4 22070102
-1 0 0 0 0 16 2 4 22080102
-1 0 0 0 0 18 2 4 22090102
+1 0 0 0 0 0 1 2 22000102
+1 0 0 0 0 1 1 2 22010102
+1 0 0 0 0 2 1 2 22020102
+1 0 0 0 0 3 1 2 22030102
+1 0 0 0 0 4 1 2 22040102
+1 0 0 0 0 5 1 2 22050102
+1 0 0 0 0 6 1 2 22060102
+1 0 0 0 0 7 1 2 22070102
+1 0 0 0 0 8 1 2 22080102
+1 0 0 0 0 9 1 2 22090102
+
+
diff --git a/CarpetAttic/Cart3dTest/test/octant/txy.yl b/CarpetAttic/Cart3dTest/test/octant/txy.yl
index 9c5b5a07e..df9ed81da 100644
--- a/CarpetAttic/Cart3dTest/test/octant/txy.yl
+++ b/CarpetAttic/Cart3dTest/test/octant/txy.yl
@@ -1,32 +1,34 @@
# CART3DTEST::txy y (txy)
#
-#
# iteration 0
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-0 0 0 0 0 0 0 4 22000002
-0 0 0 0 0 0 2 4 22000102
-0 0 0 0 0 0 4 4 22000202
-0 0 0 0 0 0 6 4 22000302
-0 0 0 0 0 0 8 4 22000402
-0 0 0 0 0 0 10 4 22000502
-0 0 0 0 0 0 12 4 22000602
-0 0 0 0 0 0 14 4 22000702
-0 0 0 0 0 0 16 4 22000802
-0 0 0 0 0 0 18 4 22000902
+0 0 0 0 0 0 0 2 22000002
+0 0 0 0 0 0 1 2 22000102
+0 0 0 0 0 0 2 2 22000202
+0 0 0 0 0 0 3 2 22000302
+0 0 0 0 0 0 4 2 22000402
+0 0 0 0 0 0 5 2 22000502
+0 0 0 0 0 0 6 2 22000602
+0 0 0 0 0 0 7 2 22000702
+0 0 0 0 0 0 8 2 22000802
+0 0 0 0 0 0 9 2 22000902
+
+
-#
# iteration 1
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-1 0 0 0 0 0 0 4 -22000102
-1 0 0 0 0 0 2 4 22000102
-1 0 0 0 0 0 4 4 22000202
-1 0 0 0 0 0 6 4 22000302
-1 0 0 0 0 0 8 4 22000402
-1 0 0 0 0 0 10 4 22000502
-1 0 0 0 0 0 12 4 22000602
-1 0 0 0 0 0 14 4 22000702
-1 0 0 0 0 0 16 4 22000802
-1 0 0 0 0 0 18 4 22000902
+1 0 0 0 0 0 0 2 -22000102
+1 0 0 0 0 0 1 2 22000102
+1 0 0 0 0 0 2 2 22000202
+1 0 0 0 0 0 3 2 22000302
+1 0 0 0 0 0 4 2 22000402
+1 0 0 0 0 0 5 2 22000502
+1 0 0 0 0 0 6 2 22000602
+1 0 0 0 0 0 7 2 22000702
+1 0 0 0 0 0 8 2 22000802
+1 0 0 0 0 0 9 2 22000902
+
+
diff --git a/CarpetAttic/Cart3dTest/test/octant/txy.zl b/CarpetAttic/Cart3dTest/test/octant/txy.zl
index c6fbb8421..ee41d856f 100644
--- a/CarpetAttic/Cart3dTest/test/octant/txy.zl
+++ b/CarpetAttic/Cart3dTest/test/octant/txy.zl
@@ -1,32 +1,34 @@
# CART3DTEST::txy z (txy)
#
-#
# iteration 0
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 0 22000100
-0 0 0 0 0 0 2 2 22000101
-0 0 0 0 0 0 2 4 22000102
-0 0 0 0 0 0 2 6 22000103
-0 0 0 0 0 0 2 8 22000104
-0 0 0 0 0 0 2 10 22000105
-0 0 0 0 0 0 2 12 22000106
-0 0 0 0 0 0 2 14 22000107
-0 0 0 0 0 0 2 16 22000108
-0 0 0 0 0 0 2 18 22000109
+0 0 0 0 0 0 1 0 22000100
+0 0 0 0 0 0 1 1 22000101
+0 0 0 0 0 0 1 2 22000102
+0 0 0 0 0 0 1 3 22000103
+0 0 0 0 0 0 1 4 22000104
+0 0 0 0 0 0 1 5 22000105
+0 0 0 0 0 0 1 6 22000106
+0 0 0 0 0 0 1 7 22000107
+0 0 0 0 0 0 1 8 22000108
+0 0 0 0 0 0 1 9 22000109
+
+
-#
# iteration 1
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 0 22000103
-1 0 0 0 0 0 2 2 22000102
-1 0 0 0 0 0 2 4 22000102
-1 0 0 0 0 0 2 6 22000103
-1 0 0 0 0 0 2 8 22000104
-1 0 0 0 0 0 2 10 22000105
-1 0 0 0 0 0 2 12 22000106
-1 0 0 0 0 0 2 14 22000107
-1 0 0 0 0 0 2 16 22000108
-1 0 0 0 0 0 2 18 22000109
+1 0 0 0 0 0 1 0 22000103
+1 0 0 0 0 0 1 1 22000102
+1 0 0 0 0 0 1 2 22000102
+1 0 0 0 0 0 1 3 22000103
+1 0 0 0 0 0 1 4 22000104
+1 0 0 0 0 0 1 5 22000105
+1 0 0 0 0 0 1 6 22000106
+1 0 0 0 0 0 1 7 22000107
+1 0 0 0 0 0 1 8 22000108
+1 0 0 0 0 0 1 9 22000109
+
+
diff --git a/CarpetAttic/Cart3dTest/test/octant/txz.xl b/CarpetAttic/Cart3dTest/test/octant/txz.xl
index bd4ec92d9..da3186e96 100644
--- a/CarpetAttic/Cart3dTest/test/octant/txz.xl
+++ b/CarpetAttic/Cart3dTest/test/octant/txz.xl
@@ -1,32 +1,34 @@
# CART3DTEST::txz x (txz)
#
-#
# iteration 0
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 4 23000102
-0 0 0 0 0 2 2 4 23010102
-0 0 0 0 0 4 2 4 23020102
-0 0 0 0 0 6 2 4 23030102
-0 0 0 0 0 8 2 4 23040102
-0 0 0 0 0 10 2 4 23050102
-0 0 0 0 0 12 2 4 23060102
-0 0 0 0 0 14 2 4 23070102
-0 0 0 0 0 16 2 4 23080102
-0 0 0 0 0 18 2 4 23090102
+0 0 0 0 0 0 1 2 23000102
+0 0 0 0 0 1 1 2 23010102
+0 0 0 0 0 2 1 2 23020102
+0 0 0 0 0 3 1 2 23030102
+0 0 0 0 0 4 1 2 23040102
+0 0 0 0 0 5 1 2 23050102
+0 0 0 0 0 6 1 2 23060102
+0 0 0 0 0 7 1 2 23070102
+0 0 0 0 0 8 1 2 23080102
+0 0 0 0 0 9 1 2 23090102
+
+
-#
# iteration 1
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 4 23000102
-1 0 0 0 0 2 2 4 23010102
-1 0 0 0 0 4 2 4 23020102
-1 0 0 0 0 6 2 4 23030102
-1 0 0 0 0 8 2 4 23040102
-1 0 0 0 0 10 2 4 23050102
-1 0 0 0 0 12 2 4 23060102
-1 0 0 0 0 14 2 4 23070102
-1 0 0 0 0 16 2 4 23080102
-1 0 0 0 0 18 2 4 23090102
+1 0 0 0 0 0 1 2 23000102
+1 0 0 0 0 1 1 2 23010102
+1 0 0 0 0 2 1 2 23020102
+1 0 0 0 0 3 1 2 23030102
+1 0 0 0 0 4 1 2 23040102
+1 0 0 0 0 5 1 2 23050102
+1 0 0 0 0 6 1 2 23060102
+1 0 0 0 0 7 1 2 23070102
+1 0 0 0 0 8 1 2 23080102
+1 0 0 0 0 9 1 2 23090102
+
+
diff --git a/CarpetAttic/Cart3dTest/test/octant/txz.yl b/CarpetAttic/Cart3dTest/test/octant/txz.yl
index 043b5637e..f5954d94d 100644
--- a/CarpetAttic/Cart3dTest/test/octant/txz.yl
+++ b/CarpetAttic/Cart3dTest/test/octant/txz.yl
@@ -1,32 +1,34 @@
# CART3DTEST::txz y (txz)
#
-#
# iteration 0
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-0 0 0 0 0 0 0 4 23000002
-0 0 0 0 0 0 2 4 23000102
-0 0 0 0 0 0 4 4 23000202
-0 0 0 0 0 0 6 4 23000302
-0 0 0 0 0 0 8 4 23000402
-0 0 0 0 0 0 10 4 23000502
-0 0 0 0 0 0 12 4 23000602
-0 0 0 0 0 0 14 4 23000702
-0 0 0 0 0 0 16 4 23000802
-0 0 0 0 0 0 18 4 23000902
+0 0 0 0 0 0 0 2 23000002
+0 0 0 0 0 0 1 2 23000102
+0 0 0 0 0 0 2 2 23000202
+0 0 0 0 0 0 3 2 23000302
+0 0 0 0 0 0 4 2 23000402
+0 0 0 0 0 0 5 2 23000502
+0 0 0 0 0 0 6 2 23000602
+0 0 0 0 0 0 7 2 23000702
+0 0 0 0 0 0 8 2 23000802
+0 0 0 0 0 0 9 2 23000902
+
+
-#
# iteration 1
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-1 0 0 0 0 0 0 4 23000102
-1 0 0 0 0 0 2 4 23000102
-1 0 0 0 0 0 4 4 23000202
-1 0 0 0 0 0 6 4 23000302
-1 0 0 0 0 0 8 4 23000402
-1 0 0 0 0 0 10 4 23000502
-1 0 0 0 0 0 12 4 23000602
-1 0 0 0 0 0 14 4 23000702
-1 0 0 0 0 0 16 4 23000802
-1 0 0 0 0 0 18 4 23000902
+1 0 0 0 0 0 0 2 23000102
+1 0 0 0 0 0 1 2 23000102
+1 0 0 0 0 0 2 2 23000202
+1 0 0 0 0 0 3 2 23000302
+1 0 0 0 0 0 4 2 23000402
+1 0 0 0 0 0 5 2 23000502
+1 0 0 0 0 0 6 2 23000602
+1 0 0 0 0 0 7 2 23000702
+1 0 0 0 0 0 8 2 23000802
+1 0 0 0 0 0 9 2 23000902
+
+
diff --git a/CarpetAttic/Cart3dTest/test/octant/txz.zl b/CarpetAttic/Cart3dTest/test/octant/txz.zl
index e27186dd4..b5a186000 100644
--- a/CarpetAttic/Cart3dTest/test/octant/txz.zl
+++ b/CarpetAttic/Cart3dTest/test/octant/txz.zl
@@ -1,32 +1,34 @@
# CART3DTEST::txz z (txz)
#
-#
# iteration 0
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 0 23000100
-0 0 0 0 0 0 2 2 23000101
-0 0 0 0 0 0 2 4 23000102
-0 0 0 0 0 0 2 6 23000103
-0 0 0 0 0 0 2 8 23000104
-0 0 0 0 0 0 2 10 23000105
-0 0 0 0 0 0 2 12 23000106
-0 0 0 0 0 0 2 14 23000107
-0 0 0 0 0 0 2 16 23000108
-0 0 0 0 0 0 2 18 23000109
+0 0 0 0 0 0 1 0 23000100
+0 0 0 0 0 0 1 1 23000101
+0 0 0 0 0 0 1 2 23000102
+0 0 0 0 0 0 1 3 23000103
+0 0 0 0 0 0 1 4 23000104
+0 0 0 0 0 0 1 5 23000105
+0 0 0 0 0 0 1 6 23000106
+0 0 0 0 0 0 1 7 23000107
+0 0 0 0 0 0 1 8 23000108
+0 0 0 0 0 0 1 9 23000109
+
+
-#
# iteration 1
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 0 -23000103
-1 0 0 0 0 0 2 2 -23000102
-1 0 0 0 0 0 2 4 23000102
-1 0 0 0 0 0 2 6 23000103
-1 0 0 0 0 0 2 8 23000104
-1 0 0 0 0 0 2 10 23000105
-1 0 0 0 0 0 2 12 23000106
-1 0 0 0 0 0 2 14 23000107
-1 0 0 0 0 0 2 16 23000108
-1 0 0 0 0 0 2 18 23000109
+1 0 0 0 0 0 1 0 -23000103
+1 0 0 0 0 0 1 1 -23000102
+1 0 0 0 0 0 1 2 23000102
+1 0 0 0 0 0 1 3 23000103
+1 0 0 0 0 0 1 4 23000104
+1 0 0 0 0 0 1 5 23000105
+1 0 0 0 0 0 1 6 23000106
+1 0 0 0 0 0 1 7 23000107
+1 0 0 0 0 0 1 8 23000108
+1 0 0 0 0 0 1 9 23000109
+
+
diff --git a/CarpetAttic/Cart3dTest/test/octant/tyy.xl b/CarpetAttic/Cart3dTest/test/octant/tyy.xl
index 0ee65f2ab..ea941f8c5 100644
--- a/CarpetAttic/Cart3dTest/test/octant/tyy.xl
+++ b/CarpetAttic/Cart3dTest/test/octant/tyy.xl
@@ -1,32 +1,34 @@
# CART3DTEST::tyy x (tyy)
#
-#
# iteration 0
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 4 24000102
-0 0 0 0 0 2 2 4 24010102
-0 0 0 0 0 4 2 4 24020102
-0 0 0 0 0 6 2 4 24030102
-0 0 0 0 0 8 2 4 24040102
-0 0 0 0 0 10 2 4 24050102
-0 0 0 0 0 12 2 4 24060102
-0 0 0 0 0 14 2 4 24070102
-0 0 0 0 0 16 2 4 24080102
-0 0 0 0 0 18 2 4 24090102
+0 0 0 0 0 0 1 2 24000102
+0 0 0 0 0 1 1 2 24010102
+0 0 0 0 0 2 1 2 24020102
+0 0 0 0 0 3 1 2 24030102
+0 0 0 0 0 4 1 2 24040102
+0 0 0 0 0 5 1 2 24050102
+0 0 0 0 0 6 1 2 24060102
+0 0 0 0 0 7 1 2 24070102
+0 0 0 0 0 8 1 2 24080102
+0 0 0 0 0 9 1 2 24090102
+
+
-#
# iteration 1
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 4 24000102
-1 0 0 0 0 2 2 4 24010102
-1 0 0 0 0 4 2 4 24020102
-1 0 0 0 0 6 2 4 24030102
-1 0 0 0 0 8 2 4 24040102
-1 0 0 0 0 10 2 4 24050102
-1 0 0 0 0 12 2 4 24060102
-1 0 0 0 0 14 2 4 24070102
-1 0 0 0 0 16 2 4 24080102
-1 0 0 0 0 18 2 4 24090102
+1 0 0 0 0 0 1 2 24000102
+1 0 0 0 0 1 1 2 24010102
+1 0 0 0 0 2 1 2 24020102
+1 0 0 0 0 3 1 2 24030102
+1 0 0 0 0 4 1 2 24040102
+1 0 0 0 0 5 1 2 24050102
+1 0 0 0 0 6 1 2 24060102
+1 0 0 0 0 7 1 2 24070102
+1 0 0 0 0 8 1 2 24080102
+1 0 0 0 0 9 1 2 24090102
+
+
diff --git a/CarpetAttic/Cart3dTest/test/octant/tyy.yl b/CarpetAttic/Cart3dTest/test/octant/tyy.yl
index 8f5fbb241..99a4256df 100644
--- a/CarpetAttic/Cart3dTest/test/octant/tyy.yl
+++ b/CarpetAttic/Cart3dTest/test/octant/tyy.yl
@@ -1,32 +1,34 @@
# CART3DTEST::tyy y (tyy)
#
-#
# iteration 0
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-0 0 0 0 0 0 0 4 24000002
-0 0 0 0 0 0 2 4 24000102
-0 0 0 0 0 0 4 4 24000202
-0 0 0 0 0 0 6 4 24000302
-0 0 0 0 0 0 8 4 24000402
-0 0 0 0 0 0 10 4 24000502
-0 0 0 0 0 0 12 4 24000602
-0 0 0 0 0 0 14 4 24000702
-0 0 0 0 0 0 16 4 24000802
-0 0 0 0 0 0 18 4 24000902
+0 0 0 0 0 0 0 2 24000002
+0 0 0 0 0 0 1 2 24000102
+0 0 0 0 0 0 2 2 24000202
+0 0 0 0 0 0 3 2 24000302
+0 0 0 0 0 0 4 2 24000402
+0 0 0 0 0 0 5 2 24000502
+0 0 0 0 0 0 6 2 24000602
+0 0 0 0 0 0 7 2 24000702
+0 0 0 0 0 0 8 2 24000802
+0 0 0 0 0 0 9 2 24000902
+
+
-#
# iteration 1
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-1 0 0 0 0 0 0 4 24000102
-1 0 0 0 0 0 2 4 24000102
-1 0 0 0 0 0 4 4 24000202
-1 0 0 0 0 0 6 4 24000302
-1 0 0 0 0 0 8 4 24000402
-1 0 0 0 0 0 10 4 24000502
-1 0 0 0 0 0 12 4 24000602
-1 0 0 0 0 0 14 4 24000702
-1 0 0 0 0 0 16 4 24000802
-1 0 0 0 0 0 18 4 24000902
+1 0 0 0 0 0 0 2 24000102
+1 0 0 0 0 0 1 2 24000102
+1 0 0 0 0 0 2 2 24000202
+1 0 0 0 0 0 3 2 24000302
+1 0 0 0 0 0 4 2 24000402
+1 0 0 0 0 0 5 2 24000502
+1 0 0 0 0 0 6 2 24000602
+1 0 0 0 0 0 7 2 24000702
+1 0 0 0 0 0 8 2 24000802
+1 0 0 0 0 0 9 2 24000902
+
+
diff --git a/CarpetAttic/Cart3dTest/test/octant/tyy.zl b/CarpetAttic/Cart3dTest/test/octant/tyy.zl
index 37ff1782f..1ad9be74b 100644
--- a/CarpetAttic/Cart3dTest/test/octant/tyy.zl
+++ b/CarpetAttic/Cart3dTest/test/octant/tyy.zl
@@ -1,32 +1,34 @@
# CART3DTEST::tyy z (tyy)
#
-#
# iteration 0
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 0 24000100
-0 0 0 0 0 0 2 2 24000101
-0 0 0 0 0 0 2 4 24000102
-0 0 0 0 0 0 2 6 24000103
-0 0 0 0 0 0 2 8 24000104
-0 0 0 0 0 0 2 10 24000105
-0 0 0 0 0 0 2 12 24000106
-0 0 0 0 0 0 2 14 24000107
-0 0 0 0 0 0 2 16 24000108
-0 0 0 0 0 0 2 18 24000109
+0 0 0 0 0 0 1 0 24000100
+0 0 0 0 0 0 1 1 24000101
+0 0 0 0 0 0 1 2 24000102
+0 0 0 0 0 0 1 3 24000103
+0 0 0 0 0 0 1 4 24000104
+0 0 0 0 0 0 1 5 24000105
+0 0 0 0 0 0 1 6 24000106
+0 0 0 0 0 0 1 7 24000107
+0 0 0 0 0 0 1 8 24000108
+0 0 0 0 0 0 1 9 24000109
+
+
-#
# iteration 1
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 0 24000103
-1 0 0 0 0 0 2 2 24000102
-1 0 0 0 0 0 2 4 24000102
-1 0 0 0 0 0 2 6 24000103
-1 0 0 0 0 0 2 8 24000104
-1 0 0 0 0 0 2 10 24000105
-1 0 0 0 0 0 2 12 24000106
-1 0 0 0 0 0 2 14 24000107
-1 0 0 0 0 0 2 16 24000108
-1 0 0 0 0 0 2 18 24000109
+1 0 0 0 0 0 1 0 24000103
+1 0 0 0 0 0 1 1 24000102
+1 0 0 0 0 0 1 2 24000102
+1 0 0 0 0 0 1 3 24000103
+1 0 0 0 0 0 1 4 24000104
+1 0 0 0 0 0 1 5 24000105
+1 0 0 0 0 0 1 6 24000106
+1 0 0 0 0 0 1 7 24000107
+1 0 0 0 0 0 1 8 24000108
+1 0 0 0 0 0 1 9 24000109
+
+
diff --git a/CarpetAttic/Cart3dTest/test/octant/tyz.xl b/CarpetAttic/Cart3dTest/test/octant/tyz.xl
index 0737d1bde..403a0ee5a 100644
--- a/CarpetAttic/Cart3dTest/test/octant/tyz.xl
+++ b/CarpetAttic/Cart3dTest/test/octant/tyz.xl
@@ -1,32 +1,34 @@
# CART3DTEST::tyz x (tyz)
#
-#
# iteration 0
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 4 25000102
-0 0 0 0 0 2 2 4 25010102
-0 0 0 0 0 4 2 4 25020102
-0 0 0 0 0 6 2 4 25030102
-0 0 0 0 0 8 2 4 25040102
-0 0 0 0 0 10 2 4 25050102
-0 0 0 0 0 12 2 4 25060102
-0 0 0 0 0 14 2 4 25070102
-0 0 0 0 0 16 2 4 25080102
-0 0 0 0 0 18 2 4 25090102
+0 0 0 0 0 0 1 2 25000102
+0 0 0 0 0 1 1 2 25010102
+0 0 0 0 0 2 1 2 25020102
+0 0 0 0 0 3 1 2 25030102
+0 0 0 0 0 4 1 2 25040102
+0 0 0 0 0 5 1 2 25050102
+0 0 0 0 0 6 1 2 25060102
+0 0 0 0 0 7 1 2 25070102
+0 0 0 0 0 8 1 2 25080102
+0 0 0 0 0 9 1 2 25090102
+
+
-#
# iteration 1
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 4 25000102
-1 0 0 0 0 2 2 4 25010102
-1 0 0 0 0 4 2 4 25020102
-1 0 0 0 0 6 2 4 25030102
-1 0 0 0 0 8 2 4 25040102
-1 0 0 0 0 10 2 4 25050102
-1 0 0 0 0 12 2 4 25060102
-1 0 0 0 0 14 2 4 25070102
-1 0 0 0 0 16 2 4 25080102
-1 0 0 0 0 18 2 4 25090102
+1 0 0 0 0 0 1 2 25000102
+1 0 0 0 0 1 1 2 25010102
+1 0 0 0 0 2 1 2 25020102
+1 0 0 0 0 3 1 2 25030102
+1 0 0 0 0 4 1 2 25040102
+1 0 0 0 0 5 1 2 25050102
+1 0 0 0 0 6 1 2 25060102
+1 0 0 0 0 7 1 2 25070102
+1 0 0 0 0 8 1 2 25080102
+1 0 0 0 0 9 1 2 25090102
+
+
diff --git a/CarpetAttic/Cart3dTest/test/octant/tyz.yl b/CarpetAttic/Cart3dTest/test/octant/tyz.yl
index 1c2873752..88e5c05a3 100644
--- a/CarpetAttic/Cart3dTest/test/octant/tyz.yl
+++ b/CarpetAttic/Cart3dTest/test/octant/tyz.yl
@@ -1,32 +1,34 @@
# CART3DTEST::tyz y (tyz)
#
-#
# iteration 0
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-0 0 0 0 0 0 0 4 25000002
-0 0 0 0 0 0 2 4 25000102
-0 0 0 0 0 0 4 4 25000202
-0 0 0 0 0 0 6 4 25000302
-0 0 0 0 0 0 8 4 25000402
-0 0 0 0 0 0 10 4 25000502
-0 0 0 0 0 0 12 4 25000602
-0 0 0 0 0 0 14 4 25000702
-0 0 0 0 0 0 16 4 25000802
-0 0 0 0 0 0 18 4 25000902
+0 0 0 0 0 0 0 2 25000002
+0 0 0 0 0 0 1 2 25000102
+0 0 0 0 0 0 2 2 25000202
+0 0 0 0 0 0 3 2 25000302
+0 0 0 0 0 0 4 2 25000402
+0 0 0 0 0 0 5 2 25000502
+0 0 0 0 0 0 6 2 25000602
+0 0 0 0 0 0 7 2 25000702
+0 0 0 0 0 0 8 2 25000802
+0 0 0 0 0 0 9 2 25000902
+
+
-#
# iteration 1
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-1 0 0 0 0 0 0 4 -25000102
-1 0 0 0 0 0 2 4 25000102
-1 0 0 0 0 0 4 4 25000202
-1 0 0 0 0 0 6 4 25000302
-1 0 0 0 0 0 8 4 25000402
-1 0 0 0 0 0 10 4 25000502
-1 0 0 0 0 0 12 4 25000602
-1 0 0 0 0 0 14 4 25000702
-1 0 0 0 0 0 16 4 25000802
-1 0 0 0 0 0 18 4 25000902
+1 0 0 0 0 0 0 2 -25000102
+1 0 0 0 0 0 1 2 25000102
+1 0 0 0 0 0 2 2 25000202
+1 0 0 0 0 0 3 2 25000302
+1 0 0 0 0 0 4 2 25000402
+1 0 0 0 0 0 5 2 25000502
+1 0 0 0 0 0 6 2 25000602
+1 0 0 0 0 0 7 2 25000702
+1 0 0 0 0 0 8 2 25000802
+1 0 0 0 0 0 9 2 25000902
+
+
diff --git a/CarpetAttic/Cart3dTest/test/octant/tyz.zl b/CarpetAttic/Cart3dTest/test/octant/tyz.zl
index 5271fb69a..10cfca3bf 100644
--- a/CarpetAttic/Cart3dTest/test/octant/tyz.zl
+++ b/CarpetAttic/Cart3dTest/test/octant/tyz.zl
@@ -1,32 +1,34 @@
# CART3DTEST::tyz z (tyz)
#
-#
# iteration 0
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 0 25000100
-0 0 0 0 0 0 2 2 25000101
-0 0 0 0 0 0 2 4 25000102
-0 0 0 0 0 0 2 6 25000103
-0 0 0 0 0 0 2 8 25000104
-0 0 0 0 0 0 2 10 25000105
-0 0 0 0 0 0 2 12 25000106
-0 0 0 0 0 0 2 14 25000107
-0 0 0 0 0 0 2 16 25000108
-0 0 0 0 0 0 2 18 25000109
+0 0 0 0 0 0 1 0 25000100
+0 0 0 0 0 0 1 1 25000101
+0 0 0 0 0 0 1 2 25000102
+0 0 0 0 0 0 1 3 25000103
+0 0 0 0 0 0 1 4 25000104
+0 0 0 0 0 0 1 5 25000105
+0 0 0 0 0 0 1 6 25000106
+0 0 0 0 0 0 1 7 25000107
+0 0 0 0 0 0 1 8 25000108
+0 0 0 0 0 0 1 9 25000109
+
+
-#
# iteration 1
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 0 -25000103
-1 0 0 0 0 0 2 2 -25000102
-1 0 0 0 0 0 2 4 25000102
-1 0 0 0 0 0 2 6 25000103
-1 0 0 0 0 0 2 8 25000104
-1 0 0 0 0 0 2 10 25000105
-1 0 0 0 0 0 2 12 25000106
-1 0 0 0 0 0 2 14 25000107
-1 0 0 0 0 0 2 16 25000108
-1 0 0 0 0 0 2 18 25000109
+1 0 0 0 0 0 1 0 -25000103
+1 0 0 0 0 0 1 1 -25000102
+1 0 0 0 0 0 1 2 25000102
+1 0 0 0 0 0 1 3 25000103
+1 0 0 0 0 0 1 4 25000104
+1 0 0 0 0 0 1 5 25000105
+1 0 0 0 0 0 1 6 25000106
+1 0 0 0 0 0 1 7 25000107
+1 0 0 0 0 0 1 8 25000108
+1 0 0 0 0 0 1 9 25000109
+
+
diff --git a/CarpetAttic/Cart3dTest/test/octant/tzz.xl b/CarpetAttic/Cart3dTest/test/octant/tzz.xl
index 4b7a0db11..9c42a9243 100644
--- a/CarpetAttic/Cart3dTest/test/octant/tzz.xl
+++ b/CarpetAttic/Cart3dTest/test/octant/tzz.xl
@@ -1,32 +1,34 @@
# CART3DTEST::tzz x (tzz)
#
-#
# iteration 0
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 4 26000102
-0 0 0 0 0 2 2 4 26010102
-0 0 0 0 0 4 2 4 26020102
-0 0 0 0 0 6 2 4 26030102
-0 0 0 0 0 8 2 4 26040102
-0 0 0 0 0 10 2 4 26050102
-0 0 0 0 0 12 2 4 26060102
-0 0 0 0 0 14 2 4 26070102
-0 0 0 0 0 16 2 4 26080102
-0 0 0 0 0 18 2 4 26090102
+0 0 0 0 0 0 1 2 26000102
+0 0 0 0 0 1 1 2 26010102
+0 0 0 0 0 2 1 2 26020102
+0 0 0 0 0 3 1 2 26030102
+0 0 0 0 0 4 1 2 26040102
+0 0 0 0 0 5 1 2 26050102
+0 0 0 0 0 6 1 2 26060102
+0 0 0 0 0 7 1 2 26070102
+0 0 0 0 0 8 1 2 26080102
+0 0 0 0 0 9 1 2 26090102
+
+
-#
# iteration 1
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 4 26000102
-1 0 0 0 0 2 2 4 26010102
-1 0 0 0 0 4 2 4 26020102
-1 0 0 0 0 6 2 4 26030102
-1 0 0 0 0 8 2 4 26040102
-1 0 0 0 0 10 2 4 26050102
-1 0 0 0 0 12 2 4 26060102
-1 0 0 0 0 14 2 4 26070102
-1 0 0 0 0 16 2 4 26080102
-1 0 0 0 0 18 2 4 26090102
+1 0 0 0 0 0 1 2 26000102
+1 0 0 0 0 1 1 2 26010102
+1 0 0 0 0 2 1 2 26020102
+1 0 0 0 0 3 1 2 26030102
+1 0 0 0 0 4 1 2 26040102
+1 0 0 0 0 5 1 2 26050102
+1 0 0 0 0 6 1 2 26060102
+1 0 0 0 0 7 1 2 26070102
+1 0 0 0 0 8 1 2 26080102
+1 0 0 0 0 9 1 2 26090102
+
+
diff --git a/CarpetAttic/Cart3dTest/test/octant/tzz.yl b/CarpetAttic/Cart3dTest/test/octant/tzz.yl
index 108e02e64..976fd4842 100644
--- a/CarpetAttic/Cart3dTest/test/octant/tzz.yl
+++ b/CarpetAttic/Cart3dTest/test/octant/tzz.yl
@@ -1,32 +1,34 @@
# CART3DTEST::tzz y (tzz)
#
-#
# iteration 0
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-0 0 0 0 0 0 0 4 26000002
-0 0 0 0 0 0 2 4 26000102
-0 0 0 0 0 0 4 4 26000202
-0 0 0 0 0 0 6 4 26000302
-0 0 0 0 0 0 8 4 26000402
-0 0 0 0 0 0 10 4 26000502
-0 0 0 0 0 0 12 4 26000602
-0 0 0 0 0 0 14 4 26000702
-0 0 0 0 0 0 16 4 26000802
-0 0 0 0 0 0 18 4 26000902
+0 0 0 0 0 0 0 2 26000002
+0 0 0 0 0 0 1 2 26000102
+0 0 0 0 0 0 2 2 26000202
+0 0 0 0 0 0 3 2 26000302
+0 0 0 0 0 0 4 2 26000402
+0 0 0 0 0 0 5 2 26000502
+0 0 0 0 0 0 6 2 26000602
+0 0 0 0 0 0 7 2 26000702
+0 0 0 0 0 0 8 2 26000802
+0 0 0 0 0 0 9 2 26000902
+
+
-#
# iteration 1
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-1 0 0 0 0 0 0 4 26000102
-1 0 0 0 0 0 2 4 26000102
-1 0 0 0 0 0 4 4 26000202
-1 0 0 0 0 0 6 4 26000302
-1 0 0 0 0 0 8 4 26000402
-1 0 0 0 0 0 10 4 26000502
-1 0 0 0 0 0 12 4 26000602
-1 0 0 0 0 0 14 4 26000702
-1 0 0 0 0 0 16 4 26000802
-1 0 0 0 0 0 18 4 26000902
+1 0 0 0 0 0 0 2 26000102
+1 0 0 0 0 0 1 2 26000102
+1 0 0 0 0 0 2 2 26000202
+1 0 0 0 0 0 3 2 26000302
+1 0 0 0 0 0 4 2 26000402
+1 0 0 0 0 0 5 2 26000502
+1 0 0 0 0 0 6 2 26000602
+1 0 0 0 0 0 7 2 26000702
+1 0 0 0 0 0 8 2 26000802
+1 0 0 0 0 0 9 2 26000902
+
+
diff --git a/CarpetAttic/Cart3dTest/test/octant/tzz.zl b/CarpetAttic/Cart3dTest/test/octant/tzz.zl
index 0b9598224..7d79ee5b9 100644
--- a/CarpetAttic/Cart3dTest/test/octant/tzz.zl
+++ b/CarpetAttic/Cart3dTest/test/octant/tzz.zl
@@ -1,32 +1,34 @@
# CART3DTEST::tzz z (tzz)
#
-#
# iteration 0
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 0 26000100
-0 0 0 0 0 0 2 2 26000101
-0 0 0 0 0 0 2 4 26000102
-0 0 0 0 0 0 2 6 26000103
-0 0 0 0 0 0 2 8 26000104
-0 0 0 0 0 0 2 10 26000105
-0 0 0 0 0 0 2 12 26000106
-0 0 0 0 0 0 2 14 26000107
-0 0 0 0 0 0 2 16 26000108
-0 0 0 0 0 0 2 18 26000109
+0 0 0 0 0 0 1 0 26000100
+0 0 0 0 0 0 1 1 26000101
+0 0 0 0 0 0 1 2 26000102
+0 0 0 0 0 0 1 3 26000103
+0 0 0 0 0 0 1 4 26000104
+0 0 0 0 0 0 1 5 26000105
+0 0 0 0 0 0 1 6 26000106
+0 0 0 0 0 0 1 7 26000107
+0 0 0 0 0 0 1 8 26000108
+0 0 0 0 0 0 1 9 26000109
+
+
-#
# iteration 1
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 0 26000103
-1 0 0 0 0 0 2 2 26000102
-1 0 0 0 0 0 2 4 26000102
-1 0 0 0 0 0 2 6 26000103
-1 0 0 0 0 0 2 8 26000104
-1 0 0 0 0 0 2 10 26000105
-1 0 0 0 0 0 2 12 26000106
-1 0 0 0 0 0 2 14 26000107
-1 0 0 0 0 0 2 16 26000108
-1 0 0 0 0 0 2 18 26000109
+1 0 0 0 0 0 1 0 26000103
+1 0 0 0 0 0 1 1 26000102
+1 0 0 0 0 0 1 2 26000102
+1 0 0 0 0 0 1 3 26000103
+1 0 0 0 0 0 1 4 26000104
+1 0 0 0 0 0 1 5 26000105
+1 0 0 0 0 0 1 6 26000106
+1 0 0 0 0 0 1 7 26000107
+1 0 0 0 0 0 1 8 26000108
+1 0 0 0 0 0 1 9 26000109
+
+
diff --git a/CarpetAttic/Cart3dTest/test/octant/vx.xl b/CarpetAttic/Cart3dTest/test/octant/vx.xl
index 914b010b6..71be3b196 100644
--- a/CarpetAttic/Cart3dTest/test/octant/vx.xl
+++ b/CarpetAttic/Cart3dTest/test/octant/vx.xl
@@ -1,32 +1,34 @@
# CART3DTEST::vx x (vx)
#
-#
# iteration 0
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 4 11000102
-0 0 0 0 0 2 2 4 11010102
-0 0 0 0 0 4 2 4 11020102
-0 0 0 0 0 6 2 4 11030102
-0 0 0 0 0 8 2 4 11040102
-0 0 0 0 0 10 2 4 11050102
-0 0 0 0 0 12 2 4 11060102
-0 0 0 0 0 14 2 4 11070102
-0 0 0 0 0 16 2 4 11080102
-0 0 0 0 0 18 2 4 11090102
+0 0 0 0 0 0 1 2 11000102
+0 0 0 0 0 1 1 2 11010102
+0 0 0 0 0 2 1 2 11020102
+0 0 0 0 0 3 1 2 11030102
+0 0 0 0 0 4 1 2 11040102
+0 0 0 0 0 5 1 2 11050102
+0 0 0 0 0 6 1 2 11060102
+0 0 0 0 0 7 1 2 11070102
+0 0 0 0 0 8 1 2 11080102
+0 0 0 0 0 9 1 2 11090102
+
+
-#
# iteration 1
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 4 11000102
-1 0 0 0 0 2 2 4 11010102
-1 0 0 0 0 4 2 4 11020102
-1 0 0 0 0 6 2 4 11030102
-1 0 0 0 0 8 2 4 11040102
-1 0 0 0 0 10 2 4 11050102
-1 0 0 0 0 12 2 4 11060102
-1 0 0 0 0 14 2 4 11070102
-1 0 0 0 0 16 2 4 11080102
-1 0 0 0 0 18 2 4 11090102
+1 0 0 0 0 0 1 2 11000102
+1 0 0 0 0 1 1 2 11010102
+1 0 0 0 0 2 1 2 11020102
+1 0 0 0 0 3 1 2 11030102
+1 0 0 0 0 4 1 2 11040102
+1 0 0 0 0 5 1 2 11050102
+1 0 0 0 0 6 1 2 11060102
+1 0 0 0 0 7 1 2 11070102
+1 0 0 0 0 8 1 2 11080102
+1 0 0 0 0 9 1 2 11090102
+
+
diff --git a/CarpetAttic/Cart3dTest/test/octant/vx.yl b/CarpetAttic/Cart3dTest/test/octant/vx.yl
index 583255232..b90a1f35c 100644
--- a/CarpetAttic/Cart3dTest/test/octant/vx.yl
+++ b/CarpetAttic/Cart3dTest/test/octant/vx.yl
@@ -1,32 +1,34 @@
# CART3DTEST::vx y (vx)
#
-#
# iteration 0
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-0 0 0 0 0 0 0 4 11000002
-0 0 0 0 0 0 2 4 11000102
-0 0 0 0 0 0 4 4 11000202
-0 0 0 0 0 0 6 4 11000302
-0 0 0 0 0 0 8 4 11000402
-0 0 0 0 0 0 10 4 11000502
-0 0 0 0 0 0 12 4 11000602
-0 0 0 0 0 0 14 4 11000702
-0 0 0 0 0 0 16 4 11000802
-0 0 0 0 0 0 18 4 11000902
+0 0 0 0 0 0 0 2 11000002
+0 0 0 0 0 0 1 2 11000102
+0 0 0 0 0 0 2 2 11000202
+0 0 0 0 0 0 3 2 11000302
+0 0 0 0 0 0 4 2 11000402
+0 0 0 0 0 0 5 2 11000502
+0 0 0 0 0 0 6 2 11000602
+0 0 0 0 0 0 7 2 11000702
+0 0 0 0 0 0 8 2 11000802
+0 0 0 0 0 0 9 2 11000902
+
+
-#
# iteration 1
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-1 0 0 0 0 0 0 4 11000102
-1 0 0 0 0 0 2 4 11000102
-1 0 0 0 0 0 4 4 11000202
-1 0 0 0 0 0 6 4 11000302
-1 0 0 0 0 0 8 4 11000402
-1 0 0 0 0 0 10 4 11000502
-1 0 0 0 0 0 12 4 11000602
-1 0 0 0 0 0 14 4 11000702
-1 0 0 0 0 0 16 4 11000802
-1 0 0 0 0 0 18 4 11000902
+1 0 0 0 0 0 0 2 11000102
+1 0 0 0 0 0 1 2 11000102
+1 0 0 0 0 0 2 2 11000202
+1 0 0 0 0 0 3 2 11000302
+1 0 0 0 0 0 4 2 11000402
+1 0 0 0 0 0 5 2 11000502
+1 0 0 0 0 0 6 2 11000602
+1 0 0 0 0 0 7 2 11000702
+1 0 0 0 0 0 8 2 11000802
+1 0 0 0 0 0 9 2 11000902
+
+
diff --git a/CarpetAttic/Cart3dTest/test/octant/vx.zl b/CarpetAttic/Cart3dTest/test/octant/vx.zl
index 6d345ec3a..f66fcd330 100644
--- a/CarpetAttic/Cart3dTest/test/octant/vx.zl
+++ b/CarpetAttic/Cart3dTest/test/octant/vx.zl
@@ -1,32 +1,34 @@
# CART3DTEST::vx z (vx)
#
-#
# iteration 0
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 0 11000100
-0 0 0 0 0 0 2 2 11000101
-0 0 0 0 0 0 2 4 11000102
-0 0 0 0 0 0 2 6 11000103
-0 0 0 0 0 0 2 8 11000104
-0 0 0 0 0 0 2 10 11000105
-0 0 0 0 0 0 2 12 11000106
-0 0 0 0 0 0 2 14 11000107
-0 0 0 0 0 0 2 16 11000108
-0 0 0 0 0 0 2 18 11000109
+0 0 0 0 0 0 1 0 11000100
+0 0 0 0 0 0 1 1 11000101
+0 0 0 0 0 0 1 2 11000102
+0 0 0 0 0 0 1 3 11000103
+0 0 0 0 0 0 1 4 11000104
+0 0 0 0 0 0 1 5 11000105
+0 0 0 0 0 0 1 6 11000106
+0 0 0 0 0 0 1 7 11000107
+0 0 0 0 0 0 1 8 11000108
+0 0 0 0 0 0 1 9 11000109
+
+
-#
# iteration 1
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 0 11000103
-1 0 0 0 0 0 2 2 11000102
-1 0 0 0 0 0 2 4 11000102
-1 0 0 0 0 0 2 6 11000103
-1 0 0 0 0 0 2 8 11000104
-1 0 0 0 0 0 2 10 11000105
-1 0 0 0 0 0 2 12 11000106
-1 0 0 0 0 0 2 14 11000107
-1 0 0 0 0 0 2 16 11000108
-1 0 0 0 0 0 2 18 11000109
+1 0 0 0 0 0 1 0 11000103
+1 0 0 0 0 0 1 1 11000102
+1 0 0 0 0 0 1 2 11000102
+1 0 0 0 0 0 1 3 11000103
+1 0 0 0 0 0 1 4 11000104
+1 0 0 0 0 0 1 5 11000105
+1 0 0 0 0 0 1 6 11000106
+1 0 0 0 0 0 1 7 11000107
+1 0 0 0 0 0 1 8 11000108
+1 0 0 0 0 0 1 9 11000109
+
+
diff --git a/CarpetAttic/Cart3dTest/test/octant/vy.xl b/CarpetAttic/Cart3dTest/test/octant/vy.xl
index 0300c9617..dcfd7a6da 100644
--- a/CarpetAttic/Cart3dTest/test/octant/vy.xl
+++ b/CarpetAttic/Cart3dTest/test/octant/vy.xl
@@ -1,32 +1,34 @@
# CART3DTEST::vy x (vy)
#
-#
# iteration 0
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 4 12000102
-0 0 0 0 0 2 2 4 12010102
-0 0 0 0 0 4 2 4 12020102
-0 0 0 0 0 6 2 4 12030102
-0 0 0 0 0 8 2 4 12040102
-0 0 0 0 0 10 2 4 12050102
-0 0 0 0 0 12 2 4 12060102
-0 0 0 0 0 14 2 4 12070102
-0 0 0 0 0 16 2 4 12080102
-0 0 0 0 0 18 2 4 12090102
+0 0 0 0 0 0 1 2 12000102
+0 0 0 0 0 1 1 2 12010102
+0 0 0 0 0 2 1 2 12020102
+0 0 0 0 0 3 1 2 12030102
+0 0 0 0 0 4 1 2 12040102
+0 0 0 0 0 5 1 2 12050102
+0 0 0 0 0 6 1 2 12060102
+0 0 0 0 0 7 1 2 12070102
+0 0 0 0 0 8 1 2 12080102
+0 0 0 0 0 9 1 2 12090102
+
+
-#
# iteration 1
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 4 12000102
-1 0 0 0 0 2 2 4 12010102
-1 0 0 0 0 4 2 4 12020102
-1 0 0 0 0 6 2 4 12030102
-1 0 0 0 0 8 2 4 12040102
-1 0 0 0 0 10 2 4 12050102
-1 0 0 0 0 12 2 4 12060102
-1 0 0 0 0 14 2 4 12070102
-1 0 0 0 0 16 2 4 12080102
-1 0 0 0 0 18 2 4 12090102
+1 0 0 0 0 0 1 2 12000102
+1 0 0 0 0 1 1 2 12010102
+1 0 0 0 0 2 1 2 12020102
+1 0 0 0 0 3 1 2 12030102
+1 0 0 0 0 4 1 2 12040102
+1 0 0 0 0 5 1 2 12050102
+1 0 0 0 0 6 1 2 12060102
+1 0 0 0 0 7 1 2 12070102
+1 0 0 0 0 8 1 2 12080102
+1 0 0 0 0 9 1 2 12090102
+
+
diff --git a/CarpetAttic/Cart3dTest/test/octant/vy.yl b/CarpetAttic/Cart3dTest/test/octant/vy.yl
index ecc01bc28..bb1ccbd5a 100644
--- a/CarpetAttic/Cart3dTest/test/octant/vy.yl
+++ b/CarpetAttic/Cart3dTest/test/octant/vy.yl
@@ -1,32 +1,34 @@
# CART3DTEST::vy y (vy)
#
-#
# iteration 0
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-0 0 0 0 0 0 0 4 12000002
-0 0 0 0 0 0 2 4 12000102
-0 0 0 0 0 0 4 4 12000202
-0 0 0 0 0 0 6 4 12000302
-0 0 0 0 0 0 8 4 12000402
-0 0 0 0 0 0 10 4 12000502
-0 0 0 0 0 0 12 4 12000602
-0 0 0 0 0 0 14 4 12000702
-0 0 0 0 0 0 16 4 12000802
-0 0 0 0 0 0 18 4 12000902
+0 0 0 0 0 0 0 2 12000002
+0 0 0 0 0 0 1 2 12000102
+0 0 0 0 0 0 2 2 12000202
+0 0 0 0 0 0 3 2 12000302
+0 0 0 0 0 0 4 2 12000402
+0 0 0 0 0 0 5 2 12000502
+0 0 0 0 0 0 6 2 12000602
+0 0 0 0 0 0 7 2 12000702
+0 0 0 0 0 0 8 2 12000802
+0 0 0 0 0 0 9 2 12000902
+
+
-#
# iteration 1
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-1 0 0 0 0 0 0 4 -12000102
-1 0 0 0 0 0 2 4 12000102
-1 0 0 0 0 0 4 4 12000202
-1 0 0 0 0 0 6 4 12000302
-1 0 0 0 0 0 8 4 12000402
-1 0 0 0 0 0 10 4 12000502
-1 0 0 0 0 0 12 4 12000602
-1 0 0 0 0 0 14 4 12000702
-1 0 0 0 0 0 16 4 12000802
-1 0 0 0 0 0 18 4 12000902
+1 0 0 0 0 0 0 2 -12000102
+1 0 0 0 0 0 1 2 12000102
+1 0 0 0 0 0 2 2 12000202
+1 0 0 0 0 0 3 2 12000302
+1 0 0 0 0 0 4 2 12000402
+1 0 0 0 0 0 5 2 12000502
+1 0 0 0 0 0 6 2 12000602
+1 0 0 0 0 0 7 2 12000702
+1 0 0 0 0 0 8 2 12000802
+1 0 0 0 0 0 9 2 12000902
+
+
diff --git a/CarpetAttic/Cart3dTest/test/octant/vy.zl b/CarpetAttic/Cart3dTest/test/octant/vy.zl
index d5af5c375..2d110fc34 100644
--- a/CarpetAttic/Cart3dTest/test/octant/vy.zl
+++ b/CarpetAttic/Cart3dTest/test/octant/vy.zl
@@ -1,32 +1,34 @@
# CART3DTEST::vy z (vy)
#
-#
# iteration 0
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 0 12000100
-0 0 0 0 0 0 2 2 12000101
-0 0 0 0 0 0 2 4 12000102
-0 0 0 0 0 0 2 6 12000103
-0 0 0 0 0 0 2 8 12000104
-0 0 0 0 0 0 2 10 12000105
-0 0 0 0 0 0 2 12 12000106
-0 0 0 0 0 0 2 14 12000107
-0 0 0 0 0 0 2 16 12000108
-0 0 0 0 0 0 2 18 12000109
+0 0 0 0 0 0 1 0 12000100
+0 0 0 0 0 0 1 1 12000101
+0 0 0 0 0 0 1 2 12000102
+0 0 0 0 0 0 1 3 12000103
+0 0 0 0 0 0 1 4 12000104
+0 0 0 0 0 0 1 5 12000105
+0 0 0 0 0 0 1 6 12000106
+0 0 0 0 0 0 1 7 12000107
+0 0 0 0 0 0 1 8 12000108
+0 0 0 0 0 0 1 9 12000109
+
+
-#
# iteration 1
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 0 12000103
-1 0 0 0 0 0 2 2 12000102
-1 0 0 0 0 0 2 4 12000102
-1 0 0 0 0 0 2 6 12000103
-1 0 0 0 0 0 2 8 12000104
-1 0 0 0 0 0 2 10 12000105
-1 0 0 0 0 0 2 12 12000106
-1 0 0 0 0 0 2 14 12000107
-1 0 0 0 0 0 2 16 12000108
-1 0 0 0 0 0 2 18 12000109
+1 0 0 0 0 0 1 0 12000103
+1 0 0 0 0 0 1 1 12000102
+1 0 0 0 0 0 1 2 12000102
+1 0 0 0 0 0 1 3 12000103
+1 0 0 0 0 0 1 4 12000104
+1 0 0 0 0 0 1 5 12000105
+1 0 0 0 0 0 1 6 12000106
+1 0 0 0 0 0 1 7 12000107
+1 0 0 0 0 0 1 8 12000108
+1 0 0 0 0 0 1 9 12000109
+
+
diff --git a/CarpetAttic/Cart3dTest/test/octant/vz.xl b/CarpetAttic/Cart3dTest/test/octant/vz.xl
index 5b2be5a21..a8969fcb1 100644
--- a/CarpetAttic/Cart3dTest/test/octant/vz.xl
+++ b/CarpetAttic/Cart3dTest/test/octant/vz.xl
@@ -1,32 +1,34 @@
# CART3DTEST::vz x (vz)
#
-#
# iteration 0
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 4 13000102
-0 0 0 0 0 2 2 4 13010102
-0 0 0 0 0 4 2 4 13020102
-0 0 0 0 0 6 2 4 13030102
-0 0 0 0 0 8 2 4 13040102
-0 0 0 0 0 10 2 4 13050102
-0 0 0 0 0 12 2 4 13060102
-0 0 0 0 0 14 2 4 13070102
-0 0 0 0 0 16 2 4 13080102
-0 0 0 0 0 18 2 4 13090102
+0 0 0 0 0 0 1 2 13000102
+0 0 0 0 0 1 1 2 13010102
+0 0 0 0 0 2 1 2 13020102
+0 0 0 0 0 3 1 2 13030102
+0 0 0 0 0 4 1 2 13040102
+0 0 0 0 0 5 1 2 13050102
+0 0 0 0 0 6 1 2 13060102
+0 0 0 0 0 7 1 2 13070102
+0 0 0 0 0 8 1 2 13080102
+0 0 0 0 0 9 1 2 13090102
+
+
-#
# iteration 1
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 4 13000102
-1 0 0 0 0 2 2 4 13010102
-1 0 0 0 0 4 2 4 13020102
-1 0 0 0 0 6 2 4 13030102
-1 0 0 0 0 8 2 4 13040102
-1 0 0 0 0 10 2 4 13050102
-1 0 0 0 0 12 2 4 13060102
-1 0 0 0 0 14 2 4 13070102
-1 0 0 0 0 16 2 4 13080102
-1 0 0 0 0 18 2 4 13090102
+1 0 0 0 0 0 1 2 13000102
+1 0 0 0 0 1 1 2 13010102
+1 0 0 0 0 2 1 2 13020102
+1 0 0 0 0 3 1 2 13030102
+1 0 0 0 0 4 1 2 13040102
+1 0 0 0 0 5 1 2 13050102
+1 0 0 0 0 6 1 2 13060102
+1 0 0 0 0 7 1 2 13070102
+1 0 0 0 0 8 1 2 13080102
+1 0 0 0 0 9 1 2 13090102
+
+
diff --git a/CarpetAttic/Cart3dTest/test/octant/vz.yl b/CarpetAttic/Cart3dTest/test/octant/vz.yl
index 0ab849f9e..a973b578f 100644
--- a/CarpetAttic/Cart3dTest/test/octant/vz.yl
+++ b/CarpetAttic/Cart3dTest/test/octant/vz.yl
@@ -1,32 +1,34 @@
# CART3DTEST::vz y (vz)
#
-#
# iteration 0
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-0 0 0 0 0 0 0 4 13000002
-0 0 0 0 0 0 2 4 13000102
-0 0 0 0 0 0 4 4 13000202
-0 0 0 0 0 0 6 4 13000302
-0 0 0 0 0 0 8 4 13000402
-0 0 0 0 0 0 10 4 13000502
-0 0 0 0 0 0 12 4 13000602
-0 0 0 0 0 0 14 4 13000702
-0 0 0 0 0 0 16 4 13000802
-0 0 0 0 0 0 18 4 13000902
+0 0 0 0 0 0 0 2 13000002
+0 0 0 0 0 0 1 2 13000102
+0 0 0 0 0 0 2 2 13000202
+0 0 0 0 0 0 3 2 13000302
+0 0 0 0 0 0 4 2 13000402
+0 0 0 0 0 0 5 2 13000502
+0 0 0 0 0 0 6 2 13000602
+0 0 0 0 0 0 7 2 13000702
+0 0 0 0 0 0 8 2 13000802
+0 0 0 0 0 0 9 2 13000902
+
+
-#
# iteration 1
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-1 0 0 0 0 0 0 4 13000102
-1 0 0 0 0 0 2 4 13000102
-1 0 0 0 0 0 4 4 13000202
-1 0 0 0 0 0 6 4 13000302
-1 0 0 0 0 0 8 4 13000402
-1 0 0 0 0 0 10 4 13000502
-1 0 0 0 0 0 12 4 13000602
-1 0 0 0 0 0 14 4 13000702
-1 0 0 0 0 0 16 4 13000802
-1 0 0 0 0 0 18 4 13000902
+1 0 0 0 0 0 0 2 13000102
+1 0 0 0 0 0 1 2 13000102
+1 0 0 0 0 0 2 2 13000202
+1 0 0 0 0 0 3 2 13000302
+1 0 0 0 0 0 4 2 13000402
+1 0 0 0 0 0 5 2 13000502
+1 0 0 0 0 0 6 2 13000602
+1 0 0 0 0 0 7 2 13000702
+1 0 0 0 0 0 8 2 13000802
+1 0 0 0 0 0 9 2 13000902
+
+
diff --git a/CarpetAttic/Cart3dTest/test/octant/vz.zl b/CarpetAttic/Cart3dTest/test/octant/vz.zl
index 134b0a9c7..c3f47d0b8 100644
--- a/CarpetAttic/Cart3dTest/test/octant/vz.zl
+++ b/CarpetAttic/Cart3dTest/test/octant/vz.zl
@@ -1,32 +1,34 @@
# CART3DTEST::vz z (vz)
#
-#
# iteration 0
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-0 0 0 0 0 0 2 0 13000100
-0 0 0 0 0 0 2 2 13000101
-0 0 0 0 0 0 2 4 13000102
-0 0 0 0 0 0 2 6 13000103
-0 0 0 0 0 0 2 8 13000104
-0 0 0 0 0 0 2 10 13000105
-0 0 0 0 0 0 2 12 13000106
-0 0 0 0 0 0 2 14 13000107
-0 0 0 0 0 0 2 16 13000108
-0 0 0 0 0 0 2 18 13000109
+0 0 0 0 0 0 1 0 13000100
+0 0 0 0 0 0 1 1 13000101
+0 0 0 0 0 0 1 2 13000102
+0 0 0 0 0 0 1 3 13000103
+0 0 0 0 0 0 1 4 13000104
+0 0 0 0 0 0 1 5 13000105
+0 0 0 0 0 0 1 6 13000106
+0 0 0 0 0 0 1 7 13000107
+0 0 0 0 0 0 1 8 13000108
+0 0 0 0 0 0 1 9 13000109
+
+
-#
# iteration 1
# time level 0 refinement level 0 component 0 multigrid level 0
# column format: it tl rl c ml x y z data
-1 0 0 0 0 0 2 0 -13000103
-1 0 0 0 0 0 2 2 -13000102
-1 0 0 0 0 0 2 4 13000102
-1 0 0 0 0 0 2 6 13000103
-1 0 0 0 0 0 2 8 13000104
-1 0 0 0 0 0 2 10 13000105
-1 0 0 0 0 0 2 12 13000106
-1 0 0 0 0 0 2 14 13000107
-1 0 0 0 0 0 2 16 13000108
-1 0 0 0 0 0 2 18 13000109
+1 0 0 0 0 0 1 0 -13000103
+1 0 0 0 0 0 1 1 -13000102
+1 0 0 0 0 0 1 2 13000102
+1 0 0 0 0 0 1 3 13000103
+1 0 0 0 0 0 1 4 13000104
+1 0 0 0 0 0 1 5 13000105
+1 0 0 0 0 0 1 6 13000106
+1 0 0 0 0 0 1 7 13000107
+1 0 0 0 0 0 1 8 13000108
+1 0 0 0 0 0 1 9 13000109
+
+