From 2d2afd99df478819b8f1ab0a78c496a8010f41c6 Mon Sep 17 00:00:00 2001 From: Erik Schnetter Date: Thu, 11 Aug 2005 16:35:00 +0000 Subject: CarpetInterp: Test also time derivatives in the test cases darcs-hash:20050811163508-891bb-a25e3c59937a75684218fde1cf4fafd19087f2c9.gz --- Carpet/CarpetInterp/test/waveinterp-1p.par | 13 ++++- .../test/waveinterp-1p/arrays1d[0].x.asc | 4 +- Carpet/CarpetInterp/test/waveinterp-1p/phi..asc | 6 +- .../test/waveinterp-1p/phi.maximum.asc | 6 +- .../test/waveinterp-1p/phi.minimum.asc | 8 +-- .../test/waveinterp-1p/phi.norm_inf.asc | 6 +- Carpet/CarpetInterp/test/waveinterp-1p/phi.x.asc | 34 +++++------ Carpet/CarpetInterp/test/waveinterp-1p/phi.y.asc | 34 +++++------ Carpet/CarpetInterp/test/waveinterp-1p/phi.z.asc | 34 +++++------ .../test/waveinterp-1p/phit.minimum.asc | 2 +- .../test/waveinterp-1p/phix.average.asc | 2 +- .../test/waveinterp-1p/phix.maximum.asc | 26 ++++----- .../test/waveinterp-1p/phix.minimum.asc | 26 ++++----- .../CarpetInterp/test/waveinterp-1p/phix.norm1.asc | 26 ++++----- .../CarpetInterp/test/waveinterp-1p/phix.norm2.asc | 26 ++++----- .../test/waveinterp-1p/phix.norm_inf.asc | 26 ++++----- .../test/waveinterp-1p/phiy.average.asc | 2 +- .../test/waveinterp-1p/phiy.maximum.asc | 26 ++++----- .../test/waveinterp-1p/phiy.minimum.asc | 26 ++++----- .../CarpetInterp/test/waveinterp-1p/phiy.norm1.asc | 26 ++++----- .../CarpetInterp/test/waveinterp-1p/phiy.norm2.asc | 26 ++++----- .../test/waveinterp-1p/phiy.norm_inf.asc | 26 ++++----- .../test/waveinterp-1p/phiz.average.asc | 2 +- .../test/waveinterp-1p/phiz.maximum.asc | 26 ++++----- .../test/waveinterp-1p/phiz.minimum.asc | 26 ++++----- .../CarpetInterp/test/waveinterp-1p/phiz.norm1.asc | 26 ++++----- .../CarpetInterp/test/waveinterp-1p/phiz.norm2.asc | 26 ++++----- .../test/waveinterp-1p/phiz.norm_inf.asc | 26 ++++----- Carpet/CarpetInterp/test/waveinterp-2p.par | 13 ++++- .../test/waveinterp-2p/arrays1d[0].x.asc | 4 +- Carpet/CarpetInterp/test/waveinterp-2p/phi..asc | 12 ++-- .../test/waveinterp-2p/phi.maximum.asc | 6 +- .../test/waveinterp-2p/phi.minimum.asc | 8 +-- .../test/waveinterp-2p/phi.norm_inf.asc | 6 +- Carpet/CarpetInterp/test/waveinterp-2p/phi.x.asc | 68 +++++++++++----------- Carpet/CarpetInterp/test/waveinterp-2p/phi.y.asc | 68 +++++++++++----------- Carpet/CarpetInterp/test/waveinterp-2p/phi.z.asc | 56 +++++++++--------- .../test/waveinterp-2p/phit.minimum.asc | 2 +- .../test/waveinterp-2p/phix.average.asc | 2 +- .../test/waveinterp-2p/phix.maximum.asc | 26 ++++----- .../test/waveinterp-2p/phix.minimum.asc | 26 ++++----- .../CarpetInterp/test/waveinterp-2p/phix.norm1.asc | 26 ++++----- .../CarpetInterp/test/waveinterp-2p/phix.norm2.asc | 26 ++++----- .../test/waveinterp-2p/phix.norm_inf.asc | 26 ++++----- .../test/waveinterp-2p/phiy.average.asc | 2 +- .../test/waveinterp-2p/phiy.maximum.asc | 26 ++++----- .../test/waveinterp-2p/phiy.minimum.asc | 26 ++++----- .../CarpetInterp/test/waveinterp-2p/phiy.norm1.asc | 26 ++++----- .../CarpetInterp/test/waveinterp-2p/phiy.norm2.asc | 26 ++++----- .../test/waveinterp-2p/phiy.norm_inf.asc | 26 ++++----- .../test/waveinterp-2p/phiz.maximum.asc | 26 ++++----- .../test/waveinterp-2p/phiz.minimum.asc | 26 ++++----- .../CarpetInterp/test/waveinterp-2p/phiz.norm1.asc | 26 ++++----- .../CarpetInterp/test/waveinterp-2p/phiz.norm2.asc | 26 ++++----- .../test/waveinterp-2p/phiz.norm_inf.asc | 26 ++++----- 55 files changed, 599 insertions(+), 581 deletions(-) diff --git a/Carpet/CarpetInterp/test/waveinterp-1p.par b/Carpet/CarpetInterp/test/waveinterp-1p.par index 23caa447a..2c7baadd1 100644 --- a/Carpet/CarpetInterp/test/waveinterp-1p.par +++ b/Carpet/CarpetInterp/test/waveinterp-1p.par @@ -99,8 +99,17 @@ IDWaveMoL::slopet = 1.0 ActiveThorns = "InterpToArray" -InterpToArray::narrays1d = 1 -InterpToArray::array1d_vars[0] = "WaveMoL::phi" +InterpToArray::narrays1d = 3 + +InterpToArray::array1d_vars [0] = "WaveMoL::phi" +InterpToArray::array1d_timederivs[0] = 0 + +InterpToArray::array1d_vars [1] = "WaveMoL::phi" +InterpToArray::array1d_timederivs[1] = 1 + +InterpToArray::array1d_vars [2] = "WaveMoL::phi" +InterpToArray::array1d_timederivs[2] = 2 + InterpToArray::array1d_npoints_i = 10 InterpToArray::array1d_dx_i = 0.1 diff --git a/Carpet/CarpetInterp/test/waveinterp-1p/arrays1d[0].x.asc b/Carpet/CarpetInterp/test/waveinterp-1p/arrays1d[0].x.asc index cfa704c1f..47cd1346d 100644 --- a/Carpet/CarpetInterp/test/waveinterp-1p/arrays1d[0].x.asc +++ b/Carpet/CarpetInterp/test/waveinterp-1p/arrays1d[0].x.asc @@ -245,8 +245,8 @@ # iteration 2097152 # refinement level 0 multigrid level 0 map 0 component 0 time level 0 # column format: 1:it 2:tl 3:rl 4:c 5:ml 6:ix 7:iy 8:iz 9:time 10:x 11:y 12:z 13:data -2097152 0 0 0 0 0 0 0 0.1 0 0 0 1.1 -2097152 0 0 0 0 1 0 0 0.1 1 0 0 1.1 +2097152 0 0 0 0 0 0 0 0.1 0 0 0 1.09999999999999 +2097152 0 0 0 0 1 0 0 0.1 1 0 0 1.09999999999999 2097152 0 0 0 0 2 0 0 0.1 2 0 0 1.1 2097152 0 0 0 0 3 0 0 0.1 3 0 0 1.1 2097152 0 0 0 0 4 0 0 0.1 4 0 0 1.1 diff --git a/Carpet/CarpetInterp/test/waveinterp-1p/phi..asc b/Carpet/CarpetInterp/test/waveinterp-1p/phi..asc index 7416cc465..c14d5916c 100644 --- a/Carpet/CarpetInterp/test/waveinterp-1p/phi..asc +++ b/Carpet/CarpetInterp/test/waveinterp-1p/phi..asc @@ -145,15 +145,15 @@ # iteration 2097152 # refinement level 0 multigrid level 0 map 0 component 0 time level 0 # column format: 1:it 2:tl 3:rl 4:c 5:ml 6:ix 7:iy 8:iz 9:time 10:x 11:y 12:z 13:data -2097152 0 0 0 0 5242880 5242880 5242880 0.1 0 0 0 1.1 +2097152 0 0 0 0 5242880 5242880 5242880 0.1 0 0 0 1.09999999999999 # iteration 2097152 # refinement level 1 multigrid level 0 map 0 component 0 time level 0 # column format: 1:it 2:tl 3:rl 4:c 5:ml 6:ix 7:iy 8:iz 9:time 10:x 11:y 12:z 13:data -2097152 0 1 0 0 5242880 5242880 5242880 0.1 0 0 0 1.1 +2097152 0 1 0 0 5242880 5242880 5242880 0.1 0 0 0 1.09999999999999 # iteration 2097152 # refinement level 2 multigrid level 0 map 0 component 0 time level 0 # column format: 1:it 2:tl 3:rl 4:c 5:ml 6:ix 7:iy 8:iz 9:time 10:x 11:y 12:z 13:data -2097152 0 2 0 0 5242880 5242880 5242880 0.1 0 0 0 1.1 +2097152 0 2 0 0 5242880 5242880 5242880 0.1 0 0 0 1.09999999999999 diff --git a/Carpet/CarpetInterp/test/waveinterp-1p/phi.maximum.asc b/Carpet/CarpetInterp/test/waveinterp-1p/phi.maximum.asc index 4a728b687..96bb460f4 100644 --- a/Carpet/CarpetInterp/test/waveinterp-1p/phi.maximum.asc +++ b/Carpet/CarpetInterp/test/waveinterp-1p/phi.maximum.asc @@ -13,9 +13,9 @@ 1048576 0.05 1.05 1179648 0.05625 1.05625 1310720 0.0625 1.0625 -1441792 0.06875 1.06875 +1441792 0.06875 1.06875000000001 1572864 0.075 1.075 1703936 0.08125 1.08125 -1835008 0.0875 1.0875 -1966080 0.09375 1.09375 +1835008 0.0875 1.08750000000001 +1966080 0.09375 1.09375000000001 2097152 0.1 1.1 diff --git a/Carpet/CarpetInterp/test/waveinterp-1p/phi.minimum.asc b/Carpet/CarpetInterp/test/waveinterp-1p/phi.minimum.asc index 4a728b687..eab4eadb9 100644 --- a/Carpet/CarpetInterp/test/waveinterp-1p/phi.minimum.asc +++ b/Carpet/CarpetInterp/test/waveinterp-1p/phi.minimum.asc @@ -7,15 +7,15 @@ 262144 0.0125 1.0125 393216 0.01875 1.01875 524288 0.025 1.025 -655360 0.03125 1.03125 +655360 0.03125 1.03124999999999 786432 0.0375 1.0375 917504 0.04375 1.04375 1048576 0.05 1.05 -1179648 0.05625 1.05625 +1179648 0.05625 1.05624999999999 1310720 0.0625 1.0625 1441792 0.06875 1.06875 1572864 0.075 1.075 1703936 0.08125 1.08125 1835008 0.0875 1.0875 -1966080 0.09375 1.09375 -2097152 0.1 1.1 +1966080 0.09375 1.09374999999999 +2097152 0.1 1.09999999999999 diff --git a/Carpet/CarpetInterp/test/waveinterp-1p/phi.norm_inf.asc b/Carpet/CarpetInterp/test/waveinterp-1p/phi.norm_inf.asc index 4a728b687..96bb460f4 100644 --- a/Carpet/CarpetInterp/test/waveinterp-1p/phi.norm_inf.asc +++ b/Carpet/CarpetInterp/test/waveinterp-1p/phi.norm_inf.asc @@ -13,9 +13,9 @@ 1048576 0.05 1.05 1179648 0.05625 1.05625 1310720 0.0625 1.0625 -1441792 0.06875 1.06875 +1441792 0.06875 1.06875000000001 1572864 0.075 1.075 1703936 0.08125 1.08125 -1835008 0.0875 1.0875 -1966080 0.09375 1.09375 +1835008 0.0875 1.08750000000001 +1966080 0.09375 1.09375000000001 2097152 0.1 1.1 diff --git a/Carpet/CarpetInterp/test/waveinterp-1p/phi.x.asc b/Carpet/CarpetInterp/test/waveinterp-1p/phi.x.asc index f1e1b613a..28b97e6d2 100644 --- a/Carpet/CarpetInterp/test/waveinterp-1p/phi.x.asc +++ b/Carpet/CarpetInterp/test/waveinterp-1p/phi.x.asc @@ -742,9 +742,9 @@ 2097152 0 0 0 0 3145728 5242880 5242880 0.1 -0.4 0 0 1.1 2097152 0 0 0 0 3670016 5242880 5242880 0.1 -0.3 0 0 1.1 2097152 0 0 0 0 4194304 5242880 5242880 0.1 -0.2 0 0 1.1 -2097152 0 0 0 0 4718592 5242880 5242880 0.1 -0.1 0 0 1.1 -2097152 0 0 0 0 5242880 5242880 5242880 0.1 0 0 0 1.1 -2097152 0 0 0 0 5767168 5242880 5242880 0.1 0.1 0 0 1.1 +2097152 0 0 0 0 4718592 5242880 5242880 0.1 -0.1 0 0 1.09999999999999 +2097152 0 0 0 0 5242880 5242880 5242880 0.1 0 0 0 1.09999999999999 +2097152 0 0 0 0 5767168 5242880 5242880 0.1 0.1 0 0 1.09999999999999 2097152 0 0 0 0 6291456 5242880 5242880 0.1 0.2 0 0 1.1 2097152 0 0 0 0 6815744 5242880 5242880 0.1 0.3 0 0 1.1 2097152 0 0 0 0 7340032 5242880 5242880 0.1 0.4 0 0 1.1 @@ -767,11 +767,11 @@ 2097152 0 1 0 0 3932160 5242880 5242880 0.1 -0.25 0 0 1.1 2097152 0 1 0 0 4194304 5242880 5242880 0.1 -0.2 0 0 1.1 2097152 0 1 0 0 4456448 5242880 5242880 0.1 -0.15 0 0 1.1 -2097152 0 1 0 0 4718592 5242880 5242880 0.1 -0.1 0 0 1.1 -2097152 0 1 0 0 4980736 5242880 5242880 0.1 -0.05 0 0 1.1 -2097152 0 1 0 0 5242880 5242880 5242880 0.1 0 0 0 1.1 -2097152 0 1 0 0 5505024 5242880 5242880 0.1 0.05 0 0 1.1 -2097152 0 1 0 0 5767168 5242880 5242880 0.1 0.1 0 0 1.1 +2097152 0 1 0 0 4718592 5242880 5242880 0.1 -0.1 0 0 1.09999999999999 +2097152 0 1 0 0 4980736 5242880 5242880 0.1 -0.05 0 0 1.09999999999999 +2097152 0 1 0 0 5242880 5242880 5242880 0.1 0 0 0 1.09999999999999 +2097152 0 1 0 0 5505024 5242880 5242880 0.1 0.05 0 0 1.09999999999999 +2097152 0 1 0 0 5767168 5242880 5242880 0.1 0.1 0 0 1.09999999999999 2097152 0 1 0 0 6029312 5242880 5242880 0.1 0.15 0 0 1.1 2097152 0 1 0 0 6291456 5242880 5242880 0.1 0.2 0 0 1.1 2097152 0 1 0 0 6553600 5242880 5242880 0.1 0.25 0 0 1.1 @@ -791,15 +791,15 @@ 2097152 0 2 0 0 4325376 5242880 5242880 0.1 -0.175 0 0 1.1 2097152 0 2 0 0 4456448 5242880 5242880 0.1 -0.15 0 0 1.1 2097152 0 2 0 0 4587520 5242880 5242880 0.1 -0.125 0 0 1.1 -2097152 0 2 0 0 4718592 5242880 5242880 0.1 -0.1 0 0 1.1 -2097152 0 2 0 0 4849664 5242880 5242880 0.1 -0.075 0 0 1.1 -2097152 0 2 0 0 4980736 5242880 5242880 0.1 -0.05 0 0 1.1 -2097152 0 2 0 0 5111808 5242880 5242880 0.1 -0.025 0 0 1.1 -2097152 0 2 0 0 5242880 5242880 5242880 0.1 0 0 0 1.1 -2097152 0 2 0 0 5373952 5242880 5242880 0.1 0.025 0 0 1.1 -2097152 0 2 0 0 5505024 5242880 5242880 0.1 0.05 0 0 1.1 -2097152 0 2 0 0 5636096 5242880 5242880 0.1 0.075 0 0 1.1 -2097152 0 2 0 0 5767168 5242880 5242880 0.1 0.1 0 0 1.1 +2097152 0 2 0 0 4718592 5242880 5242880 0.1 -0.1 0 0 1.09999999999999 +2097152 0 2 0 0 4849664 5242880 5242880 0.1 -0.075 0 0 1.09999999999999 +2097152 0 2 0 0 4980736 5242880 5242880 0.1 -0.05 0 0 1.09999999999999 +2097152 0 2 0 0 5111808 5242880 5242880 0.1 -0.025 0 0 1.09999999999999 +2097152 0 2 0 0 5242880 5242880 5242880 0.1 0 0 0 1.09999999999999 +2097152 0 2 0 0 5373952 5242880 5242880 0.1 0.025 0 0 1.09999999999999 +2097152 0 2 0 0 5505024 5242880 5242880 0.1 0.05 0 0 1.09999999999999 +2097152 0 2 0 0 5636096 5242880 5242880 0.1 0.075 0 0 1.09999999999999 +2097152 0 2 0 0 5767168 5242880 5242880 0.1 0.1 0 0 1.09999999999999 2097152 0 2 0 0 5898240 5242880 5242880 0.1 0.125 0 0 1.1 2097152 0 2 0 0 6029312 5242880 5242880 0.1 0.15 0 0 1.1 2097152 0 2 0 0 6160384 5242880 5242880 0.1 0.175 0 0 1.1 diff --git a/Carpet/CarpetInterp/test/waveinterp-1p/phi.y.asc b/Carpet/CarpetInterp/test/waveinterp-1p/phi.y.asc index f1b6531e6..33224f1e0 100644 --- a/Carpet/CarpetInterp/test/waveinterp-1p/phi.y.asc +++ b/Carpet/CarpetInterp/test/waveinterp-1p/phi.y.asc @@ -742,9 +742,9 @@ 2097152 0 0 0 0 5242880 3145728 5242880 0.1 0 -0.4 0 1.1 2097152 0 0 0 0 5242880 3670016 5242880 0.1 0 -0.3 0 1.1 2097152 0 0 0 0 5242880 4194304 5242880 0.1 0 -0.2 0 1.1 -2097152 0 0 0 0 5242880 4718592 5242880 0.1 0 -0.1 0 1.1 -2097152 0 0 0 0 5242880 5242880 5242880 0.1 0 0 0 1.1 -2097152 0 0 0 0 5242880 5767168 5242880 0.1 0 0.1 0 1.1 +2097152 0 0 0 0 5242880 4718592 5242880 0.1 0 -0.1 0 1.09999999999999 +2097152 0 0 0 0 5242880 5242880 5242880 0.1 0 0 0 1.09999999999999 +2097152 0 0 0 0 5242880 5767168 5242880 0.1 0 0.1 0 1.09999999999999 2097152 0 0 0 0 5242880 6291456 5242880 0.1 0 0.2 0 1.1 2097152 0 0 0 0 5242880 6815744 5242880 0.1 0 0.3 0 1.1 2097152 0 0 0 0 5242880 7340032 5242880 0.1 0 0.4 0 1.1 @@ -767,11 +767,11 @@ 2097152 0 1 0 0 5242880 3932160 5242880 0.1 0 -0.25 0 1.1 2097152 0 1 0 0 5242880 4194304 5242880 0.1 0 -0.2 0 1.1 2097152 0 1 0 0 5242880 4456448 5242880 0.1 0 -0.15 0 1.1 -2097152 0 1 0 0 5242880 4718592 5242880 0.1 0 -0.1 0 1.1 -2097152 0 1 0 0 5242880 4980736 5242880 0.1 0 -0.05 0 1.1 -2097152 0 1 0 0 5242880 5242880 5242880 0.1 0 0 0 1.1 -2097152 0 1 0 0 5242880 5505024 5242880 0.1 0 0.05 0 1.1 -2097152 0 1 0 0 5242880 5767168 5242880 0.1 0 0.1 0 1.1 +2097152 0 1 0 0 5242880 4718592 5242880 0.1 0 -0.1 0 1.09999999999999 +2097152 0 1 0 0 5242880 4980736 5242880 0.1 0 -0.05 0 1.09999999999999 +2097152 0 1 0 0 5242880 5242880 5242880 0.1 0 0 0 1.09999999999999 +2097152 0 1 0 0 5242880 5505024 5242880 0.1 0 0.05 0 1.09999999999999 +2097152 0 1 0 0 5242880 5767168 5242880 0.1 0 0.1 0 1.09999999999999 2097152 0 1 0 0 5242880 6029312 5242880 0.1 0 0.15 0 1.1 2097152 0 1 0 0 5242880 6291456 5242880 0.1 0 0.2 0 1.1 2097152 0 1 0 0 5242880 6553600 5242880 0.1 0 0.25 0 1.1 @@ -791,15 +791,15 @@ 2097152 0 2 0 0 5242880 4325376 5242880 0.1 0 -0.175 0 1.1 2097152 0 2 0 0 5242880 4456448 5242880 0.1 0 -0.15 0 1.1 2097152 0 2 0 0 5242880 4587520 5242880 0.1 0 -0.125 0 1.1 -2097152 0 2 0 0 5242880 4718592 5242880 0.1 0 -0.1 0 1.1 -2097152 0 2 0 0 5242880 4849664 5242880 0.1 0 -0.075 0 1.1 -2097152 0 2 0 0 5242880 4980736 5242880 0.1 0 -0.05 0 1.1 -2097152 0 2 0 0 5242880 5111808 5242880 0.1 0 -0.025 0 1.1 -2097152 0 2 0 0 5242880 5242880 5242880 0.1 0 0 0 1.1 -2097152 0 2 0 0 5242880 5373952 5242880 0.1 0 0.025 0 1.1 -2097152 0 2 0 0 5242880 5505024 5242880 0.1 0 0.05 0 1.1 -2097152 0 2 0 0 5242880 5636096 5242880 0.1 0 0.075 0 1.1 -2097152 0 2 0 0 5242880 5767168 5242880 0.1 0 0.1 0 1.1 +2097152 0 2 0 0 5242880 4718592 5242880 0.1 0 -0.1 0 1.09999999999999 +2097152 0 2 0 0 5242880 4849664 5242880 0.1 0 -0.075 0 1.09999999999999 +2097152 0 2 0 0 5242880 4980736 5242880 0.1 0 -0.05 0 1.09999999999999 +2097152 0 2 0 0 5242880 5111808 5242880 0.1 0 -0.025 0 1.09999999999999 +2097152 0 2 0 0 5242880 5242880 5242880 0.1 0 0 0 1.09999999999999 +2097152 0 2 0 0 5242880 5373952 5242880 0.1 0 0.025 0 1.09999999999999 +2097152 0 2 0 0 5242880 5505024 5242880 0.1 0 0.05 0 1.09999999999999 +2097152 0 2 0 0 5242880 5636096 5242880 0.1 0 0.075 0 1.09999999999999 +2097152 0 2 0 0 5242880 5767168 5242880 0.1 0 0.1 0 1.09999999999999 2097152 0 2 0 0 5242880 5898240 5242880 0.1 0 0.125 0 1.1 2097152 0 2 0 0 5242880 6029312 5242880 0.1 0 0.15 0 1.1 2097152 0 2 0 0 5242880 6160384 5242880 0.1 0 0.175 0 1.1 diff --git a/Carpet/CarpetInterp/test/waveinterp-1p/phi.z.asc b/Carpet/CarpetInterp/test/waveinterp-1p/phi.z.asc index 707f325c6..1dfe1c6c1 100644 --- a/Carpet/CarpetInterp/test/waveinterp-1p/phi.z.asc +++ b/Carpet/CarpetInterp/test/waveinterp-1p/phi.z.asc @@ -742,9 +742,9 @@ 2097152 0 0 0 0 5242880 5242880 3145728 0.1 0 0 -0.4 1.1 2097152 0 0 0 0 5242880 5242880 3670016 0.1 0 0 -0.3 1.1 2097152 0 0 0 0 5242880 5242880 4194304 0.1 0 0 -0.2 1.1 -2097152 0 0 0 0 5242880 5242880 4718592 0.1 0 0 -0.1 1.1 -2097152 0 0 0 0 5242880 5242880 5242880 0.1 0 0 0 1.1 -2097152 0 0 0 0 5242880 5242880 5767168 0.1 0 0 0.1 1.1 +2097152 0 0 0 0 5242880 5242880 4718592 0.1 0 0 -0.1 1.09999999999999 +2097152 0 0 0 0 5242880 5242880 5242880 0.1 0 0 0 1.09999999999999 +2097152 0 0 0 0 5242880 5242880 5767168 0.1 0 0 0.1 1.09999999999999 2097152 0 0 0 0 5242880 5242880 6291456 0.1 0 0 0.2 1.1 2097152 0 0 0 0 5242880 5242880 6815744 0.1 0 0 0.3 1.1 2097152 0 0 0 0 5242880 5242880 7340032 0.1 0 0 0.4 1.1 @@ -767,11 +767,11 @@ 2097152 0 1 0 0 5242880 5242880 3932160 0.1 0 0 -0.25 1.1 2097152 0 1 0 0 5242880 5242880 4194304 0.1 0 0 -0.2 1.1 2097152 0 1 0 0 5242880 5242880 4456448 0.1 0 0 -0.15 1.1 -2097152 0 1 0 0 5242880 5242880 4718592 0.1 0 0 -0.1 1.1 -2097152 0 1 0 0 5242880 5242880 4980736 0.1 0 0 -0.05 1.1 -2097152 0 1 0 0 5242880 5242880 5242880 0.1 0 0 0 1.1 -2097152 0 1 0 0 5242880 5242880 5505024 0.1 0 0 0.05 1.1 -2097152 0 1 0 0 5242880 5242880 5767168 0.1 0 0 0.1 1.1 +2097152 0 1 0 0 5242880 5242880 4718592 0.1 0 0 -0.1 1.09999999999999 +2097152 0 1 0 0 5242880 5242880 4980736 0.1 0 0 -0.05 1.09999999999999 +2097152 0 1 0 0 5242880 5242880 5242880 0.1 0 0 0 1.09999999999999 +2097152 0 1 0 0 5242880 5242880 5505024 0.1 0 0 0.05 1.09999999999999 +2097152 0 1 0 0 5242880 5242880 5767168 0.1 0 0 0.1 1.09999999999999 2097152 0 1 0 0 5242880 5242880 6029312 0.1 0 0 0.15 1.1 2097152 0 1 0 0 5242880 5242880 6291456 0.1 0 0 0.2 1.1 2097152 0 1 0 0 5242880 5242880 6553600 0.1 0 0 0.25 1.1 @@ -791,15 +791,15 @@ 2097152 0 2 0 0 5242880 5242880 4325376 0.1 0 0 -0.175 1.1 2097152 0 2 0 0 5242880 5242880 4456448 0.1 0 0 -0.15 1.1 2097152 0 2 0 0 5242880 5242880 4587520 0.1 0 0 -0.125 1.1 -2097152 0 2 0 0 5242880 5242880 4718592 0.1 0 0 -0.1 1.1 -2097152 0 2 0 0 5242880 5242880 4849664 0.1 0 0 -0.075 1.1 -2097152 0 2 0 0 5242880 5242880 4980736 0.1 0 0 -0.05 1.1 -2097152 0 2 0 0 5242880 5242880 5111808 0.1 0 0 -0.025 1.1 -2097152 0 2 0 0 5242880 5242880 5242880 0.1 0 0 0 1.1 -2097152 0 2 0 0 5242880 5242880 5373952 0.1 0 0 0.025 1.1 -2097152 0 2 0 0 5242880 5242880 5505024 0.1 0 0 0.05 1.1 -2097152 0 2 0 0 5242880 5242880 5636096 0.1 0 0 0.075 1.1 -2097152 0 2 0 0 5242880 5242880 5767168 0.1 0 0 0.1 1.1 +2097152 0 2 0 0 5242880 5242880 4718592 0.1 0 0 -0.1 1.09999999999999 +2097152 0 2 0 0 5242880 5242880 4849664 0.1 0 0 -0.075 1.09999999999999 +2097152 0 2 0 0 5242880 5242880 4980736 0.1 0 0 -0.05 1.09999999999999 +2097152 0 2 0 0 5242880 5242880 5111808 0.1 0 0 -0.025 1.09999999999999 +2097152 0 2 0 0 5242880 5242880 5242880 0.1 0 0 0 1.09999999999999 +2097152 0 2 0 0 5242880 5242880 5373952 0.1 0 0 0.025 1.09999999999999 +2097152 0 2 0 0 5242880 5242880 5505024 0.1 0 0 0.05 1.09999999999999 +2097152 0 2 0 0 5242880 5242880 5636096 0.1 0 0 0.075 1.09999999999999 +2097152 0 2 0 0 5242880 5242880 5767168 0.1 0 0 0.1 1.09999999999999 2097152 0 2 0 0 5242880 5242880 5898240 0.1 0 0 0.125 1.1 2097152 0 2 0 0 5242880 5242880 6029312 0.1 0 0 0.15 1.1 2097152 0 2 0 0 5242880 5242880 6160384 0.1 0 0 0.175 1.1 diff --git a/Carpet/CarpetInterp/test/waveinterp-1p/phit.minimum.asc b/Carpet/CarpetInterp/test/waveinterp-1p/phit.minimum.asc index cee29c112..119716458 100644 --- a/Carpet/CarpetInterp/test/waveinterp-1p/phit.minimum.asc +++ b/Carpet/CarpetInterp/test/waveinterp-1p/phit.minimum.asc @@ -17,5 +17,5 @@ 1572864 0.075 1 1703936 0.08125 1 1835008 0.0875 1 -1966080 0.09375 1 +1966080 0.09375 0.999999999999999 2097152 0.1 1 diff --git a/Carpet/CarpetInterp/test/waveinterp-1p/phix.average.asc b/Carpet/CarpetInterp/test/waveinterp-1p/phix.average.asc index a541ae100..a98894f2d 100644 --- a/Carpet/CarpetInterp/test/waveinterp-1p/phix.average.asc +++ b/Carpet/CarpetInterp/test/waveinterp-1p/phix.average.asc @@ -9,7 +9,7 @@ 524288 0.025 0 655360 0.03125 0 786432 0.0375 0 -917504 0.04375 0 +917504 0.04375 -7.89932203752577e-39 1048576 0.05 0 1179648 0.05625 0 1310720 0.0625 0 diff --git a/Carpet/CarpetInterp/test/waveinterp-1p/phix.maximum.asc b/Carpet/CarpetInterp/test/waveinterp-1p/phix.maximum.asc index a541ae100..42acd5c92 100644 --- a/Carpet/CarpetInterp/test/waveinterp-1p/phix.maximum.asc +++ b/Carpet/CarpetInterp/test/waveinterp-1p/phix.maximum.asc @@ -6,16 +6,16 @@ 131072 0.00625 0 262144 0.0125 0 393216 0.01875 0 -524288 0.025 0 -655360 0.03125 0 -786432 0.0375 0 -917504 0.04375 0 -1048576 0.05 0 -1179648 0.05625 0 -1310720 0.0625 0 -1441792 0.06875 0 -1572864 0.075 0 -1703936 0.08125 0 -1835008 0.0875 0 -1966080 0.09375 0 -2097152 0.1 0 +524288 0.025 2.77555756156289e-17 +655360 0.03125 2.77555756156289e-17 +786432 0.0375 2.77555756156289e-17 +917504 0.04375 2.77555756156289e-17 +1048576 0.05 2.77555756156289e-17 +1179648 0.05625 3.12250225675825e-17 +1310720 0.0625 2.77555756156289e-17 +1441792 0.06875 2.77555756156289e-17 +1572864 0.075 2.77555756156289e-17 +1703936 0.08125 2.77555756156289e-17 +1835008 0.0875 2.77555756156289e-17 +1966080 0.09375 2.77555756156289e-17 +2097152 0.1 5.55111512312578e-17 diff --git a/Carpet/CarpetInterp/test/waveinterp-1p/phix.minimum.asc b/Carpet/CarpetInterp/test/waveinterp-1p/phix.minimum.asc index a541ae100..4fe2b1cc2 100644 --- a/Carpet/CarpetInterp/test/waveinterp-1p/phix.minimum.asc +++ b/Carpet/CarpetInterp/test/waveinterp-1p/phix.minimum.asc @@ -6,16 +6,16 @@ 131072 0.00625 0 262144 0.0125 0 393216 0.01875 0 -524288 0.025 0 -655360 0.03125 0 -786432 0.0375 0 -917504 0.04375 0 -1048576 0.05 0 -1179648 0.05625 0 -1310720 0.0625 0 -1441792 0.06875 0 -1572864 0.075 0 -1703936 0.08125 0 -1835008 0.0875 0 -1966080 0.09375 0 -2097152 0.1 0 +524288 0.025 -2.77555756156289e-17 +655360 0.03125 -2.77555756156289e-17 +786432 0.0375 -2.77555756156289e-17 +917504 0.04375 -2.77555756156289e-17 +1048576 0.05 -2.77555756156289e-17 +1179648 0.05625 -3.12250225675825e-17 +1310720 0.0625 -2.77555756156289e-17 +1441792 0.06875 -2.77555756156289e-17 +1572864 0.075 -2.77555756156289e-17 +1703936 0.08125 -2.77555756156289e-17 +1835008 0.0875 -2.77555756156289e-17 +1966080 0.09375 -2.77555756156289e-17 +2097152 0.1 -5.55111512312578e-17 diff --git a/Carpet/CarpetInterp/test/waveinterp-1p/phix.norm1.asc b/Carpet/CarpetInterp/test/waveinterp-1p/phix.norm1.asc index a541ae100..963fb9e18 100644 --- a/Carpet/CarpetInterp/test/waveinterp-1p/phix.norm1.asc +++ b/Carpet/CarpetInterp/test/waveinterp-1p/phix.norm1.asc @@ -6,16 +6,16 @@ 131072 0.00625 0 262144 0.0125 0 393216 0.01875 0 -524288 0.025 0 -655360 0.03125 0 -786432 0.0375 0 -917504 0.04375 0 -1048576 0.05 0 -1179648 0.05625 0 -1310720 0.0625 0 -1441792 0.06875 0 -1572864 0.075 0 -1703936 0.08125 0 -1835008 0.0875 0 -1966080 0.09375 0 -2097152 0.1 0 +524288 0.025 6.07153216591882e-21 +655360 0.03125 6.07153216591882e-21 +786432 0.0375 6.07153216591882e-21 +917504 0.04375 2.09616566946002e-20 +1048576 0.05 4.57785309090691e-20 +1179648 0.05625 5.07419057519629e-20 +1310720 0.0625 4.57785309090691e-20 +1441792 0.06875 4.57785309090691e-20 +1572864 0.075 4.57785309090691e-20 +1703936 0.08125 4.57785309090691e-20 +1835008 0.0875 4.57785309090691e-20 +1966080 0.09375 4.57785309090691e-20 +2097152 0.1 4.75132543850459e-20 diff --git a/Carpet/CarpetInterp/test/waveinterp-1p/phix.norm2.asc b/Carpet/CarpetInterp/test/waveinterp-1p/phix.norm2.asc index a541ae100..7e27de91f 100644 --- a/Carpet/CarpetInterp/test/waveinterp-1p/phix.norm2.asc +++ b/Carpet/CarpetInterp/test/waveinterp-1p/phix.norm2.asc @@ -6,16 +6,16 @@ 131072 0.00625 0 262144 0.0125 0 393216 0.01875 0 -524288 0.025 0 -655360 0.03125 0 -786432 0.0375 0 -917504 0.04375 0 -1048576 0.05 0 -1179648 0.05625 0 -1310720 0.0625 0 -1441792 0.06875 0 -1572864 0.075 0 -1703936 0.08125 0 -1835008 0.0875 0 -1966080 0.09375 0 -2097152 0.1 0 +524288 0.025 4.10510499419787e-19 +655360 0.03125 4.10510499419787e-19 +786432 0.0375 4.10510499419787e-19 +917504 0.04375 5.4849399728362e-19 +1048576 0.05 1.05333252669963e-18 +1179648 0.05625 1.16595884337073e-18 +1310720 0.0625 1.05333252669963e-18 +1441792 0.06875 1.05333252669963e-18 +1572864 0.075 1.05333252669963e-18 +1703936 0.08125 1.05333252669963e-18 +1835008 0.0875 1.05333252669963e-18 +1966080 0.09375 1.05333252669963e-18 +2097152 0.1 1.11980094554009e-18 diff --git a/Carpet/CarpetInterp/test/waveinterp-1p/phix.norm_inf.asc b/Carpet/CarpetInterp/test/waveinterp-1p/phix.norm_inf.asc index a541ae100..42acd5c92 100644 --- a/Carpet/CarpetInterp/test/waveinterp-1p/phix.norm_inf.asc +++ b/Carpet/CarpetInterp/test/waveinterp-1p/phix.norm_inf.asc @@ -6,16 +6,16 @@ 131072 0.00625 0 262144 0.0125 0 393216 0.01875 0 -524288 0.025 0 -655360 0.03125 0 -786432 0.0375 0 -917504 0.04375 0 -1048576 0.05 0 -1179648 0.05625 0 -1310720 0.0625 0 -1441792 0.06875 0 -1572864 0.075 0 -1703936 0.08125 0 -1835008 0.0875 0 -1966080 0.09375 0 -2097152 0.1 0 +524288 0.025 2.77555756156289e-17 +655360 0.03125 2.77555756156289e-17 +786432 0.0375 2.77555756156289e-17 +917504 0.04375 2.77555756156289e-17 +1048576 0.05 2.77555756156289e-17 +1179648 0.05625 3.12250225675825e-17 +1310720 0.0625 2.77555756156289e-17 +1441792 0.06875 2.77555756156289e-17 +1572864 0.075 2.77555756156289e-17 +1703936 0.08125 2.77555756156289e-17 +1835008 0.0875 2.77555756156289e-17 +1966080 0.09375 2.77555756156289e-17 +2097152 0.1 5.55111512312578e-17 diff --git a/Carpet/CarpetInterp/test/waveinterp-1p/phiy.average.asc b/Carpet/CarpetInterp/test/waveinterp-1p/phiy.average.asc index 7193b77f4..8249c8afd 100644 --- a/Carpet/CarpetInterp/test/waveinterp-1p/phiy.average.asc +++ b/Carpet/CarpetInterp/test/waveinterp-1p/phiy.average.asc @@ -9,7 +9,7 @@ 524288 0.025 0 655360 0.03125 0 786432 0.0375 0 -917504 0.04375 0 +917504 0.04375 9.4039548065783e-39 1048576 0.05 0 1179648 0.05625 0 1310720 0.0625 0 diff --git a/Carpet/CarpetInterp/test/waveinterp-1p/phiy.maximum.asc b/Carpet/CarpetInterp/test/waveinterp-1p/phiy.maximum.asc index 7193b77f4..422a7abd2 100644 --- a/Carpet/CarpetInterp/test/waveinterp-1p/phiy.maximum.asc +++ b/Carpet/CarpetInterp/test/waveinterp-1p/phiy.maximum.asc @@ -6,16 +6,16 @@ 131072 0.00625 0 262144 0.0125 0 393216 0.01875 0 -524288 0.025 0 -655360 0.03125 0 -786432 0.0375 0 -917504 0.04375 0 -1048576 0.05 0 -1179648 0.05625 0 -1310720 0.0625 0 -1441792 0.06875 0 -1572864 0.075 0 -1703936 0.08125 0 -1835008 0.0875 0 -1966080 0.09375 0 -2097152 0.1 0 +524288 0.025 2.77555756156289e-17 +655360 0.03125 2.77555756156289e-17 +786432 0.0375 2.77555756156289e-17 +917504 0.04375 2.77555756156289e-17 +1048576 0.05 2.77555756156289e-17 +1179648 0.05625 3.12250225675825e-17 +1310720 0.0625 2.77555756156289e-17 +1441792 0.06875 2.77555756156289e-17 +1572864 0.075 2.77555756156289e-17 +1703936 0.08125 2.77555756156289e-17 +1835008 0.0875 2.77555756156289e-17 +1966080 0.09375 2.77555756156289e-17 +2097152 0.1 5.55111512312578e-17 diff --git a/Carpet/CarpetInterp/test/waveinterp-1p/phiy.minimum.asc b/Carpet/CarpetInterp/test/waveinterp-1p/phiy.minimum.asc index 7193b77f4..ade51ca79 100644 --- a/Carpet/CarpetInterp/test/waveinterp-1p/phiy.minimum.asc +++ b/Carpet/CarpetInterp/test/waveinterp-1p/phiy.minimum.asc @@ -6,16 +6,16 @@ 131072 0.00625 0 262144 0.0125 0 393216 0.01875 0 -524288 0.025 0 -655360 0.03125 0 -786432 0.0375 0 -917504 0.04375 0 -1048576 0.05 0 -1179648 0.05625 0 -1310720 0.0625 0 -1441792 0.06875 0 -1572864 0.075 0 -1703936 0.08125 0 -1835008 0.0875 0 -1966080 0.09375 0 -2097152 0.1 0 +524288 0.025 -2.77555756156289e-17 +655360 0.03125 -2.77555756156289e-17 +786432 0.0375 -2.77555756156289e-17 +917504 0.04375 -2.77555756156289e-17 +1048576 0.05 -2.77555756156289e-17 +1179648 0.05625 -3.12250225675825e-17 +1310720 0.0625 -2.77555756156289e-17 +1441792 0.06875 -2.77555756156289e-17 +1572864 0.075 -2.77555756156289e-17 +1703936 0.08125 -2.77555756156289e-17 +1835008 0.0875 -2.77555756156289e-17 +1966080 0.09375 -2.77555756156289e-17 +2097152 0.1 -5.55111512312578e-17 diff --git a/Carpet/CarpetInterp/test/waveinterp-1p/phiy.norm1.asc b/Carpet/CarpetInterp/test/waveinterp-1p/phiy.norm1.asc index 7193b77f4..c275381f4 100644 --- a/Carpet/CarpetInterp/test/waveinterp-1p/phiy.norm1.asc +++ b/Carpet/CarpetInterp/test/waveinterp-1p/phiy.norm1.asc @@ -6,16 +6,16 @@ 131072 0.00625 0 262144 0.0125 0 393216 0.01875 0 -524288 0.025 0 -655360 0.03125 0 -786432 0.0375 0 -917504 0.04375 0 -1048576 0.05 0 -1179648 0.05625 0 -1310720 0.0625 0 -1441792 0.06875 0 -1572864 0.075 0 -1703936 0.08125 0 -1835008 0.0875 0 -1966080 0.09375 0 -2097152 0.1 0 +524288 0.025 6.07153216591882e-21 +655360 0.03125 6.07153216591882e-21 +786432 0.0375 6.07153216591882e-21 +917504 0.04375 2.09616566946002e-20 +1048576 0.05 4.57785309090691e-20 +1179648 0.05625 5.07419057519629e-20 +1310720 0.0625 4.57785309090691e-20 +1441792 0.06875 4.57785309090691e-20 +1572864 0.075 4.57785309090691e-20 +1703936 0.08125 4.57785309090691e-20 +1835008 0.0875 4.57785309090691e-20 +1966080 0.09375 4.57785309090691e-20 +2097152 0.1 4.75132543850459e-20 diff --git a/Carpet/CarpetInterp/test/waveinterp-1p/phiy.norm2.asc b/Carpet/CarpetInterp/test/waveinterp-1p/phiy.norm2.asc index 7193b77f4..963c6ee5d 100644 --- a/Carpet/CarpetInterp/test/waveinterp-1p/phiy.norm2.asc +++ b/Carpet/CarpetInterp/test/waveinterp-1p/phiy.norm2.asc @@ -6,16 +6,16 @@ 131072 0.00625 0 262144 0.0125 0 393216 0.01875 0 -524288 0.025 0 -655360 0.03125 0 -786432 0.0375 0 -917504 0.04375 0 -1048576 0.05 0 -1179648 0.05625 0 -1310720 0.0625 0 -1441792 0.06875 0 -1572864 0.075 0 -1703936 0.08125 0 -1835008 0.0875 0 -1966080 0.09375 0 -2097152 0.1 0 +524288 0.025 4.10510499419787e-19 +655360 0.03125 4.10510499419787e-19 +786432 0.0375 4.10510499419787e-19 +917504 0.04375 5.4849399728362e-19 +1048576 0.05 1.05333252669963e-18 +1179648 0.05625 1.16595884337073e-18 +1310720 0.0625 1.05333252669963e-18 +1441792 0.06875 1.05333252669963e-18 +1572864 0.075 1.05333252669963e-18 +1703936 0.08125 1.05333252669963e-18 +1835008 0.0875 1.05333252669963e-18 +1966080 0.09375 1.05333252669963e-18 +2097152 0.1 1.11980094554009e-18 diff --git a/Carpet/CarpetInterp/test/waveinterp-1p/phiy.norm_inf.asc b/Carpet/CarpetInterp/test/waveinterp-1p/phiy.norm_inf.asc index 7193b77f4..422a7abd2 100644 --- a/Carpet/CarpetInterp/test/waveinterp-1p/phiy.norm_inf.asc +++ b/Carpet/CarpetInterp/test/waveinterp-1p/phiy.norm_inf.asc @@ -6,16 +6,16 @@ 131072 0.00625 0 262144 0.0125 0 393216 0.01875 0 -524288 0.025 0 -655360 0.03125 0 -786432 0.0375 0 -917504 0.04375 0 -1048576 0.05 0 -1179648 0.05625 0 -1310720 0.0625 0 -1441792 0.06875 0 -1572864 0.075 0 -1703936 0.08125 0 -1835008 0.0875 0 -1966080 0.09375 0 -2097152 0.1 0 +524288 0.025 2.77555756156289e-17 +655360 0.03125 2.77555756156289e-17 +786432 0.0375 2.77555756156289e-17 +917504 0.04375 2.77555756156289e-17 +1048576 0.05 2.77555756156289e-17 +1179648 0.05625 3.12250225675825e-17 +1310720 0.0625 2.77555756156289e-17 +1441792 0.06875 2.77555756156289e-17 +1572864 0.075 2.77555756156289e-17 +1703936 0.08125 2.77555756156289e-17 +1835008 0.0875 2.77555756156289e-17 +1966080 0.09375 2.77555756156289e-17 +2097152 0.1 5.55111512312578e-17 diff --git a/Carpet/CarpetInterp/test/waveinterp-1p/phiz.average.asc b/Carpet/CarpetInterp/test/waveinterp-1p/phiz.average.asc index 85815b800..c6c655bfe 100644 --- a/Carpet/CarpetInterp/test/waveinterp-1p/phiz.average.asc +++ b/Carpet/CarpetInterp/test/waveinterp-1p/phiz.average.asc @@ -9,7 +9,7 @@ 524288 0.025 0 655360 0.03125 0 786432 0.0375 0 -917504 0.04375 0 +917504 0.04375 9.36633898735199e-38 1048576 0.05 0 1179648 0.05625 0 1310720 0.0625 0 diff --git a/Carpet/CarpetInterp/test/waveinterp-1p/phiz.maximum.asc b/Carpet/CarpetInterp/test/waveinterp-1p/phiz.maximum.asc index 85815b800..8492643ed 100644 --- a/Carpet/CarpetInterp/test/waveinterp-1p/phiz.maximum.asc +++ b/Carpet/CarpetInterp/test/waveinterp-1p/phiz.maximum.asc @@ -6,16 +6,16 @@ 131072 0.00625 0 262144 0.0125 0 393216 0.01875 0 -524288 0.025 0 -655360 0.03125 0 -786432 0.0375 0 -917504 0.04375 0 -1048576 0.05 0 -1179648 0.05625 0 -1310720 0.0625 0 -1441792 0.06875 0 -1572864 0.075 0 -1703936 0.08125 0 -1835008 0.0875 0 -1966080 0.09375 0 -2097152 0.1 0 +524288 0.025 2.77555756156289e-17 +655360 0.03125 2.77555756156289e-17 +786432 0.0375 2.77555756156289e-17 +917504 0.04375 2.77555756156289e-17 +1048576 0.05 2.77555756156289e-17 +1179648 0.05625 3.12250225675825e-17 +1310720 0.0625 2.77555756156289e-17 +1441792 0.06875 2.77555756156289e-17 +1572864 0.075 2.77555756156289e-17 +1703936 0.08125 2.77555756156289e-17 +1835008 0.0875 2.77555756156289e-17 +1966080 0.09375 2.77555756156289e-17 +2097152 0.1 5.55111512312578e-17 diff --git a/Carpet/CarpetInterp/test/waveinterp-1p/phiz.minimum.asc b/Carpet/CarpetInterp/test/waveinterp-1p/phiz.minimum.asc index 85815b800..c02ff7556 100644 --- a/Carpet/CarpetInterp/test/waveinterp-1p/phiz.minimum.asc +++ b/Carpet/CarpetInterp/test/waveinterp-1p/phiz.minimum.asc @@ -6,16 +6,16 @@ 131072 0.00625 0 262144 0.0125 0 393216 0.01875 0 -524288 0.025 0 -655360 0.03125 0 -786432 0.0375 0 -917504 0.04375 0 -1048576 0.05 0 -1179648 0.05625 0 -1310720 0.0625 0 -1441792 0.06875 0 -1572864 0.075 0 -1703936 0.08125 0 -1835008 0.0875 0 -1966080 0.09375 0 -2097152 0.1 0 +524288 0.025 -2.77555756156289e-17 +655360 0.03125 -2.77555756156289e-17 +786432 0.0375 -2.77555756156289e-17 +917504 0.04375 -2.77555756156289e-17 +1048576 0.05 -2.77555756156289e-17 +1179648 0.05625 -3.12250225675825e-17 +1310720 0.0625 -2.77555756156289e-17 +1441792 0.06875 -2.77555756156289e-17 +1572864 0.075 -2.77555756156289e-17 +1703936 0.08125 -2.77555756156289e-17 +1835008 0.0875 -2.77555756156289e-17 +1966080 0.09375 -2.77555756156289e-17 +2097152 0.1 -5.55111512312578e-17 diff --git a/Carpet/CarpetInterp/test/waveinterp-1p/phiz.norm1.asc b/Carpet/CarpetInterp/test/waveinterp-1p/phiz.norm1.asc index 85815b800..39505ad92 100644 --- a/Carpet/CarpetInterp/test/waveinterp-1p/phiz.norm1.asc +++ b/Carpet/CarpetInterp/test/waveinterp-1p/phiz.norm1.asc @@ -6,16 +6,16 @@ 131072 0.00625 0 262144 0.0125 0 393216 0.01875 0 -524288 0.025 0 -655360 0.03125 0 -786432 0.0375 0 -917504 0.04375 0 -1048576 0.05 0 -1179648 0.05625 0 -1310720 0.0625 0 -1441792 0.06875 0 -1572864 0.075 0 -1703936 0.08125 0 -1835008 0.0875 0 -1966080 0.09375 0 -2097152 0.1 0 +524288 0.025 6.07153216591882e-21 +655360 0.03125 6.07153216591882e-21 +786432 0.0375 6.07153216591882e-21 +917504 0.04375 2.09616566946002e-20 +1048576 0.05 4.57785309090691e-20 +1179648 0.05625 5.07419057519629e-20 +1310720 0.0625 4.57785309090691e-20 +1441792 0.06875 4.57785309090691e-20 +1572864 0.075 4.57785309090691e-20 +1703936 0.08125 4.57785309090691e-20 +1835008 0.0875 4.57785309090691e-20 +1966080 0.09375 4.57785309090691e-20 +2097152 0.1 4.75132543850459e-20 diff --git a/Carpet/CarpetInterp/test/waveinterp-1p/phiz.norm2.asc b/Carpet/CarpetInterp/test/waveinterp-1p/phiz.norm2.asc index 85815b800..f345e297d 100644 --- a/Carpet/CarpetInterp/test/waveinterp-1p/phiz.norm2.asc +++ b/Carpet/CarpetInterp/test/waveinterp-1p/phiz.norm2.asc @@ -6,16 +6,16 @@ 131072 0.00625 0 262144 0.0125 0 393216 0.01875 0 -524288 0.025 0 -655360 0.03125 0 -786432 0.0375 0 -917504 0.04375 0 -1048576 0.05 0 -1179648 0.05625 0 -1310720 0.0625 0 -1441792 0.06875 0 -1572864 0.075 0 -1703936 0.08125 0 -1835008 0.0875 0 -1966080 0.09375 0 -2097152 0.1 0 +524288 0.025 4.10510499419787e-19 +655360 0.03125 4.10510499419787e-19 +786432 0.0375 4.10510499419787e-19 +917504 0.04375 5.4849399728362e-19 +1048576 0.05 1.05333252669963e-18 +1179648 0.05625 1.16595884337073e-18 +1310720 0.0625 1.05333252669963e-18 +1441792 0.06875 1.05333252669963e-18 +1572864 0.075 1.05333252669963e-18 +1703936 0.08125 1.05333252669963e-18 +1835008 0.0875 1.05333252669963e-18 +1966080 0.09375 1.05333252669963e-18 +2097152 0.1 1.11980094554009e-18 diff --git a/Carpet/CarpetInterp/test/waveinterp-1p/phiz.norm_inf.asc b/Carpet/CarpetInterp/test/waveinterp-1p/phiz.norm_inf.asc index 85815b800..8492643ed 100644 --- a/Carpet/CarpetInterp/test/waveinterp-1p/phiz.norm_inf.asc +++ b/Carpet/CarpetInterp/test/waveinterp-1p/phiz.norm_inf.asc @@ -6,16 +6,16 @@ 131072 0.00625 0 262144 0.0125 0 393216 0.01875 0 -524288 0.025 0 -655360 0.03125 0 -786432 0.0375 0 -917504 0.04375 0 -1048576 0.05 0 -1179648 0.05625 0 -1310720 0.0625 0 -1441792 0.06875 0 -1572864 0.075 0 -1703936 0.08125 0 -1835008 0.0875 0 -1966080 0.09375 0 -2097152 0.1 0 +524288 0.025 2.77555756156289e-17 +655360 0.03125 2.77555756156289e-17 +786432 0.0375 2.77555756156289e-17 +917504 0.04375 2.77555756156289e-17 +1048576 0.05 2.77555756156289e-17 +1179648 0.05625 3.12250225675825e-17 +1310720 0.0625 2.77555756156289e-17 +1441792 0.06875 2.77555756156289e-17 +1572864 0.075 2.77555756156289e-17 +1703936 0.08125 2.77555756156289e-17 +1835008 0.0875 2.77555756156289e-17 +1966080 0.09375 2.77555756156289e-17 +2097152 0.1 5.55111512312578e-17 diff --git a/Carpet/CarpetInterp/test/waveinterp-2p.par b/Carpet/CarpetInterp/test/waveinterp-2p.par index 23caa447a..2c7baadd1 100644 --- a/Carpet/CarpetInterp/test/waveinterp-2p.par +++ b/Carpet/CarpetInterp/test/waveinterp-2p.par @@ -99,8 +99,17 @@ IDWaveMoL::slopet = 1.0 ActiveThorns = "InterpToArray" -InterpToArray::narrays1d = 1 -InterpToArray::array1d_vars[0] = "WaveMoL::phi" +InterpToArray::narrays1d = 3 + +InterpToArray::array1d_vars [0] = "WaveMoL::phi" +InterpToArray::array1d_timederivs[0] = 0 + +InterpToArray::array1d_vars [1] = "WaveMoL::phi" +InterpToArray::array1d_timederivs[1] = 1 + +InterpToArray::array1d_vars [2] = "WaveMoL::phi" +InterpToArray::array1d_timederivs[2] = 2 + InterpToArray::array1d_npoints_i = 10 InterpToArray::array1d_dx_i = 0.1 diff --git a/Carpet/CarpetInterp/test/waveinterp-2p/arrays1d[0].x.asc b/Carpet/CarpetInterp/test/waveinterp-2p/arrays1d[0].x.asc index cfa704c1f..47cd1346d 100644 --- a/Carpet/CarpetInterp/test/waveinterp-2p/arrays1d[0].x.asc +++ b/Carpet/CarpetInterp/test/waveinterp-2p/arrays1d[0].x.asc @@ -245,8 +245,8 @@ # iteration 2097152 # refinement level 0 multigrid level 0 map 0 component 0 time level 0 # column format: 1:it 2:tl 3:rl 4:c 5:ml 6:ix 7:iy 8:iz 9:time 10:x 11:y 12:z 13:data -2097152 0 0 0 0 0 0 0 0.1 0 0 0 1.1 -2097152 0 0 0 0 1 0 0 0.1 1 0 0 1.1 +2097152 0 0 0 0 0 0 0 0.1 0 0 0 1.09999999999999 +2097152 0 0 0 0 1 0 0 0.1 1 0 0 1.09999999999999 2097152 0 0 0 0 2 0 0 0.1 2 0 0 1.1 2097152 0 0 0 0 3 0 0 0.1 3 0 0 1.1 2097152 0 0 0 0 4 0 0 0.1 4 0 0 1.1 diff --git a/Carpet/CarpetInterp/test/waveinterp-2p/phi..asc b/Carpet/CarpetInterp/test/waveinterp-2p/phi..asc index 5af1afa7b..97989f6b9 100644 --- a/Carpet/CarpetInterp/test/waveinterp-2p/phi..asc +++ b/Carpet/CarpetInterp/test/waveinterp-2p/phi..asc @@ -257,27 +257,27 @@ # iteration 2097152 # refinement level 0 multigrid level 0 map 0 component 0 time level 0 # column format: 1:it 2:tl 3:rl 4:c 5:ml 6:ix 7:iy 8:iz 9:time 10:x 11:y 12:z 13:data -2097152 0 0 0 0 5242880 5242880 5242880 0.1 0 0 0 1.1 +2097152 0 0 0 0 5242880 5242880 5242880 0.1 0 0 0 1.09999999999999 # iteration 2097152 # refinement level 0 multigrid level 0 map 0 component 1 time level 0 # column format: 1:it 2:tl 3:rl 4:c 5:ml 6:ix 7:iy 8:iz 9:time 10:x 11:y 12:z 13:data -2097152 0 0 1 0 5242880 5242880 5242880 0.1 0 0 0 1.1 +2097152 0 0 1 0 5242880 5242880 5242880 0.1 0 0 0 1.09999999999999 # iteration 2097152 # refinement level 1 multigrid level 0 map 0 component 0 time level 0 # column format: 1:it 2:tl 3:rl 4:c 5:ml 6:ix 7:iy 8:iz 9:time 10:x 11:y 12:z 13:data -2097152 0 1 0 0 5242880 5242880 5242880 0.1 0 0 0 1.1 +2097152 0 1 0 0 5242880 5242880 5242880 0.1 0 0 0 1.09999999999999 # iteration 2097152 # refinement level 1 multigrid level 0 map 0 component 1 time level 0 # column format: 1:it 2:tl 3:rl 4:c 5:ml 6:ix 7:iy 8:iz 9:time 10:x 11:y 12:z 13:data -2097152 0 1 1 0 5242880 5242880 5242880 0.1 0 0 0 1.1 +2097152 0 1 1 0 5242880 5242880 5242880 0.1 0 0 0 1.09999999999999 # iteration 2097152 # refinement level 2 multigrid level 0 map 0 component 0 time level 0 # column format: 1:it 2:tl 3:rl 4:c 5:ml 6:ix 7:iy 8:iz 9:time 10:x 11:y 12:z 13:data -2097152 0 2 0 0 5242880 5242880 5242880 0.1 0 0 0 1.1 +2097152 0 2 0 0 5242880 5242880 5242880 0.1 0 0 0 1.09999999999999 # iteration 2097152 # refinement level 2 multigrid level 0 map 0 component 1 time level 0 # column format: 1:it 2:tl 3:rl 4:c 5:ml 6:ix 7:iy 8:iz 9:time 10:x 11:y 12:z 13:data -2097152 0 2 1 0 5242880 5242880 5242880 0.1 0 0 0 1.1 +2097152 0 2 1 0 5242880 5242880 5242880 0.1 0 0 0 1.09999999999999 diff --git a/Carpet/CarpetInterp/test/waveinterp-2p/phi.maximum.asc b/Carpet/CarpetInterp/test/waveinterp-2p/phi.maximum.asc index 4a728b687..96bb460f4 100644 --- a/Carpet/CarpetInterp/test/waveinterp-2p/phi.maximum.asc +++ b/Carpet/CarpetInterp/test/waveinterp-2p/phi.maximum.asc @@ -13,9 +13,9 @@ 1048576 0.05 1.05 1179648 0.05625 1.05625 1310720 0.0625 1.0625 -1441792 0.06875 1.06875 +1441792 0.06875 1.06875000000001 1572864 0.075 1.075 1703936 0.08125 1.08125 -1835008 0.0875 1.0875 -1966080 0.09375 1.09375 +1835008 0.0875 1.08750000000001 +1966080 0.09375 1.09375000000001 2097152 0.1 1.1 diff --git a/Carpet/CarpetInterp/test/waveinterp-2p/phi.minimum.asc b/Carpet/CarpetInterp/test/waveinterp-2p/phi.minimum.asc index 4a728b687..eab4eadb9 100644 --- a/Carpet/CarpetInterp/test/waveinterp-2p/phi.minimum.asc +++ b/Carpet/CarpetInterp/test/waveinterp-2p/phi.minimum.asc @@ -7,15 +7,15 @@ 262144 0.0125 1.0125 393216 0.01875 1.01875 524288 0.025 1.025 -655360 0.03125 1.03125 +655360 0.03125 1.03124999999999 786432 0.0375 1.0375 917504 0.04375 1.04375 1048576 0.05 1.05 -1179648 0.05625 1.05625 +1179648 0.05625 1.05624999999999 1310720 0.0625 1.0625 1441792 0.06875 1.06875 1572864 0.075 1.075 1703936 0.08125 1.08125 1835008 0.0875 1.0875 -1966080 0.09375 1.09375 -2097152 0.1 1.1 +1966080 0.09375 1.09374999999999 +2097152 0.1 1.09999999999999 diff --git a/Carpet/CarpetInterp/test/waveinterp-2p/phi.norm_inf.asc b/Carpet/CarpetInterp/test/waveinterp-2p/phi.norm_inf.asc index 4a728b687..96bb460f4 100644 --- a/Carpet/CarpetInterp/test/waveinterp-2p/phi.norm_inf.asc +++ b/Carpet/CarpetInterp/test/waveinterp-2p/phi.norm_inf.asc @@ -13,9 +13,9 @@ 1048576 0.05 1.05 1179648 0.05625 1.05625 1310720 0.0625 1.0625 -1441792 0.06875 1.06875 +1441792 0.06875 1.06875000000001 1572864 0.075 1.075 1703936 0.08125 1.08125 -1835008 0.0875 1.0875 -1966080 0.09375 1.09375 +1835008 0.0875 1.08750000000001 +1966080 0.09375 1.09375000000001 2097152 0.1 1.1 diff --git a/Carpet/CarpetInterp/test/waveinterp-2p/phi.x.asc b/Carpet/CarpetInterp/test/waveinterp-2p/phi.x.asc index 9e76ac1d1..0b6b9ebe7 100644 --- a/Carpet/CarpetInterp/test/waveinterp-2p/phi.x.asc +++ b/Carpet/CarpetInterp/test/waveinterp-2p/phi.x.asc @@ -1442,9 +1442,9 @@ 2097152 0 0 0 0 3145728 5242880 5242880 0.1 -0.4 0 0 1.1 2097152 0 0 0 0 3670016 5242880 5242880 0.1 -0.3 0 0 1.1 2097152 0 0 0 0 4194304 5242880 5242880 0.1 -0.2 0 0 1.1 -2097152 0 0 0 0 4718592 5242880 5242880 0.1 -0.1 0 0 1.1 -2097152 0 0 0 0 5242880 5242880 5242880 0.1 0 0 0 1.1 -2097152 0 0 0 0 5767168 5242880 5242880 0.1 0.1 0 0 1.1 +2097152 0 0 0 0 4718592 5242880 5242880 0.1 -0.1 0 0 1.09999999999999 +2097152 0 0 0 0 5242880 5242880 5242880 0.1 0 0 0 1.09999999999999 +2097152 0 0 0 0 5767168 5242880 5242880 0.1 0.1 0 0 1.09999999999999 2097152 0 0 0 0 6291456 5242880 5242880 0.1 0.2 0 0 1.1 2097152 0 0 0 0 6815744 5242880 5242880 0.1 0.3 0 0 1.1 2097152 0 0 0 0 7340032 5242880 5242880 0.1 0.4 0 0 1.1 @@ -1467,9 +1467,9 @@ 2097152 0 0 1 0 3145728 5242880 5242880 0.1 -0.4 0 0 1.1 2097152 0 0 1 0 3670016 5242880 5242880 0.1 -0.3 0 0 1.1 2097152 0 0 1 0 4194304 5242880 5242880 0.1 -0.2 0 0 1.1 -2097152 0 0 1 0 4718592 5242880 5242880 0.1 -0.1 0 0 1.1 -2097152 0 0 1 0 5242880 5242880 5242880 0.1 0 0 0 1.1 -2097152 0 0 1 0 5767168 5242880 5242880 0.1 0.1 0 0 1.1 +2097152 0 0 1 0 4718592 5242880 5242880 0.1 -0.1 0 0 1.09999999999999 +2097152 0 0 1 0 5242880 5242880 5242880 0.1 0 0 0 1.09999999999999 +2097152 0 0 1 0 5767168 5242880 5242880 0.1 0.1 0 0 1.09999999999999 2097152 0 0 1 0 6291456 5242880 5242880 0.1 0.2 0 0 1.1 2097152 0 0 1 0 6815744 5242880 5242880 0.1 0.3 0 0 1.1 2097152 0 0 1 0 7340032 5242880 5242880 0.1 0.4 0 0 1.1 @@ -1492,11 +1492,11 @@ 2097152 0 1 0 0 3932160 5242880 5242880 0.1 -0.25 0 0 1.1 2097152 0 1 0 0 4194304 5242880 5242880 0.1 -0.2 0 0 1.1 2097152 0 1 0 0 4456448 5242880 5242880 0.1 -0.15 0 0 1.1 -2097152 0 1 0 0 4718592 5242880 5242880 0.1 -0.1 0 0 1.1 -2097152 0 1 0 0 4980736 5242880 5242880 0.1 -0.05 0 0 1.1 -2097152 0 1 0 0 5242880 5242880 5242880 0.1 0 0 0 1.1 -2097152 0 1 0 0 5505024 5242880 5242880 0.1 0.05 0 0 1.1 -2097152 0 1 0 0 5767168 5242880 5242880 0.1 0.1 0 0 1.1 +2097152 0 1 0 0 4718592 5242880 5242880 0.1 -0.1 0 0 1.09999999999999 +2097152 0 1 0 0 4980736 5242880 5242880 0.1 -0.05 0 0 1.09999999999999 +2097152 0 1 0 0 5242880 5242880 5242880 0.1 0 0 0 1.09999999999999 +2097152 0 1 0 0 5505024 5242880 5242880 0.1 0.05 0 0 1.09999999999999 +2097152 0 1 0 0 5767168 5242880 5242880 0.1 0.1 0 0 1.09999999999999 2097152 0 1 0 0 6029312 5242880 5242880 0.1 0.15 0 0 1.1 2097152 0 1 0 0 6291456 5242880 5242880 0.1 0.2 0 0 1.1 2097152 0 1 0 0 6553600 5242880 5242880 0.1 0.25 0 0 1.1 @@ -1517,11 +1517,11 @@ 2097152 0 1 1 0 3932160 5242880 5242880 0.1 -0.25 0 0 1.1 2097152 0 1 1 0 4194304 5242880 5242880 0.1 -0.2 0 0 1.1 2097152 0 1 1 0 4456448 5242880 5242880 0.1 -0.15 0 0 1.1 -2097152 0 1 1 0 4718592 5242880 5242880 0.1 -0.1 0 0 1.1 -2097152 0 1 1 0 4980736 5242880 5242880 0.1 -0.05 0 0 1.1 -2097152 0 1 1 0 5242880 5242880 5242880 0.1 0 0 0 1.1 -2097152 0 1 1 0 5505024 5242880 5242880 0.1 0.05 0 0 1.1 -2097152 0 1 1 0 5767168 5242880 5242880 0.1 0.1 0 0 1.1 +2097152 0 1 1 0 4718592 5242880 5242880 0.1 -0.1 0 0 1.09999999999999 +2097152 0 1 1 0 4980736 5242880 5242880 0.1 -0.05 0 0 1.09999999999999 +2097152 0 1 1 0 5242880 5242880 5242880 0.1 0 0 0 1.09999999999999 +2097152 0 1 1 0 5505024 5242880 5242880 0.1 0.05 0 0 1.09999999999999 +2097152 0 1 1 0 5767168 5242880 5242880 0.1 0.1 0 0 1.09999999999999 2097152 0 1 1 0 6029312 5242880 5242880 0.1 0.15 0 0 1.1 2097152 0 1 1 0 6291456 5242880 5242880 0.1 0.2 0 0 1.1 2097152 0 1 1 0 6553600 5242880 5242880 0.1 0.25 0 0 1.1 @@ -1541,15 +1541,15 @@ 2097152 0 2 0 0 4325376 5242880 5242880 0.1 -0.175 0 0 1.1 2097152 0 2 0 0 4456448 5242880 5242880 0.1 -0.15 0 0 1.1 2097152 0 2 0 0 4587520 5242880 5242880 0.1 -0.125 0 0 1.1 -2097152 0 2 0 0 4718592 5242880 5242880 0.1 -0.1 0 0 1.1 -2097152 0 2 0 0 4849664 5242880 5242880 0.1 -0.075 0 0 1.1 -2097152 0 2 0 0 4980736 5242880 5242880 0.1 -0.05 0 0 1.1 -2097152 0 2 0 0 5111808 5242880 5242880 0.1 -0.025 0 0 1.1 -2097152 0 2 0 0 5242880 5242880 5242880 0.1 0 0 0 1.1 -2097152 0 2 0 0 5373952 5242880 5242880 0.1 0.025 0 0 1.1 -2097152 0 2 0 0 5505024 5242880 5242880 0.1 0.05 0 0 1.1 -2097152 0 2 0 0 5636096 5242880 5242880 0.1 0.075 0 0 1.1 -2097152 0 2 0 0 5767168 5242880 5242880 0.1 0.1 0 0 1.1 +2097152 0 2 0 0 4718592 5242880 5242880 0.1 -0.1 0 0 1.09999999999999 +2097152 0 2 0 0 4849664 5242880 5242880 0.1 -0.075 0 0 1.09999999999999 +2097152 0 2 0 0 4980736 5242880 5242880 0.1 -0.05 0 0 1.09999999999999 +2097152 0 2 0 0 5111808 5242880 5242880 0.1 -0.025 0 0 1.09999999999999 +2097152 0 2 0 0 5242880 5242880 5242880 0.1 0 0 0 1.09999999999999 +2097152 0 2 0 0 5373952 5242880 5242880 0.1 0.025 0 0 1.09999999999999 +2097152 0 2 0 0 5505024 5242880 5242880 0.1 0.05 0 0 1.09999999999999 +2097152 0 2 0 0 5636096 5242880 5242880 0.1 0.075 0 0 1.09999999999999 +2097152 0 2 0 0 5767168 5242880 5242880 0.1 0.1 0 0 1.09999999999999 2097152 0 2 0 0 5898240 5242880 5242880 0.1 0.125 0 0 1.1 2097152 0 2 0 0 6029312 5242880 5242880 0.1 0.15 0 0 1.1 2097152 0 2 0 0 6160384 5242880 5242880 0.1 0.175 0 0 1.1 @@ -1566,15 +1566,15 @@ 2097152 0 2 1 0 4325376 5242880 5242880 0.1 -0.175 0 0 1.1 2097152 0 2 1 0 4456448 5242880 5242880 0.1 -0.15 0 0 1.1 2097152 0 2 1 0 4587520 5242880 5242880 0.1 -0.125 0 0 1.1 -2097152 0 2 1 0 4718592 5242880 5242880 0.1 -0.1 0 0 1.1 -2097152 0 2 1 0 4849664 5242880 5242880 0.1 -0.075 0 0 1.1 -2097152 0 2 1 0 4980736 5242880 5242880 0.1 -0.05 0 0 1.1 -2097152 0 2 1 0 5111808 5242880 5242880 0.1 -0.025 0 0 1.1 -2097152 0 2 1 0 5242880 5242880 5242880 0.1 0 0 0 1.1 -2097152 0 2 1 0 5373952 5242880 5242880 0.1 0.025 0 0 1.1 -2097152 0 2 1 0 5505024 5242880 5242880 0.1 0.05 0 0 1.1 -2097152 0 2 1 0 5636096 5242880 5242880 0.1 0.075 0 0 1.1 -2097152 0 2 1 0 5767168 5242880 5242880 0.1 0.1 0 0 1.1 +2097152 0 2 1 0 4718592 5242880 5242880 0.1 -0.1 0 0 1.09999999999999 +2097152 0 2 1 0 4849664 5242880 5242880 0.1 -0.075 0 0 1.09999999999999 +2097152 0 2 1 0 4980736 5242880 5242880 0.1 -0.05 0 0 1.09999999999999 +2097152 0 2 1 0 5111808 5242880 5242880 0.1 -0.025 0 0 1.09999999999999 +2097152 0 2 1 0 5242880 5242880 5242880 0.1 0 0 0 1.09999999999999 +2097152 0 2 1 0 5373952 5242880 5242880 0.1 0.025 0 0 1.09999999999999 +2097152 0 2 1 0 5505024 5242880 5242880 0.1 0.05 0 0 1.09999999999999 +2097152 0 2 1 0 5636096 5242880 5242880 0.1 0.075 0 0 1.09999999999999 +2097152 0 2 1 0 5767168 5242880 5242880 0.1 0.1 0 0 1.09999999999999 2097152 0 2 1 0 5898240 5242880 5242880 0.1 0.125 0 0 1.1 2097152 0 2 1 0 6029312 5242880 5242880 0.1 0.15 0 0 1.1 2097152 0 2 1 0 6160384 5242880 5242880 0.1 0.175 0 0 1.1 diff --git a/Carpet/CarpetInterp/test/waveinterp-2p/phi.y.asc b/Carpet/CarpetInterp/test/waveinterp-2p/phi.y.asc index b289a3a82..e687049a4 100644 --- a/Carpet/CarpetInterp/test/waveinterp-2p/phi.y.asc +++ b/Carpet/CarpetInterp/test/waveinterp-2p/phi.y.asc @@ -1442,9 +1442,9 @@ 2097152 0 0 0 0 5242880 3145728 5242880 0.1 0 -0.4 0 1.1 2097152 0 0 0 0 5242880 3670016 5242880 0.1 0 -0.3 0 1.1 2097152 0 0 0 0 5242880 4194304 5242880 0.1 0 -0.2 0 1.1 -2097152 0 0 0 0 5242880 4718592 5242880 0.1 0 -0.1 0 1.1 -2097152 0 0 0 0 5242880 5242880 5242880 0.1 0 0 0 1.1 -2097152 0 0 0 0 5242880 5767168 5242880 0.1 0 0.1 0 1.1 +2097152 0 0 0 0 5242880 4718592 5242880 0.1 0 -0.1 0 1.09999999999999 +2097152 0 0 0 0 5242880 5242880 5242880 0.1 0 0 0 1.09999999999999 +2097152 0 0 0 0 5242880 5767168 5242880 0.1 0 0.1 0 1.09999999999999 2097152 0 0 0 0 5242880 6291456 5242880 0.1 0 0.2 0 1.1 2097152 0 0 0 0 5242880 6815744 5242880 0.1 0 0.3 0 1.1 2097152 0 0 0 0 5242880 7340032 5242880 0.1 0 0.4 0 1.1 @@ -1467,9 +1467,9 @@ 2097152 0 0 1 0 5242880 3145728 5242880 0.1 0 -0.4 0 1.1 2097152 0 0 1 0 5242880 3670016 5242880 0.1 0 -0.3 0 1.1 2097152 0 0 1 0 5242880 4194304 5242880 0.1 0 -0.2 0 1.1 -2097152 0 0 1 0 5242880 4718592 5242880 0.1 0 -0.1 0 1.1 -2097152 0 0 1 0 5242880 5242880 5242880 0.1 0 0 0 1.1 -2097152 0 0 1 0 5242880 5767168 5242880 0.1 0 0.1 0 1.1 +2097152 0 0 1 0 5242880 4718592 5242880 0.1 0 -0.1 0 1.09999999999999 +2097152 0 0 1 0 5242880 5242880 5242880 0.1 0 0 0 1.09999999999999 +2097152 0 0 1 0 5242880 5767168 5242880 0.1 0 0.1 0 1.09999999999999 2097152 0 0 1 0 5242880 6291456 5242880 0.1 0 0.2 0 1.1 2097152 0 0 1 0 5242880 6815744 5242880 0.1 0 0.3 0 1.1 2097152 0 0 1 0 5242880 7340032 5242880 0.1 0 0.4 0 1.1 @@ -1492,11 +1492,11 @@ 2097152 0 1 0 0 5242880 3932160 5242880 0.1 0 -0.25 0 1.1 2097152 0 1 0 0 5242880 4194304 5242880 0.1 0 -0.2 0 1.1 2097152 0 1 0 0 5242880 4456448 5242880 0.1 0 -0.15 0 1.1 -2097152 0 1 0 0 5242880 4718592 5242880 0.1 0 -0.1 0 1.1 -2097152 0 1 0 0 5242880 4980736 5242880 0.1 0 -0.05 0 1.1 -2097152 0 1 0 0 5242880 5242880 5242880 0.1 0 0 0 1.1 -2097152 0 1 0 0 5242880 5505024 5242880 0.1 0 0.05 0 1.1 -2097152 0 1 0 0 5242880 5767168 5242880 0.1 0 0.1 0 1.1 +2097152 0 1 0 0 5242880 4718592 5242880 0.1 0 -0.1 0 1.09999999999999 +2097152 0 1 0 0 5242880 4980736 5242880 0.1 0 -0.05 0 1.09999999999999 +2097152 0 1 0 0 5242880 5242880 5242880 0.1 0 0 0 1.09999999999999 +2097152 0 1 0 0 5242880 5505024 5242880 0.1 0 0.05 0 1.09999999999999 +2097152 0 1 0 0 5242880 5767168 5242880 0.1 0 0.1 0 1.09999999999999 2097152 0 1 0 0 5242880 6029312 5242880 0.1 0 0.15 0 1.1 2097152 0 1 0 0 5242880 6291456 5242880 0.1 0 0.2 0 1.1 2097152 0 1 0 0 5242880 6553600 5242880 0.1 0 0.25 0 1.1 @@ -1517,11 +1517,11 @@ 2097152 0 1 1 0 5242880 3932160 5242880 0.1 0 -0.25 0 1.1 2097152 0 1 1 0 5242880 4194304 5242880 0.1 0 -0.2 0 1.1 2097152 0 1 1 0 5242880 4456448 5242880 0.1 0 -0.15 0 1.1 -2097152 0 1 1 0 5242880 4718592 5242880 0.1 0 -0.1 0 1.1 -2097152 0 1 1 0 5242880 4980736 5242880 0.1 0 -0.05 0 1.1 -2097152 0 1 1 0 5242880 5242880 5242880 0.1 0 0 0 1.1 -2097152 0 1 1 0 5242880 5505024 5242880 0.1 0 0.05 0 1.1 -2097152 0 1 1 0 5242880 5767168 5242880 0.1 0 0.1 0 1.1 +2097152 0 1 1 0 5242880 4718592 5242880 0.1 0 -0.1 0 1.09999999999999 +2097152 0 1 1 0 5242880 4980736 5242880 0.1 0 -0.05 0 1.09999999999999 +2097152 0 1 1 0 5242880 5242880 5242880 0.1 0 0 0 1.09999999999999 +2097152 0 1 1 0 5242880 5505024 5242880 0.1 0 0.05 0 1.09999999999999 +2097152 0 1 1 0 5242880 5767168 5242880 0.1 0 0.1 0 1.09999999999999 2097152 0 1 1 0 5242880 6029312 5242880 0.1 0 0.15 0 1.1 2097152 0 1 1 0 5242880 6291456 5242880 0.1 0 0.2 0 1.1 2097152 0 1 1 0 5242880 6553600 5242880 0.1 0 0.25 0 1.1 @@ -1541,15 +1541,15 @@ 2097152 0 2 0 0 5242880 4325376 5242880 0.1 0 -0.175 0 1.1 2097152 0 2 0 0 5242880 4456448 5242880 0.1 0 -0.15 0 1.1 2097152 0 2 0 0 5242880 4587520 5242880 0.1 0 -0.125 0 1.1 -2097152 0 2 0 0 5242880 4718592 5242880 0.1 0 -0.1 0 1.1 -2097152 0 2 0 0 5242880 4849664 5242880 0.1 0 -0.075 0 1.1 -2097152 0 2 0 0 5242880 4980736 5242880 0.1 0 -0.05 0 1.1 -2097152 0 2 0 0 5242880 5111808 5242880 0.1 0 -0.025 0 1.1 -2097152 0 2 0 0 5242880 5242880 5242880 0.1 0 0 0 1.1 -2097152 0 2 0 0 5242880 5373952 5242880 0.1 0 0.025 0 1.1 -2097152 0 2 0 0 5242880 5505024 5242880 0.1 0 0.05 0 1.1 -2097152 0 2 0 0 5242880 5636096 5242880 0.1 0 0.075 0 1.1 -2097152 0 2 0 0 5242880 5767168 5242880 0.1 0 0.1 0 1.1 +2097152 0 2 0 0 5242880 4718592 5242880 0.1 0 -0.1 0 1.09999999999999 +2097152 0 2 0 0 5242880 4849664 5242880 0.1 0 -0.075 0 1.09999999999999 +2097152 0 2 0 0 5242880 4980736 5242880 0.1 0 -0.05 0 1.09999999999999 +2097152 0 2 0 0 5242880 5111808 5242880 0.1 0 -0.025 0 1.09999999999999 +2097152 0 2 0 0 5242880 5242880 5242880 0.1 0 0 0 1.09999999999999 +2097152 0 2 0 0 5242880 5373952 5242880 0.1 0 0.025 0 1.09999999999999 +2097152 0 2 0 0 5242880 5505024 5242880 0.1 0 0.05 0 1.09999999999999 +2097152 0 2 0 0 5242880 5636096 5242880 0.1 0 0.075 0 1.09999999999999 +2097152 0 2 0 0 5242880 5767168 5242880 0.1 0 0.1 0 1.09999999999999 2097152 0 2 0 0 5242880 5898240 5242880 0.1 0 0.125 0 1.1 2097152 0 2 0 0 5242880 6029312 5242880 0.1 0 0.15 0 1.1 2097152 0 2 0 0 5242880 6160384 5242880 0.1 0 0.175 0 1.1 @@ -1566,15 +1566,15 @@ 2097152 0 2 1 0 5242880 4325376 5242880 0.1 0 -0.175 0 1.1 2097152 0 2 1 0 5242880 4456448 5242880 0.1 0 -0.15 0 1.1 2097152 0 2 1 0 5242880 4587520 5242880 0.1 0 -0.125 0 1.1 -2097152 0 2 1 0 5242880 4718592 5242880 0.1 0 -0.1 0 1.1 -2097152 0 2 1 0 5242880 4849664 5242880 0.1 0 -0.075 0 1.1 -2097152 0 2 1 0 5242880 4980736 5242880 0.1 0 -0.05 0 1.1 -2097152 0 2 1 0 5242880 5111808 5242880 0.1 0 -0.025 0 1.1 -2097152 0 2 1 0 5242880 5242880 5242880 0.1 0 0 0 1.1 -2097152 0 2 1 0 5242880 5373952 5242880 0.1 0 0.025 0 1.1 -2097152 0 2 1 0 5242880 5505024 5242880 0.1 0 0.05 0 1.1 -2097152 0 2 1 0 5242880 5636096 5242880 0.1 0 0.075 0 1.1 -2097152 0 2 1 0 5242880 5767168 5242880 0.1 0 0.1 0 1.1 +2097152 0 2 1 0 5242880 4718592 5242880 0.1 0 -0.1 0 1.09999999999999 +2097152 0 2 1 0 5242880 4849664 5242880 0.1 0 -0.075 0 1.09999999999999 +2097152 0 2 1 0 5242880 4980736 5242880 0.1 0 -0.05 0 1.09999999999999 +2097152 0 2 1 0 5242880 5111808 5242880 0.1 0 -0.025 0 1.09999999999999 +2097152 0 2 1 0 5242880 5242880 5242880 0.1 0 0 0 1.09999999999999 +2097152 0 2 1 0 5242880 5373952 5242880 0.1 0 0.025 0 1.09999999999999 +2097152 0 2 1 0 5242880 5505024 5242880 0.1 0 0.05 0 1.09999999999999 +2097152 0 2 1 0 5242880 5636096 5242880 0.1 0 0.075 0 1.09999999999999 +2097152 0 2 1 0 5242880 5767168 5242880 0.1 0 0.1 0 1.09999999999999 2097152 0 2 1 0 5242880 5898240 5242880 0.1 0 0.125 0 1.1 2097152 0 2 1 0 5242880 6029312 5242880 0.1 0 0.15 0 1.1 2097152 0 2 1 0 5242880 6160384 5242880 0.1 0 0.175 0 1.1 diff --git a/Carpet/CarpetInterp/test/waveinterp-2p/phi.z.asc b/Carpet/CarpetInterp/test/waveinterp-2p/phi.z.asc index a2e39f77e..6b9374217 100644 --- a/Carpet/CarpetInterp/test/waveinterp-2p/phi.z.asc +++ b/Carpet/CarpetInterp/test/waveinterp-2p/phi.z.asc @@ -966,17 +966,17 @@ 2097152 0 0 0 0 5242880 5242880 3145728 0.1 0 0 -0.4 1.1 2097152 0 0 0 0 5242880 5242880 3670016 0.1 0 0 -0.3 1.1 2097152 0 0 0 0 5242880 5242880 4194304 0.1 0 0 -0.2 1.1 -2097152 0 0 0 0 5242880 5242880 4718592 0.1 0 0 -0.1 1.1 -2097152 0 0 0 0 5242880 5242880 5242880 0.1 0 0 0 1.1 -2097152 0 0 0 0 5242880 5242880 5767168 0.1 0 0 0.1 1.1 +2097152 0 0 0 0 5242880 5242880 4718592 0.1 0 0 -0.1 1.09999999999999 +2097152 0 0 0 0 5242880 5242880 5242880 0.1 0 0 0 1.09999999999999 +2097152 0 0 0 0 5242880 5242880 5767168 0.1 0 0 0.1 1.09999999999999 2097152 0 0 0 0 5242880 5242880 6291456 0.1 0 0 0.2 1.1 # iteration 2097152 # refinement level 0 multigrid level 0 map 0 component 1 time level 0 # column format: 1:it 2:tl 3:rl 4:c 5:ml 6:ix 7:iy 8:iz 9:time 10:x 11:y 12:z 13:data -2097152 0 0 1 0 5242880 5242880 4718592 0.1 0 0 -0.1 1.1 -2097152 0 0 1 0 5242880 5242880 5242880 0.1 0 0 0 1.1 -2097152 0 0 1 0 5242880 5242880 5767168 0.1 0 0 0.1 1.1 +2097152 0 0 1 0 5242880 5242880 4718592 0.1 0 0 -0.1 1.09999999999999 +2097152 0 0 1 0 5242880 5242880 5242880 0.1 0 0 0 1.09999999999999 +2097152 0 0 1 0 5242880 5242880 5767168 0.1 0 0 0.1 1.09999999999999 2097152 0 0 1 0 5242880 5242880 6291456 0.1 0 0 0.2 1.1 2097152 0 0 1 0 5242880 5242880 6815744 0.1 0 0 0.3 1.1 2097152 0 0 1 0 5242880 5242880 7340032 0.1 0 0 0.4 1.1 @@ -999,19 +999,19 @@ 2097152 0 1 0 0 5242880 5242880 3932160 0.1 0 0 -0.25 1.1 2097152 0 1 0 0 5242880 5242880 4194304 0.1 0 0 -0.2 1.1 2097152 0 1 0 0 5242880 5242880 4456448 0.1 0 0 -0.15 1.1 -2097152 0 1 0 0 5242880 5242880 4718592 0.1 0 0 -0.1 1.1 -2097152 0 1 0 0 5242880 5242880 4980736 0.1 0 0 -0.05 1.1 -2097152 0 1 0 0 5242880 5242880 5242880 0.1 0 0 0 1.1 -2097152 0 1 0 0 5242880 5242880 5505024 0.1 0 0 0.05 1.1 -2097152 0 1 0 0 5242880 5242880 5767168 0.1 0 0 0.1 1.1 +2097152 0 1 0 0 5242880 5242880 4718592 0.1 0 0 -0.1 1.09999999999999 +2097152 0 1 0 0 5242880 5242880 4980736 0.1 0 0 -0.05 1.09999999999999 +2097152 0 1 0 0 5242880 5242880 5242880 0.1 0 0 0 1.09999999999999 +2097152 0 1 0 0 5242880 5242880 5505024 0.1 0 0 0.05 1.09999999999999 +2097152 0 1 0 0 5242880 5242880 5767168 0.1 0 0 0.1 1.09999999999999 # iteration 2097152 # refinement level 1 multigrid level 0 map 0 component 1 time level 0 # column format: 1:it 2:tl 3:rl 4:c 5:ml 6:ix 7:iy 8:iz 9:time 10:x 11:y 12:z 13:data -2097152 0 1 1 0 5242880 5242880 4980736 0.1 0 0 -0.05 1.1 -2097152 0 1 1 0 5242880 5242880 5242880 0.1 0 0 0 1.1 -2097152 0 1 1 0 5242880 5242880 5505024 0.1 0 0 0.05 1.1 -2097152 0 1 1 0 5242880 5242880 5767168 0.1 0 0 0.1 1.1 +2097152 0 1 1 0 5242880 5242880 4980736 0.1 0 0 -0.05 1.09999999999999 +2097152 0 1 1 0 5242880 5242880 5242880 0.1 0 0 0 1.09999999999999 +2097152 0 1 1 0 5242880 5242880 5505024 0.1 0 0 0.05 1.09999999999999 +2097152 0 1 1 0 5242880 5242880 5767168 0.1 0 0 0.1 1.09999999999999 2097152 0 1 1 0 5242880 5242880 6029312 0.1 0 0 0.15 1.1 2097152 0 1 1 0 5242880 5242880 6291456 0.1 0 0 0.2 1.1 2097152 0 1 1 0 5242880 5242880 6553600 0.1 0 0 0.25 1.1 @@ -1031,23 +1031,23 @@ 2097152 0 2 0 0 5242880 5242880 4325376 0.1 0 0 -0.175 1.1 2097152 0 2 0 0 5242880 5242880 4456448 0.1 0 0 -0.15 1.1 2097152 0 2 0 0 5242880 5242880 4587520 0.1 0 0 -0.125 1.1 -2097152 0 2 0 0 5242880 5242880 4718592 0.1 0 0 -0.1 1.1 -2097152 0 2 0 0 5242880 5242880 4849664 0.1 0 0 -0.075 1.1 -2097152 0 2 0 0 5242880 5242880 4980736 0.1 0 0 -0.05 1.1 -2097152 0 2 0 0 5242880 5242880 5111808 0.1 0 0 -0.025 1.1 -2097152 0 2 0 0 5242880 5242880 5242880 0.1 0 0 0 1.1 -2097152 0 2 0 0 5242880 5242880 5373952 0.1 0 0 0.025 1.1 -2097152 0 2 0 0 5242880 5242880 5505024 0.1 0 0 0.05 1.1 +2097152 0 2 0 0 5242880 5242880 4718592 0.1 0 0 -0.1 1.09999999999999 +2097152 0 2 0 0 5242880 5242880 4849664 0.1 0 0 -0.075 1.09999999999999 +2097152 0 2 0 0 5242880 5242880 4980736 0.1 0 0 -0.05 1.09999999999999 +2097152 0 2 0 0 5242880 5242880 5111808 0.1 0 0 -0.025 1.09999999999999 +2097152 0 2 0 0 5242880 5242880 5242880 0.1 0 0 0 1.09999999999999 +2097152 0 2 0 0 5242880 5242880 5373952 0.1 0 0 0.025 1.09999999999999 +2097152 0 2 0 0 5242880 5242880 5505024 0.1 0 0 0.05 1.09999999999999 # iteration 2097152 # refinement level 2 multigrid level 0 map 0 component 1 time level 0 # column format: 1:it 2:tl 3:rl 4:c 5:ml 6:ix 7:iy 8:iz 9:time 10:x 11:y 12:z 13:data -2097152 0 2 1 0 5242880 5242880 5111808 0.1 0 0 -0.025 1.1 -2097152 0 2 1 0 5242880 5242880 5242880 0.1 0 0 0 1.1 -2097152 0 2 1 0 5242880 5242880 5373952 0.1 0 0 0.025 1.1 -2097152 0 2 1 0 5242880 5242880 5505024 0.1 0 0 0.05 1.1 -2097152 0 2 1 0 5242880 5242880 5636096 0.1 0 0 0.075 1.1 -2097152 0 2 1 0 5242880 5242880 5767168 0.1 0 0 0.1 1.1 +2097152 0 2 1 0 5242880 5242880 5111808 0.1 0 0 -0.025 1.09999999999999 +2097152 0 2 1 0 5242880 5242880 5242880 0.1 0 0 0 1.09999999999999 +2097152 0 2 1 0 5242880 5242880 5373952 0.1 0 0 0.025 1.09999999999999 +2097152 0 2 1 0 5242880 5242880 5505024 0.1 0 0 0.05 1.09999999999999 +2097152 0 2 1 0 5242880 5242880 5636096 0.1 0 0 0.075 1.09999999999999 +2097152 0 2 1 0 5242880 5242880 5767168 0.1 0 0 0.1 1.09999999999999 2097152 0 2 1 0 5242880 5242880 5898240 0.1 0 0 0.125 1.1 2097152 0 2 1 0 5242880 5242880 6029312 0.1 0 0 0.15 1.1 2097152 0 2 1 0 5242880 5242880 6160384 0.1 0 0 0.175 1.1 diff --git a/Carpet/CarpetInterp/test/waveinterp-2p/phit.minimum.asc b/Carpet/CarpetInterp/test/waveinterp-2p/phit.minimum.asc index cee29c112..119716458 100644 --- a/Carpet/CarpetInterp/test/waveinterp-2p/phit.minimum.asc +++ b/Carpet/CarpetInterp/test/waveinterp-2p/phit.minimum.asc @@ -17,5 +17,5 @@ 1572864 0.075 1 1703936 0.08125 1 1835008 0.0875 1 -1966080 0.09375 1 +1966080 0.09375 0.999999999999999 2097152 0.1 1 diff --git a/Carpet/CarpetInterp/test/waveinterp-2p/phix.average.asc b/Carpet/CarpetInterp/test/waveinterp-2p/phix.average.asc index a541ae100..76627ad50 100644 --- a/Carpet/CarpetInterp/test/waveinterp-2p/phix.average.asc +++ b/Carpet/CarpetInterp/test/waveinterp-2p/phix.average.asc @@ -9,7 +9,7 @@ 524288 0.025 0 655360 0.03125 0 786432 0.0375 0 -917504 0.04375 0 +917504 0.04375 -5.64237288394698e-39 1048576 0.05 0 1179648 0.05625 0 1310720 0.0625 0 diff --git a/Carpet/CarpetInterp/test/waveinterp-2p/phix.maximum.asc b/Carpet/CarpetInterp/test/waveinterp-2p/phix.maximum.asc index a541ae100..42acd5c92 100644 --- a/Carpet/CarpetInterp/test/waveinterp-2p/phix.maximum.asc +++ b/Carpet/CarpetInterp/test/waveinterp-2p/phix.maximum.asc @@ -6,16 +6,16 @@ 131072 0.00625 0 262144 0.0125 0 393216 0.01875 0 -524288 0.025 0 -655360 0.03125 0 -786432 0.0375 0 -917504 0.04375 0 -1048576 0.05 0 -1179648 0.05625 0 -1310720 0.0625 0 -1441792 0.06875 0 -1572864 0.075 0 -1703936 0.08125 0 -1835008 0.0875 0 -1966080 0.09375 0 -2097152 0.1 0 +524288 0.025 2.77555756156289e-17 +655360 0.03125 2.77555756156289e-17 +786432 0.0375 2.77555756156289e-17 +917504 0.04375 2.77555756156289e-17 +1048576 0.05 2.77555756156289e-17 +1179648 0.05625 3.12250225675825e-17 +1310720 0.0625 2.77555756156289e-17 +1441792 0.06875 2.77555756156289e-17 +1572864 0.075 2.77555756156289e-17 +1703936 0.08125 2.77555756156289e-17 +1835008 0.0875 2.77555756156289e-17 +1966080 0.09375 2.77555756156289e-17 +2097152 0.1 5.55111512312578e-17 diff --git a/Carpet/CarpetInterp/test/waveinterp-2p/phix.minimum.asc b/Carpet/CarpetInterp/test/waveinterp-2p/phix.minimum.asc index a541ae100..4fe2b1cc2 100644 --- a/Carpet/CarpetInterp/test/waveinterp-2p/phix.minimum.asc +++ b/Carpet/CarpetInterp/test/waveinterp-2p/phix.minimum.asc @@ -6,16 +6,16 @@ 131072 0.00625 0 262144 0.0125 0 393216 0.01875 0 -524288 0.025 0 -655360 0.03125 0 -786432 0.0375 0 -917504 0.04375 0 -1048576 0.05 0 -1179648 0.05625 0 -1310720 0.0625 0 -1441792 0.06875 0 -1572864 0.075 0 -1703936 0.08125 0 -1835008 0.0875 0 -1966080 0.09375 0 -2097152 0.1 0 +524288 0.025 -2.77555756156289e-17 +655360 0.03125 -2.77555756156289e-17 +786432 0.0375 -2.77555756156289e-17 +917504 0.04375 -2.77555756156289e-17 +1048576 0.05 -2.77555756156289e-17 +1179648 0.05625 -3.12250225675825e-17 +1310720 0.0625 -2.77555756156289e-17 +1441792 0.06875 -2.77555756156289e-17 +1572864 0.075 -2.77555756156289e-17 +1703936 0.08125 -2.77555756156289e-17 +1835008 0.0875 -2.77555756156289e-17 +1966080 0.09375 -2.77555756156289e-17 +2097152 0.1 -5.55111512312578e-17 diff --git a/Carpet/CarpetInterp/test/waveinterp-2p/phix.norm1.asc b/Carpet/CarpetInterp/test/waveinterp-2p/phix.norm1.asc index a541ae100..963fb9e18 100644 --- a/Carpet/CarpetInterp/test/waveinterp-2p/phix.norm1.asc +++ b/Carpet/CarpetInterp/test/waveinterp-2p/phix.norm1.asc @@ -6,16 +6,16 @@ 131072 0.00625 0 262144 0.0125 0 393216 0.01875 0 -524288 0.025 0 -655360 0.03125 0 -786432 0.0375 0 -917504 0.04375 0 -1048576 0.05 0 -1179648 0.05625 0 -1310720 0.0625 0 -1441792 0.06875 0 -1572864 0.075 0 -1703936 0.08125 0 -1835008 0.0875 0 -1966080 0.09375 0 -2097152 0.1 0 +524288 0.025 6.07153216591882e-21 +655360 0.03125 6.07153216591882e-21 +786432 0.0375 6.07153216591882e-21 +917504 0.04375 2.09616566946002e-20 +1048576 0.05 4.57785309090691e-20 +1179648 0.05625 5.07419057519629e-20 +1310720 0.0625 4.57785309090691e-20 +1441792 0.06875 4.57785309090691e-20 +1572864 0.075 4.57785309090691e-20 +1703936 0.08125 4.57785309090691e-20 +1835008 0.0875 4.57785309090691e-20 +1966080 0.09375 4.57785309090691e-20 +2097152 0.1 4.75132543850459e-20 diff --git a/Carpet/CarpetInterp/test/waveinterp-2p/phix.norm2.asc b/Carpet/CarpetInterp/test/waveinterp-2p/phix.norm2.asc index a541ae100..7e27de91f 100644 --- a/Carpet/CarpetInterp/test/waveinterp-2p/phix.norm2.asc +++ b/Carpet/CarpetInterp/test/waveinterp-2p/phix.norm2.asc @@ -6,16 +6,16 @@ 131072 0.00625 0 262144 0.0125 0 393216 0.01875 0 -524288 0.025 0 -655360 0.03125 0 -786432 0.0375 0 -917504 0.04375 0 -1048576 0.05 0 -1179648 0.05625 0 -1310720 0.0625 0 -1441792 0.06875 0 -1572864 0.075 0 -1703936 0.08125 0 -1835008 0.0875 0 -1966080 0.09375 0 -2097152 0.1 0 +524288 0.025 4.10510499419787e-19 +655360 0.03125 4.10510499419787e-19 +786432 0.0375 4.10510499419787e-19 +917504 0.04375 5.4849399728362e-19 +1048576 0.05 1.05333252669963e-18 +1179648 0.05625 1.16595884337073e-18 +1310720 0.0625 1.05333252669963e-18 +1441792 0.06875 1.05333252669963e-18 +1572864 0.075 1.05333252669963e-18 +1703936 0.08125 1.05333252669963e-18 +1835008 0.0875 1.05333252669963e-18 +1966080 0.09375 1.05333252669963e-18 +2097152 0.1 1.11980094554009e-18 diff --git a/Carpet/CarpetInterp/test/waveinterp-2p/phix.norm_inf.asc b/Carpet/CarpetInterp/test/waveinterp-2p/phix.norm_inf.asc index a541ae100..42acd5c92 100644 --- a/Carpet/CarpetInterp/test/waveinterp-2p/phix.norm_inf.asc +++ b/Carpet/CarpetInterp/test/waveinterp-2p/phix.norm_inf.asc @@ -6,16 +6,16 @@ 131072 0.00625 0 262144 0.0125 0 393216 0.01875 0 -524288 0.025 0 -655360 0.03125 0 -786432 0.0375 0 -917504 0.04375 0 -1048576 0.05 0 -1179648 0.05625 0 -1310720 0.0625 0 -1441792 0.06875 0 -1572864 0.075 0 -1703936 0.08125 0 -1835008 0.0875 0 -1966080 0.09375 0 -2097152 0.1 0 +524288 0.025 2.77555756156289e-17 +655360 0.03125 2.77555756156289e-17 +786432 0.0375 2.77555756156289e-17 +917504 0.04375 2.77555756156289e-17 +1048576 0.05 2.77555756156289e-17 +1179648 0.05625 3.12250225675825e-17 +1310720 0.0625 2.77555756156289e-17 +1441792 0.06875 2.77555756156289e-17 +1572864 0.075 2.77555756156289e-17 +1703936 0.08125 2.77555756156289e-17 +1835008 0.0875 2.77555756156289e-17 +1966080 0.09375 2.77555756156289e-17 +2097152 0.1 5.55111512312578e-17 diff --git a/Carpet/CarpetInterp/test/waveinterp-2p/phiy.average.asc b/Carpet/CarpetInterp/test/waveinterp-2p/phiy.average.asc index 7193b77f4..e3945b875 100644 --- a/Carpet/CarpetInterp/test/waveinterp-2p/phiy.average.asc +++ b/Carpet/CarpetInterp/test/waveinterp-2p/phiy.average.asc @@ -9,7 +9,7 @@ 524288 0.025 0 655360 0.03125 0 786432 0.0375 0 -917504 0.04375 0 +917504 0.04375 2.82118644197349e-38 1048576 0.05 0 1179648 0.05625 0 1310720 0.0625 0 diff --git a/Carpet/CarpetInterp/test/waveinterp-2p/phiy.maximum.asc b/Carpet/CarpetInterp/test/waveinterp-2p/phiy.maximum.asc index 7193b77f4..422a7abd2 100644 --- a/Carpet/CarpetInterp/test/waveinterp-2p/phiy.maximum.asc +++ b/Carpet/CarpetInterp/test/waveinterp-2p/phiy.maximum.asc @@ -6,16 +6,16 @@ 131072 0.00625 0 262144 0.0125 0 393216 0.01875 0 -524288 0.025 0 -655360 0.03125 0 -786432 0.0375 0 -917504 0.04375 0 -1048576 0.05 0 -1179648 0.05625 0 -1310720 0.0625 0 -1441792 0.06875 0 -1572864 0.075 0 -1703936 0.08125 0 -1835008 0.0875 0 -1966080 0.09375 0 -2097152 0.1 0 +524288 0.025 2.77555756156289e-17 +655360 0.03125 2.77555756156289e-17 +786432 0.0375 2.77555756156289e-17 +917504 0.04375 2.77555756156289e-17 +1048576 0.05 2.77555756156289e-17 +1179648 0.05625 3.12250225675825e-17 +1310720 0.0625 2.77555756156289e-17 +1441792 0.06875 2.77555756156289e-17 +1572864 0.075 2.77555756156289e-17 +1703936 0.08125 2.77555756156289e-17 +1835008 0.0875 2.77555756156289e-17 +1966080 0.09375 2.77555756156289e-17 +2097152 0.1 5.55111512312578e-17 diff --git a/Carpet/CarpetInterp/test/waveinterp-2p/phiy.minimum.asc b/Carpet/CarpetInterp/test/waveinterp-2p/phiy.minimum.asc index 7193b77f4..ade51ca79 100644 --- a/Carpet/CarpetInterp/test/waveinterp-2p/phiy.minimum.asc +++ b/Carpet/CarpetInterp/test/waveinterp-2p/phiy.minimum.asc @@ -6,16 +6,16 @@ 131072 0.00625 0 262144 0.0125 0 393216 0.01875 0 -524288 0.025 0 -655360 0.03125 0 -786432 0.0375 0 -917504 0.04375 0 -1048576 0.05 0 -1179648 0.05625 0 -1310720 0.0625 0 -1441792 0.06875 0 -1572864 0.075 0 -1703936 0.08125 0 -1835008 0.0875 0 -1966080 0.09375 0 -2097152 0.1 0 +524288 0.025 -2.77555756156289e-17 +655360 0.03125 -2.77555756156289e-17 +786432 0.0375 -2.77555756156289e-17 +917504 0.04375 -2.77555756156289e-17 +1048576 0.05 -2.77555756156289e-17 +1179648 0.05625 -3.12250225675825e-17 +1310720 0.0625 -2.77555756156289e-17 +1441792 0.06875 -2.77555756156289e-17 +1572864 0.075 -2.77555756156289e-17 +1703936 0.08125 -2.77555756156289e-17 +1835008 0.0875 -2.77555756156289e-17 +1966080 0.09375 -2.77555756156289e-17 +2097152 0.1 -5.55111512312578e-17 diff --git a/Carpet/CarpetInterp/test/waveinterp-2p/phiy.norm1.asc b/Carpet/CarpetInterp/test/waveinterp-2p/phiy.norm1.asc index 7193b77f4..c275381f4 100644 --- a/Carpet/CarpetInterp/test/waveinterp-2p/phiy.norm1.asc +++ b/Carpet/CarpetInterp/test/waveinterp-2p/phiy.norm1.asc @@ -6,16 +6,16 @@ 131072 0.00625 0 262144 0.0125 0 393216 0.01875 0 -524288 0.025 0 -655360 0.03125 0 -786432 0.0375 0 -917504 0.04375 0 -1048576 0.05 0 -1179648 0.05625 0 -1310720 0.0625 0 -1441792 0.06875 0 -1572864 0.075 0 -1703936 0.08125 0 -1835008 0.0875 0 -1966080 0.09375 0 -2097152 0.1 0 +524288 0.025 6.07153216591882e-21 +655360 0.03125 6.07153216591882e-21 +786432 0.0375 6.07153216591882e-21 +917504 0.04375 2.09616566946002e-20 +1048576 0.05 4.57785309090691e-20 +1179648 0.05625 5.07419057519629e-20 +1310720 0.0625 4.57785309090691e-20 +1441792 0.06875 4.57785309090691e-20 +1572864 0.075 4.57785309090691e-20 +1703936 0.08125 4.57785309090691e-20 +1835008 0.0875 4.57785309090691e-20 +1966080 0.09375 4.57785309090691e-20 +2097152 0.1 4.75132543850459e-20 diff --git a/Carpet/CarpetInterp/test/waveinterp-2p/phiy.norm2.asc b/Carpet/CarpetInterp/test/waveinterp-2p/phiy.norm2.asc index 7193b77f4..963c6ee5d 100644 --- a/Carpet/CarpetInterp/test/waveinterp-2p/phiy.norm2.asc +++ b/Carpet/CarpetInterp/test/waveinterp-2p/phiy.norm2.asc @@ -6,16 +6,16 @@ 131072 0.00625 0 262144 0.0125 0 393216 0.01875 0 -524288 0.025 0 -655360 0.03125 0 -786432 0.0375 0 -917504 0.04375 0 -1048576 0.05 0 -1179648 0.05625 0 -1310720 0.0625 0 -1441792 0.06875 0 -1572864 0.075 0 -1703936 0.08125 0 -1835008 0.0875 0 -1966080 0.09375 0 -2097152 0.1 0 +524288 0.025 4.10510499419787e-19 +655360 0.03125 4.10510499419787e-19 +786432 0.0375 4.10510499419787e-19 +917504 0.04375 5.4849399728362e-19 +1048576 0.05 1.05333252669963e-18 +1179648 0.05625 1.16595884337073e-18 +1310720 0.0625 1.05333252669963e-18 +1441792 0.06875 1.05333252669963e-18 +1572864 0.075 1.05333252669963e-18 +1703936 0.08125 1.05333252669963e-18 +1835008 0.0875 1.05333252669963e-18 +1966080 0.09375 1.05333252669963e-18 +2097152 0.1 1.11980094554009e-18 diff --git a/Carpet/CarpetInterp/test/waveinterp-2p/phiy.norm_inf.asc b/Carpet/CarpetInterp/test/waveinterp-2p/phiy.norm_inf.asc index 7193b77f4..422a7abd2 100644 --- a/Carpet/CarpetInterp/test/waveinterp-2p/phiy.norm_inf.asc +++ b/Carpet/CarpetInterp/test/waveinterp-2p/phiy.norm_inf.asc @@ -6,16 +6,16 @@ 131072 0.00625 0 262144 0.0125 0 393216 0.01875 0 -524288 0.025 0 -655360 0.03125 0 -786432 0.0375 0 -917504 0.04375 0 -1048576 0.05 0 -1179648 0.05625 0 -1310720 0.0625 0 -1441792 0.06875 0 -1572864 0.075 0 -1703936 0.08125 0 -1835008 0.0875 0 -1966080 0.09375 0 -2097152 0.1 0 +524288 0.025 2.77555756156289e-17 +655360 0.03125 2.77555756156289e-17 +786432 0.0375 2.77555756156289e-17 +917504 0.04375 2.77555756156289e-17 +1048576 0.05 2.77555756156289e-17 +1179648 0.05625 3.12250225675825e-17 +1310720 0.0625 2.77555756156289e-17 +1441792 0.06875 2.77555756156289e-17 +1572864 0.075 2.77555756156289e-17 +1703936 0.08125 2.77555756156289e-17 +1835008 0.0875 2.77555756156289e-17 +1966080 0.09375 2.77555756156289e-17 +2097152 0.1 5.55111512312578e-17 diff --git a/Carpet/CarpetInterp/test/waveinterp-2p/phiz.maximum.asc b/Carpet/CarpetInterp/test/waveinterp-2p/phiz.maximum.asc index 85815b800..8492643ed 100644 --- a/Carpet/CarpetInterp/test/waveinterp-2p/phiz.maximum.asc +++ b/Carpet/CarpetInterp/test/waveinterp-2p/phiz.maximum.asc @@ -6,16 +6,16 @@ 131072 0.00625 0 262144 0.0125 0 393216 0.01875 0 -524288 0.025 0 -655360 0.03125 0 -786432 0.0375 0 -917504 0.04375 0 -1048576 0.05 0 -1179648 0.05625 0 -1310720 0.0625 0 -1441792 0.06875 0 -1572864 0.075 0 -1703936 0.08125 0 -1835008 0.0875 0 -1966080 0.09375 0 -2097152 0.1 0 +524288 0.025 2.77555756156289e-17 +655360 0.03125 2.77555756156289e-17 +786432 0.0375 2.77555756156289e-17 +917504 0.04375 2.77555756156289e-17 +1048576 0.05 2.77555756156289e-17 +1179648 0.05625 3.12250225675825e-17 +1310720 0.0625 2.77555756156289e-17 +1441792 0.06875 2.77555756156289e-17 +1572864 0.075 2.77555756156289e-17 +1703936 0.08125 2.77555756156289e-17 +1835008 0.0875 2.77555756156289e-17 +1966080 0.09375 2.77555756156289e-17 +2097152 0.1 5.55111512312578e-17 diff --git a/Carpet/CarpetInterp/test/waveinterp-2p/phiz.minimum.asc b/Carpet/CarpetInterp/test/waveinterp-2p/phiz.minimum.asc index 85815b800..c02ff7556 100644 --- a/Carpet/CarpetInterp/test/waveinterp-2p/phiz.minimum.asc +++ b/Carpet/CarpetInterp/test/waveinterp-2p/phiz.minimum.asc @@ -6,16 +6,16 @@ 131072 0.00625 0 262144 0.0125 0 393216 0.01875 0 -524288 0.025 0 -655360 0.03125 0 -786432 0.0375 0 -917504 0.04375 0 -1048576 0.05 0 -1179648 0.05625 0 -1310720 0.0625 0 -1441792 0.06875 0 -1572864 0.075 0 -1703936 0.08125 0 -1835008 0.0875 0 -1966080 0.09375 0 -2097152 0.1 0 +524288 0.025 -2.77555756156289e-17 +655360 0.03125 -2.77555756156289e-17 +786432 0.0375 -2.77555756156289e-17 +917504 0.04375 -2.77555756156289e-17 +1048576 0.05 -2.77555756156289e-17 +1179648 0.05625 -3.12250225675825e-17 +1310720 0.0625 -2.77555756156289e-17 +1441792 0.06875 -2.77555756156289e-17 +1572864 0.075 -2.77555756156289e-17 +1703936 0.08125 -2.77555756156289e-17 +1835008 0.0875 -2.77555756156289e-17 +1966080 0.09375 -2.77555756156289e-17 +2097152 0.1 -5.55111512312578e-17 diff --git a/Carpet/CarpetInterp/test/waveinterp-2p/phiz.norm1.asc b/Carpet/CarpetInterp/test/waveinterp-2p/phiz.norm1.asc index 85815b800..39505ad92 100644 --- a/Carpet/CarpetInterp/test/waveinterp-2p/phiz.norm1.asc +++ b/Carpet/CarpetInterp/test/waveinterp-2p/phiz.norm1.asc @@ -6,16 +6,16 @@ 131072 0.00625 0 262144 0.0125 0 393216 0.01875 0 -524288 0.025 0 -655360 0.03125 0 -786432 0.0375 0 -917504 0.04375 0 -1048576 0.05 0 -1179648 0.05625 0 -1310720 0.0625 0 -1441792 0.06875 0 -1572864 0.075 0 -1703936 0.08125 0 -1835008 0.0875 0 -1966080 0.09375 0 -2097152 0.1 0 +524288 0.025 6.07153216591882e-21 +655360 0.03125 6.07153216591882e-21 +786432 0.0375 6.07153216591882e-21 +917504 0.04375 2.09616566946002e-20 +1048576 0.05 4.57785309090691e-20 +1179648 0.05625 5.07419057519629e-20 +1310720 0.0625 4.57785309090691e-20 +1441792 0.06875 4.57785309090691e-20 +1572864 0.075 4.57785309090691e-20 +1703936 0.08125 4.57785309090691e-20 +1835008 0.0875 4.57785309090691e-20 +1966080 0.09375 4.57785309090691e-20 +2097152 0.1 4.75132543850459e-20 diff --git a/Carpet/CarpetInterp/test/waveinterp-2p/phiz.norm2.asc b/Carpet/CarpetInterp/test/waveinterp-2p/phiz.norm2.asc index 85815b800..f345e297d 100644 --- a/Carpet/CarpetInterp/test/waveinterp-2p/phiz.norm2.asc +++ b/Carpet/CarpetInterp/test/waveinterp-2p/phiz.norm2.asc @@ -6,16 +6,16 @@ 131072 0.00625 0 262144 0.0125 0 393216 0.01875 0 -524288 0.025 0 -655360 0.03125 0 -786432 0.0375 0 -917504 0.04375 0 -1048576 0.05 0 -1179648 0.05625 0 -1310720 0.0625 0 -1441792 0.06875 0 -1572864 0.075 0 -1703936 0.08125 0 -1835008 0.0875 0 -1966080 0.09375 0 -2097152 0.1 0 +524288 0.025 4.10510499419787e-19 +655360 0.03125 4.10510499419787e-19 +786432 0.0375 4.10510499419787e-19 +917504 0.04375 5.4849399728362e-19 +1048576 0.05 1.05333252669963e-18 +1179648 0.05625 1.16595884337073e-18 +1310720 0.0625 1.05333252669963e-18 +1441792 0.06875 1.05333252669963e-18 +1572864 0.075 1.05333252669963e-18 +1703936 0.08125 1.05333252669963e-18 +1835008 0.0875 1.05333252669963e-18 +1966080 0.09375 1.05333252669963e-18 +2097152 0.1 1.11980094554009e-18 diff --git a/Carpet/CarpetInterp/test/waveinterp-2p/phiz.norm_inf.asc b/Carpet/CarpetInterp/test/waveinterp-2p/phiz.norm_inf.asc index 85815b800..8492643ed 100644 --- a/Carpet/CarpetInterp/test/waveinterp-2p/phiz.norm_inf.asc +++ b/Carpet/CarpetInterp/test/waveinterp-2p/phiz.norm_inf.asc @@ -6,16 +6,16 @@ 131072 0.00625 0 262144 0.0125 0 393216 0.01875 0 -524288 0.025 0 -655360 0.03125 0 -786432 0.0375 0 -917504 0.04375 0 -1048576 0.05 0 -1179648 0.05625 0 -1310720 0.0625 0 -1441792 0.06875 0 -1572864 0.075 0 -1703936 0.08125 0 -1835008 0.0875 0 -1966080 0.09375 0 -2097152 0.1 0 +524288 0.025 2.77555756156289e-17 +655360 0.03125 2.77555756156289e-17 +786432 0.0375 2.77555756156289e-17 +917504 0.04375 2.77555756156289e-17 +1048576 0.05 2.77555756156289e-17 +1179648 0.05625 3.12250225675825e-17 +1310720 0.0625 2.77555756156289e-17 +1441792 0.06875 2.77555756156289e-17 +1572864 0.075 2.77555756156289e-17 +1703936 0.08125 2.77555756156289e-17 +1835008 0.0875 2.77555756156289e-17 +1966080 0.09375 2.77555756156289e-17 +2097152 0.1 5.55111512312578e-17 -- cgit v1.2.3