Fixing bugs with octant mode, coordinates, and ASCII output.

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

darcs-hash:20010313110700-f6438-2bd65c5a1e0c1582bed9a08ec9c19df312ad817a.gz

12 files changed, 156 insertions, 144 deletions

diff --git a/CarpetAttic/Cart3dTest/test/byspacing-eleven/cart3d_x.xl b/CarpetAttic/Cart3dTest/test/byspacing-eleven/cart3d_x.xl
index 0ea043e6b..53b3e689d 100644
--- a/CarpetAttic/Cart3dTest/test/byspacing-eleven/cart3d_x.xl
+++ b/CarpetAttic/Cart3dTest/test/byspacing-eleven/cart3d_x.xl
@@ -1,18 +1,19 @@
 # GRID::cart3d_x x (cart3d_x)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 10 10 -1.35
-0 0 0 0 0 2 10 10 -1.05
-0 0 0 0 0 4 10 10 -0.75
-0 0 0 0 0 6 10 10 -0.45
-0 0 0 0 0 8 10 10 -0.15
-0 0 0 0 0 10 10 10 0.15
-0 0 0 0 0 12 10 10 0.45
-0 0 0 0 0 14 10 10 0.75
-0 0 0 0 0 16 10 10 1.05
-0 0 0 0 0 18 10 10 1.35
-0 0 0 0 0 20 10 10 1.65
+0 0 0 0 0 0 5 5 -1.35
+0 0 0 0 0 1 5 5 -1.05
+0 0 0 0 0 2 5 5 -0.75
+0 0 0 0 0 3 5 5 -0.45
+0 0 0 0 0 4 5 5 -0.15
+0 0 0 0 0 5 5 5 0.15
+0 0 0 0 0 6 5 5 0.45
+0 0 0 0 0 7 5 5 0.75
+0 0 0 0 0 8 5 5 1.05
+0 0 0 0 0 9 5 5 1.35
+0 0 0 0 0 10 5 5 1.65
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/byspacing-eleven/cart3d_x.yl b/CarpetAttic/Cart3dTest/test/byspacing-eleven/cart3d_x.yl
index 7f9797125..74b67ba4b 100644
--- a/CarpetAttic/Cart3dTest/test/byspacing-eleven/cart3d_x.yl
+++ b/CarpetAttic/Cart3dTest/test/byspacing-eleven/cart3d_x.yl
@@ -1,18 +1,19 @@
 # GRID::cart3d_x y (cart3d_x)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 10 0 10 0.15
-0 0 0 0 0 10 2 10 0.15
-0 0 0 0 0 10 4 10 0.15
-0 0 0 0 0 10 6 10 0.15
-0 0 0 0 0 10 8 10 0.15
-0 0 0 0 0 10 10 10 0.15
-0 0 0 0 0 10 12 10 0.15
-0 0 0 0 0 10 14 10 0.15
-0 0 0 0 0 10 16 10 0.15
-0 0 0 0 0 10 18 10 0.15
-0 0 0 0 0 10 20 10 0.15
+0 0 0 0 0 5 0 5 0.15
+0 0 0 0 0 5 1 5 0.15
+0 0 0 0 0 5 2 5 0.15
+0 0 0 0 0 5 3 5 0.15
+0 0 0 0 0 5 4 5 0.15
+0 0 0 0 0 5 5 5 0.15
+0 0 0 0 0 5 6 5 0.15
+0 0 0 0 0 5 7 5 0.15
+0 0 0 0 0 5 8 5 0.15
+0 0 0 0 0 5 9 5 0.15
+0 0 0 0 0 5 10 5 0.15
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/byspacing-eleven/cart3d_x.zl b/CarpetAttic/Cart3dTest/test/byspacing-eleven/cart3d_x.zl
index f58e57785..644637da4 100644
--- a/CarpetAttic/Cart3dTest/test/byspacing-eleven/cart3d_x.zl
+++ b/CarpetAttic/Cart3dTest/test/byspacing-eleven/cart3d_x.zl
@@ -1,18 +1,19 @@
 # GRID::cart3d_x z (cart3d_x)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 10 10 0 0.15
-0 0 0 0 0 10 10 2 0.15
-0 0 0 0 0 10 10 4 0.15
-0 0 0 0 0 10 10 6 0.15
-0 0 0 0 0 10 10 8 0.15
-0 0 0 0 0 10 10 10 0.15
-0 0 0 0 0 10 10 12 0.15
-0 0 0 0 0 10 10 14 0.15
-0 0 0 0 0 10 10 16 0.15
-0 0 0 0 0 10 10 18 0.15
-0 0 0 0 0 10 10 20 0.15
+0 0 0 0 0 5 5 0 0.15
+0 0 0 0 0 5 5 1 0.15
+0 0 0 0 0 5 5 2 0.15
+0 0 0 0 0 5 5 3 0.15
+0 0 0 0 0 5 5 4 0.15
+0 0 0 0 0 5 5 5 0.15
+0 0 0 0 0 5 5 6 0.15
+0 0 0 0 0 5 5 7 0.15
+0 0 0 0 0 5 5 8 0.15
+0 0 0 0 0 5 5 9 0.15
+0 0 0 0 0 5 5 10 0.15
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/byspacing-eleven/cart3d_y.xl b/CarpetAttic/Cart3dTest/test/byspacing-eleven/cart3d_y.xl
index 1c5005bea..50a646b41 100644
--- a/CarpetAttic/Cart3dTest/test/byspacing-eleven/cart3d_y.xl
+++ b/CarpetAttic/Cart3dTest/test/byspacing-eleven/cart3d_y.xl
@@ -1,18 +1,19 @@
 # GRID::cart3d_y x (cart3d_y)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 10 10 0.15
-0 0 0 0 0 2 10 10 0.15
-0 0 0 0 0 4 10 10 0.15
-0 0 0 0 0 6 10 10 0.15
-0 0 0 0 0 8 10 10 0.15
-0 0 0 0 0 10 10 10 0.15
-0 0 0 0 0 12 10 10 0.15
-0 0 0 0 0 14 10 10 0.15
-0 0 0 0 0 16 10 10 0.15
-0 0 0 0 0 18 10 10 0.15
-0 0 0 0 0 20 10 10 0.15
+0 0 0 0 0 0 5 5 0.15
+0 0 0 0 0 1 5 5 0.15
+0 0 0 0 0 2 5 5 0.15
+0 0 0 0 0 3 5 5 0.15
+0 0 0 0 0 4 5 5 0.15
+0 0 0 0 0 5 5 5 0.15
+0 0 0 0 0 6 5 5 0.15
+0 0 0 0 0 7 5 5 0.15
+0 0 0 0 0 8 5 5 0.15
+0 0 0 0 0 9 5 5 0.15
+0 0 0 0 0 10 5 5 0.15
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/byspacing-eleven/cart3d_y.yl b/CarpetAttic/Cart3dTest/test/byspacing-eleven/cart3d_y.yl
index 681105ff2..f473f055a 100644
--- a/CarpetAttic/Cart3dTest/test/byspacing-eleven/cart3d_y.yl
+++ b/CarpetAttic/Cart3dTest/test/byspacing-eleven/cart3d_y.yl
@@ -1,18 +1,19 @@
 # GRID::cart3d_y y (cart3d_y)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 10 0 10 -1.35
-0 0 0 0 0 10 2 10 -1.05
-0 0 0 0 0 10 4 10 -0.75
-0 0 0 0 0 10 6 10 -0.45
-0 0 0 0 0 10 8 10 -0.15
-0 0 0 0 0 10 10 10 0.15
-0 0 0 0 0 10 12 10 0.45
-0 0 0 0 0 10 14 10 0.75
-0 0 0 0 0 10 16 10 1.05
-0 0 0 0 0 10 18 10 1.35
-0 0 0 0 0 10 20 10 1.65
+0 0 0 0 0 5 0 5 -1.35
+0 0 0 0 0 5 1 5 -1.05
+0 0 0 0 0 5 2 5 -0.75
+0 0 0 0 0 5 3 5 -0.45
+0 0 0 0 0 5 4 5 -0.15
+0 0 0 0 0 5 5 5 0.15
+0 0 0 0 0 5 6 5 0.45
+0 0 0 0 0 5 7 5 0.75
+0 0 0 0 0 5 8 5 1.05
+0 0 0 0 0 5 9 5 1.35
+0 0 0 0 0 5 10 5 1.65
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/byspacing-eleven/cart3d_y.zl b/CarpetAttic/Cart3dTest/test/byspacing-eleven/cart3d_y.zl
index a8baaf3b1..51935fcfc 100644
--- a/CarpetAttic/Cart3dTest/test/byspacing-eleven/cart3d_y.zl
+++ b/CarpetAttic/Cart3dTest/test/byspacing-eleven/cart3d_y.zl
@@ -1,18 +1,19 @@
 # GRID::cart3d_y z (cart3d_y)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 10 10 0 0.15
-0 0 0 0 0 10 10 2 0.15
-0 0 0 0 0 10 10 4 0.15
-0 0 0 0 0 10 10 6 0.15
-0 0 0 0 0 10 10 8 0.15
-0 0 0 0 0 10 10 10 0.15
-0 0 0 0 0 10 10 12 0.15
-0 0 0 0 0 10 10 14 0.15
-0 0 0 0 0 10 10 16 0.15
-0 0 0 0 0 10 10 18 0.15
-0 0 0 0 0 10 10 20 0.15
+0 0 0 0 0 5 5 0 0.15
+0 0 0 0 0 5 5 1 0.15
+0 0 0 0 0 5 5 2 0.15
+0 0 0 0 0 5 5 3 0.15
+0 0 0 0 0 5 5 4 0.15
+0 0 0 0 0 5 5 5 0.15
+0 0 0 0 0 5 5 6 0.15
+0 0 0 0 0 5 5 7 0.15
+0 0 0 0 0 5 5 8 0.15
+0 0 0 0 0 5 5 9 0.15
+0 0 0 0 0 5 5 10 0.15
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/byspacing-eleven/cart3d_z.xl b/CarpetAttic/Cart3dTest/test/byspacing-eleven/cart3d_z.xl
index 60166f19a..1f08315f3 100644
--- a/CarpetAttic/Cart3dTest/test/byspacing-eleven/cart3d_z.xl
+++ b/CarpetAttic/Cart3dTest/test/byspacing-eleven/cart3d_z.xl
@@ -1,18 +1,19 @@
 # GRID::cart3d_z x (cart3d_z)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 10 10 0.15
-0 0 0 0 0 2 10 10 0.15
-0 0 0 0 0 4 10 10 0.15
-0 0 0 0 0 6 10 10 0.15
-0 0 0 0 0 8 10 10 0.15
-0 0 0 0 0 10 10 10 0.15
-0 0 0 0 0 12 10 10 0.15
-0 0 0 0 0 14 10 10 0.15
-0 0 0 0 0 16 10 10 0.15
-0 0 0 0 0 18 10 10 0.15
-0 0 0 0 0 20 10 10 0.15
+0 0 0 0 0 0 5 5 0.15
+0 0 0 0 0 1 5 5 0.15
+0 0 0 0 0 2 5 5 0.15
+0 0 0 0 0 3 5 5 0.15
+0 0 0 0 0 4 5 5 0.15
+0 0 0 0 0 5 5 5 0.15
+0 0 0 0 0 6 5 5 0.15
+0 0 0 0 0 7 5 5 0.15
+0 0 0 0 0 8 5 5 0.15
+0 0 0 0 0 9 5 5 0.15
+0 0 0 0 0 10 5 5 0.15
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/byspacing-eleven/cart3d_z.yl b/CarpetAttic/Cart3dTest/test/byspacing-eleven/cart3d_z.yl
index 51c383730..1463c5179 100644
--- a/CarpetAttic/Cart3dTest/test/byspacing-eleven/cart3d_z.yl
+++ b/CarpetAttic/Cart3dTest/test/byspacing-eleven/cart3d_z.yl
@@ -1,18 +1,19 @@
 # GRID::cart3d_z y (cart3d_z)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 10 0 10 0.15
-0 0 0 0 0 10 2 10 0.15
-0 0 0 0 0 10 4 10 0.15
-0 0 0 0 0 10 6 10 0.15
-0 0 0 0 0 10 8 10 0.15
-0 0 0 0 0 10 10 10 0.15
-0 0 0 0 0 10 12 10 0.15
-0 0 0 0 0 10 14 10 0.15
-0 0 0 0 0 10 16 10 0.15
-0 0 0 0 0 10 18 10 0.15
-0 0 0 0 0 10 20 10 0.15
+0 0 0 0 0 5 0 5 0.15
+0 0 0 0 0 5 1 5 0.15
+0 0 0 0 0 5 2 5 0.15
+0 0 0 0 0 5 3 5 0.15
+0 0 0 0 0 5 4 5 0.15
+0 0 0 0 0 5 5 5 0.15
+0 0 0 0 0 5 6 5 0.15
+0 0 0 0 0 5 7 5 0.15
+0 0 0 0 0 5 8 5 0.15
+0 0 0 0 0 5 9 5 0.15
+0 0 0 0 0 5 10 5 0.15
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/byspacing-eleven/cart3d_z.zl b/CarpetAttic/Cart3dTest/test/byspacing-eleven/cart3d_z.zl
index 33604d71d..ad5c39153 100644
--- a/CarpetAttic/Cart3dTest/test/byspacing-eleven/cart3d_z.zl
+++ b/CarpetAttic/Cart3dTest/test/byspacing-eleven/cart3d_z.zl
@@ -1,18 +1,19 @@
 # GRID::cart3d_z z (cart3d_z)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 10 10 0 -1.35
-0 0 0 0 0 10 10 2 -1.05
-0 0 0 0 0 10 10 4 -0.75
-0 0 0 0 0 10 10 6 -0.45
-0 0 0 0 0 10 10 8 -0.15
-0 0 0 0 0 10 10 10 0.15
-0 0 0 0 0 10 10 12 0.45
-0 0 0 0 0 10 10 14 0.75
-0 0 0 0 0 10 10 16 1.05
-0 0 0 0 0 10 10 18 1.35
-0 0 0 0 0 10 10 20 1.65
+0 0 0 0 0 5 5 0 -1.35
+0 0 0 0 0 5 5 1 -1.05
+0 0 0 0 0 5 5 2 -0.75
+0 0 0 0 0 5 5 3 -0.45
+0 0 0 0 0 5 5 4 -0.15
+0 0 0 0 0 5 5 5 0.15
+0 0 0 0 0 5 5 6 0.45
+0 0 0 0 0 5 5 7 0.75
+0 0 0 0 0 5 5 8 1.05
+0 0 0 0 0 5 5 9 1.35
+0 0 0 0 0 5 5 10 1.65
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/byspacing-eleven/spher3d_r.xl b/CarpetAttic/Cart3dTest/test/byspacing-eleven/spher3d_r.xl
index 824cc05f9..4ef5d491b 100644
--- a/CarpetAttic/Cart3dTest/test/byspacing-eleven/spher3d_r.xl
+++ b/CarpetAttic/Cart3dTest/test/byspacing-eleven/spher3d_r.xl
@@ -1,18 +1,19 @@
 # GRID::spher3d_r x (spher3d_r)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 0 10 10 1.36656503687164
-0 0 0 0 0 2 10 10 1.07121426428143
-0 0 0 0 0 4 10 10 0.779422863405995
-0 0 0 0 0 6 10 10 0.49749371855331
-0 0 0 0 0 8 10 10 0.259807621135332
-0 0 0 0 0 10 10 10 0.259807621135331
-0 0 0 0 0 12 10 10 0.49749371855331
-0 0 0 0 0 14 10 10 0.779422863405995
-0 0 0 0 0 16 10 10 1.07121426428143
-0 0 0 0 0 18 10 10 1.36656503687164
-0 0 0 0 0 20 10 10 1.66358047596141
+0 0 0 0 0 0 5 5 1.36656503687164
+0 0 0 0 0 1 5 5 1.07121426428143
+0 0 0 0 0 2 5 5 0.779422863405995
+0 0 0 0 0 3 5 5 0.49749371855331
+0 0 0 0 0 4 5 5 0.259807621135332
+0 0 0 0 0 5 5 5 0.259807621135331
+0 0 0 0 0 6 5 5 0.49749371855331
+0 0 0 0 0 7 5 5 0.779422863405995
+0 0 0 0 0 8 5 5 1.07121426428143
+0 0 0 0 0 9 5 5 1.36656503687164
+0 0 0 0 0 10 5 5 1.66358047596141
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/byspacing-eleven/spher3d_r.yl b/CarpetAttic/Cart3dTest/test/byspacing-eleven/spher3d_r.yl
index b432405c8..59495776e 100644
--- a/CarpetAttic/Cart3dTest/test/byspacing-eleven/spher3d_r.yl
+++ b/CarpetAttic/Cart3dTest/test/byspacing-eleven/spher3d_r.yl
@@ -1,18 +1,19 @@
 # GRID::spher3d_r y (spher3d_r)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 10 0 10 1.36656503687164
-0 0 0 0 0 10 2 10 1.07121426428143
-0 0 0 0 0 10 4 10 0.779422863405995
-0 0 0 0 0 10 6 10 0.49749371855331
-0 0 0 0 0 10 8 10 0.259807621135332
-0 0 0 0 0 10 10 10 0.259807621135331
-0 0 0 0 0 10 12 10 0.49749371855331
-0 0 0 0 0 10 14 10 0.779422863405995
-0 0 0 0 0 10 16 10 1.07121426428143
-0 0 0 0 0 10 18 10 1.36656503687164
-0 0 0 0 0 10 20 10 1.66358047596141
+0 0 0 0 0 5 0 5 1.36656503687164
+0 0 0 0 0 5 1 5 1.07121426428143
+0 0 0 0 0 5 2 5 0.779422863405995
+0 0 0 0 0 5 3 5 0.49749371855331
+0 0 0 0 0 5 4 5 0.259807621135332
+0 0 0 0 0 5 5 5 0.259807621135331
+0 0 0 0 0 5 6 5 0.49749371855331
+0 0 0 0 0 5 7 5 0.779422863405995
+0 0 0 0 0 5 8 5 1.07121426428143
+0 0 0 0 0 5 9 5 1.36656503687164
+0 0 0 0 0 5 10 5 1.66358047596141
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/byspacing-eleven/spher3d_r.zl b/CarpetAttic/Cart3dTest/test/byspacing-eleven/spher3d_r.zl
index ab926204a..8bc04312c 100644
--- a/CarpetAttic/Cart3dTest/test/byspacing-eleven/spher3d_r.zl
+++ b/CarpetAttic/Cart3dTest/test/byspacing-eleven/spher3d_r.zl
@@ -1,18 +1,19 @@
 # GRID::spher3d_r z (spher3d_r)
 #
-#
 # iteration 0
 # time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 0 0 0 0 10 10 0 1.36656503687164
-0 0 0 0 0 10 10 2 1.07121426428143
-0 0 0 0 0 10 10 4 0.779422863405995
-0 0 0 0 0 10 10 6 0.49749371855331
-0 0 0 0 0 10 10 8 0.259807621135332
-0 0 0 0 0 10 10 10 0.259807621135331
-0 0 0 0 0 10 10 12 0.49749371855331
-0 0 0 0 0 10 10 14 0.779422863405995
-0 0 0 0 0 10 10 16 1.07121426428143
-0 0 0 0 0 10 10 18 1.36656503687164
-0 0 0 0 0 10 10 20 1.66358047596141
+0 0 0 0 0 5 5 0 1.36656503687164
+0 0 0 0 0 5 5 1 1.07121426428143
+0 0 0 0 0 5 5 2 0.779422863405995
+0 0 0 0 0 5 5 3 0.49749371855331
+0 0 0 0 0 5 5 4 0.259807621135332
+0 0 0 0 0 5 5 5 0.259807621135331
+0 0 0 0 0 5 5 6 0.49749371855331
+0 0 0 0 0 5 5 7 0.779422863405995
+0 0 0 0 0 5 5 8 1.07121426428143
+0 0 0 0 0 5 5 9 1.36656503687164
+0 0 0 0 0 5 5 10 1.66358047596141
+
+