aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Carpet/CarpetIOHDF5/test/input_initial_data.par4
-rw-r--r--Carpet/CarpetIOHDF5/test/input_initial_data/phi.average.asc35
-rw-r--r--Carpet/CarpetIOHDF5/test/input_initial_data/phi.count.asc35
-rw-r--r--Carpet/CarpetIOHDF5/test/input_initial_data/phi.maximum.asc35
-rw-r--r--Carpet/CarpetIOHDF5/test/input_initial_data/phi.minimum.asc35
-rw-r--r--Carpet/CarpetIOHDF5/test/input_initial_data/phi.norm1.asc35
-rw-r--r--Carpet/CarpetIOHDF5/test/input_initial_data/phi.norm2.asc35
-rw-r--r--Carpet/CarpetIOHDF5/test/input_initial_data/phi.norm_inf.asc35
-rw-r--r--Carpet/CarpetIOHDF5/test/input_initial_data/phi_maximum.xg34
-rw-r--r--Carpet/CarpetIOHDF5/test/input_initial_data/phi_minimum.xg34
-rw-r--r--Carpet/CarpetIOHDF5/test/input_initial_data/phi_norm1.xg34
-rw-r--r--Carpet/CarpetIOHDF5/test/input_initial_data/phi_norm2.xg34
-rw-r--r--Carpet/CarpetIOHDF5/test/input_initial_data/psi.average.asc35
-rw-r--r--Carpet/CarpetIOHDF5/test/input_initial_data/psi.count.asc35
-rw-r--r--Carpet/CarpetIOHDF5/test/input_initial_data/psi.maximum.asc35
-rw-r--r--Carpet/CarpetIOHDF5/test/input_initial_data/psi.minimum.asc35
-rw-r--r--Carpet/CarpetIOHDF5/test/input_initial_data/psi.norm1.asc35
-rw-r--r--Carpet/CarpetIOHDF5/test/input_initial_data/psi.norm2.asc35
-rw-r--r--Carpet/CarpetIOHDF5/test/input_initial_data/psi.norm_inf.asc35
-rw-r--r--Carpet/CarpetIOHDF5/test/input_initial_data/psi_maximum.xg34
-rw-r--r--Carpet/CarpetIOHDF5/test/input_initial_data/psi_minimum.xg34
-rw-r--r--Carpet/CarpetIOHDF5/test/input_initial_data/psi_norm1.xg34
-rw-r--r--Carpet/CarpetIOHDF5/test/input_initial_data/psi_norm2.xg34
-rw-r--r--Carpet/CarpetIOHDF5/test/output_initial_data.parfile4
24 files changed, 494 insertions, 276 deletions
diff --git a/Carpet/CarpetIOHDF5/test/input_initial_data.par b/Carpet/CarpetIOHDF5/test/input_initial_data.par
index 9e64b5f89..20f908f7c 100644
--- a/Carpet/CarpetIOHDF5/test/input_initial_data.par
+++ b/Carpet/CarpetIOHDF5/test/input_initial_data.par
@@ -1,7 +1,7 @@
# deactivate the IDScalarWaveMoL thorn
# initial data is read from files using the filereader
ActiveThorns = "Carpet CarpetLib CarpetRegrid CarpetInterp CarpetReduce CarpetSlab Boundary CoordBase SymBase CartGrid3D Periodic LocalInterp NaNChecker Slab Time MoL WaveToyMoL IOUtil CarpetIOBasic CarpetIOScalar CarpetIOHDF5"
-#ActiveThorns = "Carpet CarpetLib CarpetRegrid CarpetInterp CarpetReduce CarpetSlab Boundary CoordBase SymBase CartGrid3D Periodic LocalInterp NaNChecker Slab Time MoL IDScalarWaveMoL WaveToyMoL IOUtil CarpetIOBasic CarpetIOScalar CarpetIOHDF5"
+#ActiveThorns = "Carpet CarpetLib CarpetRegrid CarpetInterp CarpetReduce CarpetSlab Boundary CoordBase SymBase CartGrid3D Periodic LocalInterp NaNChecker Slab Time MoL WaveToyMoL IOUtil CarpetIOBasic CarpetIOScalar CarpetIOHDF5 IDScalarWaveMoL"
Cactus::cctk_itlast = 128
@@ -49,7 +49,7 @@ IO::out_zline_x = 0.5
IOBasic::outInfo_vars = "WaveToyMoL::scalarevolve"
IOScalar::outScalar_vars = "WaveToyMoL::scalarevolve"
-IOScalar::outScalar_reductions = "average count maximum minimum norm1 norm2 norm_inf product sum sum_abs sum_squared"
+IOScalar::outScalar_reductions = "average count maximum minimum norm1 norm2 norm_inf"
# filereader input files and directory
IO::filereader_ID_files = "psi phi"
diff --git a/Carpet/CarpetIOHDF5/test/input_initial_data/phi.average.asc b/Carpet/CarpetIOHDF5/test/input_initial_data/phi.average.asc
new file mode 100644
index 000000000..e84e3da59
--- /dev/null
+++ b/Carpet/CarpetIOHDF5/test/input_initial_data/phi.average.asc
@@ -0,0 +1,35 @@
+# Scalar ASCII output created by CarpetIOScalar
+#
+0 0 0.123091011810009
+4 0.0125 0.124453812426347
+8 0.025 0.125478440229111
+12 0.0375 0.126162111688071
+16 0.05 0.126502969736761
+20 0.0625 0.126500088816859
+24 0.075 0.126153477391419
+28 0.0875 0.125464077920157
+32 0.1 0.124433764296837
+36 0.1125 0.12306533675574
+40 0.125 0.12136251426106
+44 0.1375 0.119329924399902
+48 0.15 0.116973090806365
+52 0.1625 0.114298418150872
+56 0.175 0.111313174735542
+60 0.1875 0.108025472742914
+64 0.2 0.104444246191673
+68 0.2125 0.100579226659304
+72 0.225 0.096440916837634
+76 0.2375 0.0920405619931189
+80 0.25 0.0873901194094386
+84 0.2625 0.0825022258954281
+88 0.275 0.077390163446638
+92 0.2875 0.0720678231538362
+96 0.3 0.0665496674565193
+100 0.3125 0.0608506908440066
+104 0.325 0.0549863791109006
+108 0.3375 0.048972667277631
+112 0.35 0.0428258962904254
+116 0.3625 0.0365627686183619
+120 0.375 0.0302003028681632
+124 0.3875 0.0237557875400523
+128 0.4 0.0172467340503311
diff --git a/Carpet/CarpetIOHDF5/test/input_initial_data/phi.count.asc b/Carpet/CarpetIOHDF5/test/input_initial_data/phi.count.asc
new file mode 100644
index 000000000..a29257db6
--- /dev/null
+++ b/Carpet/CarpetIOHDF5/test/input_initial_data/phi.count.asc
@@ -0,0 +1,35 @@
+# Scalar ASCII output created by CarpetIOScalar
+#
+0 0 368
+4 0.0125 368
+8 0.025 368
+12 0.0375 368
+16 0.05 368
+20 0.0625 368
+24 0.075 368
+28 0.0875 368
+32 0.1 368
+36 0.1125 368
+40 0.125 368
+44 0.1375 368
+48 0.15 368
+52 0.1625 368
+56 0.175 368
+60 0.1875 368
+64 0.2 368
+68 0.2125 368
+72 0.225 368
+76 0.2375 368
+80 0.25 368
+84 0.2625 368
+88 0.275 368
+92 0.2875 368
+96 0.3 368
+100 0.3125 368
+104 0.325 368
+108 0.3375 368
+112 0.35 368
+116 0.3625 368
+120 0.375 368
+124 0.3875 368
+128 0.4 368
diff --git a/Carpet/CarpetIOHDF5/test/input_initial_data/phi.maximum.asc b/Carpet/CarpetIOHDF5/test/input_initial_data/phi.maximum.asc
new file mode 100644
index 000000000..3db961a35
--- /dev/null
+++ b/Carpet/CarpetIOHDF5/test/input_initial_data/phi.maximum.asc
@@ -0,0 +1,35 @@
+# Scalar ASCII output created by CarpetIOScalar
+#
+0 0 1
+4 0.0125 0.998640458785977
+8 0.025 0.994567378944388
+12 0.0375 1.01194321262644
+16 0.05 1.02680558616116
+20 0.0625 1.03887785982564
+24 0.075 1.04812723556493
+28 0.0875 1.07169030467963
+32 0.1 1.09828299749472
+36 0.1125 1.12189134782503
+40 0.125 1.14245121173926
+44 0.1375 1.15990672887962
+48 0.15 1.19000178500063
+52 0.1625 1.22191916872566
+56 0.175 1.25051625155788
+60 0.1875 1.27571533462634
+64 0.2 1.29744795236861
+68 0.2125 1.3156550585508
+72 0.225 1.33807625198048
+76 0.2375 1.36738943502524
+80 0.25 1.39298704504002
+84 0.2625 1.4147995341575
+88 0.275 1.43276763970304
+92 0.2875 1.44684254520636
+96 0.3 1.45698601302802
+100 0.3125 1.46317048824061
+104 0.325 1.4713646259286
+108 0.3375 1.48613459161591
+112 0.35 1.49686635260095
+116 0.3625 1.50353075562254
+120 0.375 1.50610969944213
+124 0.3875 1.50459618400869
+128 0.4 1.49899432945899
diff --git a/Carpet/CarpetIOHDF5/test/input_initial_data/phi.minimum.asc b/Carpet/CarpetIOHDF5/test/input_initial_data/phi.minimum.asc
new file mode 100644
index 000000000..efb226f32
--- /dev/null
+++ b/Carpet/CarpetIOHDF5/test/input_initial_data/phi.minimum.asc
@@ -0,0 +1,35 @@
+# Scalar ASCII output created by CarpetIOScalar
+#
+0 0 -1
+4 0.0125 -0.998640458785977
+8 0.025 -0.994567378944388
+12 0.0375 -1.01194321262644
+16 0.05 -1.02680558616116
+20 0.0625 -1.03887785982564
+24 0.075 -1.04812723556493
+28 0.0875 -1.07169030467963
+32 0.1 -1.09828299749472
+36 0.1125 -1.12189134782503
+40 0.125 -1.14245121173926
+44 0.1375 -1.15990672887962
+48 0.15 -1.19000178500063
+52 0.1625 -1.22191916872566
+56 0.175 -1.25051625155788
+60 0.1875 -1.27571533462634
+64 0.2 -1.29744795236861
+68 0.2125 -1.3156550585508
+72 0.225 -1.33807625198048
+76 0.2375 -1.36738943502524
+80 0.25 -1.39298704504002
+84 0.2625 -1.4147995341575
+88 0.275 -1.43276763970304
+92 0.2875 -1.44684254520635
+96 0.3 -1.45698601302802
+100 0.3125 -1.46317048824061
+104 0.325 -1.4713646259286
+108 0.3375 -1.48613459161591
+112 0.35 -1.49686635260095
+116 0.3625 -1.50353075562254
+120 0.375 -1.50610969944213
+124 0.3875 -1.50459618400869
+128 0.4 -1.49899432945899
diff --git a/Carpet/CarpetIOHDF5/test/input_initial_data/phi.norm1.asc b/Carpet/CarpetIOHDF5/test/input_initial_data/phi.norm1.asc
new file mode 100644
index 000000000..8ec958038
--- /dev/null
+++ b/Carpet/CarpetIOHDF5/test/input_initial_data/phi.norm1.asc
@@ -0,0 +1,35 @@
+# Scalar ASCII output created by CarpetIOScalar
+#
+0 0 0.672112882651314
+4 0.0125 0.679554172126944
+8 0.025 0.685148939251155
+12 0.0375 0.688881985135747
+16 0.05 0.690743169655326
+20 0.0625 0.703006070996829
+24 0.075 0.714361666928292
+28 0.0875 0.723776153123541
+32 0.1 0.731223951793471
+36 0.1125 0.741331617689588
+40 0.125 0.757042481378739
+44 0.1375 0.770696253470049
+48 0.15 0.78225583725122
+52 0.1625 0.791689826480935
+56 0.175 0.798972590716522
+60 0.1875 0.812757839893626
+64 0.2 0.826531893296801
+68 0.2125 0.838060039594329
+72 0.225 0.847310958248186
+76 0.2375 0.854259516541603
+80 0.25 0.858886837859162
+84 0.2625 0.861180352967431
+88 0.275 0.868326582457894
+92 0.2875 0.877918942111047
+96 0.3 0.885125771677889
+100 0.3125 0.889927492912791
+104 0.325 0.892311062851623
+108 0.3375 0.89227000924049
+112 0.35 0.889804448110225
+116 0.3625 0.884921083448943
+120 0.375 0.877633188973556
+124 0.3875 0.879780818030791
+128 0.4 0.88131309447863
diff --git a/Carpet/CarpetIOHDF5/test/input_initial_data/phi.norm2.asc b/Carpet/CarpetIOHDF5/test/input_initial_data/phi.norm2.asc
new file mode 100644
index 000000000..81ee23c65
--- /dev/null
+++ b/Carpet/CarpetIOHDF5/test/input_initial_data/phi.norm2.asc
@@ -0,0 +1,35 @@
+# Scalar ASCII output created by CarpetIOScalar
+#
+0 0 0.742616320690188
+4 0.0125 0.745228480624324
+8 0.025 0.749493603342551
+12 0.0375 0.755337838273661
+16 0.05 0.762662249126363
+20 0.0625 0.771346382908128
+24 0.075 0.781252290938003
+28 0.0875 0.79222871217458
+32 0.1 0.804115165093078
+36 0.1125 0.816745751540906
+40 0.125 0.829952541228542
+44 0.1375 0.843568467760588
+48 0.15 0.857429719173368
+52 0.1625 0.871377644545782
+56 0.175 0.885260223243643
+60 0.1875 0.8989331565747
+64 0.2 0.912260645798123
+68 0.2125 0.925115918378995
+72 0.225 0.937381558575981
+76 0.2375 0.948949690813141
+80 0.25 0.959722056157019
+84 0.2625 0.969610014445725
+88 0.275 0.978534497665387
+92 0.2875 0.986425934242564
+96 0.3 0.993224159047614
+100 0.3125 0.998878320012516
+104 0.325 1.00334678923583
+108 0.3375 1.00659708413698
+112 0.35 1.00860580249262
+116 0.3625 1.00935857390869
+120 0.375 1.0088500293373
+124 0.3875 1.00708378953236
+128 0.4 1.00407247276011
diff --git a/Carpet/CarpetIOHDF5/test/input_initial_data/phi.norm_inf.asc b/Carpet/CarpetIOHDF5/test/input_initial_data/phi.norm_inf.asc
new file mode 100644
index 000000000..3db961a35
--- /dev/null
+++ b/Carpet/CarpetIOHDF5/test/input_initial_data/phi.norm_inf.asc
@@ -0,0 +1,35 @@
+# Scalar ASCII output created by CarpetIOScalar
+#
+0 0 1
+4 0.0125 0.998640458785977
+8 0.025 0.994567378944388
+12 0.0375 1.01194321262644
+16 0.05 1.02680558616116
+20 0.0625 1.03887785982564
+24 0.075 1.04812723556493
+28 0.0875 1.07169030467963
+32 0.1 1.09828299749472
+36 0.1125 1.12189134782503
+40 0.125 1.14245121173926
+44 0.1375 1.15990672887962
+48 0.15 1.19000178500063
+52 0.1625 1.22191916872566
+56 0.175 1.25051625155788
+60 0.1875 1.27571533462634
+64 0.2 1.29744795236861
+68 0.2125 1.3156550585508
+72 0.225 1.33807625198048
+76 0.2375 1.36738943502524
+80 0.25 1.39298704504002
+84 0.2625 1.4147995341575
+88 0.275 1.43276763970304
+92 0.2875 1.44684254520636
+96 0.3 1.45698601302802
+100 0.3125 1.46317048824061
+104 0.325 1.4713646259286
+108 0.3375 1.48613459161591
+112 0.35 1.49686635260095
+116 0.3625 1.50353075562254
+120 0.375 1.50610969944213
+124 0.3875 1.50459618400869
+128 0.4 1.49899432945899
diff --git a/Carpet/CarpetIOHDF5/test/input_initial_data/phi_maximum.xg b/Carpet/CarpetIOHDF5/test/input_initial_data/phi_maximum.xg
deleted file mode 100644
index 78ce3fbaa..000000000
--- a/Carpet/CarpetIOHDF5/test/input_initial_data/phi_maximum.xg
+++ /dev/null
@@ -1,34 +0,0 @@
-"phi v time
-0.0000000000000 1.0000000000000
-0.0125000000000 0.9986404587860
-0.0250000000000 0.9945673789444
-0.0375000000000 1.0119432126264
-0.0500000000000 1.0268055861612
-0.0625000000000 1.0388778598256
-0.0750000000000 1.0481272355649
-0.0875000000000 1.0716903046796
-0.1000000000000 1.0982829974947
-0.1125000000000 1.1218913478250
-0.1250000000000 1.1424512117393
-0.1375000000000 1.1599067288796
-0.1500000000000 1.1900017850006
-0.1625000000000 1.2219191687257
-0.1750000000000 1.2505162515579
-0.1875000000000 1.2757153346263
-0.2000000000000 1.2974479523686
-0.2125000000000 1.3156550585508
-0.2250000000000 1.3380762519805
-0.2375000000000 1.3673894350252
-0.2500000000000 1.3929870450400
-0.2625000000000 1.4147995341575
-0.2750000000000 1.4327676397030
-0.2875000000000 1.4468425452064
-0.3000000000000 1.4569860130280
-0.3125000000000 1.4631704882406
-0.3250000000000 1.4713646259286
-0.3375000000000 1.4861345916159
-0.3500000000000 1.4968663526009
-0.3625000000000 1.5035307556225
-0.3750000000000 1.5061096994421
-0.3875000000000 1.5045961840087
-0.4000000000000 1.4989943294590
diff --git a/Carpet/CarpetIOHDF5/test/input_initial_data/phi_minimum.xg b/Carpet/CarpetIOHDF5/test/input_initial_data/phi_minimum.xg
deleted file mode 100644
index d62cc5b13..000000000
--- a/Carpet/CarpetIOHDF5/test/input_initial_data/phi_minimum.xg
+++ /dev/null
@@ -1,34 +0,0 @@
-"phi v time
-0.0000000000000 -1.0000000000000
-0.0125000000000 -0.9986404587860
-0.0250000000000 -0.9945673789444
-0.0375000000000 -1.0119432126264
-0.0500000000000 -1.0268055861612
-0.0625000000000 -1.0388778598256
-0.0750000000000 -1.0481272355649
-0.0875000000000 -1.0716903046796
-0.1000000000000 -1.0982829974947
-0.1125000000000 -1.1218913478250
-0.1250000000000 -1.1424512117393
-0.1375000000000 -1.1599067288796
-0.1500000000000 -1.1900017850006
-0.1625000000000 -1.2219191687257
-0.1750000000000 -1.2505162515579
-0.1875000000000 -1.2757153346263
-0.2000000000000 -1.2974479523686
-0.2125000000000 -1.3156550585508
-0.2250000000000 -1.3380762519805
-0.2375000000000 -1.3673894350252
-0.2500000000000 -1.3929870450400
-0.2625000000000 -1.4147995341575
-0.2750000000000 -1.4327676397030
-0.2875000000000 -1.4468425452064
-0.3000000000000 -1.4569860130280
-0.3125000000000 -1.4631704882406
-0.3250000000000 -1.4713646259286
-0.3375000000000 -1.4861345916159
-0.3500000000000 -1.4968663526009
-0.3625000000000 -1.5035307556225
-0.3750000000000 -1.5061096994421
-0.3875000000000 -1.5045961840087
-0.4000000000000 -1.4989943294590
diff --git a/Carpet/CarpetIOHDF5/test/input_initial_data/phi_norm1.xg b/Carpet/CarpetIOHDF5/test/input_initial_data/phi_norm1.xg
deleted file mode 100644
index c3618d28a..000000000
--- a/Carpet/CarpetIOHDF5/test/input_initial_data/phi_norm1.xg
+++ /dev/null
@@ -1,34 +0,0 @@
-"phi v time
-0.0000000000000 0.6807763773465
-0.0125000000000 0.6883135845966
-0.0250000000000 0.6939804679330
-0.0375000000000 0.6977616325549
-0.0500000000000 0.6996468076312
-0.0625000000000 0.7113978965384
-0.0750000000000 0.7221770888255
-0.0875000000000 0.7309939361006
-0.1000000000000 0.7378244845393
-0.1125000000000 0.7471033499543
-0.1250000000000 0.7616523319997
-0.1375000000000 0.7741316985445
-0.1500000000000 0.7845075440356
-0.1625000000000 0.7927516787444
-0.1750000000000 0.7988417053545
-0.1875000000000 0.8110731791327
-0.2000000000000 0.8232064841264
-0.2125000000000 0.8331029209643
-0.2250000000000 0.8407356028304
-0.2375000000000 0.8460837941132
-0.2500000000000 0.8491329667380
-0.2625000000000 0.8498748396317
-0.2750000000000 0.8565790617590
-0.2875000000000 0.8664821742987
-0.3000000000000 0.8740308325676
-0.3125000000000 0.8792045294337
-0.3250000000000 0.8819892111320
-0.3375000000000 0.8823773154395
-0.3500000000000 0.8803677922124
-0.3625000000000 0.8759661062267
-0.3750000000000 0.8691842223177
-0.3875000000000 0.8713683085882
-0.4000000000000 0.8728859333298
diff --git a/Carpet/CarpetIOHDF5/test/input_initial_data/phi_norm2.xg b/Carpet/CarpetIOHDF5/test/input_initial_data/phi_norm2.xg
deleted file mode 100644
index bd291cc98..000000000
--- a/Carpet/CarpetIOHDF5/test/input_initial_data/phi_norm2.xg
+++ /dev/null
@@ -1,34 +0,0 @@
-"phi v time
-0.0000000000000 0.7489861339271
-0.0125000000000 0.7518419444399
-0.0250000000000 0.7562195954773
-0.0375000000000 0.7620457996251
-0.0500000000000 0.7692251813885
-0.0625000000000 0.7776434804038
-0.0750000000000 0.7871711042100
-0.0875000000000 0.7976667955515
-0.1000000000000 0.8089812100628
-0.1125000000000 0.8209602464387
-0.1250000000000 0.8334480229821
-0.1375000000000 0.8462894436775
-0.1500000000000 0.8593323383447
-0.1625000000000 0.8724291925272
-0.1750000000000 0.8854385033832
-0.1875000000000 0.8982258092504
-0.2000000000000 0.9106644447590
-0.2125000000000 0.9226360724714
-0.2250000000000 0.9340310379450
-0.2375000000000 0.9447485893398
-0.2500000000000 0.9546969963259
-0.2625000000000 0.9637935967973
-0.2750000000000 0.9719647941895
-0.2875000000000 0.9791460232367
-0.3000000000000 0.9852816978433
-0.3125000000000 0.9903251513560
-0.3250000000000 0.9942385768297
-0.3375000000000 0.9969929727762
-0.3500000000000 0.9985680982614
-0.3625000000000 0.9989524399743
-0.3750000000000 0.9981431929225
-0.3875000000000 0.9961462556366
-0.4000000000000 0.9929762400874
diff --git a/Carpet/CarpetIOHDF5/test/input_initial_data/psi.average.asc b/Carpet/CarpetIOHDF5/test/input_initial_data/psi.average.asc
new file mode 100644
index 000000000..80a4eb61d
--- /dev/null
+++ b/Carpet/CarpetIOHDF5/test/input_initial_data/psi.average.asc
@@ -0,0 +1,35 @@
+# Scalar ASCII output created by CarpetIOScalar
+#
+0 0 0.12249510216753
+4 0.0125 0.0955711976910745
+8 0.025 0.068387653510546
+12 0.0375 0.0410183341922247
+16 0.05 0.0135376089607248
+20 0.0625 -0.0139798503806227
+24 0.075 -0.0414592723511918
+28 0.0875 -0.0688259889649551
+32 0.1 -0.096005638620781
+36 0.1125 -0.122924368159839
+40 0.125 -0.149509033541072
+44 0.1375 -0.17568739858946
+48 0.15 -0.201388331277031
+52 0.1625 -0.226541997003279
+56 0.175 -0.251080048349812
+60 0.1875 -0.27493581079363
+64 0.2 -0.298044463874394
+68 0.2125 -0.320343217323458
+72 0.225 -0.341771481676048
+76 0.2375 -0.362271032903034
+80 0.25 -0.381786170614951
+84 0.2625 -0.400263869408402
+88 0.275 -0.417653922943616
+92 0.2875 -0.433909080361684
+96 0.3 -0.448985174670802
+100 0.3125 -0.462841242752683
+104 0.325 -0.475439636663075
+108 0.3375 -0.486746125923963
+112 0.35 -0.496729990529514
+116 0.3625 -0.505364104413085
+120 0.375 -0.512625009148487
+124 0.3875 -0.518492977685281
+128 0.4 -0.522952067944914
diff --git a/Carpet/CarpetIOHDF5/test/input_initial_data/psi.count.asc b/Carpet/CarpetIOHDF5/test/input_initial_data/psi.count.asc
new file mode 100644
index 000000000..a29257db6
--- /dev/null
+++ b/Carpet/CarpetIOHDF5/test/input_initial_data/psi.count.asc
@@ -0,0 +1,35 @@
+# Scalar ASCII output created by CarpetIOScalar
+#
+0 0 368
+4 0.0125 368
+8 0.025 368
+12 0.0375 368
+16 0.05 368
+20 0.0625 368
+24 0.075 368
+28 0.0875 368
+32 0.1 368
+36 0.1125 368
+40 0.125 368
+44 0.1375 368
+48 0.15 368
+52 0.1625 368
+56 0.175 368
+60 0.1875 368
+64 0.2 368
+68 0.2125 368
+72 0.225 368
+76 0.2375 368
+80 0.25 368
+84 0.2625 368
+88 0.275 368
+92 0.2875 368
+96 0.3 368
+100 0.3125 368
+104 0.325 368
+108 0.3375 368
+112 0.35 368
+116 0.3625 368
+120 0.375 368
+124 0.3875 368
+128 0.4 368
diff --git a/Carpet/CarpetIOHDF5/test/input_initial_data/psi.maximum.asc b/Carpet/CarpetIOHDF5/test/input_initial_data/psi.maximum.asc
new file mode 100644
index 000000000..83e8e06a9
--- /dev/null
+++ b/Carpet/CarpetIOHDF5/test/input_initial_data/psi.maximum.asc
@@ -0,0 +1,35 @@
+# Scalar ASCII output created by CarpetIOScalar
+#
+0 0 6.28318530717959
+4 0.0125 6.27464305779913
+8 0.025 6.24905114238349
+12 0.0375 6.20647913168183
+16 0.05 6.14704273522965
+20 0.0625 6.10599956156205
+24 0.075 6.08235080155215
+28 0.0875 6.04217490672302
+32 0.1 5.9855810749628
+36 0.1125 5.91272311535624
+40 0.125 5.8237990301668
+44 0.1375 5.71905047673634
+48 0.15 5.59876211076453
+52 0.1625 5.49720695875172
+56 0.175 5.4231800426911
+60 0.1875 5.33441720694047
+64 0.2 5.23115966823196
+68 0.2125 5.11368802837118
+72 0.225 4.98232151170328
+76 0.2375 4.84715411685778
+80 0.25 4.77603443943425
+84 0.2625 4.69193728384899
+88 0.275 4.59509118583514
+92 0.2875 4.48575932258053
+96 0.3 4.37644231176542
+100 0.3125 4.33939596148558
+104 0.325 4.29055851960699
+108 0.3375 4.23006271073152
+112 0.35 4.15807293774264
+116 0.3625 4.16423083034146
+120 0.375 4.17137356242266
+124 0.3875 4.16718167768298
+128 0.4 4.15166658739585
diff --git a/Carpet/CarpetIOHDF5/test/input_initial_data/psi.minimum.asc b/Carpet/CarpetIOHDF5/test/input_initial_data/psi.minimum.asc
new file mode 100644
index 000000000..79a4c10ea
--- /dev/null
+++ b/Carpet/CarpetIOHDF5/test/input_initial_data/psi.minimum.asc
@@ -0,0 +1,35 @@
+# Scalar ASCII output created by CarpetIOScalar
+#
+0 0 -6.28318530717959
+4 0.0125 -6.27464305779913
+8 0.025 -6.24905114238349
+12 0.0375 -6.20647913168183
+16 0.05 -6.14704273522965
+20 0.0625 -6.10599956156206
+24 0.075 -6.08235080155215
+28 0.0875 -6.04217490672302
+32 0.1 -5.9855810749628
+36 0.1125 -5.91272311535624
+40 0.125 -5.8237990301668
+44 0.1375 -5.71905047673634
+48 0.15 -5.59876211076453
+52 0.1625 -5.49720695875172
+56 0.175 -5.42318004269111
+60 0.1875 -5.33441720694047
+64 0.2 -5.23115966823196
+68 0.2125 -5.11368802837118
+72 0.225 -4.98232151170328
+76 0.2375 -4.84715411685778
+80 0.25 -4.77603443943425
+84 0.2625 -4.69193728384899
+88 0.275 -4.59509118583514
+92 0.2875 -4.48575932258053
+96 0.3 -4.37644231176542
+100 0.3125 -4.33939596148558
+104 0.325 -4.29055851960698
+108 0.3375 -4.23006271073152
+112 0.35 -4.15807293774264
+116 0.3625 -4.16423083034147
+120 0.375 -4.17137356242267
+124 0.3875 -4.16718167768298
+128 0.4 -4.15166658739585
diff --git a/Carpet/CarpetIOHDF5/test/input_initial_data/psi.norm1.asc b/Carpet/CarpetIOHDF5/test/input_initial_data/psi.norm1.asc
new file mode 100644
index 000000000..9bfc5ed79
--- /dev/null
+++ b/Carpet/CarpetIOHDF5/test/input_initial_data/psi.norm1.asc
@@ -0,0 +1,35 @@
+# Scalar ASCII output created by CarpetIOScalar
+#
+0 0 3.65651912560683
+4 0.0125 3.67158423756511
+8 0.025 3.67667276328127
+12 0.0375 3.67177089446115
+16 0.05 3.65689196908912
+20 0.0625 3.63207643513547
+24 0.075 3.59739174059973
+28 0.0875 3.55293215018865
+32 0.1 3.49881848912735
+36 0.1125 3.45141420625079
+40 0.125 3.43847502805942
+44 0.1375 3.41619272793283
+48 0.15 3.38462786938188
+52 0.1625 3.34386623870125
+56 0.175 3.29401861182136
+60 0.1875 3.23522045325787
+64 0.2 3.17168818734304
+68 0.2125 3.15215926447888
+72 0.225 3.12406521916037
+76 0.2375 3.0874824053407
+80 0.25 3.04251024281368
+84 0.2625 2.98927094702423
+88 0.275 2.95300976801634
+92 0.2875 2.93478636970369
+96 0.3 2.90858849983522
+100 0.3125 2.87448735891817
+104 0.325 2.83257562237563
+108 0.3375 2.83531894960584
+112 0.35 2.83340907795302
+116 0.3625 2.82380017057075
+120 0.375 2.80651835134254
+124 0.3875 2.83112312379402
+128 0.4 2.85547105923085
diff --git a/Carpet/CarpetIOHDF5/test/input_initial_data/psi.norm2.asc b/Carpet/CarpetIOHDF5/test/input_initial_data/psi.norm2.asc
new file mode 100644
index 000000000..f9f8c97bd
--- /dev/null
+++ b/Carpet/CarpetIOHDF5/test/input_initial_data/psi.norm2.asc
@@ -0,0 +1,35 @@
+# Scalar ASCII output created by CarpetIOScalar
+#
+0 0 4.20795667182769
+4 0.0125 4.19990663578503
+8 0.025 4.18667215589821
+12 0.0375 4.16834844489811
+16 0.05 4.14506857974466
+20 0.0625 4.11700376812212
+24 0.075 4.08436367367534
+28 0.0875 4.04739678439428
+32 0.1 4.0063908014763
+36 0.1125 3.9616730165325
+40 0.125 3.91361063257283
+44 0.1375 3.86261096822139
+48 0.15 3.80912146456004
+52 0.1625 3.75362938956217
+56 0.175 3.69666110634241
+60 0.1875 3.63878073919588
+64 0.2 3.58058803749713
+68 0.2125 3.52271520539537
+72 0.225 3.46582244033005
+76 0.2375 3.41059191352997
+80 0.25 3.35771994101645
+84 0.2625 3.30790714596565
+88 0.275 3.26184651407919
+92 0.2875 3.22020940086818
+96 0.3 3.18362976354827
+100 0.3125 3.1526871478835
+104 0.325 3.12788923283972
+108 0.3375 3.10965497827946
+112 0.35 3.09829957815216
+116 0.3625 3.09402244130247
+120 0.375 3.09689927087407
+124 0.3875 3.10687899214116
+128 0.4 3.12378582879458
diff --git a/Carpet/CarpetIOHDF5/test/input_initial_data/psi.norm_inf.asc b/Carpet/CarpetIOHDF5/test/input_initial_data/psi.norm_inf.asc
new file mode 100644
index 000000000..125d961d6
--- /dev/null
+++ b/Carpet/CarpetIOHDF5/test/input_initial_data/psi.norm_inf.asc
@@ -0,0 +1,35 @@
+# Scalar ASCII output created by CarpetIOScalar
+#
+0 0 6.28318530717959
+4 0.0125 6.27464305779913
+8 0.025 6.24905114238349
+12 0.0375 6.20647913168183
+16 0.05 6.14704273522965
+20 0.0625 6.10599956156206
+24 0.075 6.08235080155215
+28 0.0875 6.04217490672302
+32 0.1 5.9855810749628
+36 0.1125 5.91272311535624
+40 0.125 5.8237990301668
+44 0.1375 5.71905047673634
+48 0.15 5.59876211076453
+52 0.1625 5.49720695875172
+56 0.175 5.42318004269111
+60 0.1875 5.33441720694047
+64 0.2 5.23115966823196
+68 0.2125 5.11368802837118
+72 0.225 4.98232151170328
+76 0.2375 4.84715411685778
+80 0.25 4.77603443943425
+84 0.2625 4.69193728384899
+88 0.275 4.59509118583514
+92 0.2875 4.48575932258053
+96 0.3 4.37644231176542
+100 0.3125 4.33939596148558
+104 0.325 4.29055851960699
+108 0.3375 4.23006271073152
+112 0.35 4.15807293774264
+116 0.3625 4.16423083034147
+120 0.375 4.17137356242267
+124 0.3875 4.16718167768298
+128 0.4 4.15166658739585
diff --git a/Carpet/CarpetIOHDF5/test/input_initial_data/psi_maximum.xg b/Carpet/CarpetIOHDF5/test/input_initial_data/psi_maximum.xg
deleted file mode 100644
index 27be32935..000000000
--- a/Carpet/CarpetIOHDF5/test/input_initial_data/psi_maximum.xg
+++ /dev/null
@@ -1,34 +0,0 @@
-"psi v time
-0.0000000000000 6.2831853071796
-0.0125000000000 6.2746430577991
-0.0250000000000 6.2490511423835
-0.0375000000000 6.2064791316818
-0.0500000000000 6.1470427352297
-0.0625000000000 6.1059995615621
-0.0750000000000 6.0823508015521
-0.0875000000000 6.0421749067230
-0.1000000000000 5.9855810749628
-0.1125000000000 5.9127231153562
-0.1250000000000 5.8237990301668
-0.1375000000000 5.7190504767363
-0.1500000000000 5.5987621107645
-0.1625000000000 5.4972069587517
-0.1750000000000 5.4231800426911
-0.1875000000000 5.3344172069405
-0.2000000000000 5.2311596682320
-0.2125000000000 5.1136880283712
-0.2250000000000 4.9823215117033
-0.2375000000000 4.8471541168578
-0.2500000000000 4.7760344394342
-0.2625000000000 4.6919372838490
-0.2750000000000 4.5950911858351
-0.2875000000000 4.4857593225805
-0.3000000000000 4.3764423117654
-0.3125000000000 4.3393959614856
-0.3250000000000 4.2905585196070
-0.3375000000000 4.2300627107315
-0.3500000000000 4.1580729377426
-0.3625000000000 4.1642308303415
-0.3750000000000 4.1713735624227
-0.3875000000000 4.1671816776830
-0.4000000000000 4.1516665873958
diff --git a/Carpet/CarpetIOHDF5/test/input_initial_data/psi_minimum.xg b/Carpet/CarpetIOHDF5/test/input_initial_data/psi_minimum.xg
deleted file mode 100644
index fb6cf4909..000000000
--- a/Carpet/CarpetIOHDF5/test/input_initial_data/psi_minimum.xg
+++ /dev/null
@@ -1,34 +0,0 @@
-"psi v time
-0.0000000000000 -6.2831853071796
-0.0125000000000 -6.2746430577991
-0.0250000000000 -6.2490511423835
-0.0375000000000 -6.2064791316818
-0.0500000000000 -6.1470427352296
-0.0625000000000 -6.1059995615621
-0.0750000000000 -6.0823508015522
-0.0875000000000 -6.0421749067230
-0.1000000000000 -5.9855810749628
-0.1125000000000 -5.9127231153562
-0.1250000000000 -5.8237990301668
-0.1375000000000 -5.7190504767363
-0.1500000000000 -5.5987621107645
-0.1625000000000 -5.4972069587517
-0.1750000000000 -5.4231800426911
-0.1875000000000 -5.3344172069405
-0.2000000000000 -5.2311596682320
-0.2125000000000 -5.1136880283712
-0.2250000000000 -4.9823215117033
-0.2375000000000 -4.8471541168578
-0.2500000000000 -4.7760344394342
-0.2625000000000 -4.6919372838490
-0.2750000000000 -4.5950911858351
-0.2875000000000 -4.4857593225805
-0.3000000000000 -4.3764423117654
-0.3125000000000 -4.3393959614856
-0.3250000000000 -4.2905585196070
-0.3375000000000 -4.2300627107315
-0.3500000000000 -4.1580729377426
-0.3625000000000 -4.1642308303415
-0.3750000000000 -4.1713735624227
-0.3875000000000 -4.1671816776830
-0.4000000000000 -4.1516665873958
diff --git a/Carpet/CarpetIOHDF5/test/input_initial_data/psi_norm1.xg b/Carpet/CarpetIOHDF5/test/input_initial_data/psi_norm1.xg
deleted file mode 100644
index 8fd7f80b2..000000000
--- a/Carpet/CarpetIOHDF5/test/input_initial_data/psi_norm1.xg
+++ /dev/null
@@ -1,34 +0,0 @@
-"psi v time
-0.0000000000000 3.6215553016171
-0.0125000000000 3.6364763601998
-0.0250000000000 3.6415162291713
-0.0375000000000 3.6366612322730
-0.0500000000000 3.6219245799508
-0.0625000000000 3.5973463334095
-0.0750000000000 3.5629932957073
-0.0875000000000 3.5189588301869
-0.1000000000000 3.4653626067366
-0.1125000000000 3.4178909850438
-0.1250000000000 3.4031487535687
-0.1375000000000 3.3791593932900
-0.1500000000000 3.3459881060254
-0.1625000000000 3.3037250429285
-0.1750000000000 3.2524850594811
-0.1875000000000 3.1924074033578
-0.2000000000000 3.1283204712833
-0.2125000000000 3.1162479409102
-0.2250000000000 3.0957078538273
-0.2375000000000 3.0667560379254
-0.2500000000000 3.0294711776388
-0.2625000000000 2.9839546000991
-0.2750000000000 2.9543847137139
-0.2875000000000 2.9417629539386
-0.3000000000000 2.9211477552395
-0.3125000000000 2.8925951487277
-0.3250000000000 2.8561827332153
-0.3375000000000 2.8621799018707
-0.3500000000000 2.8633237516454
-0.3625000000000 2.8566872748419
-0.3750000000000 2.8422885187004
-0.3875000000000 2.8676161308430
-0.4000000000000 2.8922779097055
diff --git a/Carpet/CarpetIOHDF5/test/input_initial_data/psi_norm2.xg b/Carpet/CarpetIOHDF5/test/input_initial_data/psi_norm2.xg
deleted file mode 100644
index f6e6af93d..000000000
--- a/Carpet/CarpetIOHDF5/test/input_initial_data/psi_norm2.xg
+++ /dev/null
@@ -1,34 +0,0 @@
-"psi v time
-0.0000000000000 4.1631485516862
-0.0125000000000 4.1541748755646
-0.0250000000000 4.1403181106482
-0.0375000000000 4.1216804330909
-0.0500000000000 4.0984006495679
-0.0625000000000 4.0706544048325
-0.0750000000000 4.0386544211818
-0.0875000000000 4.0026507506396
-0.1000000000000 3.9629310129817
-0.1125000000000 3.9198205828109
-0.1250000000000 3.8736826762988
-0.1375000000000 3.8249182725450
-0.1500000000000 3.7739657855260
-0.1625000000000 3.7213003803309
-0.1750000000000 3.6674328023249
-0.1875000000000 3.6129075612872
-0.2000000000000 3.5583002867509
-0.2125000000000 3.5042140494355
-0.2250000000000 3.4512744321941
-0.2375000000000 3.4001231394120
-0.2500000000000 3.3514099647860
-0.2625000000000 3.3057830027058
-0.2750000000000 3.2638770952932
-0.2875000000000 3.2263006583662
-0.3000000000000 3.1936212201833
-0.3125000000000 3.1663502209452
-0.3250000000000 3.1449278306735
-0.3375000000000 3.1297087101756
-0.3500000000000 3.1209497227563
-0.3625000000000 3.1188005684516
-0.3750000000000 3.1232981418444
-0.3875000000000 3.1343651203794
-0.4000000000000 3.1518129128318
diff --git a/Carpet/CarpetIOHDF5/test/output_initial_data.parfile b/Carpet/CarpetIOHDF5/test/output_initial_data.parfile
index c6c2a2477..8940ef6d9 100644
--- a/Carpet/CarpetIOHDF5/test/output_initial_data.parfile
+++ b/Carpet/CarpetIOHDF5/test/output_initial_data.parfile
@@ -44,11 +44,11 @@ IO::out_fileinfo = "none"
IO::parfile_write = "no"
IO::out_every = 1
IO::out_yline_x = 0.5
-IO::out_zline_x = 0.5
+IO::out_zline_x = 0.5
IOBasic::outInfo_vars = "WaveToyMoL::scalarevolve"
IOScalar::outScalar_vars = "WaveToyMoL::scalarevolve"
-IOScalar::outScalar_reductions = "average count maximum minimum norm1 norm2 norm_inf product sum sum_abs sum_squared"
+IOScalar::outScalar_reductions = "average count maximum minimum norm1 norm2 norm_inf"
# HDF5 output only for initial data
IOHDF5::out_every = 513