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-withorigin/cart3d_x.xl b/CarpetAttic/Cart3dTest/test/byspacing-eleven-withorigin/cart3d_x.xl
index 2bf3735c1..f63099708 100644
--- a/CarpetAttic/Cart3dTest/test/byspacing-eleven-withorigin/cart3d_x.xl
+++ b/CarpetAttic/Cart3dTest/test/byspacing-eleven-withorigin/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 12 12 -1.5
-0 0 0 0 0 2 12 12 -1.2
-0 0 0 0 0 4 12 12 -0.9
-0 0 0 0 0 6 12 12 -0.6
-0 0 0 0 0 8 12 12 -0.3
-0 0 0 0 0 10 12 12 -5.55111512312578e-17
-0 0 0 0 0 12 12 12 0.3
-0 0 0 0 0 14 12 12 0.6
-0 0 0 0 0 16 12 12 0.9
-0 0 0 0 0 18 12 12 1.2
-0 0 0 0 0 20 12 12 1.5
+0 0 0 0 0 0 5 5 -1.5
+0 0 0 0 0 1 5 5 -1.2
+0 0 0 0 0 2 5 5 -0.9
+0 0 0 0 0 3 5 5 -0.6
+0 0 0 0 0 4 5 5 -0.3
+0 0 0 0 0 5 5 5 -5.55111512312578e-17
+0 0 0 0 0 6 5 5 0.3
+0 0 0 0 0 7 5 5 0.6
+0 0 0 0 0 8 5 5 0.9
+0 0 0 0 0 9 5 5 1.2
+0 0 0 0 0 10 5 5 1.5
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/byspacing-eleven-withorigin/cart3d_x.yl b/CarpetAttic/Cart3dTest/test/byspacing-eleven-withorigin/cart3d_x.yl
index 3e7b63781..201f809d0 100644
--- a/CarpetAttic/Cart3dTest/test/byspacing-eleven-withorigin/cart3d_x.yl
+++ b/CarpetAttic/Cart3dTest/test/byspacing-eleven-withorigin/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 12 0 12 0.3
-0 0 0 0 0 12 2 12 0.3
-0 0 0 0 0 12 4 12 0.3
-0 0 0 0 0 12 6 12 0.3
-0 0 0 0 0 12 8 12 0.3
-0 0 0 0 0 12 10 12 0.3
-0 0 0 0 0 12 12 12 0.3
-0 0 0 0 0 12 14 12 0.3
-0 0 0 0 0 12 16 12 0.3
-0 0 0 0 0 12 18 12 0.3
-0 0 0 0 0 12 20 12 0.3
+0 0 0 0 0 5 0 5 -5.55111512312578e-17
+0 0 0 0 0 5 1 5 -5.55111512312578e-17
+0 0 0 0 0 5 2 5 -5.55111512312578e-17
+0 0 0 0 0 5 3 5 -5.55111512312578e-17
+0 0 0 0 0 5 4 5 -5.55111512312578e-17
+0 0 0 0 0 5 5 5 -5.55111512312578e-17
+0 0 0 0 0 5 6 5 -5.55111512312578e-17
+0 0 0 0 0 5 7 5 -5.55111512312578e-17
+0 0 0 0 0 5 8 5 -5.55111512312578e-17
+0 0 0 0 0 5 9 5 -5.55111512312578e-17
+0 0 0 0 0 5 10 5 -5.55111512312578e-17
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/byspacing-eleven-withorigin/cart3d_x.zl b/CarpetAttic/Cart3dTest/test/byspacing-eleven-withorigin/cart3d_x.zl
index 2ce37be0d..d71d3f95a 100644
--- a/CarpetAttic/Cart3dTest/test/byspacing-eleven-withorigin/cart3d_x.zl
+++ b/CarpetAttic/Cart3dTest/test/byspacing-eleven-withorigin/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 12 12 0 0.3
-0 0 0 0 0 12 12 2 0.3
-0 0 0 0 0 12 12 4 0.3
-0 0 0 0 0 12 12 6 0.3
-0 0 0 0 0 12 12 8 0.3
-0 0 0 0 0 12 12 10 0.3
-0 0 0 0 0 12 12 12 0.3
-0 0 0 0 0 12 12 14 0.3
-0 0 0 0 0 12 12 16 0.3
-0 0 0 0 0 12 12 18 0.3
-0 0 0 0 0 12 12 20 0.3
+0 0 0 0 0 5 5 0 -5.55111512312578e-17
+0 0 0 0 0 5 5 1 -5.55111512312578e-17
+0 0 0 0 0 5 5 2 -5.55111512312578e-17
+0 0 0 0 0 5 5 3 -5.55111512312578e-17
+0 0 0 0 0 5 5 4 -5.55111512312578e-17
+0 0 0 0 0 5 5 5 -5.55111512312578e-17
+0 0 0 0 0 5 5 6 -5.55111512312578e-17
+0 0 0 0 0 5 5 7 -5.55111512312578e-17
+0 0 0 0 0 5 5 8 -5.55111512312578e-17
+0 0 0 0 0 5 5 9 -5.55111512312578e-17
+0 0 0 0 0 5 5 10 -5.55111512312578e-17
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/byspacing-eleven-withorigin/cart3d_y.xl b/CarpetAttic/Cart3dTest/test/byspacing-eleven-withorigin/cart3d_y.xl
index 4abc850f6..af92033b6 100644
--- a/CarpetAttic/Cart3dTest/test/byspacing-eleven-withorigin/cart3d_y.xl
+++ b/CarpetAttic/Cart3dTest/test/byspacing-eleven-withorigin/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 12 12 0.3
-0 0 0 0 0 2 12 12 0.3
-0 0 0 0 0 4 12 12 0.3
-0 0 0 0 0 6 12 12 0.3
-0 0 0 0 0 8 12 12 0.3
-0 0 0 0 0 10 12 12 0.3
-0 0 0 0 0 12 12 12 0.3
-0 0 0 0 0 14 12 12 0.3
-0 0 0 0 0 16 12 12 0.3
-0 0 0 0 0 18 12 12 0.3
-0 0 0 0 0 20 12 12 0.3
+0 0 0 0 0 0 5 5 -5.55111512312578e-17
+0 0 0 0 0 1 5 5 -5.55111512312578e-17
+0 0 0 0 0 2 5 5 -5.55111512312578e-17
+0 0 0 0 0 3 5 5 -5.55111512312578e-17
+0 0 0 0 0 4 5 5 -5.55111512312578e-17
+0 0 0 0 0 5 5 5 -5.55111512312578e-17
+0 0 0 0 0 6 5 5 -5.55111512312578e-17
+0 0 0 0 0 7 5 5 -5.55111512312578e-17
+0 0 0 0 0 8 5 5 -5.55111512312578e-17
+0 0 0 0 0 9 5 5 -5.55111512312578e-17
+0 0 0 0 0 10 5 5 -5.55111512312578e-17
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/byspacing-eleven-withorigin/cart3d_y.yl b/CarpetAttic/Cart3dTest/test/byspacing-eleven-withorigin/cart3d_y.yl
index 8bc66d639..08726411d 100644
--- a/CarpetAttic/Cart3dTest/test/byspacing-eleven-withorigin/cart3d_y.yl
+++ b/CarpetAttic/Cart3dTest/test/byspacing-eleven-withorigin/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 12 0 12 -1.5
-0 0 0 0 0 12 2 12 -1.2
-0 0 0 0 0 12 4 12 -0.9
-0 0 0 0 0 12 6 12 -0.6
-0 0 0 0 0 12 8 12 -0.3
-0 0 0 0 0 12 10 12 -5.55111512312578e-17
-0 0 0 0 0 12 12 12 0.3
-0 0 0 0 0 12 14 12 0.6
-0 0 0 0 0 12 16 12 0.9
-0 0 0 0 0 12 18 12 1.2
-0 0 0 0 0 12 20 12 1.5
+0 0 0 0 0 5 0 5 -1.5
+0 0 0 0 0 5 1 5 -1.2
+0 0 0 0 0 5 2 5 -0.9
+0 0 0 0 0 5 3 5 -0.6
+0 0 0 0 0 5 4 5 -0.3
+0 0 0 0 0 5 5 5 -5.55111512312578e-17
+0 0 0 0 0 5 6 5 0.3
+0 0 0 0 0 5 7 5 0.6
+0 0 0 0 0 5 8 5 0.9
+0 0 0 0 0 5 9 5 1.2
+0 0 0 0 0 5 10 5 1.5
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/byspacing-eleven-withorigin/cart3d_y.zl b/CarpetAttic/Cart3dTest/test/byspacing-eleven-withorigin/cart3d_y.zl
index 0cdfd033e..6502ac6dc 100644
--- a/CarpetAttic/Cart3dTest/test/byspacing-eleven-withorigin/cart3d_y.zl
+++ b/CarpetAttic/Cart3dTest/test/byspacing-eleven-withorigin/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 12 12 0 0.3
-0 0 0 0 0 12 12 2 0.3
-0 0 0 0 0 12 12 4 0.3
-0 0 0 0 0 12 12 6 0.3
-0 0 0 0 0 12 12 8 0.3
-0 0 0 0 0 12 12 10 0.3
-0 0 0 0 0 12 12 12 0.3
-0 0 0 0 0 12 12 14 0.3
-0 0 0 0 0 12 12 16 0.3
-0 0 0 0 0 12 12 18 0.3
-0 0 0 0 0 12 12 20 0.3
+0 0 0 0 0 5 5 0 -5.55111512312578e-17
+0 0 0 0 0 5 5 1 -5.55111512312578e-17
+0 0 0 0 0 5 5 2 -5.55111512312578e-17
+0 0 0 0 0 5 5 3 -5.55111512312578e-17
+0 0 0 0 0 5 5 4 -5.55111512312578e-17
+0 0 0 0 0 5 5 5 -5.55111512312578e-17
+0 0 0 0 0 5 5 6 -5.55111512312578e-17
+0 0 0 0 0 5 5 7 -5.55111512312578e-17
+0 0 0 0 0 5 5 8 -5.55111512312578e-17
+0 0 0 0 0 5 5 9 -5.55111512312578e-17
+0 0 0 0 0 5 5 10 -5.55111512312578e-17
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/byspacing-eleven-withorigin/cart3d_z.xl b/CarpetAttic/Cart3dTest/test/byspacing-eleven-withorigin/cart3d_z.xl
index 901c53d2e..328bca7ea 100644
--- a/CarpetAttic/Cart3dTest/test/byspacing-eleven-withorigin/cart3d_z.xl
+++ b/CarpetAttic/Cart3dTest/test/byspacing-eleven-withorigin/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 12 12 0.3
-0 0 0 0 0 2 12 12 0.3
-0 0 0 0 0 4 12 12 0.3
-0 0 0 0 0 6 12 12 0.3
-0 0 0 0 0 8 12 12 0.3
-0 0 0 0 0 10 12 12 0.3
-0 0 0 0 0 12 12 12 0.3
-0 0 0 0 0 14 12 12 0.3
-0 0 0 0 0 16 12 12 0.3
-0 0 0 0 0 18 12 12 0.3
-0 0 0 0 0 20 12 12 0.3
+0 0 0 0 0 0 5 5 -5.55111512312578e-17
+0 0 0 0 0 1 5 5 -5.55111512312578e-17
+0 0 0 0 0 2 5 5 -5.55111512312578e-17
+0 0 0 0 0 3 5 5 -5.55111512312578e-17
+0 0 0 0 0 4 5 5 -5.55111512312578e-17
+0 0 0 0 0 5 5 5 -5.55111512312578e-17
+0 0 0 0 0 6 5 5 -5.55111512312578e-17
+0 0 0 0 0 7 5 5 -5.55111512312578e-17
+0 0 0 0 0 8 5 5 -5.55111512312578e-17
+0 0 0 0 0 9 5 5 -5.55111512312578e-17
+0 0 0 0 0 10 5 5 -5.55111512312578e-17
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/byspacing-eleven-withorigin/cart3d_z.yl b/CarpetAttic/Cart3dTest/test/byspacing-eleven-withorigin/cart3d_z.yl
index 6b71774e7..3ef82c136 100644
--- a/CarpetAttic/Cart3dTest/test/byspacing-eleven-withorigin/cart3d_z.yl
+++ b/CarpetAttic/Cart3dTest/test/byspacing-eleven-withorigin/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 12 0 12 0.3
-0 0 0 0 0 12 2 12 0.3
-0 0 0 0 0 12 4 12 0.3
-0 0 0 0 0 12 6 12 0.3
-0 0 0 0 0 12 8 12 0.3
-0 0 0 0 0 12 10 12 0.3
-0 0 0 0 0 12 12 12 0.3
-0 0 0 0 0 12 14 12 0.3
-0 0 0 0 0 12 16 12 0.3
-0 0 0 0 0 12 18 12 0.3
-0 0 0 0 0 12 20 12 0.3
+0 0 0 0 0 5 0 5 -5.55111512312578e-17
+0 0 0 0 0 5 1 5 -5.55111512312578e-17
+0 0 0 0 0 5 2 5 -5.55111512312578e-17
+0 0 0 0 0 5 3 5 -5.55111512312578e-17
+0 0 0 0 0 5 4 5 -5.55111512312578e-17
+0 0 0 0 0 5 5 5 -5.55111512312578e-17
+0 0 0 0 0 5 6 5 -5.55111512312578e-17
+0 0 0 0 0 5 7 5 -5.55111512312578e-17
+0 0 0 0 0 5 8 5 -5.55111512312578e-17
+0 0 0 0 0 5 9 5 -5.55111512312578e-17
+0 0 0 0 0 5 10 5 -5.55111512312578e-17
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/byspacing-eleven-withorigin/cart3d_z.zl b/CarpetAttic/Cart3dTest/test/byspacing-eleven-withorigin/cart3d_z.zl
index 11bb3ac0e..d451859ca 100644
--- a/CarpetAttic/Cart3dTest/test/byspacing-eleven-withorigin/cart3d_z.zl
+++ b/CarpetAttic/Cart3dTest/test/byspacing-eleven-withorigin/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 12 12 0 -1.5
-0 0 0 0 0 12 12 2 -1.2
-0 0 0 0 0 12 12 4 -0.9
-0 0 0 0 0 12 12 6 -0.6
-0 0 0 0 0 12 12 8 -0.3
-0 0 0 0 0 12 12 10 -5.55111512312578e-17
-0 0 0 0 0 12 12 12 0.3
-0 0 0 0 0 12 12 14 0.6
-0 0 0 0 0 12 12 16 0.9
-0 0 0 0 0 12 12 18 1.2
-0 0 0 0 0 12 12 20 1.5
+0 0 0 0 0 5 5 0 -1.5
+0 0 0 0 0 5 5 1 -1.2
+0 0 0 0 0 5 5 2 -0.9
+0 0 0 0 0 5 5 3 -0.6
+0 0 0 0 0 5 5 4 -0.3
+0 0 0 0 0 5 5 5 -5.55111512312578e-17
+0 0 0 0 0 5 5 6 0.3
+0 0 0 0 0 5 5 7 0.6
+0 0 0 0 0 5 5 8 0.9
+0 0 0 0 0 5 5 9 1.2
+0 0 0 0 0 5 5 10 1.5
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/byspacing-eleven-withorigin/spher3d_r.xl b/CarpetAttic/Cart3dTest/test/byspacing-eleven-withorigin/spher3d_r.xl
index 3497c97e5..2bc9c21e8 100644
--- a/CarpetAttic/Cart3dTest/test/byspacing-eleven-withorigin/spher3d_r.xl
+++ b/CarpetAttic/Cart3dTest/test/byspacing-eleven-withorigin/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 12 12 1.55884572681199
-0 0 0 0 0 2 12 12 1.27279220613579
-0 0 0 0 0 4 12 12 0.99498743710662
-0 0 0 0 0 6 12 12 0.734846922834953
-0 0 0 0 0 8 12 12 0.519615242270663
-0 0 0 0 0 10 12 12 0.424264068711928
-0 0 0 0 0 12 12 12 0.519615242270663
-0 0 0 0 0 14 12 12 0.734846922834953
-0 0 0 0 0 16 12 12 0.99498743710662
-0 0 0 0 0 18 12 12 1.27279220613579
-0 0 0 0 0 20 12 12 1.55884572681199
+0 0 0 0 0 0 5 5 1.5
+0 0 0 0 0 1 5 5 1.2
+0 0 0 0 0 2 5 5 0.9
+0 0 0 0 0 3 5 5 0.6
+0 0 0 0 0 4 5 5 0.3
+0 0 0 0 0 5 5 5 9.61481343191782e-17
+0 0 0 0 0 6 5 5 0.3
+0 0 0 0 0 7 5 5 0.6
+0 0 0 0 0 8 5 5 0.9
+0 0 0 0 0 9 5 5 1.2
+0 0 0 0 0 10 5 5 1.5
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/byspacing-eleven-withorigin/spher3d_r.yl b/CarpetAttic/Cart3dTest/test/byspacing-eleven-withorigin/spher3d_r.yl
index 5a6d1c436..f605f05c5 100644
--- a/CarpetAttic/Cart3dTest/test/byspacing-eleven-withorigin/spher3d_r.yl
+++ b/CarpetAttic/Cart3dTest/test/byspacing-eleven-withorigin/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 12 0 12 1.55884572681199
-0 0 0 0 0 12 2 12 1.27279220613579
-0 0 0 0 0 12 4 12 0.99498743710662
-0 0 0 0 0 12 6 12 0.734846922834953
-0 0 0 0 0 12 8 12 0.519615242270663
-0 0 0 0 0 12 10 12 0.424264068711928
-0 0 0 0 0 12 12 12 0.519615242270663
-0 0 0 0 0 12 14 12 0.734846922834953
-0 0 0 0 0 12 16 12 0.99498743710662
-0 0 0 0 0 12 18 12 1.27279220613579
-0 0 0 0 0 12 20 12 1.55884572681199
+0 0 0 0 0 5 0 5 1.5
+0 0 0 0 0 5 1 5 1.2
+0 0 0 0 0 5 2 5 0.9
+0 0 0 0 0 5 3 5 0.6
+0 0 0 0 0 5 4 5 0.3
+0 0 0 0 0 5 5 5 9.61481343191782e-17
+0 0 0 0 0 5 6 5 0.3
+0 0 0 0 0 5 7 5 0.6
+0 0 0 0 0 5 8 5 0.9
+0 0 0 0 0 5 9 5 1.2
+0 0 0 0 0 5 10 5 1.5
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/byspacing-eleven-withorigin/spher3d_r.zl b/CarpetAttic/Cart3dTest/test/byspacing-eleven-withorigin/spher3d_r.zl
index 4bb45a70d..029764bb4 100644
--- a/CarpetAttic/Cart3dTest/test/byspacing-eleven-withorigin/spher3d_r.zl
+++ b/CarpetAttic/Cart3dTest/test/byspacing-eleven-withorigin/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 12 12 0 1.55884572681199
-0 0 0 0 0 12 12 2 1.27279220613579
-0 0 0 0 0 12 12 4 0.99498743710662
-0 0 0 0 0 12 12 6 0.734846922834953
-0 0 0 0 0 12 12 8 0.519615242270663
-0 0 0 0 0 12 12 10 0.424264068711928
-0 0 0 0 0 12 12 12 0.519615242270663
-0 0 0 0 0 12 12 14 0.734846922834953
-0 0 0 0 0 12 12 16 0.99498743710662
-0 0 0 0 0 12 12 18 1.27279220613579
-0 0 0 0 0 12 12 20 1.55884572681199
+0 0 0 0 0 5 5 0 1.5
+0 0 0 0 0 5 5 1 1.2
+0 0 0 0 0 5 5 2 0.9
+0 0 0 0 0 5 5 3 0.6
+0 0 0 0 0 5 5 4 0.3
+0 0 0 0 0 5 5 5 9.61481343191782e-17
+0 0 0 0 0 5 5 6 0.3
+0 0 0 0 0 5 5 7 0.6
+0 0 0 0 0 5 5 8 0.9
+0 0 0 0 0 5 5 9 1.2
+0 0 0 0 0 5 5 10 1.5
+
+