CarpetInterp: activate CarpetIOBasic in testsuite

Activated CarpetIOBasic rather than IOBasic.  Replaced the output files
accordingly.

darcs-hash:20060421214758-32473-d3ebcbfc54affcb8b6995526b74342c738c85129.gz

1 files changed, 0 insertions, 124 deletions

diff --git a/Carpet/CarpetInterp/test/waveinterp-2p/phix..asc b/Carpet/CarpetInterp/test/waveinterp-2p/phix..asc
index 861aa59de..c286c0b8d 100644
--- a/Carpet/CarpetInterp/test/waveinterp-2p/phix..asc
+++ b/Carpet/CarpetInterp/test/waveinterp-2p/phix..asc
@@ -6,278 +6,154 @@
 # 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
 0	0 0 0 0	5242880 5242880 5242880	0	0 0 0	0
-# iteration 0
-# 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
-0	0 0 1 0	5242880 5242880 5242880	0	0 0 0	0
 
 # iteration 0
 # 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
 0	0 1 0 0	5242880 5242880 5242880	0	0 0 0	0
-# iteration 0
-# 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
-0	0 1 1 0	5242880 5242880 5242880	0	0 0 0	0
 
 # iteration 0
 # 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
 0	0 2 0 0	5242880 5242880 5242880	0	0 0 0	0
-# iteration 0
-# 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
-0	0 2 1 0	5242880 5242880 5242880	0	0 0 0	0
 
 # iteration 131072
 # 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
 131072	0 2 0 0	5242880 5242880 5242880	0.00625	0 0 0	0
-# iteration 131072
-# 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
-131072	0 2 1 0	5242880 5242880 5242880	0.00625	0 0 0	0
 
 # iteration 262144
 # 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
 262144	0 1 0 0	5242880 5242880 5242880	0.0125	0 0 0	0
-# iteration 262144
-# 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
-262144	0 1 1 0	5242880 5242880 5242880	0.0125	0 0 0	0
 
 # iteration 262144
 # 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
 262144	0 2 0 0	5242880 5242880 5242880	0.0125	0 0 0	0
-# iteration 262144
-# 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
-262144	0 2 1 0	5242880 5242880 5242880	0.0125	0 0 0	0
 
 # iteration 393216
 # 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
 393216	0 2 0 0	5242880 5242880 5242880	0.01875	0 0 0	0
-# iteration 393216
-# 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
-393216	0 2 1 0	5242880 5242880 5242880	0.01875	0 0 0	0
 
 # iteration 524288
 # 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
 524288	0 0 0 0	5242880 5242880 5242880	0.025	0 0 0	0
-# iteration 524288
-# 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
-524288	0 0 1 0	5242880 5242880 5242880	0.025	0 0 0	0
 
 # iteration 524288
 # 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
 524288	0 1 0 0	5242880 5242880 5242880	0.025	0 0 0	0
-# iteration 524288
-# 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
-524288	0 1 1 0	5242880 5242880 5242880	0.025	0 0 0	0
 
 # iteration 524288
 # 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
 524288	0 2 0 0	5242880 5242880 5242880	0.025	0 0 0	0
-# iteration 524288
-# 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
-524288	0 2 1 0	5242880 5242880 5242880	0.025	0 0 0	0
 
 # iteration 655360
 # 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
 655360	0 2 0 0	5242880 5242880 5242880	0.03125	0 0 0	0
-# iteration 655360
-# 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
-655360	0 2 1 0	5242880 5242880 5242880	0.03125	0 0 0	0
 
 # iteration 786432
 # 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
 786432	0 1 0 0	5242880 5242880 5242880	0.0375	0 0 0	0
-# iteration 786432
-# 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
-786432	0 1 1 0	5242880 5242880 5242880	0.0375	0 0 0	0
 
 # iteration 786432
 # 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
 786432	0 2 0 0	5242880 5242880 5242880	0.0375	0 0 0	0
-# iteration 786432
-# 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
-786432	0 2 1 0	5242880 5242880 5242880	0.0375	0 0 0	0
 
 # iteration 917504
 # 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
 917504	0 2 0 0	5242880 5242880 5242880	0.04375	0 0 0	0
-# iteration 917504
-# 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
-917504	0 2 1 0	5242880 5242880 5242880	0.04375	0 0 0	0
 
 # iteration 1048576
 # 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
 1048576	0 0 0 0	5242880 5242880 5242880	0.05	0 0 0	0
-# iteration 1048576
-# 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
-1048576	0 0 1 0	5242880 5242880 5242880	0.05	0 0 0	0
 
 # iteration 1048576
 # 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
 1048576	0 1 0 0	5242880 5242880 5242880	0.05	0 0 0	0
-# iteration 1048576
-# 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
-1048576	0 1 1 0	5242880 5242880 5242880	0.05	0 0 0	0
 
 # iteration 1048576
 # 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
 1048576	0 2 0 0	5242880 5242880 5242880	0.05	0 0 0	0
-# iteration 1048576
-# 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
-1048576	0 2 1 0	5242880 5242880 5242880	0.05	0 0 0	0
 
 # iteration 1179648
 # 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
 1179648	0 2 0 0	5242880 5242880 5242880	0.05625	0 0 0	0
-# iteration 1179648
-# 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
-1179648	0 2 1 0	5242880 5242880 5242880	0.05625	0 0 0	0
 
 # iteration 1310720
 # 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
 1310720	0 1 0 0	5242880 5242880 5242880	0.0625	0 0 0	0
-# iteration 1310720
-# 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
-1310720	0 1 1 0	5242880 5242880 5242880	0.0625	0 0 0	0
 
 # iteration 1310720
 # 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
 1310720	0 2 0 0	5242880 5242880 5242880	0.0625	0 0 0	0
-# iteration 1310720
-# 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
-1310720	0 2 1 0	5242880 5242880 5242880	0.0625	0 0 0	0
 
 # iteration 1441792
 # 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
 1441792	0 2 0 0	5242880 5242880 5242880	0.06875	0 0 0	0
-# iteration 1441792
-# 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
-1441792	0 2 1 0	5242880 5242880 5242880	0.06875	0 0 0	0
 
 # iteration 1572864
 # 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
 1572864	0 0 0 0	5242880 5242880 5242880	0.075	0 0 0	0
-# iteration 1572864
-# 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
-1572864	0 0 1 0	5242880 5242880 5242880	0.075	0 0 0	0
 
 # iteration 1572864
 # 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
 1572864	0 1 0 0	5242880 5242880 5242880	0.075	0 0 0	0
-# iteration 1572864
-# 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
-1572864	0 1 1 0	5242880 5242880 5242880	0.075	0 0 0	0
 
 # iteration 1572864
 # 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
 1572864	0 2 0 0	5242880 5242880 5242880	0.075	0 0 0	0
-# iteration 1572864
-# 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
-1572864	0 2 1 0	5242880 5242880 5242880	0.075	0 0 0	0
 
 # iteration 1703936
 # 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
 1703936	0 2 0 0	5242880 5242880 5242880	0.08125	0 0 0	0
-# iteration 1703936
-# 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
-1703936	0 2 1 0	5242880 5242880 5242880	0.08125	0 0 0	0
 
 # iteration 1835008
 # 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
 1835008	0 1 0 0	5242880 5242880 5242880	0.0875	0 0 0	0
-# iteration 1835008
-# 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
-1835008	0 1 1 0	5242880 5242880 5242880	0.0875	0 0 0	0
 
 # iteration 1835008
 # 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
 1835008	0 2 0 0	5242880 5242880 5242880	0.0875	0 0 0	0
-# iteration 1835008
-# 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
-1835008	0 2 1 0	5242880 5242880 5242880	0.0875	0 0 0	0
 
 # iteration 1966080
 # 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
 1966080	0 2 0 0	5242880 5242880 5242880	0.09375	0 0 0	0
-# iteration 1966080
-# 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
-1966080	0 2 1 0	5242880 5242880 5242880	0.09375	0 0 0	0
 
 # 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	0
-# 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	0
 
 # 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	0
-# 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	0
 
 # 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	0
-# 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	0