aboutsummaryrefslogtreecommitdiff
path: root/Carpet/CarpetIOASCII
diff options
context:
space:
mode:
authorRoland Haas <roland.haas@physics.gatech.edu>2012-10-11 09:42:43 -0700
committerRoland Haas <roland.haas@physics.gatech.edu>2012-10-20 15:48:16 -0700
commitab044d454ede8dccb94235d8a5c36369cc6c61d3 (patch)
tree8ec294a3fcd2bb4ba6a19fb22fe54ce9367eb3c1 /Carpet/CarpetIOASCII
parente3bb15508380267b925079383455295a42357b7c (diff)
CarpetIOASCII: do not output coordinate column labels for grid arrays in
compact_format since the coordinates themselves are not output either. Actually *only* output coordinate column labels for grid functions.
Diffstat (limited to 'Carpet/CarpetIOASCII')
-rw-r--r--Carpet/CarpetIOASCII/src/ioascii.cc6
-rw-r--r--Carpet/CarpetIOASCII/test/compact/interptoarray::arrays1d..asc8
-rw-r--r--Carpet/CarpetIOASCII/test/compact/interptoarray::arrays1d.x.asc8
-rw-r--r--Carpet/CarpetIOASCII/test/compact/interptoarray::arrays2d..asc8
-rw-r--r--Carpet/CarpetIOASCII/test/compact/interptoarray::arrays2d.x.asc8
-rw-r--r--Carpet/CarpetIOASCII/test/compact/interptoarray::arrays2d.xy.asc8
-rw-r--r--Carpet/CarpetIOASCII/test/compact/interptoarray::arrays3d..asc8
-rw-r--r--Carpet/CarpetIOASCII/test/compact/interptoarray::arrays3d.x.asc8
-rw-r--r--Carpet/CarpetIOASCII/test/compact/interptoarray::arrays3d.xy.asc8
-rw-r--r--Carpet/CarpetIOASCII/test/compact/interptoarray::arrays3d.xyz.asc8
-rw-r--r--Carpet/CarpetIOASCII/test/grid-coords/interptoarray::arrays1d..asc8
-rw-r--r--Carpet/CarpetIOASCII/test/grid-coords/interptoarray::arrays1d.x.asc8
-rw-r--r--Carpet/CarpetIOASCII/test/grid-coords/interptoarray::arrays2d..asc8
-rw-r--r--Carpet/CarpetIOASCII/test/grid-coords/interptoarray::arrays2d.x.asc8
-rw-r--r--Carpet/CarpetIOASCII/test/grid-coords/interptoarray::arrays2d.xy.asc8
-rw-r--r--Carpet/CarpetIOASCII/test/grid-coords/interptoarray::arrays3d..asc8
-rw-r--r--Carpet/CarpetIOASCII/test/grid-coords/interptoarray::arrays3d.x.asc8
-rw-r--r--Carpet/CarpetIOASCII/test/grid-coords/interptoarray::arrays3d.xy.asc8
-rw-r--r--Carpet/CarpetIOASCII/test/grid-coords/interptoarray::arrays3d.xyz.asc8
19 files changed, 73 insertions, 77 deletions
diff --git a/Carpet/CarpetIOASCII/src/ioascii.cc b/Carpet/CarpetIOASCII/src/ioascii.cc
index 0a966d5dd..9c420b892 100644
--- a/Carpet/CarpetIOASCII/src/ioascii.cc
+++ b/Carpet/CarpetIOASCII/src/ioascii.cc
@@ -1377,14 +1377,10 @@ namespace CarpetIOASCII {
}
}
os << "\t" << col++ << ":time";
- if (not compact_format) {
+ if (not compact_format or grouptype == CCTK_GF) {
for (int d=0; d<dim; ++d) {
os << (d==0 ? "\t" : " ") << col++ << ":" << coords[d];
}
- } else {
- for (int d=0; d<min(dim,groupdim); ++d) {
- os << (d==0 ? "\t" : " ") << col++ << ":" << coords[d];
- }
}
os << "\t" << col << ":data" << eol;
if (one_file_per_group) {
diff --git a/Carpet/CarpetIOASCII/test/compact/interptoarray::arrays1d..asc b/Carpet/CarpetIOASCII/test/compact/interptoarray::arrays1d..asc
index 6c67b79db..e90edfdaf 100644
--- a/Carpet/CarpetIOASCII/test/compact/interptoarray::arrays1d..asc
+++ b/Carpet/CarpetIOASCII/test/compact/interptoarray::arrays1d..asc
@@ -1,11 +1,11 @@
# 0D ASCII output created by CarpetIOASCII
-# created on erik-schnetters-macbook-pro.local by eschnett on Dec 05 2011 at 20:09:35-0500
-# parameter filename: "/Users/eschnett/Cvanilla/arrangements/Carpet/CarpetIOASCII/test/compact.par"
+# created on horizon.tapir.caltech.edu by rhaas on Oct 20 2012 at 15:44:23-0700
+# parameter filename: "compact.par"
#
# INTERPTOARRAY::ARRAYS1D (interptoarray::arrays1d)
#
-# column format: 1:it 2:ix 3:time 4:x 5:data
-# data columns: 5:arrays1d[0]
+# column format: 1:it 2:ix 3:time 4:data
+# data columns: 4:arrays1d[0]
0 0 0 0.0535714285714286
1 0 1 0.0535714285714286
2 0 2 0.0535714285714286
diff --git a/Carpet/CarpetIOASCII/test/compact/interptoarray::arrays1d.x.asc b/Carpet/CarpetIOASCII/test/compact/interptoarray::arrays1d.x.asc
index 30ea00538..097e4bb07 100644
--- a/Carpet/CarpetIOASCII/test/compact/interptoarray::arrays1d.x.asc
+++ b/Carpet/CarpetIOASCII/test/compact/interptoarray::arrays1d.x.asc
@@ -1,11 +1,11 @@
# 1D ASCII output created by CarpetIOASCII
-# created on erik-schnetters-macbook-pro.local by eschnett on Dec 05 2011 at 20:09:35-0500
-# parameter filename: "/Users/eschnett/Cvanilla/arrangements/Carpet/CarpetIOASCII/test/compact.par"
+# created on horizon.tapir.caltech.edu by rhaas on Oct 20 2012 at 15:44:23-0700
+# parameter filename: "compact.par"
#
# INTERPTOARRAY::ARRAYS1D x (interptoarray::arrays1d)
#
-# column format: 1:it 2:ix 3:time 4:x 5:data
-# data columns: 5:arrays1d[0]
+# column format: 1:it 2:ix 3:time 4:data
+# data columns: 4:arrays1d[0]
0 0 0 0.0535714285714286
0 1 0 0.0535714285714286
0 2 0 0.0535714285714286
diff --git a/Carpet/CarpetIOASCII/test/compact/interptoarray::arrays2d..asc b/Carpet/CarpetIOASCII/test/compact/interptoarray::arrays2d..asc
index 19b3e7db2..bb73812da 100644
--- a/Carpet/CarpetIOASCII/test/compact/interptoarray::arrays2d..asc
+++ b/Carpet/CarpetIOASCII/test/compact/interptoarray::arrays2d..asc
@@ -1,11 +1,11 @@
# 0D ASCII output created by CarpetIOASCII
-# created on erik-schnetters-macbook-pro.local by eschnett on Dec 05 2011 at 20:09:35-0500
-# parameter filename: "/Users/eschnett/Cvanilla/arrangements/Carpet/CarpetIOASCII/test/compact.par"
+# created on horizon.tapir.caltech.edu by rhaas on Oct 20 2012 at 15:44:23-0700
+# parameter filename: "compact.par"
#
# INTERPTOARRAY::ARRAYS2D (interptoarray::arrays2d)
#
-# column format: 1:it 2:ix 3:iy 4:time 5:x 6:y 7:data
-# data columns: 7:arrays2d[0]
+# column format: 1:it 2:ix 3:iy 4:time 5:data
+# data columns: 5:arrays2d[0]
0 0 0 0 0.0535714285714286
1 0 0 1 0.0535714285714286
2 0 0 2 0.0535714285714286
diff --git a/Carpet/CarpetIOASCII/test/compact/interptoarray::arrays2d.x.asc b/Carpet/CarpetIOASCII/test/compact/interptoarray::arrays2d.x.asc
index 10a99596d..0ab381895 100644
--- a/Carpet/CarpetIOASCII/test/compact/interptoarray::arrays2d.x.asc
+++ b/Carpet/CarpetIOASCII/test/compact/interptoarray::arrays2d.x.asc
@@ -1,11 +1,11 @@
# 1D ASCII output created by CarpetIOASCII
-# created on erik-schnetters-macbook-pro.local by eschnett on Dec 05 2011 at 20:09:35-0500
-# parameter filename: "/Users/eschnett/Cvanilla/arrangements/Carpet/CarpetIOASCII/test/compact.par"
+# created on horizon.tapir.caltech.edu by rhaas on Oct 20 2012 at 15:44:23-0700
+# parameter filename: "compact.par"
#
# INTERPTOARRAY::ARRAYS2D x (interptoarray::arrays2d)
#
-# column format: 1:it 2:ix 3:iy 4:time 5:x 6:y 7:data
-# data columns: 7:arrays2d[0]
+# column format: 1:it 2:ix 3:iy 4:time 5:data
+# data columns: 5:arrays2d[0]
0 0 0 0 0.0535714285714286
0 1 0 0 0.0535714285714286
0 2 0 0 0.0535714285714286
diff --git a/Carpet/CarpetIOASCII/test/compact/interptoarray::arrays2d.xy.asc b/Carpet/CarpetIOASCII/test/compact/interptoarray::arrays2d.xy.asc
index 4b1ccd470..e36db4d52 100644
--- a/Carpet/CarpetIOASCII/test/compact/interptoarray::arrays2d.xy.asc
+++ b/Carpet/CarpetIOASCII/test/compact/interptoarray::arrays2d.xy.asc
@@ -1,11 +1,11 @@
# 2D ASCII output created by CarpetIOASCII
-# created on erik-schnetters-macbook-pro.local by eschnett on Dec 05 2011 at 20:09:35-0500
-# parameter filename: "/Users/eschnett/Cvanilla/arrangements/Carpet/CarpetIOASCII/test/compact.par"
+# created on horizon.tapir.caltech.edu by rhaas on Oct 20 2012 at 15:44:23-0700
+# parameter filename: "compact.par"
#
# INTERPTOARRAY::ARRAYS2D x y (interptoarray::arrays2d)
#
-# column format: 1:it 2:ix 3:iy 4:time 5:x 6:y 7:data
-# data columns: 7:arrays2d[0]
+# column format: 1:it 2:ix 3:iy 4:time 5:data
+# data columns: 5:arrays2d[0]
0 0 0 0 0.0535714285714286
0 1 0 0 0.0535714285714286
0 2 0 0 0.0535714285714286
diff --git a/Carpet/CarpetIOASCII/test/compact/interptoarray::arrays3d..asc b/Carpet/CarpetIOASCII/test/compact/interptoarray::arrays3d..asc
index b813a0d30..eaecf1007 100644
--- a/Carpet/CarpetIOASCII/test/compact/interptoarray::arrays3d..asc
+++ b/Carpet/CarpetIOASCII/test/compact/interptoarray::arrays3d..asc
@@ -1,11 +1,11 @@
# 0D ASCII output created by CarpetIOASCII
-# created on erik-schnetters-macbook-pro.local by eschnett on Dec 05 2011 at 20:09:35-0500
-# parameter filename: "/Users/eschnett/Cvanilla/arrangements/Carpet/CarpetIOASCII/test/compact.par"
+# created on horizon.tapir.caltech.edu by rhaas on Oct 20 2012 at 15:44:23-0700
+# parameter filename: "compact.par"
#
# INTERPTOARRAY::ARRAYS3D (interptoarray::arrays3d)
#
-# column format: 1:it 2:ix 3:iy 4:iz 5:time 6:x 7:y 8:z 9:data
-# data columns: 9:arrays3d[0]
+# column format: 1:it 2:ix 3:iy 4:iz 5:time 6:data
+# data columns: 6:arrays3d[0]
0 0 0 0 0 0.0535714285714286
1 0 0 0 1 0.0535714285714286
2 0 0 0 2 0.0535714285714286
diff --git a/Carpet/CarpetIOASCII/test/compact/interptoarray::arrays3d.x.asc b/Carpet/CarpetIOASCII/test/compact/interptoarray::arrays3d.x.asc
index 4b6475926..275baf8b4 100644
--- a/Carpet/CarpetIOASCII/test/compact/interptoarray::arrays3d.x.asc
+++ b/Carpet/CarpetIOASCII/test/compact/interptoarray::arrays3d.x.asc
@@ -1,11 +1,11 @@
# 1D ASCII output created by CarpetIOASCII
-# created on erik-schnetters-macbook-pro.local by eschnett on Dec 05 2011 at 20:09:35-0500
-# parameter filename: "/Users/eschnett/Cvanilla/arrangements/Carpet/CarpetIOASCII/test/compact.par"
+# created on horizon.tapir.caltech.edu by rhaas on Oct 20 2012 at 15:44:23-0700
+# parameter filename: "compact.par"
#
# INTERPTOARRAY::ARRAYS3D x (interptoarray::arrays3d)
#
-# column format: 1:it 2:ix 3:iy 4:iz 5:time 6:x 7:y 8:z 9:data
-# data columns: 9:arrays3d[0]
+# column format: 1:it 2:ix 3:iy 4:iz 5:time 6:data
+# data columns: 6:arrays3d[0]
0 0 0 0 0 0.0535714285714286
0 1 0 0 0 0.0535714285714286
0 2 0 0 0 0.0535714285714286
diff --git a/Carpet/CarpetIOASCII/test/compact/interptoarray::arrays3d.xy.asc b/Carpet/CarpetIOASCII/test/compact/interptoarray::arrays3d.xy.asc
index 3bab81963..3dde78411 100644
--- a/Carpet/CarpetIOASCII/test/compact/interptoarray::arrays3d.xy.asc
+++ b/Carpet/CarpetIOASCII/test/compact/interptoarray::arrays3d.xy.asc
@@ -1,11 +1,11 @@
# 2D ASCII output created by CarpetIOASCII
-# created on erik-schnetters-macbook-pro.local by eschnett on Dec 05 2011 at 20:09:35-0500
-# parameter filename: "/Users/eschnett/Cvanilla/arrangements/Carpet/CarpetIOASCII/test/compact.par"
+# created on horizon.tapir.caltech.edu by rhaas on Oct 20 2012 at 15:44:23-0700
+# parameter filename: "compact.par"
#
# INTERPTOARRAY::ARRAYS3D x y (interptoarray::arrays3d)
#
-# column format: 1:it 2:ix 3:iy 4:iz 5:time 6:x 7:y 8:z 9:data
-# data columns: 9:arrays3d[0]
+# column format: 1:it 2:ix 3:iy 4:iz 5:time 6:data
+# data columns: 6:arrays3d[0]
0 0 0 0 0 0.0535714285714286
0 1 0 0 0 0.0535714285714286
0 2 0 0 0 0.0535714285714286
diff --git a/Carpet/CarpetIOASCII/test/compact/interptoarray::arrays3d.xyz.asc b/Carpet/CarpetIOASCII/test/compact/interptoarray::arrays3d.xyz.asc
index f44394325..7e20b338a 100644
--- a/Carpet/CarpetIOASCII/test/compact/interptoarray::arrays3d.xyz.asc
+++ b/Carpet/CarpetIOASCII/test/compact/interptoarray::arrays3d.xyz.asc
@@ -1,11 +1,11 @@
# 3D ASCII output created by CarpetIOASCII
-# created on erik-schnetters-macbook-pro.local by eschnett on Dec 05 2011 at 20:09:35-0500
-# parameter filename: "/Users/eschnett/Cvanilla/arrangements/Carpet/CarpetIOASCII/test/compact.par"
+# created on horizon.tapir.caltech.edu by rhaas on Oct 20 2012 at 15:44:23-0700
+# parameter filename: "compact.par"
#
# INTERPTOARRAY::ARRAYS3D x y z (interptoarray::arrays3d)
#
-# column format: 1:it 2:ix 3:iy 4:iz 5:time 6:x 7:y 8:z 9:data
-# data columns: 9:arrays3d[0]
+# column format: 1:it 2:ix 3:iy 4:iz 5:time 6:data
+# data columns: 6:arrays3d[0]
0 0 0 0 0 0.0535714285714286
0 1 0 0 0 0.0535714285714286
0 2 0 0 0 0.0535714285714286
diff --git a/Carpet/CarpetIOASCII/test/grid-coords/interptoarray::arrays1d..asc b/Carpet/CarpetIOASCII/test/grid-coords/interptoarray::arrays1d..asc
index c1cf10d0c..9831a78dd 100644
--- a/Carpet/CarpetIOASCII/test/grid-coords/interptoarray::arrays1d..asc
+++ b/Carpet/CarpetIOASCII/test/grid-coords/interptoarray::arrays1d..asc
@@ -1,11 +1,11 @@
# 0D ASCII output created by CarpetIOASCII
-# created on Redshift.local by eschnett on Sep 18 2012 at 09:35:53-0400
-# parameter filename: "../../arrangements/Carpet/CarpetIOASCII/test/grid-coords.par"
+# created on horizon.tapir.caltech.edu by rhaas on Oct 20 2012 at 15:44:32-0700
+# parameter filename: "grid-coords.par"
#
# INTERPTOARRAY::ARRAYS1D (interptoarray::arrays1d)
#
-# column format: 1:it 2:ix 3:time 4:x 5:data
-# data columns: 5:arrays1d[0]
+# column format: 1:it 2:ix 3:time 4:data
+# data columns: 4:arrays1d[0]
0 0 0 0.0535714285714286
1 0 1 0.0535714285714286
2 0 2 0.0535714285714286
diff --git a/Carpet/CarpetIOASCII/test/grid-coords/interptoarray::arrays1d.x.asc b/Carpet/CarpetIOASCII/test/grid-coords/interptoarray::arrays1d.x.asc
index 20ea6a3ca..ebd4447e6 100644
--- a/Carpet/CarpetIOASCII/test/grid-coords/interptoarray::arrays1d.x.asc
+++ b/Carpet/CarpetIOASCII/test/grid-coords/interptoarray::arrays1d.x.asc
@@ -1,11 +1,11 @@
# 1D ASCII output created by CarpetIOASCII
-# created on Redshift.local by eschnett on Sep 18 2012 at 09:35:53-0400
-# parameter filename: "../../arrangements/Carpet/CarpetIOASCII/test/grid-coords.par"
+# created on horizon.tapir.caltech.edu by rhaas on Oct 20 2012 at 15:44:32-0700
+# parameter filename: "grid-coords.par"
#
# INTERPTOARRAY::ARRAYS1D x (interptoarray::arrays1d)
#
-# column format: 1:it 2:ix 3:time 4:x 5:data
-# data columns: 5:arrays1d[0]
+# column format: 1:it 2:ix 3:time 4:data
+# data columns: 4:arrays1d[0]
0 0 0 0.0535714285714286
0 1 0 0.0535714285714286
0 2 0 0.0535714285714286
diff --git a/Carpet/CarpetIOASCII/test/grid-coords/interptoarray::arrays2d..asc b/Carpet/CarpetIOASCII/test/grid-coords/interptoarray::arrays2d..asc
index 486b71581..7b3787642 100644
--- a/Carpet/CarpetIOASCII/test/grid-coords/interptoarray::arrays2d..asc
+++ b/Carpet/CarpetIOASCII/test/grid-coords/interptoarray::arrays2d..asc
@@ -1,11 +1,11 @@
# 0D ASCII output created by CarpetIOASCII
-# created on Redshift.local by eschnett on Sep 18 2012 at 09:35:53-0400
-# parameter filename: "../../arrangements/Carpet/CarpetIOASCII/test/grid-coords.par"
+# created on horizon.tapir.caltech.edu by rhaas on Oct 20 2012 at 15:44:32-0700
+# parameter filename: "grid-coords.par"
#
# INTERPTOARRAY::ARRAYS2D (interptoarray::arrays2d)
#
-# column format: 1:it 2:ix 3:iy 4:time 5:x 6:y 7:data
-# data columns: 7:arrays2d[0]
+# column format: 1:it 2:ix 3:iy 4:time 5:data
+# data columns: 5:arrays2d[0]
0 0 0 0 0.0535714285714286
1 0 0 1 0.0535714285714286
2 0 0 2 0.0535714285714286
diff --git a/Carpet/CarpetIOASCII/test/grid-coords/interptoarray::arrays2d.x.asc b/Carpet/CarpetIOASCII/test/grid-coords/interptoarray::arrays2d.x.asc
index 35f08826d..48be2537d 100644
--- a/Carpet/CarpetIOASCII/test/grid-coords/interptoarray::arrays2d.x.asc
+++ b/Carpet/CarpetIOASCII/test/grid-coords/interptoarray::arrays2d.x.asc
@@ -1,11 +1,11 @@
# 1D ASCII output created by CarpetIOASCII
-# created on Redshift.local by eschnett on Sep 18 2012 at 09:35:53-0400
-# parameter filename: "../../arrangements/Carpet/CarpetIOASCII/test/grid-coords.par"
+# created on horizon.tapir.caltech.edu by rhaas on Oct 20 2012 at 15:44:32-0700
+# parameter filename: "grid-coords.par"
#
# INTERPTOARRAY::ARRAYS2D x (interptoarray::arrays2d)
#
-# column format: 1:it 2:ix 3:iy 4:time 5:x 6:y 7:data
-# data columns: 7:arrays2d[0]
+# column format: 1:it 2:ix 3:iy 4:time 5:data
+# data columns: 5:arrays2d[0]
0 0 0 0 0.0535714285714286
0 1 0 0 0.0535714285714286
0 2 0 0 0.0535714285714286
diff --git a/Carpet/CarpetIOASCII/test/grid-coords/interptoarray::arrays2d.xy.asc b/Carpet/CarpetIOASCII/test/grid-coords/interptoarray::arrays2d.xy.asc
index 14c340316..dd04dcea9 100644
--- a/Carpet/CarpetIOASCII/test/grid-coords/interptoarray::arrays2d.xy.asc
+++ b/Carpet/CarpetIOASCII/test/grid-coords/interptoarray::arrays2d.xy.asc
@@ -1,11 +1,11 @@
# 2D ASCII output created by CarpetIOASCII
-# created on Redshift.local by eschnett on Sep 18 2012 at 09:35:53-0400
-# parameter filename: "../../arrangements/Carpet/CarpetIOASCII/test/grid-coords.par"
+# created on horizon.tapir.caltech.edu by rhaas on Oct 20 2012 at 15:44:32-0700
+# parameter filename: "grid-coords.par"
#
# INTERPTOARRAY::ARRAYS2D x y (interptoarray::arrays2d)
#
-# column format: 1:it 2:ix 3:iy 4:time 5:x 6:y 7:data
-# data columns: 7:arrays2d[0]
+# column format: 1:it 2:ix 3:iy 4:time 5:data
+# data columns: 5:arrays2d[0]
0 0 0 0 0.0535714285714286
0 1 0 0 0.0535714285714286
0 2 0 0 0.0535714285714286
diff --git a/Carpet/CarpetIOASCII/test/grid-coords/interptoarray::arrays3d..asc b/Carpet/CarpetIOASCII/test/grid-coords/interptoarray::arrays3d..asc
index cfaa4fc1e..46ff7c90a 100644
--- a/Carpet/CarpetIOASCII/test/grid-coords/interptoarray::arrays3d..asc
+++ b/Carpet/CarpetIOASCII/test/grid-coords/interptoarray::arrays3d..asc
@@ -1,11 +1,11 @@
# 0D ASCII output created by CarpetIOASCII
-# created on Redshift.local by eschnett on Sep 18 2012 at 09:35:53-0400
-# parameter filename: "../../arrangements/Carpet/CarpetIOASCII/test/grid-coords.par"
+# created on horizon.tapir.caltech.edu by rhaas on Oct 20 2012 at 15:44:32-0700
+# parameter filename: "grid-coords.par"
#
# INTERPTOARRAY::ARRAYS3D (interptoarray::arrays3d)
#
-# column format: 1:it 2:ix 3:iy 4:iz 5:time 6:x 7:y 8:z 9:data
-# data columns: 9:arrays3d[0]
+# column format: 1:it 2:ix 3:iy 4:iz 5:time 6:data
+# data columns: 6:arrays3d[0]
0 0 0 0 0 0.0535714285714286
1 0 0 0 1 0.0535714285714286
2 0 0 0 2 0.0535714285714286
diff --git a/Carpet/CarpetIOASCII/test/grid-coords/interptoarray::arrays3d.x.asc b/Carpet/CarpetIOASCII/test/grid-coords/interptoarray::arrays3d.x.asc
index 04f3f2ca6..7b9d9a98c 100644
--- a/Carpet/CarpetIOASCII/test/grid-coords/interptoarray::arrays3d.x.asc
+++ b/Carpet/CarpetIOASCII/test/grid-coords/interptoarray::arrays3d.x.asc
@@ -1,11 +1,11 @@
# 1D ASCII output created by CarpetIOASCII
-# created on Redshift.local by eschnett on Sep 18 2012 at 09:35:53-0400
-# parameter filename: "../../arrangements/Carpet/CarpetIOASCII/test/grid-coords.par"
+# created on horizon.tapir.caltech.edu by rhaas on Oct 20 2012 at 15:44:32-0700
+# parameter filename: "grid-coords.par"
#
# INTERPTOARRAY::ARRAYS3D x (interptoarray::arrays3d)
#
-# column format: 1:it 2:ix 3:iy 4:iz 5:time 6:x 7:y 8:z 9:data
-# data columns: 9:arrays3d[0]
+# column format: 1:it 2:ix 3:iy 4:iz 5:time 6:data
+# data columns: 6:arrays3d[0]
0 0 0 0 0 0.0535714285714286
0 1 0 0 0 0.0535714285714286
0 2 0 0 0 0.0535714285714286
diff --git a/Carpet/CarpetIOASCII/test/grid-coords/interptoarray::arrays3d.xy.asc b/Carpet/CarpetIOASCII/test/grid-coords/interptoarray::arrays3d.xy.asc
index ec28b5364..b6a362ac5 100644
--- a/Carpet/CarpetIOASCII/test/grid-coords/interptoarray::arrays3d.xy.asc
+++ b/Carpet/CarpetIOASCII/test/grid-coords/interptoarray::arrays3d.xy.asc
@@ -1,11 +1,11 @@
# 2D ASCII output created by CarpetIOASCII
-# created on Redshift.local by eschnett on Sep 18 2012 at 09:35:53-0400
-# parameter filename: "../../arrangements/Carpet/CarpetIOASCII/test/grid-coords.par"
+# created on horizon.tapir.caltech.edu by rhaas on Oct 20 2012 at 15:44:32-0700
+# parameter filename: "grid-coords.par"
#
# INTERPTOARRAY::ARRAYS3D x y (interptoarray::arrays3d)
#
-# column format: 1:it 2:ix 3:iy 4:iz 5:time 6:x 7:y 8:z 9:data
-# data columns: 9:arrays3d[0]
+# column format: 1:it 2:ix 3:iy 4:iz 5:time 6:data
+# data columns: 6:arrays3d[0]
0 0 0 0 0 0.0535714285714286
0 1 0 0 0 0.0535714285714286
0 2 0 0 0 0.0535714285714286
diff --git a/Carpet/CarpetIOASCII/test/grid-coords/interptoarray::arrays3d.xyz.asc b/Carpet/CarpetIOASCII/test/grid-coords/interptoarray::arrays3d.xyz.asc
index d2cb3bbec..0c911219a 100644
--- a/Carpet/CarpetIOASCII/test/grid-coords/interptoarray::arrays3d.xyz.asc
+++ b/Carpet/CarpetIOASCII/test/grid-coords/interptoarray::arrays3d.xyz.asc
@@ -1,11 +1,11 @@
# 3D ASCII output created by CarpetIOASCII
-# created on Redshift.local by eschnett on Sep 18 2012 at 09:35:53-0400
-# parameter filename: "../../arrangements/Carpet/CarpetIOASCII/test/grid-coords.par"
+# created on horizon.tapir.caltech.edu by rhaas on Oct 20 2012 at 15:44:32-0700
+# parameter filename: "grid-coords.par"
#
# INTERPTOARRAY::ARRAYS3D x y z (interptoarray::arrays3d)
#
-# column format: 1:it 2:ix 3:iy 4:iz 5:time 6:x 7:y 8:z 9:data
-# data columns: 9:arrays3d[0]
+# column format: 1:it 2:ix 3:iy 4:iz 5:time 6:data
+# data columns: 6:arrays3d[0]
0 0 0 0 0 0.0535714285714286
0 1 0 0 0 0.0535714285714286
0 2 0 0 0 0.0535714285714286