CarpetEvolutionMask: don't output "sum" reductions in CarpetEvolutionMask_test testsuite

The sum reduction needs a much higher tolerance, and contains  essentially the
same information as the average reduction.

darcs-hash:20070131155833-776a0-e79108728ba0fdd3948cdaa4e3aac76dbcdc8d94.gz

9 files changed, 4 insertions, 82 deletions

diff --git a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test.par b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test.par
index 044046d72..71df3cba2 100644
--- a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test.par
+++ b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test.par
@@ -102,8 +102,10 @@ carpetioascii::out2D_vars = "adm_bssn::adm_bs_gxx carpetevolutionmask::evolution
 carpetioascii::out3D_vars = "adm_bssn::adm_bs_gxx carpetevolutionmask::evolution_mask"
 
 
-IOScalar::outScalar_every =  4
-IOScalar::outScalar_vars  = "adm_bssn::adm_bs_gxx adm_bssn::adm_bs_Axx adm_bssn::adm_bs_phi adm_bssn::adm_bs_k adm_bssn::adm_bs_Gx admbase::gxx admbase::kxx admbase::alp"
+IOScalar::outScalar_every      =  4
+IOScalar::outScalar_vars       = "adm_bssn::adm_bs_gxx adm_bssn::adm_bs_Axx adm_bssn::adm_bs_phi adm_bssn::adm_bs_k adm_bssn::adm_bs_Gx admbase::gxx admbase::kxx admbase::alp"
+IOScalar::outScalar_reductions = "count minimum maximum average norm1 norm2 norm_inf"
+
 
 ##################################################################
 
diff --git a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test/ADM_BS_Axx.sum.asc b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test/ADM_BS_Axx.sum.asc
deleted file mode 100644
index 2de96ef88..000000000
--- a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test/ADM_BS_Axx.sum.asc
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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.00267028539355906
-8 0.2 -0.0220214335989277
-12 0.3 -0.0747224626959277
-16 0.4 -0.177465912710982
-20 0.5 -0.347009761178274
diff --git a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test/ADM_BS_Gx.sum.asc b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test/ADM_BS_Gx.sum.asc
deleted file mode 100644
index 52ec207ef..000000000
--- a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test/ADM_BS_Gx.sum.asc
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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.672958729495216
-8 0.2 2.69224111410974
-12 0.3 6.05915169848759
-16 0.4 10.7760540794797
-20 0.5 16.8465834548135
diff --git a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test/ADM_BS_K.sum.asc b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test/ADM_BS_K.sum.asc
deleted file mode 100644
index 449ae4f50..000000000
--- a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test/ADM_BS_K.sum.asc
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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.00268185577941675
-8 0.2 0.0220476775406149
-12 0.3 0.0748183013184946
-16 0.4 0.177795422957472
-20 0.5 0.347904716268108
diff --git a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test/ADM_BS_gxx.sum.asc b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test/ADM_BS_gxx.sum.asc
deleted file mode 100644
index 821204032..000000000
--- a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test/ADM_BS_gxx.sum.asc
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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.0001279926
-8 0.2 32768.0021808625
-12 0.3 32768.0111613892
-16 0.4 32768.0354079665
-20 0.5 32768.0866028154
diff --git a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test/ADM_BS_phi.sum.asc b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test/ADM_BS_phi.sum.asc
deleted file mode 100644
index 6b793030c..000000000
--- a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test/ADM_BS_phi.sum.asc
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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.24013515350526e-05
-8 0.2 -0.000188589114830803
-12 0.3 -0.000945882130226849
-16 0.4 -0.00298091416070007
-20 0.5 -0.00727131356836295
diff --git a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test/alp.sum.asc b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test/alp.sum.asc
deleted file mode 100644
index ea9a34f00..000000000
--- a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test/alp.sum.asc
+++ /dev/null
@@ -1,10 +0,0 @@
-# Scalar ASCII output created by CarpetIOScalar
-#
-# ADMBASE::alp (alp)
-# 1:iteration 2:time 3:data
-0 0 32768
-4 0.1 32767.9999255928
-8 0.2 32767.9988684657
-12 0.3 32767.9943247067
-16 0.4 32767.9821145151
-20 0.5 32767.9563721185
diff --git a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test/gxx.sum.asc b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test/gxx.sum.asc
deleted file mode 100644
index 68c2dafa3..000000000
--- a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test/gxx.sum.asc
+++ /dev/null
@@ -1,10 +0,0 @@
-# Scalar ASCII output created by CarpetIOScalar
-#
-# ADMBASE::gxx (gxx)
-# 1:iteration 2:time 3:data
-0 0 32768
-4 0.1 32768.000078387
-8 0.2 32768.0014265065
-12 0.3 32768.0073778515
-16 0.4 32768.0234842306
-20 0.5 32768.0575170937
diff --git a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test/kxx.sum.asc b/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test/kxx.sum.asc
deleted file mode 100644
index 31abaf513..000000000
--- a/Carpet/CarpetEvolutionMask/test/CarpetEvolutionMask_test/kxx.sum.asc
+++ /dev/null
@@ -1,10 +0,0 @@
-# Scalar ASCII output created by CarpetIOScalar
-#
-# ADMBASE::kxx (kxx)
-# 1:iteration 2:time 3:data
-0 0 0
-4 0.1 -0.00960719478688067
-8 0.2 -0.0768434270586617
-12 0.3 -0.259410812927628
-16 0.4 -0.615260317897108
-20 0.5 -1.20285959541655