Fixing bugs with octant mode, coordinates, and ASCII output.

Fixing bugs with octant mode, coordinates, and ASCII output.
Adapting the test suite.

darcs-hash:20010313110700-f6438-2bd65c5a1e0c1582bed9a08ec9c19df312ad817a.gz

12 files changed, 1098 insertions, 1024 deletions

diff --git a/CarpetExtra/WaveToyF77/test/wavetoyf77.log b/CarpetExtra/WaveToyF77/test/wavetoyf77.log
index 11d9f22b2..a5e76c34c 100644
--- a/CarpetExtra/WaveToyF77/test/wavetoyf77.log
+++ b/CarpetExtra/WaveToyF77/test/wavetoyf77.log
@@ -61,6 +61,31 @@ AMR 3D ASCII I/O provided by CarpetIOASCII
 --------------------------------------------------------------------------------
 WaveToyF77: Evolutions of a Scalar Field
 --------------------------------------------------------------------------------
+
+dh bboxes:
+rl=0 c=0 ml=0
+exterior=([0,0,0]:[19,19,19]:[1,1,1])
+interior=([1,1,1]:[18,18,18]:[1,1,1])
+send_mg_fine=[]
+send_mg_coarse=[]
+recv_mg_fine=[]
+recv_mg_coarse=[]
+send_ref_fine=[]
+send_ref_coarse=[]
+recv_ref_fine=[]
+recv_ref_coarse=[]
+send_sync=[0:[]]
+send_ref_bnd_fine=[]
+boundaries={([0,0,0]:[0,19,19]:[1,1,1]),([1,0,0]:[18,0,19]:[1,1,1]),([19,0,0]:[19,19,19]:[1,1,1]),([1,1,0]:[18,18,0]:[1,1,1]),([1,19,0]:[18,19,19]:[1,1,1]),([1,1,19]:[18,18,19]:[1,1,1])}
+recv_sync=[0:[]]
+recv_ref_bnd_coarse=[]
+sync_not={([0,0,0]:[0,19,19]:[1,1,1]),([1,0,0]:[18,0,19]:[1,1,1]),([19,0,0]:[19,19,19]:[1,1,1]),([1,1,0]:[18,18,0]:[1,1,1]),([1,19,0]:[18,19,19]:[1,1,1]),([1,1,19]:[18,18,19]:[1,1,1])}
+
+dh bases:
+rl=0 ml=0
+exterior=([0,0,0]:[19,19,19]:[1,1,1])
+interior=([1,1,1]:[18,18,18]:[1,1,1])
+boundaries={([0,0,0]:[0,19,19]:[1,1,1]),([1,0,0]:[18,0,19]:[1,1,1]),([19,0,0]:[19,19,19]:[1,1,1]),([1,1,0]:[18,18,0]:[1,1,1]),([1,19,0]:[18,19,19]:[1,1,1]),([1,1,19]:[18,18,19]:[1,1,1])}
 ----------------
  it  |         |
      |    t    |
diff --git a/CarpetExtra/WaveToyF77/test/wavetoyf77/phi.xl b/CarpetExtra/WaveToyF77/test/wavetoyf77/phi.xl
index 843c885b6..e239ab8f7 100644
--- a/CarpetExtra/WaveToyF77/test/wavetoyf77/phi.xl
+++ b/CarpetExtra/WaveToyF77/test/wavetoyf77/phi.xl
@@ -1,288 +1,288 @@
 # WAVETOY::phi x (phi)
 #
 # iteration 0
-# time level 1   refinement level 0   component 0   multigrid level 0
+# time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 1 0 0 0 0 20 20 2.13769355812841e-44
-0 1 0 0 0 2 20 20 9.81238207534605e-36
-0 1 0 0 0 4 20 20 4.91109129723921e-28
-0 1 0 0 0 6 20 20 2.68013160656255e-21
-0 1 0 0 0 8 20 20 1.59480940571288e-15
-0 1 0 0 0 10 20 20 1.03475137373628e-10
-0 1 0 0 0 12 20 20 7.32045019582289e-07
-0 1 0 0 0 14 20 20 0.000564695236523836
-0 1 0 0 0 16 20 20 0.0474968724749268
-0 1 0 0 0 18 20 20 0.435602594953338
-0 1 0 0 0 20 20 20 0.435602594953338
-0 1 0 0 0 22 20 20 0.047496872474927
-0 1 0 0 0 24 20 20 0.00056469523652384
-0 1 0 0 0 26 20 20 7.32045019582296e-07
-0 1 0 0 0 28 20 20 1.0347513737363e-10
-0 1 0 0 0 30 20 20 1.5948094057129e-15
-0 1 0 0 0 32 20 20 2.68013160656261e-21
-0 1 0 0 0 34 20 20 4.91109129723928e-28
-0 1 0 0 0 36 20 20 9.81238207534619e-36
-0 1 0 0 0 38 20 20 2.13769355812841e-44
+0 0 0 0 0 0 10 10 2.13769355812841e-44
+0 0 0 0 0 1 10 10 9.81238207534605e-36
+0 0 0 0 0 2 10 10 4.91109129723921e-28
+0 0 0 0 0 3 10 10 2.68013160656255e-21
+0 0 0 0 0 4 10 10 1.59480940571288e-15
+0 0 0 0 0 5 10 10 1.03475137373628e-10
+0 0 0 0 0 6 10 10 7.32045019582289e-07
+0 0 0 0 0 7 10 10 0.000564695236523836
+0 0 0 0 0 8 10 10 0.0474968724749268
+0 0 0 0 0 9 10 10 0.435602594953338
+0 0 0 0 0 10 10 10 0.435602594953338
+0 0 0 0 0 11 10 10 0.047496872474927
+0 0 0 0 0 12 10 10 0.00056469523652384
+0 0 0 0 0 13 10 10 7.32045019582296e-07
+0 0 0 0 0 14 10 10 1.0347513737363e-10
+0 0 0 0 0 15 10 10 1.5948094057129e-15
+0 0 0 0 0 16 10 10 2.68013160656261e-21
+0 0 0 0 0 17 10 10 4.91109129723928e-28
+0 0 0 0 0 18 10 10 9.81238207534619e-36
+0 0 0 0 0 19 10 10 2.13769355812841e-44
 
 
 
 # iteration 1
-# time level 1   refinement level 0   component 0   multigrid level 0
+# time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 1 0 0 0 0 20 20 0
-1 1 0 0 0 2 20 20 1.22682689034646e-28
-1 1 0 0 0 4 20 20 6.68463146460746e-22
-1 1 0 0 0 6 20 20 3.95859475931403e-16
-1 1 0 0 0 8 20 20 2.53070110965507e-11
-1 1 0 0 0 10 20 20 1.70914716385004e-07
-1 1 0 0 0 12 20 20 0.000112938462633636
-1 1 0 0 0 14 20 20 0.00485368397550732
-1 1 0 0 0 16 20 20 -0.0670042756634817
-1 1 0 0 0 18 20 20 -0.281918670454475
-1 1 0 0 0 20 20 20 -0.281918670454475
-1 1 0 0 0 22 20 20 -0.067004275663482
-1 1 0 0 0 24 20 20 0.00485368397550734
-1 1 0 0 0 26 20 20 0.000112938462633636
-1 1 0 0 0 28 20 20 1.70914716385006e-07
-1 1 0 0 0 30 20 20 2.5307011096551e-11
-1 1 0 0 0 32 20 20 3.95859475931408e-16
-1 1 0 0 0 34 20 20 6.6846314646076e-22
-1 1 0 0 0 36 20 20 1.22682689034648e-28
-1 1 0 0 0 38 20 20 0
+1 0 0 0 0 0 10 10 0
+1 0 0 0 0 1 10 10 1.22682689034646e-28
+1 0 0 0 0 2 10 10 6.68463146460746e-22
+1 0 0 0 0 3 10 10 3.95859475931403e-16
+1 0 0 0 0 4 10 10 2.53070110965507e-11
+1 0 0 0 0 5 10 10 1.70914716385004e-07
+1 0 0 0 0 6 10 10 0.000112938462633636
+1 0 0 0 0 7 10 10 0.00485368397550732
+1 0 0 0 0 8 10 10 -0.0670042756634817
+1 0 0 0 0 9 10 10 -0.281918670454475
+1 0 0 0 0 10 10 10 -0.281918670454475
+1 0 0 0 0 11 10 10 -0.067004275663482
+1 0 0 0 0 12 10 10 0.00485368397550734
+1 0 0 0 0 13 10 10 0.000112938462633636
+1 0 0 0 0 14 10 10 1.70914716385006e-07
+1 0 0 0 0 15 10 10 2.5307011096551e-11
+1 0 0 0 0 16 10 10 3.95859475931408e-16
+1 0 0 0 0 17 10 10 6.6846314646076e-22
+1 0 0 0 0 18 10 10 1.22682689034648e-28
+1 0 0 0 0 19 10 10 0
 
 
 
 # iteration 2
-# time level 1   refinement level 0   component 0   multigrid level 0
+# time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-2 1 0 0 0 0 20 20 0
-2 1 0 0 0 2 20 20 1.67115915985643e-22
-2 1 0 0 0 4 20 20 9.89655738758155e-17
-2 1 0 0 0 6 20 20 6.32717018479805e-12
-2 1 0 0 0 8 20 20 4.27553578129613e-08
-2 1 0 0 0 10 20 20 2.84145841284519e-05
-2 1 0 0 0 12 20 20 0.00133135677107058
-2 1 0 0 0 14 20 20 -0.0123105937045863
-2 1 0 0 0 16 20 20 -0.191827773445984
-2 1 0 0 0 18 20 20 -0.838254139769044
-2 1 0 0 0 20 20 20 -0.838254139769044
-2 1 0 0 0 22 20 20 -0.191827773445984
-2 1 0 0 0 24 20 20 -0.0123105937045864
-2 1 0 0 0 26 20 20 0.00133135677107059
-2 1 0 0 0 28 20 20 2.84145841284521e-05
-2 1 0 0 0 30 20 20 4.27553578129617e-08
-2 1 0 0 0 32 20 20 6.32717018479812e-12
-2 1 0 0 0 34 20 20 9.89655738758169e-17
-2 1 0 0 0 36 20 20 1.67115915985646e-22
-2 1 0 0 0 38 20 20 0
+2 0 0 0 0 0 10 10 0
+2 0 0 0 0 1 10 10 1.67115915985643e-22
+2 0 0 0 0 2 10 10 9.89655738758155e-17
+2 0 0 0 0 3 10 10 6.32717018479805e-12
+2 0 0 0 0 4 10 10 4.27553578129613e-08
+2 0 0 0 0 5 10 10 2.84145841284519e-05
+2 0 0 0 0 6 10 10 0.00133135677107058
+2 0 0 0 0 7 10 10 -0.0123105937045863
+2 0 0 0 0 8 10 10 -0.191827773445984
+2 0 0 0 0 9 10 10 -0.838254139769044
+2 0 0 0 0 10 10 10 -0.838254139769044
+2 0 0 0 0 11 10 10 -0.191827773445984
+2 0 0 0 0 12 10 10 -0.0123105937045864
+2 0 0 0 0 13 10 10 0.00133135677107059
+2 0 0 0 0 14 10 10 2.84145841284521e-05
+2 0 0 0 0 15 10 10 4.27553578129617e-08
+2 0 0 0 0 16 10 10 6.32717018479812e-12
+2 0 0 0 0 17 10 10 9.89655738758169e-17
+2 0 0 0 0 18 10 10 1.67115915985646e-22
+2 0 0 0 0 19 10 10 0
 
 
 
 # iteration 3
-# time level 1   refinement level 0   component 0   multigrid level 0
+# time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-3 1 0 0 0 0 20 20 0
-3 1 0 0 0 2 20 20 2.47415696923374e-17
-3 1 0 0 0 4 20 20 1.58189689968305e-12
-3 1 0 0 0 6 20 20 1.06955096189697e-08
-3 1 0 0 0 8 20 20 7.14866962467265e-06
-3 1 0 0 0 10 20 20 0.000362543700949426
-3 1 0 0 0 12 20 20 -0.00180281581401197
-3 1 0 0 0 14 20 20 -0.0661355403874472
-3 1 0 0 0 16 20 20 -0.363219448163234
-3 1 0 0 0 18 20 20 -0.909769834341317
-3 1 0 0 0 20 20 20 -0.909769834341318
-3 1 0 0 0 22 20 20 -0.363219448163234
-3 1 0 0 0 24 20 20 -0.0661355403874474
-3 1 0 0 0 26 20 20 -0.00180281581401198
-3 1 0 0 0 28 20 20 0.000362543700949428
-3 1 0 0 0 30 20 20 7.14866962467269e-06
-3 1 0 0 0 32 20 20 1.06955096189698e-08
-3 1 0 0 0 34 20 20 1.58189689968307e-12
-3 1 0 0 0 36 20 20 2.47415696923378e-17
-3 1 0 0 0 38 20 20 0
+3 0 0 0 0 0 10 10 0
+3 0 0 0 0 1 10 10 2.47415696923374e-17
+3 0 0 0 0 2 10 10 1.58189689968305e-12
+3 0 0 0 0 3 10 10 1.06955096189697e-08
+3 0 0 0 0 4 10 10 7.14866962467265e-06
+3 0 0 0 0 5 10 10 0.000362543700949426
+3 0 0 0 0 6 10 10 -0.00180281581401197
+3 0 0 0 0 7 10 10 -0.0661355403874472
+3 0 0 0 0 8 10 10 -0.363219448163234
+3 0 0 0 0 9 10 10 -0.909769834341317
+3 0 0 0 0 10 10 10 -0.909769834341318
+3 0 0 0 0 11 10 10 -0.363219448163234
+3 0 0 0 0 12 10 10 -0.0661355403874474
+3 0 0 0 0 13 10 10 -0.00180281581401198
+3 0 0 0 0 14 10 10 0.000362543700949428
+3 0 0 0 0 15 10 10 7.14866962467269e-06
+3 0 0 0 0 16 10 10 1.06955096189698e-08
+3 0 0 0 0 17 10 10 1.58189689968307e-12
+3 0 0 0 0 18 10 10 2.47415696923378e-17
+3 0 0 0 0 19 10 10 0
 
 
 
 # iteration 4
-# time level 1   refinement level 0   component 0   multigrid level 0
+# time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-4 1 0 0 0 0 20 20 0
-4 1 0 0 0 2 20 20 3.95500313485421e-13
-4 1 0 0 0 4 20 20 2.67554506710229e-09
-4 1 0 0 0 6 20 20 1.79843103280261e-06
-4 1 0 0 0 8 20 20 9.81141807427285e-05
-4 1 0 0 0 10 20 20 -9.77890293755282e-05
-4 1 0 0 0 12 20 20 -0.0197154488008626
-4 1 0 0 0 14 20 20 -0.154257957160012
-4 1 0 0 0 16 20 20 -0.477053040993001
-4 1 0 0 0 18 20 20 -0.571372739280028
-4 1 0 0 0 20 20 20 -0.571372739280028
-4 1 0 0 0 22 20 20 -0.477053040993001
-4 1 0 0 0 24 20 20 -0.154257957160012
-4 1 0 0 0 26 20 20 -0.0197154488008626
-4 1 0 0 0 28 20 20 -9.77890293755287e-05
-4 1 0 0 0 30 20 20 9.81141807427289e-05
-4 1 0 0 0 32 20 20 1.79843103280262e-06
-4 1 0 0 0 34 20 20 2.67554506710232e-09
-4 1 0 0 0 36 20 20 3.95500313485426e-13
-4 1 0 0 0 38 20 20 0
+4 0 0 0 0 0 10 10 0
+4 0 0 0 0 1 10 10 3.95500313485421e-13
+4 0 0 0 0 2 10 10 2.67554506710229e-09
+4 0 0 0 0 3 10 10 1.79843103280261e-06
+4 0 0 0 0 4 10 10 9.81141807427285e-05
+4 0 0 0 0 5 10 10 -9.77890293755282e-05
+4 0 0 0 0 6 10 10 -0.0197154488008626
+4 0 0 0 0 7 10 10 -0.154257957160012
+4 0 0 0 0 8 10 10 -0.477053040993001
+4 0 0 0 0 9 10 10 -0.571372739280028
+4 0 0 0 0 10 10 10 -0.571372739280028
+4 0 0 0 0 11 10 10 -0.477053040993001
+4 0 0 0 0 12 10 10 -0.154257957160012
+4 0 0 0 0 13 10 10 -0.0197154488008626
+4 0 0 0 0 14 10 10 -9.77890293755287e-05
+4 0 0 0 0 15 10 10 9.81141807427289e-05
+4 0 0 0 0 16 10 10 1.79843103280262e-06
+4 0 0 0 0 17 10 10 2.67554506710232e-09
+4 0 0 0 0 18 10 10 3.95500313485426e-13
+4 0 0 0 0 19 10 10 0
 
 
 
 # iteration 5
-# time level 1   refinement level 0   component 0   multigrid level 0
+# time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-5 1 0 0 0 0 20 20 0
-5 1 0 0 0 2 20 20 6.693032110513e-10
-5 1 0 0 0 4 20 20 4.52425597130395e-07
-5 1 0 0 0 6 20 20 2.64111506026688e-05
-5 1 0 0 0 8 20 20 7.239670253815e-05
-5 1 0 0 0 10 20 20 -0.00534199985172874
-5 1 0 0 0 12 20 20 -0.0591799530595224
-5 1 0 0 0 14 20 20 -0.242393755395384
-5 1 0 0 0 16 20 20 -0.416512311171182
-5 1 0 0 0 18 20 20 -0.162235870503469
-5 1 0 0 0 20 20 20 -0.162235870503468
-5 1 0 0 0 22 20 20 -0.416512311171182
-5 1 0 0 0 24 20 20 -0.242393755395385
-5 1 0 0 0 26 20 20 -0.0591799530595225
-5 1 0 0 0 28 20 20 -0.00534199985172875
-5 1 0 0 0 30 20 20 7.23967025381503e-05
-5 1 0 0 0 32 20 20 2.64111506026689e-05
-5 1 0 0 0 34 20 20 4.52425597130398e-07
-5 1 0 0 0 36 20 20 6.69303211051306e-10
-5 1 0 0 0 38 20 20 0
+5 0 0 0 0 0 10 10 0
+5 0 0 0 0 1 10 10 6.693032110513e-10
+5 0 0 0 0 2 10 10 4.52425597130395e-07
+5 0 0 0 0 3 10 10 2.64111506026688e-05
+5 0 0 0 0 4 10 10 7.239670253815e-05
+5 0 0 0 0 5 10 10 -0.00534199985172874
+5 0 0 0 0 6 10 10 -0.0591799530595224
+5 0 0 0 0 7 10 10 -0.242393755395384
+5 0 0 0 0 8 10 10 -0.416512311171182
+5 0 0 0 0 9 10 10 -0.162235870503469
+5 0 0 0 0 10 10 10 -0.162235870503468
+5 0 0 0 0 11 10 10 -0.416512311171182
+5 0 0 0 0 12 10 10 -0.242393755395385
+5 0 0 0 0 13 10 10 -0.0591799530595225
+5 0 0 0 0 14 10 10 -0.00534199985172875
+5 0 0 0 0 15 10 10 7.23967025381503e-05
+5 0 0 0 0 16 10 10 2.64111506026689e-05
+5 0 0 0 0 17 10 10 4.52425597130398e-07
+5 0 0 0 0 18 10 10 6.69303211051306e-10
+5 0 0 0 0 19 10 10 0
 
 
 
 # iteration 6
-# time level 1   refinement level 0   component 0   multigrid level 0
+# time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-6 1 0 0 0 0 20 20 0
-6 1 0 0 0 2 20 20 1.13811317397662e-07
-6 1 0 0 0 4 20 20 7.07670174667689e-06
-6 1 0 0 0 6 20 20 4.44798688829561e-05
-6 1 0 0 0 8 20 20 -0.00133276732717108
-6 1 0 0 0 10 20 20 -0.0207006388099142
-6 1 0 0 0 12 20 20 -0.113482596872543
-6 1 0 0 0 14 20 20 -0.274751275149732
-6 1 0 0 0 16 20 20 -0.217136795981632
-6 1 0 0 0 18 20 20 0.0561936677723053
-6 1 0 0 0 20 20 20 0.0561936677723056
-6 1 0 0 0 22 20 20 -0.217136795981632
-6 1 0 0 0 24 20 20 -0.274751275149732
-6 1 0 0 0 26 20 20 -0.113482596872543
-6 1 0 0 0 28 20 20 -0.0207006388099143
-6 1 0 0 0 30 20 20 -0.00133276732717108
-6 1 0 0 0 32 20 20 4.44798688829563e-05
-6 1 0 0 0 34 20 20 7.07670174667692e-06
-6 1 0 0 0 36 20 20 1.13811317397662e-07
-6 1 0 0 0 38 20 20 0
+6 0 0 0 0 0 10 10 0
+6 0 0 0 0 1 10 10 1.13811317397662e-07
+6 0 0 0 0 2 10 10 7.07670174667689e-06
+6 0 0 0 0 3 10 10 4.44798688829561e-05
+6 0 0 0 0 4 10 10 -0.00133276732717108
+6 0 0 0 0 5 10 10 -0.0207006388099142
+6 0 0 0 0 6 10 10 -0.113482596872543
+6 0 0 0 0 7 10 10 -0.274751275149732
+6 0 0 0 0 8 10 10 -0.217136795981632
+6 0 0 0 0 9 10 10 0.0561936677723053
+6 0 0 0 0 10 10 10 0.0561936677723056
+6 0 0 0 0 11 10 10 -0.217136795981632
+6 0 0 0 0 12 10 10 -0.274751275149732
+6 0 0 0 0 13 10 10 -0.113482596872543
+6 0 0 0 0 14 10 10 -0.0207006388099143
+6 0 0 0 0 15 10 10 -0.00133276732717108
+6 0 0 0 0 16 10 10 4.44798688829563e-05
+6 0 0 0 0 17 10 10 7.07670174667692e-06
+6 0 0 0 0 18 10 10 1.13811317397662e-07
+6 0 0 0 0 19 10 10 0
 
 
 
 # iteration 7
-# time level 1   refinement level 0   component 0   multigrid level 0
+# time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-7 1 0 0 0 0 20 20 0
-7 1 0 0 0 2 20 20 1.88842835173522e-06
-7 1 0 0 0 4 20 20 1.82615433390579e-05
-7 1 0 0 0 6 20 20 -0.000303370910566002
-7 1 0 0 0 8 20 20 -0.0067173106912752
-7 1 0 0 0 10 20 20 -0.0483316756133807
-7 1 0 0 0 12 20 20 -0.160680197396579
-7 1 0 0 0 14 20 20 -0.225795013580303
-7 1 0 0 0 16 20 20 -0.0302663611493069
-7 1 0 0 0 18 20 20 0.0696253582326263
-7 1 0 0 0 20 20 20 0.0696253582326263
-7 1 0 0 0 22 20 20 -0.0302663611493066
-7 1 0 0 0 24 20 20 -0.225795013580303
-7 1 0 0 0 26 20 20 -0.160680197396579
-7 1 0 0 0 28 20 20 -0.0483316756133808
-7 1 0 0 0 30 20 20 -0.00671731069127522
-7 1 0 0 0 32 20 20 -0.000303370910566003
-7 1 0 0 0 34 20 20 1.8261543339058e-05
-7 1 0 0 0 36 20 20 1.88842835173522e-06
-7 1 0 0 0 38 20 20 0
+7 0 0 0 0 0 10 10 0
+7 0 0 0 0 1 10 10 1.88842835173522e-06
+7 0 0 0 0 2 10 10 1.82615433390579e-05
+7 0 0 0 0 3 10 10 -0.000303370910566002
+7 0 0 0 0 4 10 10 -0.0067173106912752
+7 0 0 0 0 5 10 10 -0.0483316756133807
+7 0 0 0 0 6 10 10 -0.160680197396579
+7 0 0 0 0 7 10 10 -0.225795013580303
+7 0 0 0 0 8 10 10 -0.0302663611493069
+7 0 0 0 0 9 10 10 0.0696253582326263
+7 0 0 0 0 10 10 10 0.0696253582326263
+7 0 0 0 0 11 10 10 -0.0302663611493066
+7 0 0 0 0 12 10 10 -0.225795013580303
+7 0 0 0 0 13 10 10 -0.160680197396579
+7 0 0 0 0 14 10 10 -0.0483316756133808
+7 0 0 0 0 15 10 10 -0.00671731069127522
+7 0 0 0 0 16 10 10 -0.000303370910566003
+7 0 0 0 0 17 10 10 1.8261543339058e-05
+7 0 0 0 0 18 10 10 1.88842835173522e-06
+7 0 0 0 0 19 10 10 0
 
 
 
 # iteration 8
-# time level 1   refinement level 0   component 0   multigrid level 0
+# time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-8 1 0 0 0 0 20 20 0
-8 1 0 0 0 2 20 20 6.48117414563856e-06
-8 1 0 0 0 4 20 20 -6.04396714485246e-05
-8 1 0 0 0 6 20 20 -0.00204743656355179
-8 1 0 0 0 8 20 20 -0.0189160596760373
-8 1 0 0 0 10 20 20 -0.08332429364187
-8 1 0 0 0 12 20 20 -0.177263752132348
-8 1 0 0 0 14 20 20 -0.129192651620611
-8 1 0 0 0 16 20 20 0.0443520012015004
-8 1 0 0 0 18 20 20 0.00813825915649741
-8 1 0 0 0 20 20 20 0.00813825915649736
-8 1 0 0 0 22 20 20 0.0443520012015006
-8 1 0 0 0 24 20 20 -0.12919265162061
-8 1 0 0 0 26 20 20 -0.177263752132348
-8 1 0 0 0 28 20 20 -0.0833242936418701
-8 1 0 0 0 30 20 20 -0.0189160596760373
-8 1 0 0 0 32 20 20 -0.0020474365635518
-8 1 0 0 0 34 20 20 -6.04396714485248e-05
-8 1 0 0 0 36 20 20 6.48117414563859e-06
-8 1 0 0 0 38 20 20 0
+8 0 0 0 0 0 10 10 0
+8 0 0 0 0 1 10 10 6.48117414563856e-06
+8 0 0 0 0 2 10 10 -6.04396714485246e-05
+8 0 0 0 0 3 10 10 -0.00204743656355179
+8 0 0 0 0 4 10 10 -0.0189160596760373
+8 0 0 0 0 5 10 10 -0.08332429364187
+8 0 0 0 0 6 10 10 -0.177263752132348
+8 0 0 0 0 7 10 10 -0.129192651620611
+8 0 0 0 0 8 10 10 0.0443520012015004
+8 0 0 0 0 9 10 10 0.00813825915649741
+8 0 0 0 0 10 10 10 0.00813825915649736
+8 0 0 0 0 11 10 10 0.0443520012015006
+8 0 0 0 0 12 10 10 -0.12919265162061
+8 0 0 0 0 13 10 10 -0.177263752132348
+8 0 0 0 0 14 10 10 -0.0833242936418701
+8 0 0 0 0 15 10 10 -0.0189160596760373
+8 0 0 0 0 16 10 10 -0.0020474365635518
+8 0 0 0 0 17 10 10 -6.04396714485248e-05
+8 0 0 0 0 18 10 10 6.48117414563859e-06
+8 0 0 0 0 19 10 10 0
 
 
 
 # iteration 9
-# time level 1   refinement level 0   component 0   multigrid level 0
+# time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-9 1 0 0 0 0 20 20 0
-9 1 0 0 0 2 20 20 -9.23817882069273e-06
-9 1 0 0 0 4 20 20 -0.000590230726689046
-9 1 0 0 0 6 20 20 -0.0068967819068776
-9 1 0 0 0 8 20 20 -0.0389052231484413
-9 1 0 0 0 10 20 20 -0.114612889871635
-9 1 0 0 0 12 20 20 -0.15580435440971
-9 1 0 0 0 14 20 20 -0.0417427533393864
-9 1 0 0 0 16 20 20 0.0295094995247097
-9 1 0 0 0 18 20 20 -0.0261885333858792
-9 1 0 0 0 20 20 20 -0.0261885333858792
-9 1 0 0 0 22 20 20 0.0295094995247098
-9 1 0 0 0 24 20 20 -0.0417427533393862
-9 1 0 0 0 26 20 20 -0.15580435440971
-9 1 0 0 0 28 20 20 -0.114612889871635
-9 1 0 0 0 30 20 20 -0.0389052231484414
-9 1 0 0 0 32 20 20 -0.00689678190687761
-9 1 0 0 0 34 20 20 -0.000590230726689047
-9 1 0 0 0 36 20 20 -9.23817882069273e-06
-9 1 0 0 0 38 20 20 0
+9 0 0 0 0 0 10 10 0
+9 0 0 0 0 1 10 10 -9.23817882069273e-06
+9 0 0 0 0 2 10 10 -0.000590230726689046
+9 0 0 0 0 3 10 10 -0.0068967819068776
+9 0 0 0 0 4 10 10 -0.0389052231484413
+9 0 0 0 0 5 10 10 -0.114612889871635
+9 0 0 0 0 6 10 10 -0.15580435440971
+9 0 0 0 0 7 10 10 -0.0417427533393864
+9 0 0 0 0 8 10 10 0.0295094995247097
+9 0 0 0 0 9 10 10 -0.0261885333858792
+9 0 0 0 0 10 10 10 -0.0261885333858792
+9 0 0 0 0 11 10 10 0.0295094995247098
+9 0 0 0 0 12 10 10 -0.0417427533393862
+9 0 0 0 0 13 10 10 -0.15580435440971
+9 0 0 0 0 14 10 10 -0.114612889871635
+9 0 0 0 0 15 10 10 -0.0389052231484414
+9 0 0 0 0 16 10 10 -0.00689678190687761
+9 0 0 0 0 17 10 10 -0.000590230726689047
+9 0 0 0 0 18 10 10 -9.23817882069273e-06
+9 0 0 0 0 19 10 10 0
 
 
 
 # iteration 10
-# time level 1   refinement level 0   component 0   multigrid level 0
+# time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-10 1 0 0 0 0 20 20 0
-10 1 0 0 0 2 20 20 -0.000161871977848914
-10 1 0 0 0 4 20 20 -0.00236947911491751
-10 1 0 0 0 6 20 20 -0.0166505589685362
-10 1 0 0 0 8 20 20 -0.064163184805119
-10 1 0 0 0 10 20 20 -0.130411533364738
-10 1 0 0 0 12 20 20 -0.10750594086851
-10 1 0 0 0 14 20 20 0.0072111680655955
-10 1 0 0 0 16 20 20 -0.0022163213506164
-10 1 0 0 0 18 20 20 -0.018741801245314
-10 1 0 0 0 20 20 20 -0.018741801245314
-10 1 0 0 0 22 20 20 -0.00221632135061644
-10 1 0 0 0 24 20 20 0.00721116806559556
-10 1 0 0 0 26 20 20 -0.10750594086851
-10 1 0 0 0 28 20 20 -0.130411533364738
-10 1 0 0 0 30 20 20 -0.0641631848051191
-10 1 0 0 0 32 20 20 -0.0166505589685362
-10 1 0 0 0 34 20 20 -0.00236947911491752
-10 1 0 0 0 36 20 20 -0.000161871977848915
-10 1 0 0 0 38 20 20 0
+10 0 0 0 0 0 10 10 0
+10 0 0 0 0 1 10 10 -0.000161871977848914
+10 0 0 0 0 2 10 10 -0.00236947911491751
+10 0 0 0 0 3 10 10 -0.0166505589685362
+10 0 0 0 0 4 10 10 -0.064163184805119
+10 0 0 0 0 5 10 10 -0.130411533364738
+10 0 0 0 0 6 10 10 -0.10750594086851
+10 0 0 0 0 7 10 10 0.0072111680655955
+10 0 0 0 0 8 10 10 -0.0022163213506164
+10 0 0 0 0 9 10 10 -0.018741801245314
+10 0 0 0 0 10 10 10 -0.018741801245314
+10 0 0 0 0 11 10 10 -0.00221632135061644
+10 0 0 0 0 12 10 10 0.00721116806559556
+10 0 0 0 0 13 10 10 -0.10750594086851
+10 0 0 0 0 14 10 10 -0.130411533364738
+10 0 0 0 0 15 10 10 -0.0641631848051191
+10 0 0 0 0 16 10 10 -0.0166505589685362
+10 0 0 0 0 17 10 10 -0.00236947911491752
+10 0 0 0 0 18 10 10 -0.000161871977848915
+10 0 0 0 0 19 10 10 0
 
 
 
diff --git a/CarpetExtra/WaveToyF77/test/wavetoyf77/phi.yl b/CarpetExtra/WaveToyF77/test/wavetoyf77/phi.yl
index 07c729e44..06c729092 100644
--- a/CarpetExtra/WaveToyF77/test/wavetoyf77/phi.yl
+++ b/CarpetExtra/WaveToyF77/test/wavetoyf77/phi.yl
@@ -1,288 +1,288 @@
 # WAVETOY::phi y (phi)
 #
 # iteration 0
-# time level 1   refinement level 0   component 0   multigrid level 0
+# time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 1 0 0 0 20 0 20 2.13769355812841e-44
-0 1 0 0 0 20 2 20 9.81238207534605e-36
-0 1 0 0 0 20 4 20 4.91109129723921e-28
-0 1 0 0 0 20 6 20 2.68013160656255e-21
-0 1 0 0 0 20 8 20 1.59480940571288e-15
-0 1 0 0 0 20 10 20 1.03475137373628e-10
-0 1 0 0 0 20 12 20 7.32045019582289e-07
-0 1 0 0 0 20 14 20 0.000564695236523836
-0 1 0 0 0 20 16 20 0.0474968724749268
-0 1 0 0 0 20 18 20 0.435602594953338
-0 1 0 0 0 20 20 20 0.435602594953338
-0 1 0 0 0 20 22 20 0.047496872474927
-0 1 0 0 0 20 24 20 0.00056469523652384
-0 1 0 0 0 20 26 20 7.32045019582296e-07
-0 1 0 0 0 20 28 20 1.0347513737363e-10
-0 1 0 0 0 20 30 20 1.5948094057129e-15
-0 1 0 0 0 20 32 20 2.68013160656261e-21
-0 1 0 0 0 20 34 20 4.91109129723928e-28
-0 1 0 0 0 20 36 20 9.81238207534619e-36
-0 1 0 0 0 20 38 20 2.13769355812841e-44
+0 0 0 0 0 10 0 10 2.13769355812841e-44
+0 0 0 0 0 10 1 10 9.81238207534605e-36
+0 0 0 0 0 10 2 10 4.91109129723921e-28
+0 0 0 0 0 10 3 10 2.68013160656255e-21
+0 0 0 0 0 10 4 10 1.59480940571288e-15
+0 0 0 0 0 10 5 10 1.03475137373628e-10
+0 0 0 0 0 10 6 10 7.32045019582289e-07
+0 0 0 0 0 10 7 10 0.000564695236523836
+0 0 0 0 0 10 8 10 0.0474968724749268
+0 0 0 0 0 10 9 10 0.435602594953338
+0 0 0 0 0 10 10 10 0.435602594953338
+0 0 0 0 0 10 11 10 0.047496872474927
+0 0 0 0 0 10 12 10 0.00056469523652384
+0 0 0 0 0 10 13 10 7.32045019582296e-07
+0 0 0 0 0 10 14 10 1.0347513737363e-10
+0 0 0 0 0 10 15 10 1.5948094057129e-15
+0 0 0 0 0 10 16 10 2.68013160656261e-21
+0 0 0 0 0 10 17 10 4.91109129723928e-28
+0 0 0 0 0 10 18 10 9.81238207534619e-36
+0 0 0 0 0 10 19 10 2.13769355812841e-44
 
 
 
 # iteration 1
-# time level 1   refinement level 0   component 0   multigrid level 0
+# time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 1 0 0 0 20 0 20 0
-1 1 0 0 0 20 2 20 1.22682689034646e-28
-1 1 0 0 0 20 4 20 6.68463146460746e-22
-1 1 0 0 0 20 6 20 3.95859475931402e-16
-1 1 0 0 0 20 8 20 2.53070110965507e-11
-1 1 0 0 0 20 10 20 1.70914716385004e-07
-1 1 0 0 0 20 12 20 0.000112938462633636
-1 1 0 0 0 20 14 20 0.00485368397550732
-1 1 0 0 0 20 16 20 -0.0670042756634817
-1 1 0 0 0 20 18 20 -0.281918670454475
-1 1 0 0 0 20 20 20 -0.281918670454475
-1 1 0 0 0 20 22 20 -0.067004275663482
-1 1 0 0 0 20 24 20 0.00485368397550734
-1 1 0 0 0 20 26 20 0.000112938462633636
-1 1 0 0 0 20 28 20 1.70914716385006e-07
-1 1 0 0 0 20 30 20 2.5307011096551e-11
-1 1 0 0 0 20 32 20 3.95859475931408e-16
-1 1 0 0 0 20 34 20 6.68463146460761e-22
-1 1 0 0 0 20 36 20 1.22682689034648e-28
-1 1 0 0 0 20 38 20 0
+1 0 0 0 0 10 0 10 0
+1 0 0 0 0 10 1 10 1.22682689034646e-28
+1 0 0 0 0 10 2 10 6.68463146460746e-22
+1 0 0 0 0 10 3 10 3.95859475931402e-16
+1 0 0 0 0 10 4 10 2.53070110965507e-11
+1 0 0 0 0 10 5 10 1.70914716385004e-07
+1 0 0 0 0 10 6 10 0.000112938462633636
+1 0 0 0 0 10 7 10 0.00485368397550732
+1 0 0 0 0 10 8 10 -0.0670042756634817
+1 0 0 0 0 10 9 10 -0.281918670454475
+1 0 0 0 0 10 10 10 -0.281918670454475
+1 0 0 0 0 10 11 10 -0.067004275663482
+1 0 0 0 0 10 12 10 0.00485368397550734
+1 0 0 0 0 10 13 10 0.000112938462633636
+1 0 0 0 0 10 14 10 1.70914716385006e-07
+1 0 0 0 0 10 15 10 2.5307011096551e-11
+1 0 0 0 0 10 16 10 3.95859475931408e-16
+1 0 0 0 0 10 17 10 6.68463146460761e-22
+1 0 0 0 0 10 18 10 1.22682689034648e-28
+1 0 0 0 0 10 19 10 0
 
 
 
 # iteration 2
-# time level 1   refinement level 0   component 0   multigrid level 0
+# time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-2 1 0 0 0 20 0 20 0
-2 1 0 0 0 20 2 20 1.67115915985643e-22
-2 1 0 0 0 20 4 20 9.89655738758154e-17
-2 1 0 0 0 20 6 20 6.32717018479805e-12
-2 1 0 0 0 20 8 20 4.27553578129613e-08
-2 1 0 0 0 20 10 20 2.84145841284519e-05
-2 1 0 0 0 20 12 20 0.00133135677107058
-2 1 0 0 0 20 14 20 -0.0123105937045863
-2 1 0 0 0 20 16 20 -0.191827773445984
-2 1 0 0 0 20 18 20 -0.838254139769044
-2 1 0 0 0 20 20 20 -0.838254139769044
-2 1 0 0 0 20 22 20 -0.191827773445984
-2 1 0 0 0 20 24 20 -0.0123105937045864
-2 1 0 0 0 20 26 20 0.00133135677107059
-2 1 0 0 0 20 28 20 2.84145841284521e-05
-2 1 0 0 0 20 30 20 4.27553578129617e-08
-2 1 0 0 0 20 32 20 6.32717018479812e-12
-2 1 0 0 0 20 34 20 9.89655738758169e-17
-2 1 0 0 0 20 36 20 1.67115915985646e-22
-2 1 0 0 0 20 38 20 0
+2 0 0 0 0 10 0 10 0
+2 0 0 0 0 10 1 10 1.67115915985643e-22
+2 0 0 0 0 10 2 10 9.89655738758154e-17
+2 0 0 0 0 10 3 10 6.32717018479805e-12
+2 0 0 0 0 10 4 10 4.27553578129613e-08
+2 0 0 0 0 10 5 10 2.84145841284519e-05
+2 0 0 0 0 10 6 10 0.00133135677107058
+2 0 0 0 0 10 7 10 -0.0123105937045863
+2 0 0 0 0 10 8 10 -0.191827773445984
+2 0 0 0 0 10 9 10 -0.838254139769044
+2 0 0 0 0 10 10 10 -0.838254139769044
+2 0 0 0 0 10 11 10 -0.191827773445984
+2 0 0 0 0 10 12 10 -0.0123105937045864
+2 0 0 0 0 10 13 10 0.00133135677107059
+2 0 0 0 0 10 14 10 2.84145841284521e-05
+2 0 0 0 0 10 15 10 4.27553578129617e-08
+2 0 0 0 0 10 16 10 6.32717018479812e-12
+2 0 0 0 0 10 17 10 9.89655738758169e-17
+2 0 0 0 0 10 18 10 1.67115915985646e-22
+2 0 0 0 0 10 19 10 0
 
 
 
 # iteration 3
-# time level 1   refinement level 0   component 0   multigrid level 0
+# time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-3 1 0 0 0 20 0 20 0
-3 1 0 0 0 20 2 20 2.47415696923374e-17
-3 1 0 0 0 20 4 20 1.58189689968305e-12
-3 1 0 0 0 20 6 20 1.06955096189697e-08
-3 1 0 0 0 20 8 20 7.14866962467265e-06
-3 1 0 0 0 20 10 20 0.000362543700949426
-3 1 0 0 0 20 12 20 -0.00180281581401197
-3 1 0 0 0 20 14 20 -0.0661355403874472
-3 1 0 0 0 20 16 20 -0.363219448163234
-3 1 0 0 0 20 18 20 -0.909769834341317
-3 1 0 0 0 20 20 20 -0.909769834341318
-3 1 0 0 0 20 22 20 -0.363219448163234
-3 1 0 0 0 20 24 20 -0.0661355403874474
-3 1 0 0 0 20 26 20 -0.00180281581401198
-3 1 0 0 0 20 28 20 0.000362543700949427
-3 1 0 0 0 20 30 20 7.14866962467269e-06
-3 1 0 0 0 20 32 20 1.06955096189698e-08
-3 1 0 0 0 20 34 20 1.58189689968307e-12
-3 1 0 0 0 20 36 20 2.47415696923378e-17
-3 1 0 0 0 20 38 20 0
+3 0 0 0 0 10 0 10 0
+3 0 0 0 0 10 1 10 2.47415696923374e-17
+3 0 0 0 0 10 2 10 1.58189689968305e-12
+3 0 0 0 0 10 3 10 1.06955096189697e-08
+3 0 0 0 0 10 4 10 7.14866962467265e-06
+3 0 0 0 0 10 5 10 0.000362543700949426
+3 0 0 0 0 10 6 10 -0.00180281581401197
+3 0 0 0 0 10 7 10 -0.0661355403874472
+3 0 0 0 0 10 8 10 -0.363219448163234
+3 0 0 0 0 10 9 10 -0.909769834341317
+3 0 0 0 0 10 10 10 -0.909769834341318
+3 0 0 0 0 10 11 10 -0.363219448163234
+3 0 0 0 0 10 12 10 -0.0661355403874474
+3 0 0 0 0 10 13 10 -0.00180281581401198
+3 0 0 0 0 10 14 10 0.000362543700949427
+3 0 0 0 0 10 15 10 7.14866962467269e-06
+3 0 0 0 0 10 16 10 1.06955096189698e-08
+3 0 0 0 0 10 17 10 1.58189689968307e-12
+3 0 0 0 0 10 18 10 2.47415696923378e-17
+3 0 0 0 0 10 19 10 0
 
 
 
 # iteration 4
-# time level 1   refinement level 0   component 0   multigrid level 0
+# time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-4 1 0 0 0 20 0 20 0
-4 1 0 0 0 20 2 20 3.95500313485421e-13
-4 1 0 0 0 20 4 20 2.67554506710229e-09
-4 1 0 0 0 20 6 20 1.79843103280261e-06
-4 1 0 0 0 20 8 20 9.81141807427286e-05
-4 1 0 0 0 20 10 20 -9.77890293755283e-05
-4 1 0 0 0 20 12 20 -0.0197154488008626
-4 1 0 0 0 20 14 20 -0.154257957160012
-4 1 0 0 0 20 16 20 -0.477053040993001
-4 1 0 0 0 20 18 20 -0.571372739280028
-4 1 0 0 0 20 20 20 -0.571372739280028
-4 1 0 0 0 20 22 20 -0.477053040993001
-4 1 0 0 0 20 24 20 -0.154257957160012
-4 1 0 0 0 20 26 20 -0.0197154488008626
-4 1 0 0 0 20 28 20 -9.77890293755288e-05
-4 1 0 0 0 20 30 20 9.81141807427289e-05
-4 1 0 0 0 20 32 20 1.79843103280262e-06
-4 1 0 0 0 20 34 20 2.67554506710232e-09
-4 1 0 0 0 20 36 20 3.95500313485425e-13
-4 1 0 0 0 20 38 20 0
+4 0 0 0 0 10 0 10 0
+4 0 0 0 0 10 1 10 3.95500313485421e-13
+4 0 0 0 0 10 2 10 2.67554506710229e-09
+4 0 0 0 0 10 3 10 1.79843103280261e-06
+4 0 0 0 0 10 4 10 9.81141807427286e-05
+4 0 0 0 0 10 5 10 -9.77890293755283e-05
+4 0 0 0 0 10 6 10 -0.0197154488008626
+4 0 0 0 0 10 7 10 -0.154257957160012
+4 0 0 0 0 10 8 10 -0.477053040993001
+4 0 0 0 0 10 9 10 -0.571372739280028
+4 0 0 0 0 10 10 10 -0.571372739280028
+4 0 0 0 0 10 11 10 -0.477053040993001
+4 0 0 0 0 10 12 10 -0.154257957160012
+4 0 0 0 0 10 13 10 -0.0197154488008626
+4 0 0 0 0 10 14 10 -9.77890293755288e-05
+4 0 0 0 0 10 15 10 9.81141807427289e-05
+4 0 0 0 0 10 16 10 1.79843103280262e-06
+4 0 0 0 0 10 17 10 2.67554506710232e-09
+4 0 0 0 0 10 18 10 3.95500313485425e-13
+4 0 0 0 0 10 19 10 0
 
 
 
 # iteration 5
-# time level 1   refinement level 0   component 0   multigrid level 0
+# time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-5 1 0 0 0 20 0 20 0
-5 1 0 0 0 20 2 20 6.693032110513e-10
-5 1 0 0 0 20 4 20 4.52425597130395e-07
-5 1 0 0 0 20 6 20 2.64111506026688e-05
-5 1 0 0 0 20 8 20 7.239670253815e-05
-5 1 0 0 0 20 10 20 -0.00534199985172874
-5 1 0 0 0 20 12 20 -0.0591799530595224
-5 1 0 0 0 20 14 20 -0.242393755395384
-5 1 0 0 0 20 16 20 -0.416512311171182
-5 1 0 0 0 20 18 20 -0.162235870503469
-5 1 0 0 0 20 20 20 -0.162235870503468
-5 1 0 0 0 20 22 20 -0.416512311171182
-5 1 0 0 0 20 24 20 -0.242393755395385
-5 1 0 0 0 20 26 20 -0.0591799530595225
-5 1 0 0 0 20 28 20 -0.00534199985172875
-5 1 0 0 0 20 30 20 7.23967025381502e-05
-5 1 0 0 0 20 32 20 2.64111506026689e-05
-5 1 0 0 0 20 34 20 4.52425597130398e-07
-5 1 0 0 0 20 36 20 6.69303211051306e-10
-5 1 0 0 0 20 38 20 0
+5 0 0 0 0 10 0 10 0
+5 0 0 0 0 10 1 10 6.693032110513e-10
+5 0 0 0 0 10 2 10 4.52425597130395e-07
+5 0 0 0 0 10 3 10 2.64111506026688e-05
+5 0 0 0 0 10 4 10 7.239670253815e-05
+5 0 0 0 0 10 5 10 -0.00534199985172874
+5 0 0 0 0 10 6 10 -0.0591799530595224
+5 0 0 0 0 10 7 10 -0.242393755395384
+5 0 0 0 0 10 8 10 -0.416512311171182
+5 0 0 0 0 10 9 10 -0.162235870503469
+5 0 0 0 0 10 10 10 -0.162235870503468
+5 0 0 0 0 10 11 10 -0.416512311171182
+5 0 0 0 0 10 12 10 -0.242393755395385
+5 0 0 0 0 10 13 10 -0.0591799530595225
+5 0 0 0 0 10 14 10 -0.00534199985172875
+5 0 0 0 0 10 15 10 7.23967025381502e-05
+5 0 0 0 0 10 16 10 2.64111506026689e-05
+5 0 0 0 0 10 17 10 4.52425597130398e-07
+5 0 0 0 0 10 18 10 6.69303211051306e-10
+5 0 0 0 0 10 19 10 0
 
 
 
 # iteration 6
-# time level 1   refinement level 0   component 0   multigrid level 0
+# time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-6 1 0 0 0 20 0 20 0
-6 1 0 0 0 20 2 20 1.13811317397662e-07
-6 1 0 0 0 20 4 20 7.07670174667689e-06
-6 1 0 0 0 20 6 20 4.44798688829561e-05
-6 1 0 0 0 20 8 20 -0.00133276732717108
-6 1 0 0 0 20 10 20 -0.0207006388099142
-6 1 0 0 0 20 12 20 -0.113482596872543
-6 1 0 0 0 20 14 20 -0.274751275149732
-6 1 0 0 0 20 16 20 -0.217136795981632
-6 1 0 0 0 20 18 20 0.0561936677723053
-6 1 0 0 0 20 20 20 0.0561936677723056
-6 1 0 0 0 20 22 20 -0.217136795981632
-6 1 0 0 0 20 24 20 -0.274751275149732
-6 1 0 0 0 20 26 20 -0.113482596872543
-6 1 0 0 0 20 28 20 -0.0207006388099143
-6 1 0 0 0 20 30 20 -0.00133276732717108
-6 1 0 0 0 20 32 20 4.44798688829562e-05
-6 1 0 0 0 20 34 20 7.07670174667692e-06
-6 1 0 0 0 20 36 20 1.13811317397662e-07
-6 1 0 0 0 20 38 20 0
+6 0 0 0 0 10 0 10 0
+6 0 0 0 0 10 1 10 1.13811317397662e-07
+6 0 0 0 0 10 2 10 7.07670174667689e-06
+6 0 0 0 0 10 3 10 4.44798688829561e-05
+6 0 0 0 0 10 4 10 -0.00133276732717108
+6 0 0 0 0 10 5 10 -0.0207006388099142
+6 0 0 0 0 10 6 10 -0.113482596872543
+6 0 0 0 0 10 7 10 -0.274751275149732
+6 0 0 0 0 10 8 10 -0.217136795981632
+6 0 0 0 0 10 9 10 0.0561936677723053
+6 0 0 0 0 10 10 10 0.0561936677723056
+6 0 0 0 0 10 11 10 -0.217136795981632
+6 0 0 0 0 10 12 10 -0.274751275149732
+6 0 0 0 0 10 13 10 -0.113482596872543
+6 0 0 0 0 10 14 10 -0.0207006388099143
+6 0 0 0 0 10 15 10 -0.00133276732717108
+6 0 0 0 0 10 16 10 4.44798688829562e-05
+6 0 0 0 0 10 17 10 7.07670174667692e-06
+6 0 0 0 0 10 18 10 1.13811317397662e-07
+6 0 0 0 0 10 19 10 0
 
 
 
 # iteration 7
-# time level 1   refinement level 0   component 0   multigrid level 0
+# time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-7 1 0 0 0 20 0 20 0
-7 1 0 0 0 20 2 20 1.88842835173522e-06
-7 1 0 0 0 20 4 20 1.8261543339058e-05
-7 1 0 0 0 20 6 20 -0.000303370910566002
-7 1 0 0 0 20 8 20 -0.0067173106912752
-7 1 0 0 0 20 10 20 -0.0483316756133807
-7 1 0 0 0 20 12 20 -0.160680197396579
-7 1 0 0 0 20 14 20 -0.225795013580303
-7 1 0 0 0 20 16 20 -0.0302663611493069
-7 1 0 0 0 20 18 20 0.0696253582326263
-7 1 0 0 0 20 20 20 0.0696253582326263
-7 1 0 0 0 20 22 20 -0.0302663611493066
-7 1 0 0 0 20 24 20 -0.225795013580303
-7 1 0 0 0 20 26 20 -0.160680197396579
-7 1 0 0 0 20 28 20 -0.0483316756133808
-7 1 0 0 0 20 30 20 -0.00671731069127522
-7 1 0 0 0 20 32 20 -0.000303370910566003
-7 1 0 0 0 20 34 20 1.8261543339058e-05
-7 1 0 0 0 20 36 20 1.88842835173522e-06
-7 1 0 0 0 20 38 20 0
+7 0 0 0 0 10 0 10 0
+7 0 0 0 0 10 1 10 1.88842835173522e-06
+7 0 0 0 0 10 2 10 1.8261543339058e-05
+7 0 0 0 0 10 3 10 -0.000303370910566002
+7 0 0 0 0 10 4 10 -0.0067173106912752
+7 0 0 0 0 10 5 10 -0.0483316756133807
+7 0 0 0 0 10 6 10 -0.160680197396579
+7 0 0 0 0 10 7 10 -0.225795013580303
+7 0 0 0 0 10 8 10 -0.0302663611493069
+7 0 0 0 0 10 9 10 0.0696253582326263
+7 0 0 0 0 10 10 10 0.0696253582326263
+7 0 0 0 0 10 11 10 -0.0302663611493066
+7 0 0 0 0 10 12 10 -0.225795013580303
+7 0 0 0 0 10 13 10 -0.160680197396579
+7 0 0 0 0 10 14 10 -0.0483316756133808
+7 0 0 0 0 10 15 10 -0.00671731069127522
+7 0 0 0 0 10 16 10 -0.000303370910566003
+7 0 0 0 0 10 17 10 1.8261543339058e-05
+7 0 0 0 0 10 18 10 1.88842835173522e-06
+7 0 0 0 0 10 19 10 0
 
 
 
 # iteration 8
-# time level 1   refinement level 0   component 0   multigrid level 0
+# time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-8 1 0 0 0 20 0 20 0
-8 1 0 0 0 20 2 20 6.48117414563857e-06
-8 1 0 0 0 20 4 20 -6.04396714485247e-05
-8 1 0 0 0 20 6 20 -0.00204743656355179
-8 1 0 0 0 20 8 20 -0.0189160596760373
-8 1 0 0 0 20 10 20 -0.08332429364187
-8 1 0 0 0 20 12 20 -0.177263752132348
-8 1 0 0 0 20 14 20 -0.129192651620611
-8 1 0 0 0 20 16 20 0.0443520012015004
-8 1 0 0 0 20 18 20 0.0081382591564974
-8 1 0 0 0 20 20 20 0.00813825915649736
-8 1 0 0 0 20 22 20 0.0443520012015005
-8 1 0 0 0 20 24 20 -0.12919265162061
-8 1 0 0 0 20 26 20 -0.177263752132348
-8 1 0 0 0 20 28 20 -0.0833242936418701
-8 1 0 0 0 20 30 20 -0.0189160596760373
-8 1 0 0 0 20 32 20 -0.0020474365635518
-8 1 0 0 0 20 34 20 -6.04396714485248e-05
-8 1 0 0 0 20 36 20 6.48117414563859e-06
-8 1 0 0 0 20 38 20 0
+8 0 0 0 0 10 0 10 0
+8 0 0 0 0 10 1 10 6.48117414563857e-06
+8 0 0 0 0 10 2 10 -6.04396714485247e-05
+8 0 0 0 0 10 3 10 -0.00204743656355179
+8 0 0 0 0 10 4 10 -0.0189160596760373
+8 0 0 0 0 10 5 10 -0.08332429364187
+8 0 0 0 0 10 6 10 -0.177263752132348
+8 0 0 0 0 10 7 10 -0.129192651620611
+8 0 0 0 0 10 8 10 0.0443520012015004
+8 0 0 0 0 10 9 10 0.0081382591564974
+8 0 0 0 0 10 10 10 0.00813825915649736
+8 0 0 0 0 10 11 10 0.0443520012015005
+8 0 0 0 0 10 12 10 -0.12919265162061
+8 0 0 0 0 10 13 10 -0.177263752132348
+8 0 0 0 0 10 14 10 -0.0833242936418701
+8 0 0 0 0 10 15 10 -0.0189160596760373
+8 0 0 0 0 10 16 10 -0.0020474365635518
+8 0 0 0 0 10 17 10 -6.04396714485248e-05
+8 0 0 0 0 10 18 10 6.48117414563859e-06
+8 0 0 0 0 10 19 10 0
 
 
 
 # iteration 9
-# time level 1   refinement level 0   component 0   multigrid level 0
+# time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-9 1 0 0 0 20 0 20 0
-9 1 0 0 0 20 2 20 -9.23817882069273e-06
-9 1 0 0 0 20 4 20 -0.000590230726689046
-9 1 0 0 0 20 6 20 -0.00689678190687759
-9 1 0 0 0 20 8 20 -0.0389052231484413
-9 1 0 0 0 20 10 20 -0.114612889871635
-9 1 0 0 0 20 12 20 -0.15580435440971
-9 1 0 0 0 20 14 20 -0.0417427533393863
-9 1 0 0 0 20 16 20 0.0295094995247097
-9 1 0 0 0 20 18 20 -0.0261885333858791
-9 1 0 0 0 20 20 20 -0.0261885333858792
-9 1 0 0 0 20 22 20 0.0295094995247097
-9 1 0 0 0 20 24 20 -0.0417427533393862
-9 1 0 0 0 20 26 20 -0.15580435440971
-9 1 0 0 0 20 28 20 -0.114612889871635
-9 1 0 0 0 20 30 20 -0.0389052231484414
-9 1 0 0 0 20 32 20 -0.00689678190687761
-9 1 0 0 0 20 34 20 -0.000590230726689047
-9 1 0 0 0 20 36 20 -9.23817882069273e-06
-9 1 0 0 0 20 38 20 0
+9 0 0 0 0 10 0 10 0
+9 0 0 0 0 10 1 10 -9.23817882069273e-06
+9 0 0 0 0 10 2 10 -0.000590230726689046
+9 0 0 0 0 10 3 10 -0.00689678190687759
+9 0 0 0 0 10 4 10 -0.0389052231484413
+9 0 0 0 0 10 5 10 -0.114612889871635
+9 0 0 0 0 10 6 10 -0.15580435440971
+9 0 0 0 0 10 7 10 -0.0417427533393863
+9 0 0 0 0 10 8 10 0.0295094995247097
+9 0 0 0 0 10 9 10 -0.0261885333858791
+9 0 0 0 0 10 10 10 -0.0261885333858792
+9 0 0 0 0 10 11 10 0.0295094995247097
+9 0 0 0 0 10 12 10 -0.0417427533393862
+9 0 0 0 0 10 13 10 -0.15580435440971
+9 0 0 0 0 10 14 10 -0.114612889871635
+9 0 0 0 0 10 15 10 -0.0389052231484414
+9 0 0 0 0 10 16 10 -0.00689678190687761
+9 0 0 0 0 10 17 10 -0.000590230726689047
+9 0 0 0 0 10 18 10 -9.23817882069273e-06
+9 0 0 0 0 10 19 10 0
 
 
 
 # iteration 10
-# time level 1   refinement level 0   component 0   multigrid level 0
+# time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-10 1 0 0 0 20 0 20 0
-10 1 0 0 0 20 2 20 -0.000161871977848914
-10 1 0 0 0 20 4 20 -0.00236947911491751
-10 1 0 0 0 20 6 20 -0.0166505589685362
-10 1 0 0 0 20 8 20 -0.064163184805119
-10 1 0 0 0 20 10 20 -0.130411533364738
-10 1 0 0 0 20 12 20 -0.10750594086851
-10 1 0 0 0 20 14 20 0.00721116806559549
-10 1 0 0 0 20 16 20 -0.00221632135061639
-10 1 0 0 0 20 18 20 -0.0187418012453139
-10 1 0 0 0 20 20 20 -0.018741801245314
-10 1 0 0 0 20 22 20 -0.00221632135061639
-10 1 0 0 0 20 24 20 0.00721116806559558
-10 1 0 0 0 20 26 20 -0.10750594086851
-10 1 0 0 0 20 28 20 -0.130411533364738
-10 1 0 0 0 20 30 20 -0.0641631848051191
-10 1 0 0 0 20 32 20 -0.0166505589685362
-10 1 0 0 0 20 34 20 -0.00236947911491752
-10 1 0 0 0 20 36 20 -0.000161871977848915
-10 1 0 0 0 20 38 20 0
+10 0 0 0 0 10 0 10 0
+10 0 0 0 0 10 1 10 -0.000161871977848914
+10 0 0 0 0 10 2 10 -0.00236947911491751
+10 0 0 0 0 10 3 10 -0.0166505589685362
+10 0 0 0 0 10 4 10 -0.064163184805119
+10 0 0 0 0 10 5 10 -0.130411533364738
+10 0 0 0 0 10 6 10 -0.10750594086851
+10 0 0 0 0 10 7 10 0.00721116806559549
+10 0 0 0 0 10 8 10 -0.00221632135061639
+10 0 0 0 0 10 9 10 -0.0187418012453139
+10 0 0 0 0 10 10 10 -0.018741801245314
+10 0 0 0 0 10 11 10 -0.00221632135061639
+10 0 0 0 0 10 12 10 0.00721116806559558
+10 0 0 0 0 10 13 10 -0.10750594086851
+10 0 0 0 0 10 14 10 -0.130411533364738
+10 0 0 0 0 10 15 10 -0.0641631848051191
+10 0 0 0 0 10 16 10 -0.0166505589685362
+10 0 0 0 0 10 17 10 -0.00236947911491752
+10 0 0 0 0 10 18 10 -0.000161871977848915
+10 0 0 0 0 10 19 10 0
 
 
 
diff --git a/CarpetExtra/WaveToyF77/test/wavetoyf77/phi.zl b/CarpetExtra/WaveToyF77/test/wavetoyf77/phi.zl
index 69df48bab..46a0cf70d 100644
--- a/CarpetExtra/WaveToyF77/test/wavetoyf77/phi.zl
+++ b/CarpetExtra/WaveToyF77/test/wavetoyf77/phi.zl
@@ -1,288 +1,288 @@
 # WAVETOY::phi z (phi)
 #
 # iteration 0
-# time level 1   refinement level 0   component 0   multigrid level 0
+# time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 1 0 0 0 20 20 0 2.13769355812841e-44
-0 1 0 0 0 20 20 2 9.81238207534605e-36
-0 1 0 0 0 20 20 4 4.91109129723921e-28
-0 1 0 0 0 20 20 6 2.68013160656255e-21
-0 1 0 0 0 20 20 8 1.59480940571288e-15
-0 1 0 0 0 20 20 10 1.03475137373628e-10
-0 1 0 0 0 20 20 12 7.32045019582289e-07
-0 1 0 0 0 20 20 14 0.000564695236523836
-0 1 0 0 0 20 20 16 0.0474968724749268
-0 1 0 0 0 20 20 18 0.435602594953338
-0 1 0 0 0 20 20 20 0.435602594953338
-0 1 0 0 0 20 20 22 0.047496872474927
-0 1 0 0 0 20 20 24 0.00056469523652384
-0 1 0 0 0 20 20 26 7.32045019582296e-07
-0 1 0 0 0 20 20 28 1.0347513737363e-10
-0 1 0 0 0 20 20 30 1.5948094057129e-15
-0 1 0 0 0 20 20 32 2.68013160656261e-21
-0 1 0 0 0 20 20 34 4.91109129723928e-28
-0 1 0 0 0 20 20 36 9.81238207534619e-36
-0 1 0 0 0 20 20 38 2.13769355812841e-44
+0 0 0 0 0 10 10 0 2.13769355812841e-44
+0 0 0 0 0 10 10 1 9.81238207534605e-36
+0 0 0 0 0 10 10 2 4.91109129723921e-28
+0 0 0 0 0 10 10 3 2.68013160656255e-21
+0 0 0 0 0 10 10 4 1.59480940571288e-15
+0 0 0 0 0 10 10 5 1.03475137373628e-10
+0 0 0 0 0 10 10 6 7.32045019582289e-07
+0 0 0 0 0 10 10 7 0.000564695236523836
+0 0 0 0 0 10 10 8 0.0474968724749268
+0 0 0 0 0 10 10 9 0.435602594953338
+0 0 0 0 0 10 10 10 0.435602594953338
+0 0 0 0 0 10 10 11 0.047496872474927
+0 0 0 0 0 10 10 12 0.00056469523652384
+0 0 0 0 0 10 10 13 7.32045019582296e-07
+0 0 0 0 0 10 10 14 1.0347513737363e-10
+0 0 0 0 0 10 10 15 1.5948094057129e-15
+0 0 0 0 0 10 10 16 2.68013160656261e-21
+0 0 0 0 0 10 10 17 4.91109129723928e-28
+0 0 0 0 0 10 10 18 9.81238207534619e-36
+0 0 0 0 0 10 10 19 2.13769355812841e-44
 
 
 
 # iteration 1
-# time level 1   refinement level 0   component 0   multigrid level 0
+# time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 1 0 0 0 20 20 0 0
-1 1 0 0 0 20 20 2 1.22682689034646e-28
-1 1 0 0 0 20 20 4 6.68463146460746e-22
-1 1 0 0 0 20 20 6 3.95859475931402e-16
-1 1 0 0 0 20 20 8 2.53070110965507e-11
-1 1 0 0 0 20 20 10 1.70914716385004e-07
-1 1 0 0 0 20 20 12 0.000112938462633636
-1 1 0 0 0 20 20 14 0.00485368397550732
-1 1 0 0 0 20 20 16 -0.0670042756634817
-1 1 0 0 0 20 20 18 -0.281918670454475
-1 1 0 0 0 20 20 20 -0.281918670454475
-1 1 0 0 0 20 20 22 -0.067004275663482
-1 1 0 0 0 20 20 24 0.00485368397550734
-1 1 0 0 0 20 20 26 0.000112938462633636
-1 1 0 0 0 20 20 28 1.70914716385006e-07
-1 1 0 0 0 20 20 30 2.5307011096551e-11
-1 1 0 0 0 20 20 32 3.95859475931408e-16
-1 1 0 0 0 20 20 34 6.68463146460761e-22
-1 1 0 0 0 20 20 36 1.22682689034648e-28
-1 1 0 0 0 20 20 38 0
+1 0 0 0 0 10 10 0 0
+1 0 0 0 0 10 10 1 1.22682689034646e-28
+1 0 0 0 0 10 10 2 6.68463146460746e-22
+1 0 0 0 0 10 10 3 3.95859475931402e-16
+1 0 0 0 0 10 10 4 2.53070110965507e-11
+1 0 0 0 0 10 10 5 1.70914716385004e-07
+1 0 0 0 0 10 10 6 0.000112938462633636
+1 0 0 0 0 10 10 7 0.00485368397550732
+1 0 0 0 0 10 10 8 -0.0670042756634817
+1 0 0 0 0 10 10 9 -0.281918670454475
+1 0 0 0 0 10 10 10 -0.281918670454475
+1 0 0 0 0 10 10 11 -0.067004275663482
+1 0 0 0 0 10 10 12 0.00485368397550734
+1 0 0 0 0 10 10 13 0.000112938462633636
+1 0 0 0 0 10 10 14 1.70914716385006e-07
+1 0 0 0 0 10 10 15 2.5307011096551e-11
+1 0 0 0 0 10 10 16 3.95859475931408e-16
+1 0 0 0 0 10 10 17 6.68463146460761e-22
+1 0 0 0 0 10 10 18 1.22682689034648e-28
+1 0 0 0 0 10 10 19 0
 
 
 
 # iteration 2
-# time level 1   refinement level 0   component 0   multigrid level 0
+# time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-2 1 0 0 0 20 20 0 0
-2 1 0 0 0 20 20 2 1.67115915985643e-22
-2 1 0 0 0 20 20 4 9.89655738758154e-17
-2 1 0 0 0 20 20 6 6.32717018479805e-12
-2 1 0 0 0 20 20 8 4.27553578129613e-08
-2 1 0 0 0 20 20 10 2.84145841284519e-05
-2 1 0 0 0 20 20 12 0.00133135677107058
-2 1 0 0 0 20 20 14 -0.0123105937045863
-2 1 0 0 0 20 20 16 -0.191827773445984
-2 1 0 0 0 20 20 18 -0.838254139769044
-2 1 0 0 0 20 20 20 -0.838254139769044
-2 1 0 0 0 20 20 22 -0.191827773445984
-2 1 0 0 0 20 20 24 -0.0123105937045864
-2 1 0 0 0 20 20 26 0.00133135677107059
-2 1 0 0 0 20 20 28 2.84145841284521e-05
-2 1 0 0 0 20 20 30 4.27553578129617e-08
-2 1 0 0 0 20 20 32 6.32717018479812e-12
-2 1 0 0 0 20 20 34 9.89655738758169e-17
-2 1 0 0 0 20 20 36 1.67115915985646e-22
-2 1 0 0 0 20 20 38 0
+2 0 0 0 0 10 10 0 0
+2 0 0 0 0 10 10 1 1.67115915985643e-22
+2 0 0 0 0 10 10 2 9.89655738758154e-17
+2 0 0 0 0 10 10 3 6.32717018479805e-12
+2 0 0 0 0 10 10 4 4.27553578129613e-08
+2 0 0 0 0 10 10 5 2.84145841284519e-05
+2 0 0 0 0 10 10 6 0.00133135677107058
+2 0 0 0 0 10 10 7 -0.0123105937045863
+2 0 0 0 0 10 10 8 -0.191827773445984
+2 0 0 0 0 10 10 9 -0.838254139769044
+2 0 0 0 0 10 10 10 -0.838254139769044
+2 0 0 0 0 10 10 11 -0.191827773445984
+2 0 0 0 0 10 10 12 -0.0123105937045864
+2 0 0 0 0 10 10 13 0.00133135677107059
+2 0 0 0 0 10 10 14 2.84145841284521e-05
+2 0 0 0 0 10 10 15 4.27553578129617e-08
+2 0 0 0 0 10 10 16 6.32717018479812e-12
+2 0 0 0 0 10 10 17 9.89655738758169e-17
+2 0 0 0 0 10 10 18 1.67115915985646e-22
+2 0 0 0 0 10 10 19 0
 
 
 
 # iteration 3
-# time level 1   refinement level 0   component 0   multigrid level 0
+# time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-3 1 0 0 0 20 20 0 0
-3 1 0 0 0 20 20 2 2.47415696923374e-17
-3 1 0 0 0 20 20 4 1.58189689968305e-12
-3 1 0 0 0 20 20 6 1.06955096189697e-08
-3 1 0 0 0 20 20 8 7.14866962467265e-06
-3 1 0 0 0 20 20 10 0.000362543700949426
-3 1 0 0 0 20 20 12 -0.00180281581401197
-3 1 0 0 0 20 20 14 -0.0661355403874472
-3 1 0 0 0 20 20 16 -0.363219448163234
-3 1 0 0 0 20 20 18 -0.909769834341317
-3 1 0 0 0 20 20 20 -0.909769834341318
-3 1 0 0 0 20 20 22 -0.363219448163234
-3 1 0 0 0 20 20 24 -0.0661355403874474
-3 1 0 0 0 20 20 26 -0.00180281581401198
-3 1 0 0 0 20 20 28 0.000362543700949427
-3 1 0 0 0 20 20 30 7.14866962467269e-06
-3 1 0 0 0 20 20 32 1.06955096189698e-08
-3 1 0 0 0 20 20 34 1.58189689968307e-12
-3 1 0 0 0 20 20 36 2.47415696923378e-17
-3 1 0 0 0 20 20 38 0
+3 0 0 0 0 10 10 0 0
+3 0 0 0 0 10 10 1 2.47415696923374e-17
+3 0 0 0 0 10 10 2 1.58189689968305e-12
+3 0 0 0 0 10 10 3 1.06955096189697e-08
+3 0 0 0 0 10 10 4 7.14866962467265e-06
+3 0 0 0 0 10 10 5 0.000362543700949426
+3 0 0 0 0 10 10 6 -0.00180281581401197
+3 0 0 0 0 10 10 7 -0.0661355403874472
+3 0 0 0 0 10 10 8 -0.363219448163234
+3 0 0 0 0 10 10 9 -0.909769834341317
+3 0 0 0 0 10 10 10 -0.909769834341318
+3 0 0 0 0 10 10 11 -0.363219448163234
+3 0 0 0 0 10 10 12 -0.0661355403874474
+3 0 0 0 0 10 10 13 -0.00180281581401198
+3 0 0 0 0 10 10 14 0.000362543700949427
+3 0 0 0 0 10 10 15 7.14866962467269e-06
+3 0 0 0 0 10 10 16 1.06955096189698e-08
+3 0 0 0 0 10 10 17 1.58189689968307e-12
+3 0 0 0 0 10 10 18 2.47415696923378e-17
+3 0 0 0 0 10 10 19 0
 
 
 
 # iteration 4
-# time level 1   refinement level 0   component 0   multigrid level 0
+# time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-4 1 0 0 0 20 20 0 0
-4 1 0 0 0 20 20 2 3.95500313485421e-13
-4 1 0 0 0 20 20 4 2.67554506710229e-09
-4 1 0 0 0 20 20 6 1.79843103280261e-06
-4 1 0 0 0 20 20 8 9.81141807427286e-05
-4 1 0 0 0 20 20 10 -9.77890293755283e-05
-4 1 0 0 0 20 20 12 -0.0197154488008626
-4 1 0 0 0 20 20 14 -0.154257957160012
-4 1 0 0 0 20 20 16 -0.477053040993001
-4 1 0 0 0 20 20 18 -0.571372739280028
-4 1 0 0 0 20 20 20 -0.571372739280028
-4 1 0 0 0 20 20 22 -0.477053040993001
-4 1 0 0 0 20 20 24 -0.154257957160012
-4 1 0 0 0 20 20 26 -0.0197154488008626
-4 1 0 0 0 20 20 28 -9.77890293755288e-05
-4 1 0 0 0 20 20 30 9.81141807427289e-05
-4 1 0 0 0 20 20 32 1.79843103280262e-06
-4 1 0 0 0 20 20 34 2.67554506710232e-09
-4 1 0 0 0 20 20 36 3.95500313485425e-13
-4 1 0 0 0 20 20 38 0
+4 0 0 0 0 10 10 0 0
+4 0 0 0 0 10 10 1 3.95500313485421e-13
+4 0 0 0 0 10 10 2 2.67554506710229e-09
+4 0 0 0 0 10 10 3 1.79843103280261e-06
+4 0 0 0 0 10 10 4 9.81141807427286e-05
+4 0 0 0 0 10 10 5 -9.77890293755283e-05
+4 0 0 0 0 10 10 6 -0.0197154488008626
+4 0 0 0 0 10 10 7 -0.154257957160012
+4 0 0 0 0 10 10 8 -0.477053040993001
+4 0 0 0 0 10 10 9 -0.571372739280028
+4 0 0 0 0 10 10 10 -0.571372739280028
+4 0 0 0 0 10 10 11 -0.477053040993001
+4 0 0 0 0 10 10 12 -0.154257957160012
+4 0 0 0 0 10 10 13 -0.0197154488008626
+4 0 0 0 0 10 10 14 -9.77890293755288e-05
+4 0 0 0 0 10 10 15 9.81141807427289e-05
+4 0 0 0 0 10 10 16 1.79843103280262e-06
+4 0 0 0 0 10 10 17 2.67554506710232e-09
+4 0 0 0 0 10 10 18 3.95500313485425e-13
+4 0 0 0 0 10 10 19 0
 
 
 
 # iteration 5
-# time level 1   refinement level 0   component 0   multigrid level 0
+# time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-5 1 0 0 0 20 20 0 0
-5 1 0 0 0 20 20 2 6.693032110513e-10
-5 1 0 0 0 20 20 4 4.52425597130395e-07
-5 1 0 0 0 20 20 6 2.64111506026688e-05
-5 1 0 0 0 20 20 8 7.239670253815e-05
-5 1 0 0 0 20 20 10 -0.00534199985172874
-5 1 0 0 0 20 20 12 -0.0591799530595224
-5 1 0 0 0 20 20 14 -0.242393755395384
-5 1 0 0 0 20 20 16 -0.416512311171182
-5 1 0 0 0 20 20 18 -0.162235870503469
-5 1 0 0 0 20 20 20 -0.162235870503468
-5 1 0 0 0 20 20 22 -0.416512311171182
-5 1 0 0 0 20 20 24 -0.242393755395385
-5 1 0 0 0 20 20 26 -0.0591799530595225
-5 1 0 0 0 20 20 28 -0.00534199985172875
-5 1 0 0 0 20 20 30 7.23967025381502e-05
-5 1 0 0 0 20 20 32 2.64111506026689e-05
-5 1 0 0 0 20 20 34 4.52425597130398e-07
-5 1 0 0 0 20 20 36 6.69303211051306e-10
-5 1 0 0 0 20 20 38 0
+5 0 0 0 0 10 10 0 0
+5 0 0 0 0 10 10 1 6.693032110513e-10
+5 0 0 0 0 10 10 2 4.52425597130395e-07
+5 0 0 0 0 10 10 3 2.64111506026688e-05
+5 0 0 0 0 10 10 4 7.239670253815e-05
+5 0 0 0 0 10 10 5 -0.00534199985172874
+5 0 0 0 0 10 10 6 -0.0591799530595224
+5 0 0 0 0 10 10 7 -0.242393755395384
+5 0 0 0 0 10 10 8 -0.416512311171182
+5 0 0 0 0 10 10 9 -0.162235870503469
+5 0 0 0 0 10 10 10 -0.162235870503468
+5 0 0 0 0 10 10 11 -0.416512311171182
+5 0 0 0 0 10 10 12 -0.242393755395385
+5 0 0 0 0 10 10 13 -0.0591799530595225
+5 0 0 0 0 10 10 14 -0.00534199985172875
+5 0 0 0 0 10 10 15 7.23967025381502e-05
+5 0 0 0 0 10 10 16 2.64111506026689e-05
+5 0 0 0 0 10 10 17 4.52425597130398e-07
+5 0 0 0 0 10 10 18 6.69303211051306e-10
+5 0 0 0 0 10 10 19 0
 
 
 
 # iteration 6
-# time level 1   refinement level 0   component 0   multigrid level 0
+# time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-6 1 0 0 0 20 20 0 0
-6 1 0 0 0 20 20 2 1.13811317397662e-07
-6 1 0 0 0 20 20 4 7.07670174667689e-06
-6 1 0 0 0 20 20 6 4.44798688829561e-05
-6 1 0 0 0 20 20 8 -0.00133276732717108
-6 1 0 0 0 20 20 10 -0.0207006388099142
-6 1 0 0 0 20 20 12 -0.113482596872543
-6 1 0 0 0 20 20 14 -0.274751275149732
-6 1 0 0 0 20 20 16 -0.217136795981632
-6 1 0 0 0 20 20 18 0.0561936677723053
-6 1 0 0 0 20 20 20 0.0561936677723056
-6 1 0 0 0 20 20 22 -0.217136795981632
-6 1 0 0 0 20 20 24 -0.274751275149732
-6 1 0 0 0 20 20 26 -0.113482596872543
-6 1 0 0 0 20 20 28 -0.0207006388099143
-6 1 0 0 0 20 20 30 -0.00133276732717108
-6 1 0 0 0 20 20 32 4.44798688829562e-05
-6 1 0 0 0 20 20 34 7.07670174667692e-06
-6 1 0 0 0 20 20 36 1.13811317397662e-07
-6 1 0 0 0 20 20 38 0
+6 0 0 0 0 10 10 0 0
+6 0 0 0 0 10 10 1 1.13811317397662e-07
+6 0 0 0 0 10 10 2 7.07670174667689e-06
+6 0 0 0 0 10 10 3 4.44798688829561e-05
+6 0 0 0 0 10 10 4 -0.00133276732717108
+6 0 0 0 0 10 10 5 -0.0207006388099142
+6 0 0 0 0 10 10 6 -0.113482596872543
+6 0 0 0 0 10 10 7 -0.274751275149732
+6 0 0 0 0 10 10 8 -0.217136795981632
+6 0 0 0 0 10 10 9 0.0561936677723053
+6 0 0 0 0 10 10 10 0.0561936677723056
+6 0 0 0 0 10 10 11 -0.217136795981632
+6 0 0 0 0 10 10 12 -0.274751275149732
+6 0 0 0 0 10 10 13 -0.113482596872543
+6 0 0 0 0 10 10 14 -0.0207006388099143
+6 0 0 0 0 10 10 15 -0.00133276732717108
+6 0 0 0 0 10 10 16 4.44798688829562e-05
+6 0 0 0 0 10 10 17 7.07670174667692e-06
+6 0 0 0 0 10 10 18 1.13811317397662e-07
+6 0 0 0 0 10 10 19 0
 
 
 
 # iteration 7
-# time level 1   refinement level 0   component 0   multigrid level 0
+# time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-7 1 0 0 0 20 20 0 0
-7 1 0 0 0 20 20 2 1.88842835173522e-06
-7 1 0 0 0 20 20 4 1.8261543339058e-05
-7 1 0 0 0 20 20 6 -0.000303370910566002
-7 1 0 0 0 20 20 8 -0.0067173106912752
-7 1 0 0 0 20 20 10 -0.0483316756133807
-7 1 0 0 0 20 20 12 -0.160680197396579
-7 1 0 0 0 20 20 14 -0.225795013580303
-7 1 0 0 0 20 20 16 -0.0302663611493069
-7 1 0 0 0 20 20 18 0.0696253582326263
-7 1 0 0 0 20 20 20 0.0696253582326263
-7 1 0 0 0 20 20 22 -0.0302663611493066
-7 1 0 0 0 20 20 24 -0.225795013580303
-7 1 0 0 0 20 20 26 -0.160680197396579
-7 1 0 0 0 20 20 28 -0.0483316756133808
-7 1 0 0 0 20 20 30 -0.00671731069127522
-7 1 0 0 0 20 20 32 -0.000303370910566003
-7 1 0 0 0 20 20 34 1.8261543339058e-05
-7 1 0 0 0 20 20 36 1.88842835173522e-06
-7 1 0 0 0 20 20 38 0
+7 0 0 0 0 10 10 0 0
+7 0 0 0 0 10 10 1 1.88842835173522e-06
+7 0 0 0 0 10 10 2 1.8261543339058e-05
+7 0 0 0 0 10 10 3 -0.000303370910566002
+7 0 0 0 0 10 10 4 -0.0067173106912752
+7 0 0 0 0 10 10 5 -0.0483316756133807
+7 0 0 0 0 10 10 6 -0.160680197396579
+7 0 0 0 0 10 10 7 -0.225795013580303
+7 0 0 0 0 10 10 8 -0.0302663611493069
+7 0 0 0 0 10 10 9 0.0696253582326263
+7 0 0 0 0 10 10 10 0.0696253582326263
+7 0 0 0 0 10 10 11 -0.0302663611493066
+7 0 0 0 0 10 10 12 -0.225795013580303
+7 0 0 0 0 10 10 13 -0.160680197396579
+7 0 0 0 0 10 10 14 -0.0483316756133808
+7 0 0 0 0 10 10 15 -0.00671731069127522
+7 0 0 0 0 10 10 16 -0.000303370910566003
+7 0 0 0 0 10 10 17 1.8261543339058e-05
+7 0 0 0 0 10 10 18 1.88842835173522e-06
+7 0 0 0 0 10 10 19 0
 
 
 
 # iteration 8
-# time level 1   refinement level 0   component 0   multigrid level 0
+# time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-8 1 0 0 0 20 20 0 0
-8 1 0 0 0 20 20 2 6.48117414563857e-06
-8 1 0 0 0 20 20 4 -6.04396714485247e-05
-8 1 0 0 0 20 20 6 -0.00204743656355179
-8 1 0 0 0 20 20 8 -0.0189160596760373
-8 1 0 0 0 20 20 10 -0.08332429364187
-8 1 0 0 0 20 20 12 -0.177263752132348
-8 1 0 0 0 20 20 14 -0.129192651620611
-8 1 0 0 0 20 20 16 0.0443520012015004
-8 1 0 0 0 20 20 18 0.0081382591564974
-8 1 0 0 0 20 20 20 0.00813825915649736
-8 1 0 0 0 20 20 22 0.0443520012015005
-8 1 0 0 0 20 20 24 -0.12919265162061
-8 1 0 0 0 20 20 26 -0.177263752132348
-8 1 0 0 0 20 20 28 -0.0833242936418701
-8 1 0 0 0 20 20 30 -0.0189160596760373
-8 1 0 0 0 20 20 32 -0.0020474365635518
-8 1 0 0 0 20 20 34 -6.04396714485248e-05
-8 1 0 0 0 20 20 36 6.48117414563859e-06
-8 1 0 0 0 20 20 38 0
+8 0 0 0 0 10 10 0 0
+8 0 0 0 0 10 10 1 6.48117414563857e-06
+8 0 0 0 0 10 10 2 -6.04396714485247e-05
+8 0 0 0 0 10 10 3 -0.00204743656355179
+8 0 0 0 0 10 10 4 -0.0189160596760373
+8 0 0 0 0 10 10 5 -0.08332429364187
+8 0 0 0 0 10 10 6 -0.177263752132348
+8 0 0 0 0 10 10 7 -0.129192651620611
+8 0 0 0 0 10 10 8 0.0443520012015004
+8 0 0 0 0 10 10 9 0.0081382591564974
+8 0 0 0 0 10 10 10 0.00813825915649736
+8 0 0 0 0 10 10 11 0.0443520012015005
+8 0 0 0 0 10 10 12 -0.12919265162061
+8 0 0 0 0 10 10 13 -0.177263752132348
+8 0 0 0 0 10 10 14 -0.0833242936418701
+8 0 0 0 0 10 10 15 -0.0189160596760373
+8 0 0 0 0 10 10 16 -0.0020474365635518
+8 0 0 0 0 10 10 17 -6.04396714485248e-05
+8 0 0 0 0 10 10 18 6.48117414563859e-06
+8 0 0 0 0 10 10 19 0
 
 
 
 # iteration 9
-# time level 1   refinement level 0   component 0   multigrid level 0
+# time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-9 1 0 0 0 20 20 0 0
-9 1 0 0 0 20 20 2 -9.23817882069273e-06
-9 1 0 0 0 20 20 4 -0.000590230726689046
-9 1 0 0 0 20 20 6 -0.00689678190687759
-9 1 0 0 0 20 20 8 -0.0389052231484413
-9 1 0 0 0 20 20 10 -0.114612889871635
-9 1 0 0 0 20 20 12 -0.15580435440971
-9 1 0 0 0 20 20 14 -0.0417427533393863
-9 1 0 0 0 20 20 16 0.0295094995247097
-9 1 0 0 0 20 20 18 -0.0261885333858791
-9 1 0 0 0 20 20 20 -0.0261885333858792
-9 1 0 0 0 20 20 22 0.0295094995247097
-9 1 0 0 0 20 20 24 -0.0417427533393862
-9 1 0 0 0 20 20 26 -0.15580435440971
-9 1 0 0 0 20 20 28 -0.114612889871635
-9 1 0 0 0 20 20 30 -0.0389052231484414
-9 1 0 0 0 20 20 32 -0.00689678190687761
-9 1 0 0 0 20 20 34 -0.000590230726689047
-9 1 0 0 0 20 20 36 -9.23817882069273e-06
-9 1 0 0 0 20 20 38 0
+9 0 0 0 0 10 10 0 0
+9 0 0 0 0 10 10 1 -9.23817882069273e-06
+9 0 0 0 0 10 10 2 -0.000590230726689046
+9 0 0 0 0 10 10 3 -0.00689678190687759
+9 0 0 0 0 10 10 4 -0.0389052231484413
+9 0 0 0 0 10 10 5 -0.114612889871635
+9 0 0 0 0 10 10 6 -0.15580435440971
+9 0 0 0 0 10 10 7 -0.0417427533393863
+9 0 0 0 0 10 10 8 0.0295094995247097
+9 0 0 0 0 10 10 9 -0.0261885333858791
+9 0 0 0 0 10 10 10 -0.0261885333858792
+9 0 0 0 0 10 10 11 0.0295094995247097
+9 0 0 0 0 10 10 12 -0.0417427533393862
+9 0 0 0 0 10 10 13 -0.15580435440971
+9 0 0 0 0 10 10 14 -0.114612889871635
+9 0 0 0 0 10 10 15 -0.0389052231484414
+9 0 0 0 0 10 10 16 -0.00689678190687761
+9 0 0 0 0 10 10 17 -0.000590230726689047
+9 0 0 0 0 10 10 18 -9.23817882069273e-06
+9 0 0 0 0 10 10 19 0
 
 
 
 # iteration 10
-# time level 1   refinement level 0   component 0   multigrid level 0
+# time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-10 1 0 0 0 20 20 0 0
-10 1 0 0 0 20 20 2 -0.000161871977848914
-10 1 0 0 0 20 20 4 -0.00236947911491751
-10 1 0 0 0 20 20 6 -0.0166505589685362
-10 1 0 0 0 20 20 8 -0.064163184805119
-10 1 0 0 0 20 20 10 -0.130411533364738
-10 1 0 0 0 20 20 12 -0.10750594086851
-10 1 0 0 0 20 20 14 0.00721116806559549
-10 1 0 0 0 20 20 16 -0.00221632135061639
-10 1 0 0 0 20 20 18 -0.0187418012453139
-10 1 0 0 0 20 20 20 -0.018741801245314
-10 1 0 0 0 20 20 22 -0.00221632135061639
-10 1 0 0 0 20 20 24 0.00721116806559558
-10 1 0 0 0 20 20 26 -0.10750594086851
-10 1 0 0 0 20 20 28 -0.130411533364738
-10 1 0 0 0 20 20 30 -0.0641631848051191
-10 1 0 0 0 20 20 32 -0.0166505589685362
-10 1 0 0 0 20 20 34 -0.00236947911491752
-10 1 0 0 0 20 20 36 -0.000161871977848915
-10 1 0 0 0 20 20 38 0
+10 0 0 0 0 10 10 0 0
+10 0 0 0 0 10 10 1 -0.000161871977848914
+10 0 0 0 0 10 10 2 -0.00236947911491751
+10 0 0 0 0 10 10 3 -0.0166505589685362
+10 0 0 0 0 10 10 4 -0.064163184805119
+10 0 0 0 0 10 10 5 -0.130411533364738
+10 0 0 0 0 10 10 6 -0.10750594086851
+10 0 0 0 0 10 10 7 0.00721116806559549
+10 0 0 0 0 10 10 8 -0.00221632135061639
+10 0 0 0 0 10 10 9 -0.0187418012453139
+10 0 0 0 0 10 10 10 -0.018741801245314
+10 0 0 0 0 10 10 11 -0.00221632135061639
+10 0 0 0 0 10 10 12 0.00721116806559558
+10 0 0 0 0 10 10 13 -0.10750594086851
+10 0 0 0 0 10 10 14 -0.130411533364738
+10 0 0 0 0 10 10 15 -0.0641631848051191
+10 0 0 0 0 10 10 16 -0.0166505589685362
+10 0 0 0 0 10 10 17 -0.00236947911491752
+10 0 0 0 0 10 10 18 -0.000161871977848915
+10 0 0 0 0 10 10 19 0
 
 
 
diff --git a/CarpetExtra/WaveToyF77/test/wavetoyf77_rad.log b/CarpetExtra/WaveToyF77/test/wavetoyf77_rad.log
index 5c4da9766..c9dc6415f 100644
--- a/CarpetExtra/WaveToyF77/test/wavetoyf77_rad.log
+++ b/CarpetExtra/WaveToyF77/test/wavetoyf77_rad.log
@@ -62,6 +62,31 @@ AMR 3D ASCII I/O provided by CarpetIOASCII
 --------------------------------------------------------------------------------
 WaveToyF77: Evolutions of a Scalar Field
 --------------------------------------------------------------------------------
+
+dh bboxes:
+rl=0 c=0 ml=0
+exterior=([0,0,0]:[9,9,9]:[1,1,1])
+interior=([1,1,1]:[8,8,8]:[1,1,1])
+send_mg_fine=[]
+send_mg_coarse=[]
+recv_mg_fine=[]
+recv_mg_coarse=[]
+send_ref_fine=[]
+send_ref_coarse=[]
+recv_ref_fine=[]
+recv_ref_coarse=[]
+send_sync=[0:[]]
+send_ref_bnd_fine=[]
+boundaries={([0,0,0]:[0,9,9]:[1,1,1]),([1,0,0]:[8,0,9]:[1,1,1]),([9,0,0]:[9,9,9]:[1,1,1]),([1,1,0]:[8,8,0]:[1,1,1]),([1,9,0]:[8,9,9]:[1,1,1]),([1,1,9]:[8,8,9]:[1,1,1])}
+recv_sync=[0:[]]
+recv_ref_bnd_coarse=[]
+sync_not={([0,0,0]:[0,9,9]:[1,1,1]),([1,0,0]:[8,0,9]:[1,1,1]),([9,0,0]:[9,9,9]:[1,1,1]),([1,1,0]:[8,8,0]:[1,1,1]),([1,9,0]:[8,9,9]:[1,1,1]),([1,1,9]:[8,8,9]:[1,1,1])}
+
+dh bases:
+rl=0 ml=0
+exterior=([0,0,0]:[9,9,9]:[1,1,1])
+interior=([1,1,1]:[8,8,8]:[1,1,1])
+boundaries={([0,0,0]:[0,9,9]:[1,1,1]),([1,0,0]:[8,0,9]:[1,1,1]),([9,0,0]:[9,9,9]:[1,1,1]),([1,1,0]:[8,8,0]:[1,1,1]),([1,9,0]:[8,9,9]:[1,1,1]),([1,1,9]:[8,8,9]:[1,1,1])}
 ----------------
  it  |         |
      |    t    |
diff --git a/CarpetExtra/WaveToyF77/test/wavetoyf77_rad/phi.xl b/CarpetExtra/WaveToyF77/test/wavetoyf77_rad/phi.xl
index 86bfd667e..eb9bf4ebe 100644
--- a/CarpetExtra/WaveToyF77/test/wavetoyf77_rad/phi.xl
+++ b/CarpetExtra/WaveToyF77/test/wavetoyf77_rad/phi.xl
@@ -1,82 +1,82 @@
 # WAVETOY::phi x (phi)
 #
 # iteration 0
-# time level 1   refinement level 0   component 0   multigrid level 0
+# time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 1 0 0 0 0 2 2 0.966147489762885
-0 1 0 0 0 2 2 2 0.966147489762885
-0 1 0 0 0 4 2 2 0.881371986353857
-0 1 0 0 0 6 2 2 0.733484377941989
-0 1 0 0 0 8 2 2 0.556850106619834
-0 1 0 0 0 10 2 2 0.385657302025291
-0 1 0 0 0 12 2 2 0.243657970841475
-0 1 0 0 0 14 2 2 0.140435045869805
-0 1 0 0 0 16 2 2 0.0738390653280284
-0 1 0 0 0 18 2 2 0.0354170752128787
+0 0 0 0 0 0 1 1 0.966147489762885
+0 0 0 0 0 1 1 1 0.966147489762885
+0 0 0 0 0 2 1 1 0.881371986353857
+0 0 0 0 0 3 1 1 0.733484377941989
+0 0 0 0 0 4 1 1 0.556850106619834
+0 0 0 0 0 5 1 1 0.385657302025291
+0 0 0 0 0 6 1 1 0.243657970841475
+0 0 0 0 0 7 1 1 0.140435045869805
+0 0 0 0 0 8 1 1 0.0738390653280284
+0 0 0 0 0 9 1 1 0.0354170752128787
 
 
 
 # iteration 1
-# time level 1   refinement level 0   component 0   multigrid level 0
+# time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 1 0 0 0 0 2 2 0.874846362533133
-1 1 0 0 0 2 2 2 0.874846362533133
-1 1 0 0 0 4 2 2 0.768046252122832
-1 1 0 0 0 6 2 2 0.610612554181502
-1 1 0 0 0 8 2 2 0.442054772678387
-1 1 0 0 0 10 2 2 0.291737697980911
-1 1 0 0 0 12 2 2 0.175592784577625
-1 1 0 0 0 14 2 2 0.0964185960819811
-1 1 0 0 0 16 2 2 0.048317742510022
-1 1 0 0 0 18 2 2 0.0648874395788695
+1 0 0 0 0 0 1 1 0.874846362533133
+1 0 0 0 0 1 1 1 0.874846362533133
+1 0 0 0 0 2 1 1 0.768046252122832
+1 0 0 0 0 3 1 1 0.610612554181502
+1 0 0 0 0 4 1 1 0.442054772678387
+1 0 0 0 0 5 1 1 0.291737697980911
+1 0 0 0 0 6 1 1 0.175592784577625
+1 0 0 0 0 7 1 1 0.0964185960819811
+1 0 0 0 0 8 1 1 0.048317742510022
+1 0 0 0 0 9 1 1 0.0648874395788695
 
 
 
 # iteration 2
-# time level 1   refinement level 0   component 0   multigrid level 0
+# time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-2 1 0 0 0 0 2 2 0.703445152495655
-2 1 0 0 0 2 2 2 0.703445152495655
-2 1 0 0 0 4 2 2 0.599601090521016
-2 1 0 0 0 6 2 2 0.453309510725706
-2 1 0 0 0 8 2 2 0.309761576207388
-2 1 0 0 0 10 2 2 0.192149941162959
-2 1 0 0 0 12 2 2 0.108355071915476
-2 1 0 0 0 14 2 2 0.0556031057827004
-2 1 0 0 0 16 2 2 0.0366949038717224
-2 1 0 0 0 18 2 2 0.0534774058648878
+2 0 0 0 0 0 1 1 0.703445152495655
+2 0 0 0 0 1 1 1 0.703445152495655
+2 0 0 0 0 2 1 1 0.599601090521016
+2 0 0 0 0 3 1 1 0.453309510725706
+2 0 0 0 0 4 1 1 0.309761576207388
+2 0 0 0 0 5 1 1 0.192149941162959
+2 0 0 0 0 6 1 1 0.108355071915476
+2 0 0 0 0 7 1 1 0.0556031057827004
+2 0 0 0 0 8 1 1 0.0366949038717224
+2 0 0 0 0 9 1 1 0.0534774058648878
 
 
 
 # iteration 3
-# time level 1   refinement level 0   component 0   multigrid level 0
+# time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-3 1 0 0 0 0 2 2 0.454160895977198
-3 1 0 0 0 2 2 2 0.454160895977198
-3 1 0 0 0 4 2 2 0.380060531239133
-3 1 0 0 0 6 2 2 0.268863874196307
-3 1 0 0 0 8 2 2 0.166113058346442
-3 1 0 0 0 10 2 2 0.0903998237110913
-3 1 0 0 0 12 2 2 0.0430548540962486
-3 1 0 0 0 14 2 2 0.0203161034551613
-3 1 0 0 0 16 2 2 0.0322129594259089
-3 1 0 0 0 18 2 2 0.0403940744680788
+3 0 0 0 0 0 1 1 0.454160895977198
+3 0 0 0 0 1 1 1 0.454160895977198
+3 0 0 0 0 2 1 1 0.380060531239133
+3 0 0 0 0 3 1 1 0.268863874196307
+3 0 0 0 0 4 1 1 0.166113058346442
+3 0 0 0 0 5 1 1 0.0903998237110913
+3 0 0 0 0 6 1 1 0.0430548540962486
+3 0 0 0 0 7 1 1 0.0203161034551613
+3 0 0 0 0 8 1 1 0.0322129594259089
+3 0 0 0 0 9 1 1 0.0403940744680788
 
 
 
 # iteration 4
-# time level 1   refinement level 0   component 0   multigrid level 0
+# time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-4 1 0 0 0 0 2 2 0.149301365905192
-4 1 0 0 0 2 2 2 0.149301365905192
-4 1 0 0 0 4 2 2 0.120051603120114
-4 1 0 0 0 6 2 2 0.0657673372539709
-4 1 0 0 0 8 2 2 0.0171016561289884
-4 1 0 0 0 10 2 2 -0.0106833532180277
-4 1 0 0 0 12 2 2 -0.0191712381729754
-4 1 0 0 0 14 2 2 -0.00773714485982075
-4 1 0 0 0 16 2 2 0.0252242027455782
-4 1 0 0 0 18 2 2 0.0345117309749551
+4 0 0 0 0 0 1 1 0.149301365905192
+4 0 0 0 0 1 1 1 0.149301365905192
+4 0 0 0 0 2 1 1 0.120051603120114
+4 0 0 0 0 3 1 1 0.0657673372539709
+4 0 0 0 0 4 1 1 0.0171016561289884
+4 0 0 0 0 5 1 1 -0.0106833532180277
+4 0 0 0 0 6 1 1 -0.0191712381729754
+4 0 0 0 0 7 1 1 -0.00773714485982075
+4 0 0 0 0 8 1 1 0.0252242027455782
+4 0 0 0 0 9 1 1 0.0345117309749551
 
 
 
diff --git a/CarpetExtra/WaveToyF77/test/wavetoyf77_rad/phi.yl b/CarpetExtra/WaveToyF77/test/wavetoyf77_rad/phi.yl
index 33eee6d44..ff296a205 100644
--- a/CarpetExtra/WaveToyF77/test/wavetoyf77_rad/phi.yl
+++ b/CarpetExtra/WaveToyF77/test/wavetoyf77_rad/phi.yl
@@ -1,82 +1,82 @@
 # WAVETOY::phi y (phi)
 #
 # iteration 0
-# time level 1   refinement level 0   component 0   multigrid level 0
+# time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 1 0 0 0 2 0 2 0.966147489762885
-0 1 0 0 0 2 2 2 0.966147489762885
-0 1 0 0 0 2 4 2 0.881371986353857
-0 1 0 0 0 2 6 2 0.733484377941989
-0 1 0 0 0 2 8 2 0.556850106619834
-0 1 0 0 0 2 10 2 0.385657302025291
-0 1 0 0 0 2 12 2 0.243657970841475
-0 1 0 0 0 2 14 2 0.140435045869805
-0 1 0 0 0 2 16 2 0.0738390653280284
-0 1 0 0 0 2 18 2 0.0354170752128787
+0 0 0 0 0 1 0 1 0.966147489762885
+0 0 0 0 0 1 1 1 0.966147489762885
+0 0 0 0 0 1 2 1 0.881371986353857
+0 0 0 0 0 1 3 1 0.733484377941989
+0 0 0 0 0 1 4 1 0.556850106619834
+0 0 0 0 0 1 5 1 0.385657302025291
+0 0 0 0 0 1 6 1 0.243657970841475
+0 0 0 0 0 1 7 1 0.140435045869805
+0 0 0 0 0 1 8 1 0.0738390653280284
+0 0 0 0 0 1 9 1 0.0354170752128787
 
 
 
 # iteration 1
-# time level 1   refinement level 0   component 0   multigrid level 0
+# time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 1 0 0 0 2 0 2 0.874846362533133
-1 1 0 0 0 2 2 2 0.874846362533133
-1 1 0 0 0 2 4 2 0.768046252122832
-1 1 0 0 0 2 6 2 0.610612554181502
-1 1 0 0 0 2 8 2 0.442054772678387
-1 1 0 0 0 2 10 2 0.291737697980911
-1 1 0 0 0 2 12 2 0.175592784577625
-1 1 0 0 0 2 14 2 0.0964185960819811
-1 1 0 0 0 2 16 2 0.0483177425100221
-1 1 0 0 0 2 18 2 0.0648874395788695
+1 0 0 0 0 1 0 1 0.874846362533133
+1 0 0 0 0 1 1 1 0.874846362533133
+1 0 0 0 0 1 2 1 0.768046252122832
+1 0 0 0 0 1 3 1 0.610612554181502
+1 0 0 0 0 1 4 1 0.442054772678387
+1 0 0 0 0 1 5 1 0.291737697980911
+1 0 0 0 0 1 6 1 0.175592784577625
+1 0 0 0 0 1 7 1 0.0964185960819811
+1 0 0 0 0 1 8 1 0.0483177425100221
+1 0 0 0 0 1 9 1 0.0648874395788695
 
 
 
 # iteration 2
-# time level 1   refinement level 0   component 0   multigrid level 0
+# time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-2 1 0 0 0 2 0 2 0.703445152495655
-2 1 0 0 0 2 2 2 0.703445152495655
-2 1 0 0 0 2 4 2 0.599601090521016
-2 1 0 0 0 2 6 2 0.453309510725706
-2 1 0 0 0 2 8 2 0.309761576207388
-2 1 0 0 0 2 10 2 0.192149941162959
-2 1 0 0 0 2 12 2 0.108355071915476
-2 1 0 0 0 2 14 2 0.0556031057827004
-2 1 0 0 0 2 16 2 0.0366949038717224
-2 1 0 0 0 2 18 2 0.0534774058648878
+2 0 0 0 0 1 0 1 0.703445152495655
+2 0 0 0 0 1 1 1 0.703445152495655
+2 0 0 0 0 1 2 1 0.599601090521016
+2 0 0 0 0 1 3 1 0.453309510725706
+2 0 0 0 0 1 4 1 0.309761576207388
+2 0 0 0 0 1 5 1 0.192149941162959
+2 0 0 0 0 1 6 1 0.108355071915476
+2 0 0 0 0 1 7 1 0.0556031057827004
+2 0 0 0 0 1 8 1 0.0366949038717224
+2 0 0 0 0 1 9 1 0.0534774058648878
 
 
 
 # iteration 3
-# time level 1   refinement level 0   component 0   multigrid level 0
+# time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-3 1 0 0 0 2 0 2 0.454160895977198
-3 1 0 0 0 2 2 2 0.454160895977198
-3 1 0 0 0 2 4 2 0.380060531239133
-3 1 0 0 0 2 6 2 0.268863874196307
-3 1 0 0 0 2 8 2 0.166113058346442
-3 1 0 0 0 2 10 2 0.0903998237110912
-3 1 0 0 0 2 12 2 0.0430548540962486
-3 1 0 0 0 2 14 2 0.0203161034551613
-3 1 0 0 0 2 16 2 0.0322129594259089
-3 1 0 0 0 2 18 2 0.0403940744680788
+3 0 0 0 0 1 0 1 0.454160895977198
+3 0 0 0 0 1 1 1 0.454160895977198
+3 0 0 0 0 1 2 1 0.380060531239133
+3 0 0 0 0 1 3 1 0.268863874196307
+3 0 0 0 0 1 4 1 0.166113058346442
+3 0 0 0 0 1 5 1 0.0903998237110912
+3 0 0 0 0 1 6 1 0.0430548540962486
+3 0 0 0 0 1 7 1 0.0203161034551613
+3 0 0 0 0 1 8 1 0.0322129594259089
+3 0 0 0 0 1 9 1 0.0403940744680788
 
 
 
 # iteration 4
-# time level 1   refinement level 0   component 0   multigrid level 0
+# time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-4 1 0 0 0 2 0 2 0.149301365905192
-4 1 0 0 0 2 2 2 0.149301365905192
-4 1 0 0 0 2 4 2 0.120051603120114
-4 1 0 0 0 2 6 2 0.065767337253971
-4 1 0 0 0 2 8 2 0.0171016561289883
-4 1 0 0 0 2 10 2 -0.0106833532180277
-4 1 0 0 0 2 12 2 -0.0191712381729754
-4 1 0 0 0 2 14 2 -0.00773714485982075
-4 1 0 0 0 2 16 2 0.0252242027455782
-4 1 0 0 0 2 18 2 0.0345117309749552
+4 0 0 0 0 1 0 1 0.149301365905192
+4 0 0 0 0 1 1 1 0.149301365905192
+4 0 0 0 0 1 2 1 0.120051603120114
+4 0 0 0 0 1 3 1 0.065767337253971
+4 0 0 0 0 1 4 1 0.0171016561289883
+4 0 0 0 0 1 5 1 -0.0106833532180277
+4 0 0 0 0 1 6 1 -0.0191712381729754
+4 0 0 0 0 1 7 1 -0.00773714485982075
+4 0 0 0 0 1 8 1 0.0252242027455782
+4 0 0 0 0 1 9 1 0.0345117309749552
 
 
 
diff --git a/CarpetExtra/WaveToyF77/test/wavetoyf77_rad/phi.zl b/CarpetExtra/WaveToyF77/test/wavetoyf77_rad/phi.zl
index ac722ad22..bc0b3b843 100644
--- a/CarpetExtra/WaveToyF77/test/wavetoyf77_rad/phi.zl
+++ b/CarpetExtra/WaveToyF77/test/wavetoyf77_rad/phi.zl
@@ -1,82 +1,82 @@
 # WAVETOY::phi z (phi)
 #
 # iteration 0
-# time level 1   refinement level 0   component 0   multigrid level 0
+# time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 1 0 0 0 2 2 0 0.966147489762885
-0 1 0 0 0 2 2 2 0.966147489762885
-0 1 0 0 0 2 2 4 0.881371986353857
-0 1 0 0 0 2 2 6 0.733484377941989
-0 1 0 0 0 2 2 8 0.556850106619834
-0 1 0 0 0 2 2 10 0.385657302025291
-0 1 0 0 0 2 2 12 0.243657970841475
-0 1 0 0 0 2 2 14 0.140435045869805
-0 1 0 0 0 2 2 16 0.0738390653280284
-0 1 0 0 0 2 2 18 0.0354170752128787
+0 0 0 0 0 1 1 0 0.966147489762885
+0 0 0 0 0 1 1 1 0.966147489762885
+0 0 0 0 0 1 1 2 0.881371986353857
+0 0 0 0 0 1 1 3 0.733484377941989
+0 0 0 0 0 1 1 4 0.556850106619834
+0 0 0 0 0 1 1 5 0.385657302025291
+0 0 0 0 0 1 1 6 0.243657970841475
+0 0 0 0 0 1 1 7 0.140435045869805
+0 0 0 0 0 1 1 8 0.0738390653280284
+0 0 0 0 0 1 1 9 0.0354170752128787
 
 
 
 # iteration 1
-# time level 1   refinement level 0   component 0   multigrid level 0
+# time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 1 0 0 0 2 2 0 0.874846362533133
-1 1 0 0 0 2 2 2 0.874846362533133
-1 1 0 0 0 2 2 4 0.768046252122832
-1 1 0 0 0 2 2 6 0.610612554181502
-1 1 0 0 0 2 2 8 0.442054772678387
-1 1 0 0 0 2 2 10 0.291737697980911
-1 1 0 0 0 2 2 12 0.175592784577625
-1 1 0 0 0 2 2 14 0.0964185960819811
-1 1 0 0 0 2 2 16 0.0483177425100221
-1 1 0 0 0 2 2 18 0.0648874395788695
+1 0 0 0 0 1 1 0 0.874846362533133
+1 0 0 0 0 1 1 1 0.874846362533133
+1 0 0 0 0 1 1 2 0.768046252122832
+1 0 0 0 0 1 1 3 0.610612554181502
+1 0 0 0 0 1 1 4 0.442054772678387
+1 0 0 0 0 1 1 5 0.291737697980911
+1 0 0 0 0 1 1 6 0.175592784577625
+1 0 0 0 0 1 1 7 0.0964185960819811
+1 0 0 0 0 1 1 8 0.0483177425100221
+1 0 0 0 0 1 1 9 0.0648874395788695
 
 
 
 # iteration 2
-# time level 1   refinement level 0   component 0   multigrid level 0
+# time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-2 1 0 0 0 2 2 0 0.703445152495655
-2 1 0 0 0 2 2 2 0.703445152495655
-2 1 0 0 0 2 2 4 0.599601090521016
-2 1 0 0 0 2 2 6 0.453309510725706
-2 1 0 0 0 2 2 8 0.309761576207388
-2 1 0 0 0 2 2 10 0.192149941162959
-2 1 0 0 0 2 2 12 0.108355071915476
-2 1 0 0 0 2 2 14 0.0556031057827004
-2 1 0 0 0 2 2 16 0.0366949038717224
-2 1 0 0 0 2 2 18 0.0534774058648878
+2 0 0 0 0 1 1 0 0.703445152495655
+2 0 0 0 0 1 1 1 0.703445152495655
+2 0 0 0 0 1 1 2 0.599601090521016
+2 0 0 0 0 1 1 3 0.453309510725706
+2 0 0 0 0 1 1 4 0.309761576207388
+2 0 0 0 0 1 1 5 0.192149941162959
+2 0 0 0 0 1 1 6 0.108355071915476
+2 0 0 0 0 1 1 7 0.0556031057827004
+2 0 0 0 0 1 1 8 0.0366949038717224
+2 0 0 0 0 1 1 9 0.0534774058648878
 
 
 
 # iteration 3
-# time level 1   refinement level 0   component 0   multigrid level 0
+# time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-3 1 0 0 0 2 2 0 0.454160895977198
-3 1 0 0 0 2 2 2 0.454160895977198
-3 1 0 0 0 2 2 4 0.380060531239133
-3 1 0 0 0 2 2 6 0.268863874196307
-3 1 0 0 0 2 2 8 0.166113058346442
-3 1 0 0 0 2 2 10 0.0903998237110912
-3 1 0 0 0 2 2 12 0.0430548540962486
-3 1 0 0 0 2 2 14 0.0203161034551613
-3 1 0 0 0 2 2 16 0.0322129594259089
-3 1 0 0 0 2 2 18 0.0403940744680788
+3 0 0 0 0 1 1 0 0.454160895977198
+3 0 0 0 0 1 1 1 0.454160895977198
+3 0 0 0 0 1 1 2 0.380060531239133
+3 0 0 0 0 1 1 3 0.268863874196307
+3 0 0 0 0 1 1 4 0.166113058346442
+3 0 0 0 0 1 1 5 0.0903998237110912
+3 0 0 0 0 1 1 6 0.0430548540962486
+3 0 0 0 0 1 1 7 0.0203161034551613
+3 0 0 0 0 1 1 8 0.0322129594259089
+3 0 0 0 0 1 1 9 0.0403940744680788
 
 
 
 # iteration 4
-# time level 1   refinement level 0   component 0   multigrid level 0
+# time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-4 1 0 0 0 2 2 0 0.149301365905192
-4 1 0 0 0 2 2 2 0.149301365905192
-4 1 0 0 0 2 2 4 0.120051603120114
-4 1 0 0 0 2 2 6 0.065767337253971
-4 1 0 0 0 2 2 8 0.0171016561289883
-4 1 0 0 0 2 2 10 -0.0106833532180277
-4 1 0 0 0 2 2 12 -0.0191712381729754
-4 1 0 0 0 2 2 14 -0.00773714485982075
-4 1 0 0 0 2 2 16 0.0252242027455782
-4 1 0 0 0 2 2 18 0.0345117309749552
+4 0 0 0 0 1 1 0 0.149301365905192
+4 0 0 0 0 1 1 1 0.149301365905192
+4 0 0 0 0 1 1 2 0.120051603120114
+4 0 0 0 0 1 1 3 0.065767337253971
+4 0 0 0 0 1 1 4 0.0171016561289883
+4 0 0 0 0 1 1 5 -0.0106833532180277
+4 0 0 0 0 1 1 6 -0.0191712381729754
+4 0 0 0 0 1 1 7 -0.00773714485982075
+4 0 0 0 0 1 1 8 0.0252242027455782
+4 0 0 0 0 1 1 9 0.0345117309749552
 
 
 
diff --git a/CarpetExtra/WaveToyF77/test/wavetoyf77_rob.log b/CarpetExtra/WaveToyF77/test/wavetoyf77_rob.log
index ba349b5b0..c9dc6415f 100644
--- a/CarpetExtra/WaveToyF77/test/wavetoyf77_rob.log
+++ b/CarpetExtra/WaveToyF77/test/wavetoyf77_rob.log
@@ -62,7 +62,31 @@ AMR 3D ASCII I/O provided by CarpetIOASCII
 --------------------------------------------------------------------------------
 WaveToyF77: Evolutions of a Scalar Field
 --------------------------------------------------------------------------------
-INFO (Cactus): Creating directory: "wavetoyf77_rob"
+
+dh bboxes:
+rl=0 c=0 ml=0
+exterior=([0,0,0]:[9,9,9]:[1,1,1])
+interior=([1,1,1]:[8,8,8]:[1,1,1])
+send_mg_fine=[]
+send_mg_coarse=[]
+recv_mg_fine=[]
+recv_mg_coarse=[]
+send_ref_fine=[]
+send_ref_coarse=[]
+recv_ref_fine=[]
+recv_ref_coarse=[]
+send_sync=[0:[]]
+send_ref_bnd_fine=[]
+boundaries={([0,0,0]:[0,9,9]:[1,1,1]),([1,0,0]:[8,0,9]:[1,1,1]),([9,0,0]:[9,9,9]:[1,1,1]),([1,1,0]:[8,8,0]:[1,1,1]),([1,9,0]:[8,9,9]:[1,1,1]),([1,1,9]:[8,8,9]:[1,1,1])}
+recv_sync=[0:[]]
+recv_ref_bnd_coarse=[]
+sync_not={([0,0,0]:[0,9,9]:[1,1,1]),([1,0,0]:[8,0,9]:[1,1,1]),([9,0,0]:[9,9,9]:[1,1,1]),([1,1,0]:[8,8,0]:[1,1,1]),([1,9,0]:[8,9,9]:[1,1,1]),([1,1,9]:[8,8,9]:[1,1,1])}
+
+dh bases:
+rl=0 ml=0
+exterior=([0,0,0]:[9,9,9]:[1,1,1])
+interior=([1,1,1]:[8,8,8]:[1,1,1])
+boundaries={([0,0,0]:[0,9,9]:[1,1,1]),([1,0,0]:[8,0,9]:[1,1,1]),([9,0,0]:[9,9,9]:[1,1,1]),([1,1,0]:[8,8,0]:[1,1,1]),([1,9,0]:[8,9,9]:[1,1,1]),([1,1,9]:[8,8,9]:[1,1,1])}
 ----------------
  it  |         |
      |    t    |
diff --git a/CarpetExtra/WaveToyF77/test/wavetoyf77_rob/phi.xl b/CarpetExtra/WaveToyF77/test/wavetoyf77_rob/phi.xl
index 90f4a9fea..c591b3329 100644
--- a/CarpetExtra/WaveToyF77/test/wavetoyf77_rob/phi.xl
+++ b/CarpetExtra/WaveToyF77/test/wavetoyf77_rob/phi.xl
@@ -1,82 +1,82 @@
 # WAVETOY::phi x (phi)
 #
 # iteration 0
-# time level 1   refinement level 0   component 0   multigrid level 0
+# time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 1 0 0 0 0 2 2 0.0772707537752263
-0 1 0 0 0 2 2 2 0.0772707537752263
-0 1 0 0 0 4 2 2 0.129259354697139
-0 1 0 0 0 6 2 2 0.220821442028418
-0 1 0 0 0 8 2 2 0.35290892993724
-0 1 0 0 0 10 2 2 0.519210269400491
-0 1 0 0 0 12 2 2 0.699816191967712
-0 1 0 0 0 14 2 2 0.862476271858616
-0 1 0 0 0 16 2 2 0.97103460435341
-0 1 0 0 0 18 2 2 0.998237056794807
+0 0 0 0 0 0 1 1 0.0772707537752263
+0 0 0 0 0 1 1 1 0.0772707537752263
+0 0 0 0 0 2 1 1 0.129259354697139
+0 0 0 0 0 3 1 1 0.220821442028418
+0 0 0 0 0 4 1 1 0.35290892993724
+0 0 0 0 0 5 1 1 0.519210269400491
+0 0 0 0 0 6 1 1 0.699816191967712
+0 0 0 0 0 7 1 1 0.862476271858616
+0 0 0 0 0 8 1 1 0.97103460435341
+0 0 0 0 0 9 1 1 0.998237056794807
 
 
 
 # iteration 1
-# time level 1   refinement level 0   component 0   multigrid level 0
+# time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 1 0 0 0 0 2 2 1.0606552584088
-1 1 0 0 0 2 2 2 0.388831041154735
-1 1 0 0 0 4 2 2 0.339430441359681
-1 1 0 0 0 6 2 2 0.366492974313102
-1 1 0 0 0 8 2 2 0.476622613248931
-1 1 0 0 0 10 2 2 0.632086421371345
-1 1 0 0 0 12 2 2 0.795352838936977
-1 1 0 0 0 14 2 2 0.926776632742052
-1 1 0 0 0 16 2 2 0.991476557916373
-1 1 0 0 0 18 2 2 0.987666437076881
+1 0 0 0 0 0 1 1 0.388831041154735
+1 0 0 0 0 1 1 1 0.388831041154735
+1 0 0 0 0 2 1 1 0.339430441359681
+1 0 0 0 0 3 1 1 0.366492974313102
+1 0 0 0 0 4 1 1 0.476622613248931
+1 0 0 0 0 5 1 1 0.632086421371345
+1 0 0 0 0 6 1 1 0.795352838936977
+1 0 0 0 0 7 1 1 0.926776632742052
+1 0 0 0 0 8 1 1 0.991476557916373
+1 0 0 0 0 9 1 1 0.987666437076881
 
 
 
 # iteration 2
-# time level 1   refinement level 0   component 0   multigrid level 0
+# time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-2 1 0 0 0 0 2 2 2.30810079453186
-2 1 0 0 0 2 2 2 1.16095755782905
-2 1 0 0 0 4 2 2 0.616113098418623
-2 1 0 0 0 6 2 2 0.539988588575034
-2 1 0 0 0 8 2 2 0.620176851375088
-2 1 0 0 0 10 2 2 0.757124592645756
-2 1 0 0 0 12 2 2 0.892116727446336
-2 1 0 0 0 14 2 2 0.980410892827681
-2 1 0 0 0 16 2 2 0.996513757143105
-2 1 0 0 0 18 2 2 0.952558459110051
+2 0 0 0 0 0 1 1 0.82504544920202
+2 0 0 0 0 1 1 1 0.82504544920202
+2 0 0 0 0 2 1 1 0.565756836771333
+2 0 0 0 0 3 1 1 0.524154352431554
+2 0 0 0 0 4 1 1 0.614675653104463
+2 0 0 0 0 5 1 1 0.755604743649443
+2 0 0 0 0 6 1 1 0.892395911218175
+2 0 0 0 0 7 1 1 0.98143202201713
+2 0 0 0 0 8 1 1 0.997651774451677
+2 0 0 0 0 9 1 1 0.953437784051319
 
 
 
 # iteration 3
-# time level 1   refinement level 0   component 0   multigrid level 0
+# time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-3 1 0 0 0 0 2 2 5.43249363989395
-3 1 0 0 0 2 2 2 2.98873054923262
-3 1 0 0 0 4 2 2 1.17151538480293
-3 1 0 0 0 6 2 2 0.817194288347204
-3 1 0 0 0 8 2 2 0.807056691615237
-3 1 0 0 0 10 2 2 0.892791911898805
-3 1 0 0 0 12 2 2 0.977272823987101
-3 1 0 0 0 14 2 2 1.00911912393361
-3 1 0 0 0 16 2 2 0.975680134960076
-3 1 0 0 0 18 2 2 0.897456522962003
+3 0 0 0 0 0 1 1 1.73057832016583
+3 0 0 0 0 1 1 1 1.73057832016583
+3 0 0 0 0 2 1 1 0.959114370953934
+3 0 0 0 0 3 1 1 0.760559396113893
+3 0 0 0 0 4 1 1 0.788511514700708
+3 0 0 0 0 5 1 1 0.888135941478872
+3 0 0 0 0 6 1 1 0.978478525634592
+3 0 0 0 0 7 1 1 1.01254370213636
+3 0 0 0 0 8 1 1 0.979371873618747
+3 0 0 0 0 9 1 1 0.900286054313313
 
 
 
 # iteration 4
-# time level 1   refinement level 0   component 0   multigrid level 0
+# time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-4 1 0 0 0 0 2 2 12.1536172073313
-4 1 0 0 0 2 2 2 6.72475501990893
-4 1 0 0 0 4 2 2 2.16632306664007
-4 1 0 0 0 6 2 2 1.22645602334026
-4 1 0 0 0 8 2 2 1.03543015346878
-4 1 0 0 0 10 2 2 1.02959825707057
-4 1 0 0 0 12 2 2 1.04150960720363
-4 1 0 0 0 14 2 2 1.00886111443554
-4 1 0 0 0 16 2 2 0.928738122738529
-4 1 0 0 0 18 2 2 0.823805483686488
+4 0 0 0 0 0 1 1 3.24921247997033
+4 0 0 0 0 1 1 1 3.24921247997033
+4 0 0 0 0 2 1 1 1.53343686544613
+4 0 0 0 0 3 1 1 1.07405797423003
+4 0 0 0 0 4 1 1 0.990062574922588
+4 0 0 0 0 5 1 1 1.01885055308125
+4 0 0 0 0 6 1 1 1.04423594871171
+4 0 0 0 0 7 1 1 1.01631333690387
+4 0 0 0 0 8 1 1 0.936699141990475
+4 0 0 0 0 9 1 1 0.829858376505245
 
 
 
diff --git a/CarpetExtra/WaveToyF77/test/wavetoyf77_rob/phi.yl b/CarpetExtra/WaveToyF77/test/wavetoyf77_rob/phi.yl
index aa0952d5a..435261162 100644
--- a/CarpetExtra/WaveToyF77/test/wavetoyf77_rob/phi.yl
+++ b/CarpetExtra/WaveToyF77/test/wavetoyf77_rob/phi.yl
@@ -1,82 +1,82 @@
 # WAVETOY::phi y (phi)
 #
 # iteration 0
-# time level 1   refinement level 0   component 0   multigrid level 0
+# time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 1 0 0 0 2 0 2 0.0772707537752263
-0 1 0 0 0 2 2 2 0.0772707537752263
-0 1 0 0 0 2 4 2 0.129259354697139
-0 1 0 0 0 2 6 2 0.220821442028418
-0 1 0 0 0 2 8 2 0.35290892993724
-0 1 0 0 0 2 10 2 0.519210269400491
-0 1 0 0 0 2 12 2 0.699816191967712
-0 1 0 0 0 2 14 2 0.862476271858616
-0 1 0 0 0 2 16 2 0.97103460435341
-0 1 0 0 0 2 18 2 0.998237056794807
+0 0 0 0 0 1 0 1 0.0772707537752263
+0 0 0 0 0 1 1 1 0.0772707537752263
+0 0 0 0 0 1 2 1 0.129259354697139
+0 0 0 0 0 1 3 1 0.220821442028418
+0 0 0 0 0 1 4 1 0.35290892993724
+0 0 0 0 0 1 5 1 0.519210269400491
+0 0 0 0 0 1 6 1 0.699816191967712
+0 0 0 0 0 1 7 1 0.862476271858616
+0 0 0 0 0 1 8 1 0.97103460435341
+0 0 0 0 0 1 9 1 0.998237056794807
 
 
 
 # iteration 1
-# time level 1   refinement level 0   component 0   multigrid level 0
+# time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 1 0 0 0 2 0 2 1.0606552584088
-1 1 0 0 0 2 2 2 0.388831041154735
-1 1 0 0 0 2 4 2 0.339430441359681
-1 1 0 0 0 2 6 2 0.366492974313102
-1 1 0 0 0 2 8 2 0.47662261324893
-1 1 0 0 0 2 10 2 0.632086421371344
-1 1 0 0 0 2 12 2 0.795352838936977
-1 1 0 0 0 2 14 2 0.926776632742051
-1 1 0 0 0 2 16 2 0.991476557916372
-1 1 0 0 0 2 18 2 0.98766643707688
+1 0 0 0 0 1 0 1 0.388831041154735
+1 0 0 0 0 1 1 1 0.388831041154735
+1 0 0 0 0 1 2 1 0.339430441359681
+1 0 0 0 0 1 3 1 0.366492974313102
+1 0 0 0 0 1 4 1 0.47662261324893
+1 0 0 0 0 1 5 1 0.632086421371344
+1 0 0 0 0 1 6 1 0.795352838936977
+1 0 0 0 0 1 7 1 0.926776632742051
+1 0 0 0 0 1 8 1 0.991476557916372
+1 0 0 0 0 1 9 1 0.98766643707688
 
 
 
 # iteration 2
-# time level 1   refinement level 0   component 0   multigrid level 0
+# time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-2 1 0 0 0 2 0 2 2.30810079453186
-2 1 0 0 0 2 2 2 1.16095755782905
-2 1 0 0 0 2 4 2 0.616113098418623
-2 1 0 0 0 2 6 2 0.539988588575034
-2 1 0 0 0 2 8 2 0.620176851375087
-2 1 0 0 0 2 10 2 0.757124592645756
-2 1 0 0 0 2 12 2 0.892116727446335
-2 1 0 0 0 2 14 2 0.980410892827681
-2 1 0 0 0 2 16 2 0.996513757143103
-2 1 0 0 0 2 18 2 0.952558459110047
+2 0 0 0 0 1 0 1 0.82504544920202
+2 0 0 0 0 1 1 1 0.82504544920202
+2 0 0 0 0 1 2 1 0.565756836771333
+2 0 0 0 0 1 3 1 0.524154352431554
+2 0 0 0 0 1 4 1 0.614675653104463
+2 0 0 0 0 1 5 1 0.755604743649443
+2 0 0 0 0 1 6 1 0.892395911218174
+2 0 0 0 0 1 7 1 0.981432022017129
+2 0 0 0 0 1 8 1 0.997651774451676
+2 0 0 0 0 1 9 1 0.953437784051318
 
 
 
 # iteration 3
-# time level 1   refinement level 0   component 0   multigrid level 0
+# time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-3 1 0 0 0 2 0 2 5.43249363989395
-3 1 0 0 0 2 2 2 2.98873054923262
-3 1 0 0 0 2 4 2 1.17151538480293
-3 1 0 0 0 2 6 2 0.817194288347204
-3 1 0 0 0 2 8 2 0.807056691615237
-3 1 0 0 0 2 10 2 0.892791911898806
-3 1 0 0 0 2 12 2 0.9772728239871
-3 1 0 0 0 2 14 2 1.00911912393361
-3 1 0 0 0 2 16 2 0.975680134960073
-3 1 0 0 0 2 18 2 0.897456522961995
+3 0 0 0 0 1 0 1 1.73057832016583
+3 0 0 0 0 1 1 1 1.73057832016583
+3 0 0 0 0 1 2 1 0.959114370953934
+3 0 0 0 0 1 3 1 0.760559396113893
+3 0 0 0 0 1 4 1 0.788511514700708
+3 0 0 0 0 1 5 1 0.888135941478872
+3 0 0 0 0 1 6 1 0.978478525634591
+3 0 0 0 0 1 7 1 1.01254370213636
+3 0 0 0 0 1 8 1 0.979371873618745
+3 0 0 0 0 1 9 1 0.900286054313308
 
 
 
 # iteration 4
-# time level 1   refinement level 0   component 0   multigrid level 0
+# time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-4 1 0 0 0 2 0 2 12.1536172073313
-4 1 0 0 0 2 2 2 6.72475501990893
-4 1 0 0 0 2 4 2 2.16632306664007
-4 1 0 0 0 2 6 2 1.22645602334026
-4 1 0 0 0 2 8 2 1.03543015346878
-4 1 0 0 0 2 10 2 1.02959825707057
-4 1 0 0 0 2 12 2 1.04150960720363
-4 1 0 0 0 2 14 2 1.00886111443554
-4 1 0 0 0 2 16 2 0.928738122738523
-4 1 0 0 0 2 18 2 0.823805483686472
+4 0 0 0 0 1 0 1 3.24921247997033
+4 0 0 0 0 1 1 1 3.24921247997033
+4 0 0 0 0 1 2 1 1.53343686544613
+4 0 0 0 0 1 3 1 1.07405797423003
+4 0 0 0 0 1 4 1 0.990062574922588
+4 0 0 0 0 1 5 1 1.01885055308125
+4 0 0 0 0 1 6 1 1.04423594871171
+4 0 0 0 0 1 7 1 1.01631333690387
+4 0 0 0 0 1 8 1 0.936699141990473
+4 0 0 0 0 1 9 1 0.82985837650524
 
 
 
diff --git a/CarpetExtra/WaveToyF77/test/wavetoyf77_rob/phi.zl b/CarpetExtra/WaveToyF77/test/wavetoyf77_rob/phi.zl
index 2f462d423..85352d332 100644
--- a/CarpetExtra/WaveToyF77/test/wavetoyf77_rob/phi.zl
+++ b/CarpetExtra/WaveToyF77/test/wavetoyf77_rob/phi.zl
@@ -1,82 +1,82 @@
 # WAVETOY::phi z (phi)
 #
 # iteration 0
-# time level 1   refinement level 0   component 0   multigrid level 0
+# time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-0 1 0 0 0 2 2 0 0.0772707537752263
-0 1 0 0 0 2 2 2 0.0772707537752263
-0 1 0 0 0 2 2 4 0.129259354697139
-0 1 0 0 0 2 2 6 0.220821442028418
-0 1 0 0 0 2 2 8 0.35290892993724
-0 1 0 0 0 2 2 10 0.519210269400491
-0 1 0 0 0 2 2 12 0.699816191967712
-0 1 0 0 0 2 2 14 0.862476271858616
-0 1 0 0 0 2 2 16 0.97103460435341
-0 1 0 0 0 2 2 18 0.998237056794807
+0 0 0 0 0 1 1 0 0.0772707537752263
+0 0 0 0 0 1 1 1 0.0772707537752263
+0 0 0 0 0 1 1 2 0.129259354697139
+0 0 0 0 0 1 1 3 0.220821442028418
+0 0 0 0 0 1 1 4 0.35290892993724
+0 0 0 0 0 1 1 5 0.519210269400491
+0 0 0 0 0 1 1 6 0.699816191967712
+0 0 0 0 0 1 1 7 0.862476271858616
+0 0 0 0 0 1 1 8 0.97103460435341
+0 0 0 0 0 1 1 9 0.998237056794807
 
 
 
 # iteration 1
-# time level 1   refinement level 0   component 0   multigrid level 0
+# time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-1 1 0 0 0 2 2 0 0.0772707537752263
-1 1 0 0 0 2 2 2 0.388831041154735
-1 1 0 0 0 2 2 4 0.197584711009551
-1 1 0 0 0 2 2 6 0.306274145299139
-1 1 0 0 0 2 2 8 0.455464652407218
-1 1 0 0 0 2 2 10 0.629929661976572
-1 1 0 0 0 2 2 12 0.802192186813378
-1 1 0 0 0 2 2 14 0.936672532031597
-1 1 0 0 0 2 2 16 1.00073340889318
-1 1 0 0 0 2 2 18 0.995944552771732
+1 0 0 0 0 1 1 0 0.388831041154735
+1 0 0 0 0 1 1 1 0.388831041154735
+1 0 0 0 0 1 1 2 0.197584711009551
+1 0 0 0 0 1 1 3 0.306274145299139
+1 0 0 0 0 1 1 4 0.455464652407218
+1 0 0 0 0 1 1 5 0.629929661976572
+1 0 0 0 0 1 1 6 0.802192186813378
+1 0 0 0 0 1 1 7 0.936672532031597
+1 0 0 0 0 1 1 8 1.00073340889318
+1 0 0 0 0 1 1 9 0.995944552771732
 
 
 
 # iteration 2
-# time level 1   refinement level 0   component 0   multigrid level 0
+# time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-2 1 0 0 0 2 2 0 0.388831041154735
-2 1 0 0 0 2 2 2 1.16095755782905
-2 1 0 0 0 2 2 4 0.46547300063786
-2 1 0 0 0 2 2 6 0.456573185101915
-2 1 0 0 0 2 2 8 0.597570352832436
-2 1 0 0 0 2 2 10 0.76206474854011
-2 1 0 0 0 2 2 12 0.908270578593604
-2 1 0 0 0 2 2 14 0.998558711076361
-2 1 0 0 0 2 2 16 1.01189942342898
-2 1 0 0 0 2 2 18 0.964526811464942
+2 0 0 0 0 1 1 0 0.82504544920202
+2 0 0 0 0 1 1 1 0.82504544920202
+2 0 0 0 0 1 1 2 0.36877201495145
+2 0 0 0 0 1 1 3 0.427575499472453
+2 0 0 0 0 1 1 4 0.587532674249213
+2 0 0 0 0 1 1 5 0.759451946807565
+2 0 0 0 0 1 1 6 0.909054497473686
+2 0 0 0 0 1 1 7 1.00072078937352
+2 0 0 0 0 1 1 8 1.01422912467588
+2 0 0 0 0 1 1 9 0.966328470909494
 
 
 
 # iteration 3
-# time level 1   refinement level 0   component 0   multigrid level 0
+# time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-3 1 0 0 0 2 2 0 1.16095755782905
-3 1 0 0 0 2 2 2 2.98873054923262
-3 1 0 0 0 2 2 4 1.04150127391973
-3 1 0 0 0 2 2 6 0.704069650324813
-3 1 0 0 0 2 2 8 0.778553025633356
-3 1 0 0 0 2 2 10 0.908401151560036
-3 1 0 0 0 2 2 12 1.00871857605607
-3 1 0 0 0 2 2 14 1.04134056134622
-3 1 0 0 0 2 2 16 1.00206965975872
-3 1 0 0 0 2 2 18 0.917096012681975
+3 0 0 0 0 1 1 0 1.73057832016583
+3 0 0 0 0 1 1 1 1.73057832016583
+3 0 0 0 0 1 1 2 0.686358081160278
+3 0 0 0 0 1 1 3 0.60240426584507
+3 0 0 0 0 1 1 4 0.746296182815676
+3 0 0 0 0 1 1 5 0.901186355919636
+3 0 0 0 0 1 1 6 1.01218904939224
+3 0 0 0 0 1 1 7 1.04872620195508
+3 0 0 0 0 1 1 8 1.00968167694742
+3 0 0 0 0 1 1 9 0.92294069356573
 
 
 
 # iteration 4
-# time level 1   refinement level 0   component 0   multigrid level 0
+# time level 0   refinement level 0   component 0   multigrid level 0
 # column format: it tl rl c ml x y z data
-4 1 0 0 0 2 2 0 2.98873054923262
-4 1 0 0 0 2 2 2 6.72475501990893
-4 1 0 0 0 2 2 4 2.18342068906256
-4 1 0 0 0 2 2 6 1.12141464560871
-4 1 0 0 0 2 2 8 1.00466942800075
-4 1 0 0 0 2 2 10 1.06091539949207
-4 1 0 0 0 2 2 12 1.09409165178709
-4 1 0 0 0 2 2 14 1.06006318920315
-4 1 0 0 0 2 2 16 0.969896145145695
-4 1 0 0 0 2 2 18 0.854235431816351
+4 0 0 0 0 1 1 0 3.24921247997033
+4 0 0 0 0 1 1 1 3.24921247997033
+4 0 0 0 0 1 1 2 1.22166584396726
+4 0 0 0 0 1 1 3 0.859589877847065
+4 0 0 0 0 1 1 4 0.930185648195557
+4 0 0 0 0 1 1 5 1.04645093110598
+4 0 0 0 0 1 1 6 1.10292976778475
+4 0 0 0 0 1 1 7 1.07660969796605
+4 0 0 0 0 1 1 8 0.986507457535597
+4 0 0 0 0 1 1 9 0.866972393929939