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, 144 insertions, 132 deletions

diff --git a/CarpetAttic/Cart3dTest/test/ghosts/cart3d_x.xl b/CarpetAttic/Cart3dTest/test/ghosts/cart3d_x.xl
index 29aa5ee71..514360e24 100644
--- a/CarpetAttic/Cart3dTest/test/ghosts/cart3d_x.xl
+++ b/CarpetAttic/Cart3dTest/test/ghosts/cart3d_x.xl
@@ -1,17 +1,18 @@
 # 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 -0.5
-0 0 0 0 0 2 10 10 -0.388888888888889
-0 0 0 0 0 4 10 10 -0.277777777777778
-0 0 0 0 0 6 10 10 -0.166666666666667
-0 0 0 0 0 8 10 10 -0.0555555555555556
-0 0 0 0 0 10 10 10 0.0555555555555555
-0 0 0 0 0 12 10 10 0.166666666666667
-0 0 0 0 0 14 10 10 0.277777777777778
-0 0 0 0 0 16 10 10 0.388888888888889
-0 0 0 0 0 18 10 10 0.5
+0 0 0 0 0 0 5 5 -0.5
+0 0 0 0 0 1 5 5 -0.388888888888889
+0 0 0 0 0 2 5 5 -0.277777777777778
+0 0 0 0 0 3 5 5 -0.166666666666667
+0 0 0 0 0 4 5 5 -0.0555555555555556
+0 0 0 0 0 5 5 5 0.0555555555555555
+0 0 0 0 0 6 5 5 0.166666666666667
+0 0 0 0 0 7 5 5 0.277777777777778
+0 0 0 0 0 8 5 5 0.388888888888889
+0 0 0 0 0 9 5 5 0.5
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/ghosts/cart3d_x.yl b/CarpetAttic/Cart3dTest/test/ghosts/cart3d_x.yl
index 2145ba1c6..9878432a6 100644
--- a/CarpetAttic/Cart3dTest/test/ghosts/cart3d_x.yl
+++ b/CarpetAttic/Cart3dTest/test/ghosts/cart3d_x.yl
@@ -1,17 +1,18 @@
 # 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.0555555555555555
-0 0 0 0 0 10 2 10 0.0555555555555555
-0 0 0 0 0 10 4 10 0.0555555555555555
-0 0 0 0 0 10 6 10 0.0555555555555555
-0 0 0 0 0 10 8 10 0.0555555555555555
-0 0 0 0 0 10 10 10 0.0555555555555555
-0 0 0 0 0 10 12 10 0.0555555555555555
-0 0 0 0 0 10 14 10 0.0555555555555555
-0 0 0 0 0 10 16 10 0.0555555555555555
-0 0 0 0 0 10 18 10 0.0555555555555555
+0 0 0 0 0 5 0 5 0.0555555555555555
+0 0 0 0 0 5 1 5 0.0555555555555555
+0 0 0 0 0 5 2 5 0.0555555555555555
+0 0 0 0 0 5 3 5 0.0555555555555555
+0 0 0 0 0 5 4 5 0.0555555555555555
+0 0 0 0 0 5 5 5 0.0555555555555555
+0 0 0 0 0 5 6 5 0.0555555555555555
+0 0 0 0 0 5 7 5 0.0555555555555555
+0 0 0 0 0 5 8 5 0.0555555555555555
+0 0 0 0 0 5 9 5 0.0555555555555555
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/ghosts/cart3d_x.zl b/CarpetAttic/Cart3dTest/test/ghosts/cart3d_x.zl
index b0dd704e6..a49ec16e5 100644
--- a/CarpetAttic/Cart3dTest/test/ghosts/cart3d_x.zl
+++ b/CarpetAttic/Cart3dTest/test/ghosts/cart3d_x.zl
@@ -1,17 +1,18 @@
 # 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.0555555555555555
-0 0 0 0 0 10 10 2 0.0555555555555555
-0 0 0 0 0 10 10 4 0.0555555555555555
-0 0 0 0 0 10 10 6 0.0555555555555555
-0 0 0 0 0 10 10 8 0.0555555555555555
-0 0 0 0 0 10 10 10 0.0555555555555555
-0 0 0 0 0 10 10 12 0.0555555555555555
-0 0 0 0 0 10 10 14 0.0555555555555555
-0 0 0 0 0 10 10 16 0.0555555555555555
-0 0 0 0 0 10 10 18 0.0555555555555555
+0 0 0 0 0 5 5 0 0.0555555555555555
+0 0 0 0 0 5 5 1 0.0555555555555555
+0 0 0 0 0 5 5 2 0.0555555555555555
+0 0 0 0 0 5 5 3 0.0555555555555555
+0 0 0 0 0 5 5 4 0.0555555555555555
+0 0 0 0 0 5 5 5 0.0555555555555555
+0 0 0 0 0 5 5 6 0.0555555555555555
+0 0 0 0 0 5 5 7 0.0555555555555555
+0 0 0 0 0 5 5 8 0.0555555555555555
+0 0 0 0 0 5 5 9 0.0555555555555555
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/ghosts/cart3d_y.xl b/CarpetAttic/Cart3dTest/test/ghosts/cart3d_y.xl
index 65098476c..305df91b9 100644
--- a/CarpetAttic/Cart3dTest/test/ghosts/cart3d_y.xl
+++ b/CarpetAttic/Cart3dTest/test/ghosts/cart3d_y.xl
@@ -1,17 +1,18 @@
 # 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.0555555555555555
-0 0 0 0 0 2 10 10 0.0555555555555555
-0 0 0 0 0 4 10 10 0.0555555555555555
-0 0 0 0 0 6 10 10 0.0555555555555555
-0 0 0 0 0 8 10 10 0.0555555555555555
-0 0 0 0 0 10 10 10 0.0555555555555555
-0 0 0 0 0 12 10 10 0.0555555555555555
-0 0 0 0 0 14 10 10 0.0555555555555555
-0 0 0 0 0 16 10 10 0.0555555555555555
-0 0 0 0 0 18 10 10 0.0555555555555555
+0 0 0 0 0 0 5 5 0.0555555555555555
+0 0 0 0 0 1 5 5 0.0555555555555555
+0 0 0 0 0 2 5 5 0.0555555555555555
+0 0 0 0 0 3 5 5 0.0555555555555555
+0 0 0 0 0 4 5 5 0.0555555555555555
+0 0 0 0 0 5 5 5 0.0555555555555555
+0 0 0 0 0 6 5 5 0.0555555555555555
+0 0 0 0 0 7 5 5 0.0555555555555555
+0 0 0 0 0 8 5 5 0.0555555555555555
+0 0 0 0 0 9 5 5 0.0555555555555555
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/ghosts/cart3d_y.yl b/CarpetAttic/Cart3dTest/test/ghosts/cart3d_y.yl
index 0a335b713..e48707e3e 100644
--- a/CarpetAttic/Cart3dTest/test/ghosts/cart3d_y.yl
+++ b/CarpetAttic/Cart3dTest/test/ghosts/cart3d_y.yl
@@ -1,17 +1,18 @@
 # 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 -0.5
-0 0 0 0 0 10 2 10 -0.388888888888889
-0 0 0 0 0 10 4 10 -0.277777777777778
-0 0 0 0 0 10 6 10 -0.166666666666667
-0 0 0 0 0 10 8 10 -0.0555555555555556
-0 0 0 0 0 10 10 10 0.0555555555555555
-0 0 0 0 0 10 12 10 0.166666666666667
-0 0 0 0 0 10 14 10 0.277777777777778
-0 0 0 0 0 10 16 10 0.388888888888889
-0 0 0 0 0 10 18 10 0.5
+0 0 0 0 0 5 0 5 -0.5
+0 0 0 0 0 5 1 5 -0.388888888888889
+0 0 0 0 0 5 2 5 -0.277777777777778
+0 0 0 0 0 5 3 5 -0.166666666666667
+0 0 0 0 0 5 4 5 -0.0555555555555556
+0 0 0 0 0 5 5 5 0.0555555555555555
+0 0 0 0 0 5 6 5 0.166666666666667
+0 0 0 0 0 5 7 5 0.277777777777778
+0 0 0 0 0 5 8 5 0.388888888888889
+0 0 0 0 0 5 9 5 0.5
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/ghosts/cart3d_y.zl b/CarpetAttic/Cart3dTest/test/ghosts/cart3d_y.zl
index b67034d52..87aa406c3 100644
--- a/CarpetAttic/Cart3dTest/test/ghosts/cart3d_y.zl
+++ b/CarpetAttic/Cart3dTest/test/ghosts/cart3d_y.zl
@@ -1,17 +1,18 @@
 # 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.0555555555555555
-0 0 0 0 0 10 10 2 0.0555555555555555
-0 0 0 0 0 10 10 4 0.0555555555555555
-0 0 0 0 0 10 10 6 0.0555555555555555
-0 0 0 0 0 10 10 8 0.0555555555555555
-0 0 0 0 0 10 10 10 0.0555555555555555
-0 0 0 0 0 10 10 12 0.0555555555555555
-0 0 0 0 0 10 10 14 0.0555555555555555
-0 0 0 0 0 10 10 16 0.0555555555555555
-0 0 0 0 0 10 10 18 0.0555555555555555
+0 0 0 0 0 5 5 0 0.0555555555555555
+0 0 0 0 0 5 5 1 0.0555555555555555
+0 0 0 0 0 5 5 2 0.0555555555555555
+0 0 0 0 0 5 5 3 0.0555555555555555
+0 0 0 0 0 5 5 4 0.0555555555555555
+0 0 0 0 0 5 5 5 0.0555555555555555
+0 0 0 0 0 5 5 6 0.0555555555555555
+0 0 0 0 0 5 5 7 0.0555555555555555
+0 0 0 0 0 5 5 8 0.0555555555555555
+0 0 0 0 0 5 5 9 0.0555555555555555
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/ghosts/cart3d_z.xl b/CarpetAttic/Cart3dTest/test/ghosts/cart3d_z.xl
index 057e1fe8d..43f2286a4 100644
--- a/CarpetAttic/Cart3dTest/test/ghosts/cart3d_z.xl
+++ b/CarpetAttic/Cart3dTest/test/ghosts/cart3d_z.xl
@@ -1,17 +1,18 @@
 # 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.0555555555555555
-0 0 0 0 0 2 10 10 0.0555555555555555
-0 0 0 0 0 4 10 10 0.0555555555555555
-0 0 0 0 0 6 10 10 0.0555555555555555
-0 0 0 0 0 8 10 10 0.0555555555555555
-0 0 0 0 0 10 10 10 0.0555555555555555
-0 0 0 0 0 12 10 10 0.0555555555555555
-0 0 0 0 0 14 10 10 0.0555555555555555
-0 0 0 0 0 16 10 10 0.0555555555555555
-0 0 0 0 0 18 10 10 0.0555555555555555
+0 0 0 0 0 0 5 5 0.0555555555555555
+0 0 0 0 0 1 5 5 0.0555555555555555
+0 0 0 0 0 2 5 5 0.0555555555555555
+0 0 0 0 0 3 5 5 0.0555555555555555
+0 0 0 0 0 4 5 5 0.0555555555555555
+0 0 0 0 0 5 5 5 0.0555555555555555
+0 0 0 0 0 6 5 5 0.0555555555555555
+0 0 0 0 0 7 5 5 0.0555555555555555
+0 0 0 0 0 8 5 5 0.0555555555555555
+0 0 0 0 0 9 5 5 0.0555555555555555
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/ghosts/cart3d_z.yl b/CarpetAttic/Cart3dTest/test/ghosts/cart3d_z.yl
index d8397ac63..98832f13a 100644
--- a/CarpetAttic/Cart3dTest/test/ghosts/cart3d_z.yl
+++ b/CarpetAttic/Cart3dTest/test/ghosts/cart3d_z.yl
@@ -1,17 +1,18 @@
 # 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.0555555555555555
-0 0 0 0 0 10 2 10 0.0555555555555555
-0 0 0 0 0 10 4 10 0.0555555555555555
-0 0 0 0 0 10 6 10 0.0555555555555555
-0 0 0 0 0 10 8 10 0.0555555555555555
-0 0 0 0 0 10 10 10 0.0555555555555555
-0 0 0 0 0 10 12 10 0.0555555555555555
-0 0 0 0 0 10 14 10 0.0555555555555555
-0 0 0 0 0 10 16 10 0.0555555555555555
-0 0 0 0 0 10 18 10 0.0555555555555555
+0 0 0 0 0 5 0 5 0.0555555555555555
+0 0 0 0 0 5 1 5 0.0555555555555555
+0 0 0 0 0 5 2 5 0.0555555555555555
+0 0 0 0 0 5 3 5 0.0555555555555555
+0 0 0 0 0 5 4 5 0.0555555555555555
+0 0 0 0 0 5 5 5 0.0555555555555555
+0 0 0 0 0 5 6 5 0.0555555555555555
+0 0 0 0 0 5 7 5 0.0555555555555555
+0 0 0 0 0 5 8 5 0.0555555555555555
+0 0 0 0 0 5 9 5 0.0555555555555555
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/ghosts/cart3d_z.zl b/CarpetAttic/Cart3dTest/test/ghosts/cart3d_z.zl
index 123c43702..d5eb90a96 100644
--- a/CarpetAttic/Cart3dTest/test/ghosts/cart3d_z.zl
+++ b/CarpetAttic/Cart3dTest/test/ghosts/cart3d_z.zl
@@ -1,17 +1,18 @@
 # 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 -0.5
-0 0 0 0 0 10 10 2 -0.388888888888889
-0 0 0 0 0 10 10 4 -0.277777777777778
-0 0 0 0 0 10 10 6 -0.166666666666667
-0 0 0 0 0 10 10 8 -0.0555555555555556
-0 0 0 0 0 10 10 10 0.0555555555555555
-0 0 0 0 0 10 10 12 0.166666666666667
-0 0 0 0 0 10 10 14 0.277777777777778
-0 0 0 0 0 10 10 16 0.388888888888889
-0 0 0 0 0 10 10 18 0.5
+0 0 0 0 0 5 5 0 -0.5
+0 0 0 0 0 5 5 1 -0.388888888888889
+0 0 0 0 0 5 5 2 -0.277777777777778
+0 0 0 0 0 5 5 3 -0.166666666666667
+0 0 0 0 0 5 5 4 -0.0555555555555556
+0 0 0 0 0 5 5 5 0.0555555555555555
+0 0 0 0 0 5 5 6 0.166666666666667
+0 0 0 0 0 5 5 7 0.277777777777778
+0 0 0 0 0 5 5 8 0.388888888888889
+0 0 0 0 0 5 5 9 0.5
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/ghosts/spher3d_r.xl b/CarpetAttic/Cart3dTest/test/ghosts/spher3d_r.xl
index a64dc5bde..deb988a58 100644
--- a/CarpetAttic/Cart3dTest/test/ghosts/spher3d_r.xl
+++ b/CarpetAttic/Cart3dTest/test/ghosts/spher3d_r.xl
@@ -1,17 +1,18 @@
 # 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 0.50613519884135
-0 0 0 0 0 2 10 10 0.396746023807936
-0 0 0 0 0 4 10 10 0.288675134594813
-0 0 0 0 0 6 10 10 0.184256932797522
-0 0 0 0 0 8 10 10 0.0962250448649376
-0 0 0 0 0 10 10 10 0.0962250448649376
-0 0 0 0 0 12 10 10 0.184256932797522
-0 0 0 0 0 14 10 10 0.288675134594813
-0 0 0 0 0 16 10 10 0.396746023807936
-0 0 0 0 0 18 10 10 0.50613519884135
+0 0 0 0 0 0 5 5 0.50613519884135
+0 0 0 0 0 1 5 5 0.396746023807936
+0 0 0 0 0 2 5 5 0.288675134594813
+0 0 0 0 0 3 5 5 0.184256932797522
+0 0 0 0 0 4 5 5 0.0962250448649376
+0 0 0 0 0 5 5 5 0.0962250448649376
+0 0 0 0 0 6 5 5 0.184256932797522
+0 0 0 0 0 7 5 5 0.288675134594813
+0 0 0 0 0 8 5 5 0.396746023807936
+0 0 0 0 0 9 5 5 0.50613519884135
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/ghosts/spher3d_r.yl b/CarpetAttic/Cart3dTest/test/ghosts/spher3d_r.yl
index 7e71bb4cb..d6c525c9b 100644
--- a/CarpetAttic/Cart3dTest/test/ghosts/spher3d_r.yl
+++ b/CarpetAttic/Cart3dTest/test/ghosts/spher3d_r.yl
@@ -1,17 +1,18 @@
 # 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 0.50613519884135
-0 0 0 0 0 10 2 10 0.396746023807936
-0 0 0 0 0 10 4 10 0.288675134594813
-0 0 0 0 0 10 6 10 0.184256932797522
-0 0 0 0 0 10 8 10 0.0962250448649376
-0 0 0 0 0 10 10 10 0.0962250448649376
-0 0 0 0 0 10 12 10 0.184256932797522
-0 0 0 0 0 10 14 10 0.288675134594813
-0 0 0 0 0 10 16 10 0.396746023807936
-0 0 0 0 0 10 18 10 0.50613519884135
+0 0 0 0 0 5 0 5 0.50613519884135
+0 0 0 0 0 5 1 5 0.396746023807936
+0 0 0 0 0 5 2 5 0.288675134594813
+0 0 0 0 0 5 3 5 0.184256932797522
+0 0 0 0 0 5 4 5 0.0962250448649376
+0 0 0 0 0 5 5 5 0.0962250448649376
+0 0 0 0 0 5 6 5 0.184256932797522
+0 0 0 0 0 5 7 5 0.288675134594813
+0 0 0 0 0 5 8 5 0.396746023807936
+0 0 0 0 0 5 9 5 0.50613519884135
+
+
 
diff --git a/CarpetAttic/Cart3dTest/test/ghosts/spher3d_r.zl b/CarpetAttic/Cart3dTest/test/ghosts/spher3d_r.zl
index 4968b63c5..8f6440db6 100644
--- a/CarpetAttic/Cart3dTest/test/ghosts/spher3d_r.zl
+++ b/CarpetAttic/Cart3dTest/test/ghosts/spher3d_r.zl
@@ -1,17 +1,18 @@
 # 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 0.50613519884135
-0 0 0 0 0 10 10 2 0.396746023807936
-0 0 0 0 0 10 10 4 0.288675134594813
-0 0 0 0 0 10 10 6 0.184256932797522
-0 0 0 0 0 10 10 8 0.0962250448649376
-0 0 0 0 0 10 10 10 0.0962250448649376
-0 0 0 0 0 10 10 12 0.184256932797522
-0 0 0 0 0 10 10 14 0.288675134594813
-0 0 0 0 0 10 10 16 0.396746023807936
-0 0 0 0 0 10 10 18 0.50613519884135
+0 0 0 0 0 5 5 0 0.50613519884135
+0 0 0 0 0 5 5 1 0.396746023807936
+0 0 0 0 0 5 5 2 0.288675134594813
+0 0 0 0 0 5 5 3 0.184256932797522
+0 0 0 0 0 5 5 4 0.0962250448649376
+0 0 0 0 0 5 5 5 0.0962250448649376
+0 0 0 0 0 5 5 6 0.184256932797522
+0 0 0 0 0 5 5 7 0.288675134594813
+0 0 0 0 0 5 5 8 0.396746023807936
+0 0 0 0 0 5 5 9 0.50613519884135
+
+