aboutsummaryrefslogtreecommitdiff
path: root/Carpet/CarpetEvolutionMask
diff options
context:
space:
mode:
authorThomas Radke <tradke@aei.mpg.de>2006-11-28 15:29:00 +0000
committerThomas Radke <tradke@aei.mpg.de>2006-11-28 15:29:00 +0000
commit272f0ffe229970ee8aecd3314d0da97274290b5a (patch)
treedeb936e3d33bb2c674924c2660f5b97d0c81e2d9 /Carpet/CarpetEvolutionMask
parentfe95a28c05f6ebc0f534a54e8fb91a3e7294b5e3 (diff)
CarpetEvolutionMask: get the CarpetEvolutionMask_test_off at least partially working again
* use IO::out_fileinfo = "axis labels" to match the existing 1D/2D output * substitute IOBasic's reduction output by that from CarpetIOScalar (it has been checked that the output data are the same, only the filenames and the format changed) Still the testsuite is failing because of differences in the evolution_mask output. darcs-hash:20061128152932-776a0-90ef141b6eb370b267b1e0647473bc59a732479e.gz
Diffstat (limited to 'Carpet/CarpetEvolutionMask')
-rw-r--r--Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off.par2
-rw-r--r--Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_Axx.average.asc10
-rw-r--r--Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_Axx.count.asc10
-rw-r--r--Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_Axx.maximum.asc10
-rw-r--r--Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_Axx.minimum.asc10
-rw-r--r--Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_Axx.norm1.asc10
-rw-r--r--Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_Axx.norm2.asc10
-rw-r--r--Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_Axx.norm_inf.asc10
-rw-r--r--Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_Axx.sum.asc10
-rw-r--r--Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_Axx_maximum.xg7
-rw-r--r--Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_Axx_minimum.xg7
-rw-r--r--Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_Axx_norm1.xg7
-rw-r--r--Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_Axx_norm2.xg7
-rw-r--r--Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_Gx.average.asc10
-rw-r--r--Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_Gx.count.asc10
-rw-r--r--Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_Gx.maximum.asc10
-rw-r--r--Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_Gx.minimum.asc10
-rw-r--r--Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_Gx.norm1.asc10
-rw-r--r--Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_Gx.norm2.asc10
-rw-r--r--Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_Gx.norm_inf.asc10
-rw-r--r--Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_Gx.sum.asc10
-rw-r--r--Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_Gx_maximum.xg7
-rw-r--r--Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_Gx_minimum.xg7
-rw-r--r--Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_Gx_norm1.xg7
-rw-r--r--Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_Gx_norm2.xg7
-rw-r--r--Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_K.average.asc10
-rw-r--r--Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_K.count.asc10
-rw-r--r--Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_K.maximum.asc10
-rw-r--r--Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_K.minimum.asc10
-rw-r--r--Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_K.norm1.asc10
-rw-r--r--Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_K.norm2.asc10
-rw-r--r--Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_K.norm_inf.asc10
-rw-r--r--Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_K.sum.asc10
-rw-r--r--Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_K_maximum.xg7
-rw-r--r--Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_K_minimum.xg7
-rw-r--r--Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_K_norm1.xg7
-rw-r--r--Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_K_norm2.xg7
-rw-r--r--Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_gxx.average.asc10
-rw-r--r--Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_gxx.count.asc10
-rw-r--r--Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_gxx.maximum.asc10
-rw-r--r--Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_gxx.minimum.asc10
-rw-r--r--Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_gxx.norm1.asc10
-rw-r--r--Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_gxx.norm2.asc10
-rw-r--r--Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_gxx.norm_inf.asc10
-rw-r--r--Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_gxx.sum.asc10
-rw-r--r--Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_gxx_maximum.xg7
-rw-r--r--Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_gxx_minimum.xg7
-rw-r--r--Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_gxx_norm1.xg7
-rw-r--r--Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_gxx_norm2.xg7
-rw-r--r--Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_phi.average.asc10
-rw-r--r--Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_phi.count.asc10
-rw-r--r--Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_phi.maximum.asc10
-rw-r--r--Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_phi.minimum.asc10
-rw-r--r--Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_phi.norm1.asc10
-rw-r--r--Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_phi.norm2.asc10
-rw-r--r--Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_phi.norm_inf.asc10
-rw-r--r--Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_phi.sum.asc10
-rw-r--r--Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_phi_maximum.xg7
-rw-r--r--Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_phi_minimum.xg7
-rw-r--r--Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_phi_norm1.xg7
-rw-r--r--Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_phi_norm2.xg7
-rw-r--r--Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/alp.average.asc10
-rw-r--r--Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/alp.count.asc10
-rw-r--r--Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/alp.maximum.asc10
-rw-r--r--Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/alp.minimum.asc10
-rw-r--r--Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/alp.norm1.asc10
-rw-r--r--Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/alp.norm2.asc10
-rw-r--r--Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/alp.norm_inf.asc10
-rw-r--r--Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/alp.sum.asc10
-rw-r--r--Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/alp_maximum.xg7
-rw-r--r--Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/alp_minimum.xg7
-rw-r--r--Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/alp_norm1.xg7
-rw-r--r--Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/alp_norm2.xg7
-rw-r--r--Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/gxx.average.asc10
-rw-r--r--Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/gxx.count.asc10
-rw-r--r--Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/gxx.maximum.asc10
-rw-r--r--Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/gxx.minimum.asc10
-rw-r--r--Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/gxx.norm1.asc10
-rw-r--r--Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/gxx.norm2.asc10
-rw-r--r--Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/gxx.norm_inf.asc10
-rw-r--r--Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/gxx.sum.asc10
-rw-r--r--Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/gxx_maximum.xg7
-rw-r--r--Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/gxx_minimum.xg7
-rw-r--r--Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/gxx_norm1.xg7
-rw-r--r--Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/gxx_norm2.xg7
-rw-r--r--Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/kxx.average.asc10
-rw-r--r--Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/kxx.count.asc10
-rw-r--r--Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/kxx.maximum.asc10
-rw-r--r--Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/kxx.minimum.asc10
-rw-r--r--Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/kxx.norm1.asc10
-rw-r--r--Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/kxx.norm2.asc10
-rw-r--r--Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/kxx.norm_inf.asc10
-rw-r--r--Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/kxx.sum.asc10
-rw-r--r--Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/kxx_maximum.xg7
-rw-r--r--Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/kxx_minimum.xg7
-rw-r--r--Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/kxx_norm1.xg7
-rw-r--r--Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/kxx_norm2.xg7
97 files changed, 641 insertions, 225 deletions
diff --git a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off.par b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off.par
index fe10ebd34..2d7265867 100644
--- a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off.par
+++ b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off.par
@@ -86,7 +86,7 @@ admbase::lapse_evolution_method = "1+log"
# Output
-IO::out_fileinfo="none"
+IO::out_fileinfo="axis labels"
IO::parfile_write = "no"
IO::out_dir = $parfile
diff --git a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_Axx.average.asc b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_Axx.average.asc
new file mode 100644
index 000000000..6d5307fcb
--- /dev/null
+++ b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_Axx.average.asc
@@ -0,0 +1,10 @@
+# Scalar ASCII output created by CarpetIOScalar
+#
+# ADM_BSSN::ADM_BS_Axx (ADM_BS_Axx)
+# 1:iteration 2:time 3:data
+0 0 0
+4 0.1 -8.45995182794237e-08
+8 0.2 -6.77814743612524e-07
+12 0.3 -2.28714542165304e-06
+16 0.4 -5.42049362312108e-06
+20 0.5 -1.05881439940233e-05
diff --git a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_Axx.count.asc b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_Axx.count.asc
new file mode 100644
index 000000000..a9860425f
--- /dev/null
+++ b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_Axx.count.asc
@@ -0,0 +1,10 @@
+# Scalar ASCII output created by CarpetIOScalar
+#
+# ADM_BSSN::ADM_BS_Axx (ADM_BS_Axx)
+# 1:iteration 2:time 3:data
+0 0 32768
+4 0.1 32768
+8 0.2 32768
+12 0.3 32768
+16 0.4 32768
+20 0.5 32768
diff --git a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_Axx.maximum.asc b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_Axx.maximum.asc
new file mode 100644
index 000000000..20f37aa1f
--- /dev/null
+++ b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_Axx.maximum.asc
@@ -0,0 +1,10 @@
+# Scalar ASCII output created by CarpetIOScalar
+#
+# ADM_BSSN::ADM_BS_Axx (ADM_BS_Axx)
+# 1:iteration 2:time 3:data
+0 0 0
+4 0.1 0.00312420371275632
+8 0.2 0.00624374636270958
+12 0.3 0.0093546558666403
+16 0.4 0.0124541830405009
+20 0.5 0.0155410683644124
diff --git a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_Axx.minimum.asc b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_Axx.minimum.asc
new file mode 100644
index 000000000..19afb3ee4
--- /dev/null
+++ b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_Axx.minimum.asc
@@ -0,0 +1,10 @@
+# Scalar ASCII output created by CarpetIOScalar
+#
+# ADM_BSSN::ADM_BS_Axx (ADM_BS_Axx)
+# 1:iteration 2:time 3:data
+0 0 0
+4 0.1 -0.00625426169342383
+8 0.2 -0.0125342188014534
+12 0.3 -0.0188664649812413
+16 0.4 -0.0252792713142838
+20 0.5 -0.0318031604235592
diff --git a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_Axx.norm1.asc b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_Axx.norm1.asc
new file mode 100644
index 000000000..4a3ac8a48
--- /dev/null
+++ b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_Axx.norm1.asc
@@ -0,0 +1,10 @@
+# Scalar ASCII output created by CarpetIOScalar
+#
+# ADM_BSSN::ADM_BS_Axx (ADM_BS_Axx)
+# 1:iteration 2:time 3:data
+0 0 0
+4 0.1 0.000348069541103841
+8 0.2 0.000696374733492028
+12 0.3 0.00104517529986315
+16 0.4 0.0013947270681962
+20 0.5 0.00174529030864894
diff --git a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_Axx.norm2.asc b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_Axx.norm2.asc
new file mode 100644
index 000000000..5b938f783
--- /dev/null
+++ b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_Axx.norm2.asc
@@ -0,0 +1,10 @@
+# Scalar ASCII output created by CarpetIOScalar
+#
+# ADM_BSSN::ADM_BS_Axx (ADM_BS_Axx)
+# 1:iteration 2:time 3:data
+0 0 0
+4 0.1 0.000576098035827011
+8 0.2 0.00115285982082865
+12 0.3 0.00173101848306788
+16 0.4 0.00231133658054996
+20 0.5 0.00289462425561741
diff --git a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_Axx.norm_inf.asc b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_Axx.norm_inf.asc
new file mode 100644
index 000000000..1bff5a713
--- /dev/null
+++ b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_Axx.norm_inf.asc
@@ -0,0 +1,10 @@
+# Scalar ASCII output created by CarpetIOScalar
+#
+# ADM_BSSN::ADM_BS_Axx (ADM_BS_Axx)
+# 1:iteration 2:time 3:data
+0 0 0
+4 0.1 0.00625426169342383
+8 0.2 0.0125342188014534
+12 0.3 0.0188664649812413
+16 0.4 0.0252792713142838
+20 0.5 0.0318031604235592
diff --git a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_Axx.sum.asc b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_Axx.sum.asc
new file mode 100644
index 000000000..72df2b28b
--- /dev/null
+++ b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_Axx.sum.asc
@@ -0,0 +1,10 @@
+# Scalar ASCII output created by CarpetIOScalar
+#
+# ADM_BSSN::ADM_BS_Axx (ADM_BS_Axx)
+# 1:iteration 2:time 3:data
+0 0 0
+4 0.1 -0.00277215701498016
+8 0.2 -0.0222106335186952
+12 0.3 -0.0749451811767269
+16 0.4 -0.177618735042432
+20 0.5 -0.346952302396156
diff --git a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_Axx_maximum.xg b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_Axx_maximum.xg
deleted file mode 100644
index a44aff209..000000000
--- a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_Axx_maximum.xg
+++ /dev/null
@@ -1,7 +0,0 @@
-"ADM_BS_Axx v time
-0.0000000000000 0.0000000000000
-0.1000000000000 0.0031244507625
-0.2000000000000 0.0062459664918
-0.3000000000000 0.0093620714749
-0.4000000000000 0.0124710879025
-0.5000000000000 0.0155722677110
diff --git a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_Axx_minimum.xg b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_Axx_minimum.xg
deleted file mode 100644
index 2752fe2ca..000000000
--- a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_Axx_minimum.xg
+++ /dev/null
@@ -1,7 +0,0 @@
-"ADM_BS_Axx v time
-0.0000000000000 0.0000000000000
-0.1000000000000 -0.0062542616934
-0.2000000000000 -0.0125342188015
-0.3000000000000 -0.0188664649812
-0.4000000000000 -0.0252792713143
-0.5000000000000 -0.0318031604236
diff --git a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_Axx_norm1.xg b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_Axx_norm1.xg
deleted file mode 100644
index 9344ba9fe..000000000
--- a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_Axx_norm1.xg
+++ /dev/null
@@ -1,7 +0,0 @@
-"ADM_BS_Axx v time
-0.0000000000000 0.0000000000000
-0.1000000000000 0.0004368798038
-0.2000000000000 0.0008743591158
-0.3000000000000 0.0013130283087
-0.4000000000000 0.0017534087442
-0.5000000000000 0.0021959546245
diff --git a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_Axx_norm2.xg b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_Axx_norm2.xg
deleted file mode 100644
index c5a3142df..000000000
--- a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_Axx_norm2.xg
+++ /dev/null
@@ -1,7 +0,0 @@
-"ADM_BS_Axx v time
-0.0000000000000 0.0000000000000
-0.1000000000000 0.0007490253894
-0.2000000000000 0.0014997270283
-0.3000000000000 0.0022537656628
-0.4000000000000 0.0030126788526
-0.5000000000000 0.0037778820810
diff --git a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_Gx.average.asc b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_Gx.average.asc
new file mode 100644
index 000000000..515929a7d
--- /dev/null
+++ b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_Gx.average.asc
@@ -0,0 +1,10 @@
+# Scalar ASCII output created by CarpetIOScalar
+#
+# ADM_BSSN::ADM_BS_Gx (ADM_BS_Gx)
+# 1:iteration 2:time 3:data
+0 0 0
+4 0.1 2.04724009624754e-05
+8 0.2 8.19020982943166e-05
+12 0.3 0.000184331107327303
+16 0.4 0.000327838303556054
+20 0.5 0.000512546820504614
diff --git a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_Gx.count.asc b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_Gx.count.asc
new file mode 100644
index 000000000..f75d1f346
--- /dev/null
+++ b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_Gx.count.asc
@@ -0,0 +1,10 @@
+# Scalar ASCII output created by CarpetIOScalar
+#
+# ADM_BSSN::ADM_BS_Gx (ADM_BS_Gx)
+# 1:iteration 2:time 3:data
+0 0 32768
+4 0.1 32768
+8 0.2 32768
+12 0.3 32768
+16 0.4 32768
+20 0.5 32768
diff --git a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_Gx.maximum.asc b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_Gx.maximum.asc
new file mode 100644
index 000000000..9522add83
--- /dev/null
+++ b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_Gx.maximum.asc
@@ -0,0 +1,10 @@
+# Scalar ASCII output created by CarpetIOScalar
+#
+# ADM_BSSN::ADM_BS_Gx (ADM_BS_Gx)
+# 1:iteration 2:time 3:data
+0 0 0
+4 0.1 0.00364226055700177
+8 0.2 0.0145624684258393
+12 0.3 0.0327408900692863
+16 0.4 0.0581447138199854
+20 0.5 0.0907281657869717
diff --git a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_Gx.minimum.asc b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_Gx.minimum.asc
new file mode 100644
index 000000000..1f3d7c915
--- /dev/null
+++ b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_Gx.minimum.asc
@@ -0,0 +1,10 @@
+# Scalar ASCII output created by CarpetIOScalar
+#
+# ADM_BSSN::ADM_BS_Gx (ADM_BS_Gx)
+# 1:iteration 2:time 3:data
+0 0 0
+4 0.1 -4.62966140023156e-15
+8 0.2 -2.84499768197896e-13
+12 0.3 -3.17201508786912e-12
+16 0.4 -1.76464549444061e-11
+20 0.5 -6.69545565763992e-11
diff --git a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_Gx.norm1.asc b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_Gx.norm1.asc
new file mode 100644
index 000000000..a2c640ad1
--- /dev/null
+++ b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_Gx.norm1.asc
@@ -0,0 +1,10 @@
+# Scalar ASCII output created by CarpetIOScalar
+#
+# ADM_BSSN::ADM_BS_Gx (ADM_BS_Gx)
+# 1:iteration 2:time 3:data
+0 0 0
+4 0.1 2.04724009624754e-05
+8 0.2 8.19020982943187e-05
+12 0.3 0.000184331107327327
+16 0.4 0.000327838303556188
+20 0.5 0.000512546820505125
diff --git a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_Gx.norm2.asc b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_Gx.norm2.asc
new file mode 100644
index 000000000..d72cf0fa3
--- /dev/null
+++ b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_Gx.norm2.asc
@@ -0,0 +1,10 @@
+# Scalar ASCII output created by CarpetIOScalar
+#
+# ADM_BSSN::ADM_BS_Gx (ADM_BS_Gx)
+# 1:iteration 2:time 3:data
+0 0 0
+4 0.1 9.78524383661354e-05
+8 0.2 0.000391303723828008
+12 0.3 0.000880037815658869
+16 0.4 0.00156353492569036
+20 0.5 0.00244107941326661
diff --git a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_Gx.norm_inf.asc b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_Gx.norm_inf.asc
new file mode 100644
index 000000000..9522add83
--- /dev/null
+++ b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_Gx.norm_inf.asc
@@ -0,0 +1,10 @@
+# Scalar ASCII output created by CarpetIOScalar
+#
+# ADM_BSSN::ADM_BS_Gx (ADM_BS_Gx)
+# 1:iteration 2:time 3:data
+0 0 0
+4 0.1 0.00364226055700177
+8 0.2 0.0145624684258393
+12 0.3 0.0327408900692863
+16 0.4 0.0581447138199854
+20 0.5 0.0907281657869717
diff --git a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_Gx.sum.asc b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_Gx.sum.asc
new file mode 100644
index 000000000..6d8686c8a
--- /dev/null
+++ b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_Gx.sum.asc
@@ -0,0 +1,10 @@
+# Scalar ASCII output created by CarpetIOScalar
+#
+# ADM_BSSN::ADM_BS_Gx (ADM_BS_Gx)
+# 1:iteration 2:time 3:data
+0 0 0
+4 0.1 0.670839634738393
+8 0.2 2.68376795690816
+12 0.3 6.04016172490105
+16 0.4 10.7426055309248
+20 0.5 16.7951342142952
diff --git a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_Gx_maximum.xg b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_Gx_maximum.xg
deleted file mode 100644
index d7779fd0b..000000000
--- a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_Gx_maximum.xg
+++ /dev/null
@@ -1,7 +0,0 @@
-"ADM_BS_Gx v time
-0.0000000000000 0.0000000000000
-0.1000000000000 0.0036422605570
-0.2000000000000 0.0145624684258
-0.3000000000000 0.0327408900693
-0.4000000000000 0.0581447138200
-0.5000000000000 0.0907281657870
diff --git a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_Gx_minimum.xg b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_Gx_minimum.xg
deleted file mode 100644
index b9d4cc023..000000000
--- a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_Gx_minimum.xg
+++ /dev/null
@@ -1,7 +0,0 @@
-"ADM_BS_Gx v time
-0.0000000000000 0.0000000000000
-0.1000000000000 -0.0013445733698
-0.2000000000000 -0.0053775742905
-0.3000000000000 -0.0120968523005
-0.4000000000000 -0.0214988257243
-0.5000000000000 -0.0335784852409
diff --git a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_Gx_norm1.xg b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_Gx_norm1.xg
deleted file mode 100644
index ea4073a13..000000000
--- a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_Gx_norm1.xg
+++ /dev/null
@@ -1,7 +0,0 @@
-"ADM_BS_Gx v time
-0.0000000000000 0.0000000000000
-0.1000000000000 0.0000309757902
-0.2000000000000 0.0001238104213
-0.3000000000000 0.0002782469930
-0.4000000000000 0.0004939058893
-0.5000000000000 0.0007703358280
diff --git a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_Gx_norm2.xg b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_Gx_norm2.xg
deleted file mode 100644
index e95df417f..000000000
--- a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_Gx_norm2.xg
+++ /dev/null
@@ -1,7 +0,0 @@
-"ADM_BS_Gx v time
-0.0000000000000 0.0000000000000
-0.1000000000000 0.0001572567182
-0.2000000000000 0.0006287377241
-0.3000000000000 0.0014135838134
-0.4000000000000 0.0025103883715
-0.5000000000000 0.0039172279754
diff --git a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_K.average.asc b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_K.average.asc
new file mode 100644
index 000000000..842232040
--- /dev/null
+++ b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_K.average.asc
@@ -0,0 +1,10 @@
+# Scalar ASCII output created by CarpetIOScalar
+#
+# ADM_BSSN::ADM_BS_K (ADM_BS_K)
+# 1:iteration 2:time 3:data
+0 0 0
+4 0.1 8.18514065537901e-08
+8 0.2 6.72671936209966e-07
+12 0.3 2.28257721330222e-06
+16 0.4 5.42419219279052e-06
+20 0.5 1.06140145305967e-05
diff --git a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_K.count.asc b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_K.count.asc
new file mode 100644
index 000000000..4d888cce1
--- /dev/null
+++ b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_K.count.asc
@@ -0,0 +1,10 @@
+# Scalar ASCII output created by CarpetIOScalar
+#
+# ADM_BSSN::ADM_BS_K (ADM_BS_K)
+# 1:iteration 2:time 3:data
+0 0 32768
+4 0.1 32768
+8 0.2 32768
+12 0.3 32768
+16 0.4 32768
+20 0.5 32768
diff --git a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_K.maximum.asc b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_K.maximum.asc
new file mode 100644
index 000000000..70ea35822
--- /dev/null
+++ b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_K.maximum.asc
@@ -0,0 +1,10 @@
+# Scalar ASCII output created by CarpetIOScalar
+#
+# ADM_BSSN::ADM_BS_K (ADM_BS_K)
+# 1:iteration 2:time 3:data
+0 0 0
+4 0.1 1.92257912599605e-06
+8 0.2 1.5562810962461e-05
+12 0.3 5.26379454714546e-05
+16 0.4 0.000124882480049462
+20 0.5 0.000244096836778555
diff --git a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_K.minimum.asc b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_K.minimum.asc
new file mode 100644
index 000000000..71f17916b
--- /dev/null
+++ b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_K.minimum.asc
@@ -0,0 +1,10 @@
+# Scalar ASCII output created by CarpetIOScalar
+#
+# ADM_BSSN::ADM_BS_K (ADM_BS_K)
+# 1:iteration 2:time 3:data
+0 0 0
+4 0.1 8.06559818933295e-74
+8 0.2 2.509567137432e-72
+12 0.3 1.88339203677219e-71
+16 0.4 7.89757961527817e-71
+20 0.5 2.40451692973152e-70
diff --git a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_K.norm1.asc b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_K.norm1.asc
new file mode 100644
index 000000000..842232040
--- /dev/null
+++ b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_K.norm1.asc
@@ -0,0 +1,10 @@
+# Scalar ASCII output created by CarpetIOScalar
+#
+# ADM_BSSN::ADM_BS_K (ADM_BS_K)
+# 1:iteration 2:time 3:data
+0 0 0
+4 0.1 8.18514065537901e-08
+8 0.2 6.72671936209966e-07
+12 0.3 2.28257721330222e-06
+16 0.4 5.42419219279052e-06
+20 0.5 1.06140145305967e-05
diff --git a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_K.norm2.asc b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_K.norm2.asc
new file mode 100644
index 000000000..e2e5133c4
--- /dev/null
+++ b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_K.norm2.asc
@@ -0,0 +1,10 @@
+# Scalar ASCII output created by CarpetIOScalar
+#
+# ADM_BSSN::ADM_BS_K (ADM_BS_K)
+# 1:iteration 2:time 3:data
+0 0 0
+4 0.1 2.24027504540841e-07
+8 0.2 1.81796134531781e-06
+12 0.3 6.1528105472934e-06
+16 0.4 1.46021806929657e-05
+20 0.5 2.85442778132981e-05
diff --git a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_K.norm_inf.asc b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_K.norm_inf.asc
new file mode 100644
index 000000000..70ea35822
--- /dev/null
+++ b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_K.norm_inf.asc
@@ -0,0 +1,10 @@
+# Scalar ASCII output created by CarpetIOScalar
+#
+# ADM_BSSN::ADM_BS_K (ADM_BS_K)
+# 1:iteration 2:time 3:data
+0 0 0
+4 0.1 1.92257912599605e-06
+8 0.2 1.5562810962461e-05
+12 0.3 5.26379454714546e-05
+16 0.4 0.000124882480049462
+20 0.5 0.000244096836778555
diff --git a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_K.sum.asc b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_K.sum.asc
new file mode 100644
index 000000000..7b165c6e4
--- /dev/null
+++ b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_K.sum.asc
@@ -0,0 +1,10 @@
+# Scalar ASCII output created by CarpetIOScalar
+#
+# ADM_BSSN::ADM_BS_K (ADM_BS_K)
+# 1:iteration 2:time 3:data
+0 0 0
+4 0.1 0.00268210688995459
+8 0.2 0.0220421140057282
+12 0.3 0.0747954901254872
+16 0.4 0.17773992977336
+20 0.5 0.347800028138593
diff --git a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_K_maximum.xg b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_K_maximum.xg
deleted file mode 100644
index 815dfdd93..000000000
--- a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_K_maximum.xg
+++ /dev/null
@@ -1,7 +0,0 @@
-"ADM_BS_K v time
-0.0000000000000 0.0000000000000
-0.1000000000000 0.0000019227965
-0.2000000000000 0.0000155758474
-0.3000000000000 0.0000527435242
-0.4000000000000 0.0001253280104
-0.5000000000000 0.0002454267129
diff --git a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_K_minimum.xg b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_K_minimum.xg
deleted file mode 100644
index 5077046c4..000000000
--- a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_K_minimum.xg
+++ /dev/null
@@ -1,7 +0,0 @@
-"ADM_BS_K v time
-0.0000000000000 0.0000000000000
-0.1000000000000 0.0000000000000
-0.2000000000000 0.0000000000000
-0.3000000000000 0.0000000000000
-0.4000000000000 0.0000000000000
-0.5000000000000 0.0000000000000
diff --git a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_K_norm1.xg b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_K_norm1.xg
deleted file mode 100644
index 0b08909ab..000000000
--- a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_K_norm1.xg
+++ /dev/null
@@ -1,7 +0,0 @@
-"ADM_BS_K v time
-0.0000000000000 0.0000000000000
-0.1000000000000 0.0000001096143
-0.2000000000000 0.0000008984950
-0.3000000000000 0.0000030480991
-0.4000000000000 0.0000072444951
-0.5000000000000 0.0000141806986
diff --git a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_K_norm2.xg b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_K_norm2.xg
deleted file mode 100644
index a889fa6ed..000000000
--- a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_K_norm2.xg
+++ /dev/null
@@ -1,7 +0,0 @@
-"ADM_BS_K v time
-0.0000000000000 0.0000000000000
-0.1000000000000 0.0000002915384
-0.2000000000000 0.0000023647892
-0.3000000000000 0.0000080050595
-0.4000000000000 0.0000190054021
-0.5000000000000 0.0000371713324
diff --git a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_gxx.average.asc b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_gxx.average.asc
new file mode 100644
index 000000000..70878189e
--- /dev/null
+++ b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_gxx.average.asc
@@ -0,0 +1,10 @@
+# Scalar ASCII output created by CarpetIOScalar
+#
+# ADM_BSSN::ADM_BS_gxx (ADM_BS_gxx)
+# 1:iteration 2:time 3:data
+0 0 1
+4 0.1 1.00000000421634
+8 0.2 1.00000006776037
+12 0.3 1.00000034310588
+16 0.4 1.00000108424269
+20 0.5 1.00000264692971
diff --git a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_gxx.count.asc b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_gxx.count.asc
new file mode 100644
index 000000000..e76289c72
--- /dev/null
+++ b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_gxx.count.asc
@@ -0,0 +1,10 @@
+# Scalar ASCII output created by CarpetIOScalar
+#
+# ADM_BSSN::ADM_BS_gxx (ADM_BS_gxx)
+# 1:iteration 2:time 3:data
+0 0 32768
+4 0.1 32768
+8 0.2 32768
+12 0.3 32768
+16 0.4 32768
+20 0.5 32768
diff --git a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_gxx.maximum.asc b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_gxx.maximum.asc
new file mode 100644
index 000000000..96ae596b6
--- /dev/null
+++ b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_gxx.maximum.asc
@@ -0,0 +1,10 @@
+# Scalar ASCII output created by CarpetIOScalar
+#
+# ADM_BSSN::ADM_BS_gxx (ADM_BS_gxx)
+# 1:iteration 2:time 3:data
+0 0 1
+4 0.1 1.00062521830929
+8 0.2 1.0025034393346
+12 0.3 1.00564243505801
+16 0.4 1.01005543698549
+20 0.5 1.01576151388977
diff --git a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_gxx.minimum.asc b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_gxx.minimum.asc
new file mode 100644
index 000000000..9d90a709b
--- /dev/null
+++ b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_gxx.minimum.asc
@@ -0,0 +1,10 @@
+# Scalar ASCII output created by CarpetIOScalar
+#
+# ADM_BSSN::ADM_BS_gxx (ADM_BS_gxx)
+# 1:iteration 2:time 3:data
+0 0 1
+4 0.1 0.999687537245347
+8 0.2 0.99875061891522
+12 0.3 0.997190592918368
+16 0.4 0.995009493639104
+20 0.5 0.992209774750601
diff --git a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_gxx.norm1.asc b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_gxx.norm1.asc
new file mode 100644
index 000000000..70878189e
--- /dev/null
+++ b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_gxx.norm1.asc
@@ -0,0 +1,10 @@
+# Scalar ASCII output created by CarpetIOScalar
+#
+# ADM_BSSN::ADM_BS_gxx (ADM_BS_gxx)
+# 1:iteration 2:time 3:data
+0 0 1
+4 0.1 1.00000000421634
+8 0.2 1.00000006776037
+12 0.3 1.00000034310588
+16 0.4 1.00000108424269
+20 0.5 1.00000264692971
diff --git a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_gxx.norm2.asc b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_gxx.norm2.asc
new file mode 100644
index 000000000..23bc4ad38
--- /dev/null
+++ b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_gxx.norm2.asc
@@ -0,0 +1,10 @@
+# Scalar ASCII output created by CarpetIOScalar
+#
+# ADM_BSSN::ADM_BS_gxx (ADM_BS_gxx)
+# 1:iteration 2:time 3:data
+0 0 1
+4 0.1 1.0000000058755
+8 0.2 1.00000009432203
+12 0.3 1.00000047770615
+16 0.4 1.00000151024326
+20 0.5 1.00000368888034
diff --git a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_gxx.norm_inf.asc b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_gxx.norm_inf.asc
new file mode 100644
index 000000000..96ae596b6
--- /dev/null
+++ b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_gxx.norm_inf.asc
@@ -0,0 +1,10 @@
+# Scalar ASCII output created by CarpetIOScalar
+#
+# ADM_BSSN::ADM_BS_gxx (ADM_BS_gxx)
+# 1:iteration 2:time 3:data
+0 0 1
+4 0.1 1.00062521830929
+8 0.2 1.0025034393346
+12 0.3 1.00564243505801
+16 0.4 1.01005543698549
+20 0.5 1.01576151388977
diff --git a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_gxx.sum.asc b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_gxx.sum.asc
new file mode 100644
index 000000000..b031a25be
--- /dev/null
+++ b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_gxx.sum.asc
@@ -0,0 +1,10 @@
+# Scalar ASCII output created by CarpetIOScalar
+#
+# ADM_BSSN::ADM_BS_gxx (ADM_BS_gxx)
+# 1:iteration 2:time 3:data
+0 0 32768
+4 0.1 32768.0001381611
+8 0.2 32768.0022203717
+12 0.3 32768.0112428936
+16 0.4 32768.0355284645
+20 0.5 32768.0867345927
diff --git a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_gxx_maximum.xg b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_gxx_maximum.xg
deleted file mode 100644
index d4f8b3274..000000000
--- a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_gxx_maximum.xg
+++ /dev/null
@@ -1,7 +0,0 @@
-"ADM_BS_gxx v time
-0.0000000000000 1.0000000000000
-0.1000000000000 1.0006252183093
-0.2000000000000 1.0025034393346
-0.3000000000000 1.0056424350580
-0.4000000000000 1.0100554369855
-0.5000000000000 1.0157615138898
diff --git a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_gxx_minimum.xg b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_gxx_minimum.xg
deleted file mode 100644
index 5bed66e68..000000000
--- a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_gxx_minimum.xg
+++ /dev/null
@@ -1,7 +0,0 @@
-"ADM_BS_gxx v time
-0.0000000000000 1.0000000000000
-0.1000000000000 0.9996875270592
-0.2000000000000 0.9987504022495
-0.3000000000000 0.9971894733065
-0.4000000000000 0.9950060150507
-0.5000000000000 0.9922015619139
diff --git a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_gxx_norm1.xg b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_gxx_norm1.xg
deleted file mode 100644
index 0e95c1f20..000000000
--- a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_gxx_norm1.xg
+++ /dev/null
@@ -1,7 +0,0 @@
-"ADM_BS_gxx v time
-0.0000000000000 1.0000000000000
-0.1000000000000 0.9999997260385
-0.2000000000000 0.9999989634494
-0.3000000000000 0.9999978918870
-0.4000000000000 0.9999968148351
-0.5000000000000 0.9999961649487
diff --git a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_gxx_norm2.xg b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_gxx_norm2.xg
deleted file mode 100644
index f77ddc022..000000000
--- a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_gxx_norm2.xg
+++ /dev/null
@@ -1,7 +0,0 @@
-"ADM_BS_gxx v time
-0.0000000000000 1.0000000000000
-0.1000000000000 0.9999997288426
-0.2000000000000 0.9999990083665
-0.3000000000000 0.9999981197050
-0.4000000000000 0.9999975367129
-0.5000000000000 0.9999979330941
diff --git a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_phi.average.asc b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_phi.average.asc
new file mode 100644
index 000000000..f75e04101
--- /dev/null
+++ b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_phi.average.asc
@@ -0,0 +1,10 @@
+# Scalar ASCII output created by CarpetIOScalar
+#
+# ADM_BSSN::ADM_BS_phi (ADM_BS_phi)
+# 1:iteration 2:time 3:data
+0 0 0
+4 0.1 -3.77862465877526e-10
+8 0.2 -5.75216520577591e-09
+12 0.3 -2.88543900494417e-08
+16 0.4 -9.09371873603519e-08
+20 0.5 -2.21827192270712e-07
diff --git a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_phi.count.asc b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_phi.count.asc
new file mode 100644
index 000000000..dad797d4d
--- /dev/null
+++ b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_phi.count.asc
@@ -0,0 +1,10 @@
+# Scalar ASCII output created by CarpetIOScalar
+#
+# ADM_BSSN::ADM_BS_phi (ADM_BS_phi)
+# 1:iteration 2:time 3:data
+0 0 32768
+4 0.1 32768
+8 0.2 32768
+12 0.3 32768
+16 0.4 32768
+20 0.5 32768
diff --git a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_phi.maximum.asc b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_phi.maximum.asc
new file mode 100644
index 000000000..8a1ea3eb2
--- /dev/null
+++ b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_phi.maximum.asc
@@ -0,0 +1,10 @@
+# Scalar ASCII output created by CarpetIOScalar
+#
+# ADM_BSSN::ADM_BS_phi (ADM_BS_phi)
+# 1:iteration 2:time 3:data
+0 0 0
+4 0.1 -2.24041213821765e-76
+8 0.2 -1.42465213815816e-74
+12 0.3 -1.59197000663042e-73
+16 0.4 -8.85796654660246e-73
+20 0.5 -3.36139375685768e-72
diff --git a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_phi.minimum.asc b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_phi.minimum.asc
new file mode 100644
index 000000000..ec6361d9a
--- /dev/null
+++ b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_phi.minimum.asc
@@ -0,0 +1,10 @@
+# Scalar ASCII output created by CarpetIOScalar
+#
+# ADM_BSSN::ADM_BS_phi (ADM_BS_phi)
+# 1:iteration 2:time 3:data
+0 0 0
+4 0.1 -8.39218959423325e-09
+8 0.2 -1.31218005961535e-07
+12 0.3 -6.61408528044365e-07
+16 0.4 -2.08727632175901e-06
+20 0.5 -5.09313747845263e-06
diff --git a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_phi.norm1.asc b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_phi.norm1.asc
new file mode 100644
index 000000000..b14e37b14
--- /dev/null
+++ b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_phi.norm1.asc
@@ -0,0 +1,10 @@
+# Scalar ASCII output created by CarpetIOScalar
+#
+# ADM_BSSN::ADM_BS_phi (ADM_BS_phi)
+# 1:iteration 2:time 3:data
+0 0 0
+4 0.1 3.77862465877526e-10
+8 0.2 5.75216520577591e-09
+12 0.3 2.88543900494417e-08
+16 0.4 9.09371873603519e-08
+20 0.5 2.21827192270712e-07
diff --git a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_phi.norm2.asc b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_phi.norm2.asc
new file mode 100644
index 000000000..1ec1b8646
--- /dev/null
+++ b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_phi.norm2.asc
@@ -0,0 +1,10 @@
+# Scalar ASCII output created by CarpetIOScalar
+#
+# ADM_BSSN::ADM_BS_phi (ADM_BS_phi)
+# 1:iteration 2:time 3:data
+0 0 0
+4 0.1 9.87222905464737e-10
+8 0.2 1.5363632730994e-08
+12 0.3 7.73840310228108e-08
+16 0.4 2.44171748096407e-07
+20 0.5 5.95776718189912e-07
diff --git a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_phi.norm_inf.asc b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_phi.norm_inf.asc
new file mode 100644
index 000000000..bf74ef94a
--- /dev/null
+++ b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_phi.norm_inf.asc
@@ -0,0 +1,10 @@
+# Scalar ASCII output created by CarpetIOScalar
+#
+# ADM_BSSN::ADM_BS_phi (ADM_BS_phi)
+# 1:iteration 2:time 3:data
+0 0 0
+4 0.1 8.39218959423325e-09
+8 0.2 1.31218005961535e-07
+12 0.3 6.61408528044365e-07
+16 0.4 2.08727632175901e-06
+20 0.5 5.09313747845263e-06
diff --git a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_phi.sum.asc b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_phi.sum.asc
new file mode 100644
index 000000000..241d4621d
--- /dev/null
+++ b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_phi.sum.asc
@@ -0,0 +1,10 @@
+# Scalar ASCII output created by CarpetIOScalar
+#
+# ADM_BSSN::ADM_BS_phi (ADM_BS_phi)
+# 1:iteration 2:time 3:data
+0 0 0
+4 0.1 -1.23817972818748e-05
+8 0.2 -0.000188486949462865
+12 0.3 -0.000945500653140105
+16 0.4 -0.00297982975542401
+20 0.5 -0.00726883343632668
diff --git a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_phi_maximum.xg b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_phi_maximum.xg
deleted file mode 100644
index 529025a62..000000000
--- a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_phi_maximum.xg
+++ /dev/null
@@ -1,7 +0,0 @@
-"ADM_BS_phi v time
-0.0000000000000 0.0000000000000
-0.1000000000000 -0.0000000000000
-0.2000000000000 -0.0000000000000
-0.3000000000000 -0.0000000000000
-0.4000000000000 -0.0000000000000
-0.5000000000000 -0.0000000000000
diff --git a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_phi_minimum.xg b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_phi_minimum.xg
deleted file mode 100644
index bc366ba84..000000000
--- a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_phi_minimum.xg
+++ /dev/null
@@ -1,7 +0,0 @@
-"ADM_BS_phi v time
-0.0000000000000 0.0000000000000
-0.1000000000000 -0.0000000083926
-0.2000000000000 -0.0000001312869
-0.3000000000000 -0.0000006622794
-0.4000000000000 -0.0000020922539
-0.5000000000000 -0.0000051119487
diff --git a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_phi_norm1.xg b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_phi_norm1.xg
deleted file mode 100644
index cb6c79349..000000000
--- a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_phi_norm1.xg
+++ /dev/null
@@ -1,7 +0,0 @@
-"ADM_BS_phi v time
-0.0000000000000 0.0000000000000
-0.1000000000000 0.0000000005009
-0.2000000000000 0.0000000076626
-0.3000000000000 0.0000000384808
-0.4000000000000 0.0000001213442
-0.5000000000000 0.0000002961302
diff --git a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_phi_norm2.xg b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_phi_norm2.xg
deleted file mode 100644
index e2d244741..000000000
--- a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/ADM_BS_phi_norm2.xg
+++ /dev/null
@@ -1,7 +0,0 @@
-"ADM_BS_phi v time
-0.0000000000000 0.0000000000000
-0.1000000000000 0.0000000012815
-0.2000000000000 0.0000000199708
-0.3000000000000 0.0000001006337
-0.4000000000000 0.0000003176484
-0.5000000000000 0.0000007753716
diff --git a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/alp.average.asc b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/alp.average.asc
new file mode 100644
index 000000000..6b9f6b428
--- /dev/null
+++ b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/alp.average.asc
@@ -0,0 +1,10 @@
+# Scalar ASCII output created by CarpetIOScalar
+#
+# ADMBASE::alp (alp)
+# 1:iteration 2:time 3:data
+0 0 1
+4 0.1 0.999999997732832
+8 0.2 0.999999965487015
+12 0.3 0.999999826873647
+16 0.4 0.999999454376879
+20 0.5 0.999998669036854
diff --git a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/alp.count.asc b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/alp.count.asc
new file mode 100644
index 000000000..221dfcf16
--- /dev/null
+++ b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/alp.count.asc
@@ -0,0 +1,10 @@
+# Scalar ASCII output created by CarpetIOScalar
+#
+# ADMBASE::alp (alp)
+# 1:iteration 2:time 3:data
+0 0 32768
+4 0.1 32768
+8 0.2 32768
+12 0.3 32768
+16 0.4 32768
+20 0.5 32768
diff --git a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/alp.maximum.asc b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/alp.maximum.asc
new file mode 100644
index 000000000..7ca7b0e93
--- /dev/null
+++ b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/alp.maximum.asc
@@ -0,0 +1,10 @@
+# Scalar ASCII output created by CarpetIOScalar
+#
+# ADMBASE::alp (alp)
+# 1:iteration 2:time 3:data
+0 0 1
+4 0.1 1
+8 0.2 1
+12 0.3 1
+16 0.4 1
+20 0.5 1
diff --git a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/alp.minimum.asc b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/alp.minimum.asc
new file mode 100644
index 000000000..926120087
--- /dev/null
+++ b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/alp.minimum.asc
@@ -0,0 +1,10 @@
+# Scalar ASCII output created by CarpetIOScalar
+#
+# ADMBASE::alp (alp)
+# 1:iteration 2:time 3:data
+0 0 1
+4 0.1 0.999999949646863
+8 0.2 0.999999212691964
+12 0.3 0.999996031548832
+16 0.4 0.999987476342069
+20 0.5 0.999969441175129
diff --git a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/alp.norm1.asc b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/alp.norm1.asc
new file mode 100644
index 000000000..6b9f6b428
--- /dev/null
+++ b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/alp.norm1.asc
@@ -0,0 +1,10 @@
+# Scalar ASCII output created by CarpetIOScalar
+#
+# ADMBASE::alp (alp)
+# 1:iteration 2:time 3:data
+0 0 1
+4 0.1 0.999999997732832
+8 0.2 0.999999965487015
+12 0.3 0.999999826873647
+16 0.4 0.999999454376879
+20 0.5 0.999998669036854
diff --git a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/alp.norm2.asc b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/alp.norm2.asc
new file mode 100644
index 000000000..756da2bfc
--- /dev/null
+++ b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/alp.norm2.asc
@@ -0,0 +1,10 @@
+# Scalar ASCII output created by CarpetIOScalar
+#
+# ADMBASE::alp (alp)
+# 1:iteration 2:time 3:data
+0 0 1
+4 0.1 0.999999997732823
+8 0.2 0.999999965487005
+12 0.3 0.999999826873752
+16 0.4 0.999999454377806
+20 0.5 0.999998669042352
diff --git a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/alp.norm_inf.asc b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/alp.norm_inf.asc
new file mode 100644
index 000000000..7ca7b0e93
--- /dev/null
+++ b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/alp.norm_inf.asc
@@ -0,0 +1,10 @@
+# Scalar ASCII output created by CarpetIOScalar
+#
+# ADMBASE::alp (alp)
+# 1:iteration 2:time 3:data
+0 0 1
+4 0.1 1
+8 0.2 1
+12 0.3 1
+16 0.4 1
+20 0.5 1
diff --git a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/alp.sum.asc b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/alp.sum.asc
new file mode 100644
index 000000000..d6715ab31
--- /dev/null
+++ b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/alp.sum.asc
@@ -0,0 +1,10 @@
+# Scalar ASCII output created by CarpetIOScalar
+#
+# ADMBASE::alp (alp)
+# 1:iteration 2:time 3:data
+0 0 32768
+4 0.1 32767.9999257095
+8 0.2 32767.9988690785
+12 0.3 32767.9943269957
+16 0.4 32767.9821210216
+20 0.5 32767.9563869996
diff --git a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/alp_maximum.xg b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/alp_maximum.xg
deleted file mode 100644
index d2e34cf74..000000000
--- a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/alp_maximum.xg
+++ /dev/null
@@ -1,7 +0,0 @@
-"alp v time
-0.0000000000000 1.0000000000000
-0.1000000000000 1.0000000000000
-0.2000000000000 1.0000000000000
-0.3000000000000 1.0000000000000
-0.4000000000000 1.0000000000000
-0.5000000000000 1.0000000000000
diff --git a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/alp_minimum.xg b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/alp_minimum.xg
deleted file mode 100644
index 3c169d416..000000000
--- a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/alp_minimum.xg
+++ /dev/null
@@ -1,7 +0,0 @@
-"alp v time
-0.0000000000000 1.0000000000000
-0.1000000000000 0.9999999496443
-0.2000000000000 0.9999992122786
-0.3000000000000 0.9999960263237
-0.4000000000000 0.9999874464767
-0.5000000000000 0.9999693283078
diff --git a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/alp_norm1.xg b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/alp_norm1.xg
deleted file mode 100644
index c274e490e..000000000
--- a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/alp_norm1.xg
+++ /dev/null
@@ -1,7 +0,0 @@
-"alp v time
-0.0000000000000 1.0000000000000
-0.1000000000000 0.9999999969949
-0.2000000000000 0.9999999540245
-0.3000000000000 0.9999997691152
-0.4000000000000 0.9999992719351
-0.5000000000000 0.9999982232187
diff --git a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/alp_norm2.xg b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/alp_norm2.xg
deleted file mode 100644
index f19725548..000000000
--- a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/alp_norm2.xg
+++ /dev/null
@@ -1,7 +0,0 @@
-"alp v time
-0.0000000000000 1.0000000000000
-0.1000000000000 0.9999999969949
-0.2000000000000 0.9999999540245
-0.3000000000000 0.9999997691153
-0.4000000000000 0.9999992719366
-0.5000000000000 0.9999982232279
diff --git a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/gxx.average.asc b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/gxx.average.asc
new file mode 100644
index 000000000..73fdcd454
--- /dev/null
+++ b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/gxx.average.asc
@@ -0,0 +1,10 @@
+# Scalar ASCII output created by CarpetIOScalar
+#
+# ADMBASE::gxx (gxx)
+# 1:iteration 2:time 3:data
+0 0 1
+4 0.1 1.00000000270489
+8 0.2 1.00000004475171
+12 0.3 1.00000022768806
+16 0.4 1.00000072049152
+20 0.5 1.00000175960676
diff --git a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/gxx.count.asc b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/gxx.count.asc
new file mode 100644
index 000000000..3ffe92d99
--- /dev/null
+++ b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/gxx.count.asc
@@ -0,0 +1,10 @@
+# Scalar ASCII output created by CarpetIOScalar
+#
+# ADMBASE::gxx (gxx)
+# 1:iteration 2:time 3:data
+0 0 32768
+4 0.1 32768
+8 0.2 32768
+12 0.3 32768
+16 0.4 32768
+20 0.5 32768
diff --git a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/gxx.maximum.asc b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/gxx.maximum.asc
new file mode 100644
index 000000000..c3011f553
--- /dev/null
+++ b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/gxx.maximum.asc
@@ -0,0 +1,10 @@
+# Scalar ASCII output created by CarpetIOScalar
+#
+# ADMBASE::gxx (gxx)
+# 1:iteration 2:time 3:data
+0 0 1
+4 0.1 1.00062518471956
+8 0.2 1.00250291315327
+12 0.3 1.00563977460982
+16 0.4 1.01004700501736
+20 0.5 1.01574082651521
diff --git a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/gxx.minimum.asc b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/gxx.minimum.asc
new file mode 100644
index 000000000..336863b29
--- /dev/null
+++ b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/gxx.minimum.asc
@@ -0,0 +1,10 @@
+# Scalar ASCII output created by CarpetIOScalar
+#
+# ADMBASE::gxx (gxx)
+# 1:iteration 2:time 3:data
+0 0 1
+4 0.1 0.999687503687078
+8 0.2 0.998750094699099
+12 0.3 0.997187954720409
+16 0.4 0.99500118623476
+20 0.5 0.992189561113343
diff --git a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/gxx.norm1.asc b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/gxx.norm1.asc
new file mode 100644
index 000000000..73fdcd454
--- /dev/null
+++ b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/gxx.norm1.asc
@@ -0,0 +1,10 @@
+# Scalar ASCII output created by CarpetIOScalar
+#
+# ADMBASE::gxx (gxx)
+# 1:iteration 2:time 3:data
+0 0 1
+4 0.1 1.00000000270489
+8 0.2 1.00000004475171
+12 0.3 1.00000022768806
+16 0.4 1.00000072049152
+20 0.5 1.00000175960676
diff --git a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/gxx.norm2.asc b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/gxx.norm2.asc
new file mode 100644
index 000000000..5852d48dc
--- /dev/null
+++ b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/gxx.norm2.asc
@@ -0,0 +1,10 @@
+# Scalar ASCII output created by CarpetIOScalar
+#
+# ADMBASE::gxx (gxx)
+# 1:iteration 2:time 3:data
+0 0 1
+4 0.1 1.00000000436405
+8 0.2 1.00000007131334
+12 0.3 1.00000036228792
+16 0.4 1.00000114648789
+20 0.5 1.00000280153241
diff --git a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/gxx.norm_inf.asc b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/gxx.norm_inf.asc
new file mode 100644
index 000000000..c3011f553
--- /dev/null
+++ b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/gxx.norm_inf.asc
@@ -0,0 +1,10 @@
+# Scalar ASCII output created by CarpetIOScalar
+#
+# ADMBASE::gxx (gxx)
+# 1:iteration 2:time 3:data
+0 0 1
+4 0.1 1.00062518471956
+8 0.2 1.00250291315327
+12 0.3 1.00563977460982
+16 0.4 1.01004700501736
+20 0.5 1.01574082651521
diff --git a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/gxx.sum.asc b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/gxx.sum.asc
new file mode 100644
index 000000000..e4f8bb5e0
--- /dev/null
+++ b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/gxx.sum.asc
@@ -0,0 +1,10 @@
+# Scalar ASCII output created by CarpetIOScalar
+#
+# ADMBASE::gxx (gxx)
+# 1:iteration 2:time 3:data
+0 0 32768
+4 0.1 32768.0000886338
+8 0.2 32768.0014664239
+12 0.3 32768.0074608822
+16 0.4 32768.0236090663
+20 0.5 32768.0576587942
diff --git a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/gxx_maximum.xg b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/gxx_maximum.xg
deleted file mode 100644
index 087f66e11..000000000
--- a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/gxx_maximum.xg
+++ /dev/null
@@ -1,7 +0,0 @@
-"gxx v time
-0.0000000000000 1.0000000000000
-0.1000000000000 1.0006251847196
-0.2000000000000 1.0025029131533
-0.3000000000000 1.0056397746098
-0.4000000000000 1.0100470050174
-0.5000000000000 1.0157408265152
diff --git a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/gxx_minimum.xg b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/gxx_minimum.xg
deleted file mode 100644
index 2c6935073..000000000
--- a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/gxx_minimum.xg
+++ /dev/null
@@ -1,7 +0,0 @@
-"gxx v time
-0.0000000000000 1.0000000000000
-0.1000000000000 0.9996874934992
-0.2000000000000 0.9987498778799
-0.3000000000000 0.9971868333114
-0.4000000000000 0.9949976976376
-0.5000000000000 0.9921813109687
diff --git a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/gxx_norm1.xg b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/gxx_norm1.xg
deleted file mode 100644
index 93973deb0..000000000
--- a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/gxx_norm1.xg
+++ /dev/null
@@ -1,7 +0,0 @@
-"gxx v time
-0.0000000000000 1.0000000000000
-0.1000000000000 0.9999997240350
-0.2000000000000 0.9999989327994
-0.3000000000000 0.9999977379673
-0.4000000000000 0.9999963294772
-0.5000000000000 0.9999949804925
diff --git a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/gxx_norm2.xg b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/gxx_norm2.xg
deleted file mode 100644
index 9360347df..000000000
--- a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/gxx_norm2.xg
+++ /dev/null
@@ -1,7 +0,0 @@
-"gxx v time
-0.0000000000000 1.0000000000000
-0.1000000000000 0.9999997268392
-0.2000000000000 0.9999989777168
-0.3000000000000 0.9999979657881
-0.4000000000000 0.9999970513672
-0.5000000000000 0.9999967486684
diff --git a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/kxx.average.asc b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/kxx.average.asc
new file mode 100644
index 000000000..0b5b0db58
--- /dev/null
+++ b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/kxx.average.asc
@@ -0,0 +1,10 @@
+# Scalar ASCII output created by CarpetIOScalar
+#
+# ADMBASE::kxx (kxx)
+# 1:iteration 2:time 3:data
+0 0 0
+4 0.1 -2.96169403250362e-07
+8 0.2 -2.34912489642796e-06
+12 0.3 -7.91473944306097e-06
+16 0.4 -1.87537791708504e-05
+20 0.5 -3.66429080155338e-05
diff --git a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/kxx.count.asc b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/kxx.count.asc
new file mode 100644
index 000000000..b9d3bedcc
--- /dev/null
+++ b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/kxx.count.asc
@@ -0,0 +1,10 @@
+# Scalar ASCII output created by CarpetIOScalar
+#
+# ADMBASE::kxx (kxx)
+# 1:iteration 2:time 3:data
+0 0 32768
+4 0.1 32768
+8 0.2 32768
+12 0.3 32768
+16 0.4 32768
+20 0.5 32768
diff --git a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/kxx.maximum.asc b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/kxx.maximum.asc
new file mode 100644
index 000000000..5cf4e685b
--- /dev/null
+++ b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/kxx.maximum.asc
@@ -0,0 +1,10 @@
+# Scalar ASCII output created by CarpetIOScalar
+#
+# ADMBASE::kxx (kxx)
+# 1:iteration 2:time 3:data
+0 0 0
+4 0.1 0.694433302233891
+8 0.2 1.38880168385809
+12 0.3 2.08303975415815
+16 0.4 2.77708117653079
+20 0.5 3.47085818980626
diff --git a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/kxx.minimum.asc b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/kxx.minimum.asc
new file mode 100644
index 000000000..b99955bc7
--- /dev/null
+++ b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/kxx.minimum.asc
@@ -0,0 +1,10 @@
+# Scalar ASCII output created by CarpetIOScalar
+#
+# ADMBASE::kxx (kxx)
+# 1:iteration 2:time 3:data
+0 0 0
+4 0.1 -1.38901661005073
+8 0.2 -2.77879641869372
+12 0.3 -4.1701016086115
+16 0.4 -5.56369231648688
+20 0.5 -6.96032558538665
diff --git a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/kxx.norm1.asc b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/kxx.norm1.asc
new file mode 100644
index 000000000..57da73176
--- /dev/null
+++ b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/kxx.norm1.asc
@@ -0,0 +1,10 @@
+# Scalar ASCII output created by CarpetIOScalar
+#
+# ADMBASE::kxx (kxx)
+# 1:iteration 2:time 3:data
+0 0 0
+4 0.1 0.00114944326543772
+8 0.2 0.00229994719635991
+12 0.3 0.00345265800731383
+16 0.4 0.00460873357952467
+20 0.5 0.00576936113925884
diff --git a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/kxx.norm2.asc b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/kxx.norm2.asc
new file mode 100644
index 000000000..2482f2e62
--- /dev/null
+++ b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/kxx.norm2.asc
@@ -0,0 +1,10 @@
+# Scalar ASCII output created by CarpetIOScalar
+#
+# ADMBASE::kxx (kxx)
+# 1:iteration 2:time 3:data
+0 0 0
+4 0.1 0.00724567675640446
+8 0.2 0.0144986802071971
+12 0.3 0.0217665065733693
+16 0.4 0.0290568852060759
+20 0.5 0.0363778639156285
diff --git a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/kxx.norm_inf.asc b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/kxx.norm_inf.asc
new file mode 100644
index 000000000..68e829fdc
--- /dev/null
+++ b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/kxx.norm_inf.asc
@@ -0,0 +1,10 @@
+# Scalar ASCII output created by CarpetIOScalar
+#
+# ADMBASE::kxx (kxx)
+# 1:iteration 2:time 3:data
+0 0 0
+4 0.1 1.38901661005073
+8 0.2 2.77879641869372
+12 0.3 4.1701016086115
+16 0.4 5.56369231648688
+20 0.5 6.96032558538665
diff --git a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/kxx.sum.asc b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/kxx.sum.asc
new file mode 100644
index 000000000..57d251b3c
--- /dev/null
+++ b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/kxx.sum.asc
@@ -0,0 +1,10 @@
+# Scalar ASCII output created by CarpetIOScalar
+#
+# ADMBASE::kxx (kxx)
+# 1:iteration 2:time 3:data
+0 0 0
+4 0.1 -0.00970487900570788
+8 0.2 -0.0769761246061512
+12 0.3 -0.259350182070222
+16 0.4 -0.614523835870424
+20 0.5 -1.20071480985301
diff --git a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/kxx_maximum.xg b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/kxx_maximum.xg
deleted file mode 100644
index f31e1964f..000000000
--- a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/kxx_maximum.xg
+++ /dev/null
@@ -1,7 +0,0 @@
-"kxx v time
-0.0000000000000 0.0000000000000
-0.1000000000000 0.6944333022339
-0.2000000000000 1.3888016838581
-0.3000000000000 2.0830397541582
-0.4000000000000 2.7770811765308
-0.5000000000000 3.4708581898063
diff --git a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/kxx_minimum.xg b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/kxx_minimum.xg
deleted file mode 100644
index 5f07867ec..000000000
--- a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/kxx_minimum.xg
+++ /dev/null
@@ -1,7 +0,0 @@
-"kxx v time
-0.0000000000000 0.0000000000000
-0.1000000000000 -1.3890166100507
-0.2000000000000 -2.7787964186937
-0.3000000000000 -4.1701016086115
-0.4000000000000 -5.5636923164869
-0.5000000000000 -6.9603255853867
diff --git a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/kxx_norm1.xg b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/kxx_norm1.xg
deleted file mode 100644
index 804db8bad..000000000
--- a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/kxx_norm1.xg
+++ /dev/null
@@ -1,7 +0,0 @@
-"kxx v time
-0.0000000000000 0.0000000000000
-0.1000000000000 0.0021045049931
-0.2000000000000 0.0042127441679
-0.3000000000000 0.0063283834593
-0.4000000000000 0.0084548004819
-0.5000000000000 0.0105950537529
diff --git a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/kxx_norm2.xg b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/kxx_norm2.xg
deleted file mode 100644
index fb10b1b57..000000000
--- a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test_off/kxx_norm2.xg
+++ /dev/null
@@ -1,7 +0,0 @@
-"kxx v time
-0.0000000000000 0.0000000000000
-0.1000000000000 0.0139806363863
-0.2000000000000 0.0279785541896
-0.3000000000000 0.0420109309316
-0.4000000000000 0.0560946961843
-0.5000000000000 0.0702464750806