Modified the Carpet driver so that it uses the same new timelevel

Modified the Carpet driver so that it uses the same new timelevel
cycling as does PUGH.

Modified the CarpetIOASCII and CarpetIOFlexIO output routines so that
they always output the current time level.

Found and fixed a bug in the time interpolation in CarpetLib.

Fixed a bug where the necessary number of ghost zones for space
interpolation was calculated incorrectly.

Fixed bugs in the example parameter files that used an insufficient
number of ghost zones.

darcs-hash:20010423061011-07bb3-c69e59f7bc5f283d7632a663c0770578cdb73881.gz

24 files changed, 297 insertions, 256 deletions

diff --git a/CarpetExtra/HydroToy/par/convtest.gnuplot b/CarpetExtra/HydroToy/par/convtest.gnuplot
index 0cb0cc29c..15eb3716b 100644
--- a/CarpetExtra/HydroToy/par/convtest.gnuplot
+++ b/CarpetExtra/HydroToy/par/convtest.gnuplot
@@ -9,17 +9,17 @@ omega=sqrt(kx**2 + ky**2 + kz**2)
 # without refinement
 
 # solutions
-p "hydrotoy_periodic/u.zl" u 8:($1==time&&$3==0?$9:0/0) w lp, "hydrotoy_periodic_coarse/u.zl" u (2*$8):(2*$1==time&&$3==0?$9:0/0) w lp, cos((kz*(0.3*x-9) + omega*(0.15*time))*pi) w l
+p "hydrotoy_periodic/u.zl" u ($8-1):($1==time&&$3==0?$9:0/0) w lp, "hydrotoy_periodic_coarse/u.zl" u (2*($8-1)):(2*$1==time&&$3==0?$9:0/0) w lp, cos((kz*(0.3*x-9) + omega*(0.15*time))*pi) w l
 
 # errors
-p "hydrotoy_periodic/u.zl" u 8:($1==time&&$3==0?$9-cos((kz*(0.3*$8-9) + omega*(0.15*time))*pi):0/0) w lp, "hydrotoy_periodic_coarse/u.zl" u (2*$8):(2*$1==time&&$3==0?$9-cos((kz*(0.3*(2*$8)-9) + omega*(0.15*time))*pi):0/0) w lp
+p "hydrotoy_periodic/u.zl" u ($8-1):($1==time&&$3==0?$9-cos((kz*(0.3*($8-1)-9) + omega*(0.15*time))*pi):0/0) w lp, "hydrotoy_periodic_coarse/u.zl" u (2*($8-1)):(2*$1==time&&$3==0?$9-cos((kz*(0.3*(2*($8-1))-9) + omega*(0.15*time))*pi):0/0) w lp
 
 
 
 # with refinement
 
 # solutions
-p "hydrotoy_periodic_rl2/u.zl" u 8:($1==time&&$3==0?$9:0/0) w lp, "hydrotoy_periodic_coarse_rl2/u.zl" u (2*$8):(2*$1==time&&$3==0?$9:0/0) w lp, cos((kz*(0.15*x-9) + omega*(0.075*time))*pi) w l
+p "hydrotoy_periodic_rl2/u.zl" u ($8-2):($1==time&&$3==0?$9:0/0) w lp, "hydrotoy_periodic_coarse_rl2/u.zl" u (2*($8-2)):(2*$1==time&&$3==0?$9:0/0) w lp, cos((kz*(0.15*x-9) + omega*(0.075*time))*pi) w l
 
 # errors
-p "hydrotoy_periodic_rl2/u.zl" u 8:($1==time&&$3==0?$9-cos((kz*(0.15*$8-9) + omega*(0.075*time))*pi):0/0) w lp, "hydrotoy_periodic_coarse_rl2/u.zl" u (2*$8):(2*$1==time&&$3==0?$9-cos((kz*(0.15*(2*$8)-9) + omega*(0.075*time))*pi):0/0) w lp
+p "hydrotoy_periodic_rl2/u.zl" u ($8-2):($1==time&&$3==0?$9-cos((kz*(0.15*($8-2)-9) + omega*(0.075*time))*pi):0/0) w lp, "hydrotoy_periodic_coarse_rl2/u.zl" u (2*($8-2)):(2*$1==time&&$3==0?$9-cos((kz*(0.15*(2*($8-2))-9) + omega*(0.075*time))*pi):0/0) w lp
diff --git a/CarpetExtra/HydroToy/par/hydrotoy_periodic.par b/CarpetExtra/HydroToy/par/hydrotoy_periodic.par
index fb5b9010b..ac96d3e85 100644
--- a/CarpetExtra/HydroToy/par/hydrotoy_periodic.par
+++ b/CarpetExtra/HydroToy/par/hydrotoy_periodic.par
@@ -7,7 +7,7 @@
 #   @enddesc
 # @@*/
 #
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/HydroToy/par/hydrotoy_periodic.par,v 1.3 2001/03/30 00:50:45 eschnett Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/HydroToy/par/hydrotoy_periodic.par,v 1.4 2001/04/23 08:10:18 schnetter Exp $
 
 ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetSlab IDHydroToy HydroToy"
 
@@ -19,17 +19,19 @@ Cactus::cctk_itlast		= 120
 
 Time::dtfac			= 0.5
 
-driver::global_nx		= 32
-driver::global_ny		= 46
-driver::global_nz		= 62
+driver::global_nx		= 34
+driver::global_ny		= 48
+driver::global_nz		= 64
+
+driver::ghost_size		= 2
 
 grid::type			= byrange
-grid::xmin			= -4.8
-grid::ymin			= -6.6
-grid::zmin			= -9.0
-grid::xmax			=  4.5
-grid::ymax			=  6.9
-grid::zmax			=  9.3
+grid::xmin			= -5.1
+grid::ymin			= -6.9
+grid::zmin			= -9.3
+grid::xmax			=  4.8
+grid::ymax			=  7.2
+grid::zmax			=  9.6
 grid::mode			= periodic
 
 IO::outdir			= "hydrotoy_periodic"
diff --git a/CarpetExtra/HydroToy/par/hydrotoy_periodic_coarse.par b/CarpetExtra/HydroToy/par/hydrotoy_periodic_coarse.par
index a80662039..a047c4908 100644
--- a/CarpetExtra/HydroToy/par/hydrotoy_periodic_coarse.par
+++ b/CarpetExtra/HydroToy/par/hydrotoy_periodic_coarse.par
@@ -7,7 +7,7 @@
 #   @enddesc
 # @@*/
 #
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/HydroToy/par/hydrotoy_periodic_coarse.par,v 1.2 2001/03/30 00:50:45 eschnett Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/HydroToy/par/hydrotoy_periodic_coarse.par,v 1.3 2001/04/23 08:10:18 schnetter Exp $
 
 ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetSlab IDHydroToy HydroToy"
 
@@ -19,17 +19,19 @@ Cactus::cctk_itlast		= 60
 
 Time::dtfac			= 0.5
 
-driver::global_nx		= 17
-driver::global_ny		= 24
-driver::global_nz		= 32
+driver::global_nx		= 19
+driver::global_ny		= 26
+driver::global_nz		= 34
+
+driver::ghost_size		= 2
 
 grid::type			= byrange
-grid::xmin			= -4.8
-grid::ymin			= -6.6
-grid::zmin			= -9.0
-grid::xmax			=  4.8
-grid::ymax			=  7.2
-grid::zmax			=  9.6
+grid::xmin			= -5.4
+grid::ymin			= -7.2
+grid::zmin			= -9.6
+grid::xmax			=  5.4
+grid::ymax			=  7.8
+grid::zmax			= 10.2
 grid::mode			= periodic
 
 IO::outdir			= "hydrotoy_periodic_coarse"
diff --git a/CarpetExtra/HydroToy/par/hydrotoy_periodic_coarse_rl2.par b/CarpetExtra/HydroToy/par/hydrotoy_periodic_coarse_rl2.par
index 1588d1926..7f08bca65 100644
--- a/CarpetExtra/HydroToy/par/hydrotoy_periodic_coarse_rl2.par
+++ b/CarpetExtra/HydroToy/par/hydrotoy_periodic_coarse_rl2.par
@@ -7,7 +7,7 @@
 #   @enddesc
 # @@*/
 #
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/HydroToy/par/hydrotoy_periodic_coarse_rl2.par,v 1.3 2001/03/30 00:50:45 eschnett Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/HydroToy/par/hydrotoy_periodic_coarse_rl2.par,v 1.4 2001/04/23 08:10:18 schnetter Exp $
 
 ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetSlab IDHydroToy HydroToy"
 
@@ -19,21 +19,23 @@ Cactus::cctk_itlast		= 120
 
 Time::dtfac			= 0.5
 
-driver::global_nx		= 17
-driver::global_ny		= 24
-driver::global_nz		= 32
+driver::global_nx		= 19
+driver::global_ny		= 26
+driver::global_nz		= 34
+
+driver::ghost_size		= 2
 
 Carpet::max_refinement_levels	= 2
 Carpet::prolongation_order_space= 3
 Carpet::prolongation_order_time	= 2
 
 grid::type			= byrange
-grid::xmin			= -4.8
-grid::ymin			= -6.6
-grid::zmin			= -9.0
-grid::xmax			=  4.8
-grid::ymax			=  7.2
-grid::zmax			=  9.6
+grid::xmin			= -5.4
+grid::ymin			= -7.2
+grid::zmin			= -9.6
+grid::xmax			=  5.4
+grid::ymax			=  7.8
+grid::zmax			= 10.2
 grid::mode			= periodic
 
 IO::outdir			= "hydrotoy_periodic_coarse_rl2"
diff --git a/CarpetExtra/HydroToy/par/hydrotoy_periodic_coarse_rl3.par b/CarpetExtra/HydroToy/par/hydrotoy_periodic_coarse_rl3.par
index 182e537ec..5f9cf7790 100644
--- a/CarpetExtra/HydroToy/par/hydrotoy_periodic_coarse_rl3.par
+++ b/CarpetExtra/HydroToy/par/hydrotoy_periodic_coarse_rl3.par
@@ -7,7 +7,7 @@
 #   @enddesc
 # @@*/
 #
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/HydroToy/par/hydrotoy_periodic_coarse_rl3.par,v 1.3 2001/03/30 00:50:45 eschnett Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/HydroToy/par/hydrotoy_periodic_coarse_rl3.par,v 1.4 2001/04/23 08:10:18 schnetter Exp $
 
 ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetSlab IDHydroToy HydroToy"
 
@@ -19,21 +19,23 @@ Cactus::cctk_itlast		= 240
 
 Time::dtfac			= 0.5
 
-driver::global_nx		= 17
-driver::global_ny		= 24
-driver::global_nz		= 32
+driver::global_nx		= 19
+driver::global_ny		= 26
+driver::global_nz		= 34
+
+driver::ghost_size		= 2
 
 Carpet::max_refinement_levels	= 3
 Carpet::prolongation_order_space= 3
 Carpet::prolongation_order_time	= 2
 
 grid::type			= byrange
-grid::xmin			= -4.8
-grid::ymin			= -6.6
-grid::zmin			= -9.0
-grid::xmax			=  4.8
-grid::ymax			=  7.2
-grid::zmax			=  9.6
+grid::xmin			= -5.4
+grid::ymin			= -7.2
+grid::zmin			= -9.6
+grid::xmax			=  5.4
+grid::ymax			=  7.8
+grid::zmax			= 10.2
 grid::mode			= periodic
 
 IO::outdir			= "hydrotoy_periodic_coarse_rl3"
diff --git a/CarpetExtra/HydroToy/par/hydrotoy_periodic_rl2.par b/CarpetExtra/HydroToy/par/hydrotoy_periodic_rl2.par
index 7bb9ca230..5b1fe7f03 100644
--- a/CarpetExtra/HydroToy/par/hydrotoy_periodic_rl2.par
+++ b/CarpetExtra/HydroToy/par/hydrotoy_periodic_rl2.par
@@ -7,7 +7,7 @@
 #   @enddesc
 # @@*/
 #
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/HydroToy/par/hydrotoy_periodic_rl2.par,v 1.3 2001/03/30 00:50:45 eschnett Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/HydroToy/par/hydrotoy_periodic_rl2.par,v 1.4 2001/04/23 08:10:18 schnetter Exp $
 
 ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetSlab IDHydroToy HydroToy"
 
@@ -19,21 +19,23 @@ Cactus::cctk_itlast		= 240
 
 Time::dtfac			= 0.5
 
-driver::global_nx		= 32
-driver::global_ny		= 46
-driver::global_nz		= 62
+driver::global_nx		= 34
+driver::global_ny		= 48
+driver::global_nz		= 64
+
+driver::ghost_size		= 2
 
 Carpet::max_refinement_levels	= 2
 Carpet::prolongation_order_space= 3
 Carpet::prolongation_order_time	= 2
 
 grid::type			= byrange
-grid::xmin			= -4.8
-grid::ymin			= -6.6
-grid::zmin			= -9.0
-grid::xmax			=  4.5
-grid::ymax			=  6.9
-grid::zmax			=  9.3
+grid::xmin			= -5.1
+grid::ymin			= -6.9
+grid::zmin			= -9.3
+grid::xmax			=  4.8
+grid::ymax			=  7.2
+grid::zmax			=  9.6
 grid::mode			= periodic
 
 IO::outdir			= "hydrotoy_periodic_rl2"
diff --git a/CarpetExtra/HydroToy/par/hydrotoy_periodic_rl3.par b/CarpetExtra/HydroToy/par/hydrotoy_periodic_rl3.par
index dd82cc821..d1fd53bbb 100644
--- a/CarpetExtra/HydroToy/par/hydrotoy_periodic_rl3.par
+++ b/CarpetExtra/HydroToy/par/hydrotoy_periodic_rl3.par
@@ -7,7 +7,7 @@
 #   @enddesc
 # @@*/
 #
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/HydroToy/par/hydrotoy_periodic_rl3.par,v 1.3 2001/03/30 00:50:45 eschnett Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/HydroToy/par/hydrotoy_periodic_rl3.par,v 1.4 2001/04/23 08:10:18 schnetter Exp $
 
 ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetSlab IDHydroToy HydroToy"
 
@@ -19,21 +19,23 @@ Cactus::cctk_itlast		= 480
 
 Time::dtfac			= 0.5
 
-driver::global_nx		= 32
-driver::global_ny		= 46
-driver::global_nz		= 62
+driver::global_nx		= 34
+driver::global_ny		= 48
+driver::global_nz		= 64
+
+driver::ghost_size		= 2
 
 Carpet::max_refinement_levels	= 3
 Carpet::prolongation_order_space= 3
 Carpet::prolongation_order_time	= 2
 
 grid::type			= byrange
-grid::xmin			= -4.8
-grid::ymin			= -6.6
-grid::zmin			= -9.0
-grid::xmax			=  4.5
-grid::ymax			=  6.9
-grid::zmax			=  9.3
+grid::xmin			= -5.1
+grid::ymin			= -6.9
+grid::zmin			= -9.3
+grid::xmax			=  4.8
+grid::ymax			=  7.2
+grid::zmax			=  9.6
 grid::mode			= periodic
 
 IO::outdir			= "hydrotoy_periodic_rl3"
diff --git a/CarpetExtra/HydroToy/src/HydroToy.F77 b/CarpetExtra/HydroToy/src/HydroToy.F77
index dcffc75f9..4797162c4 100644
--- a/CarpetExtra/HydroToy/src/HydroToy.F77
+++ b/CarpetExtra/HydroToy/src/HydroToy.F77
@@ -1,5 +1,5 @@
 c     -*-Fortran-*-
-c     $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/HydroToy/src/HydroToy.F77,v 1.4 2001/03/26 02:28:36 eschnett Exp $
+c     $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/HydroToy/src/HydroToy.F77,v 1.5 2001/04/23 08:10:19 schnetter Exp $
       
 #include "cctk.h" 
 #include "cctk_Parameters.h"
@@ -22,10 +22,10 @@ c     Copy
          do j=1,cctk_lsh(2)
             do i=1,cctk_lsh(1)
                
-               u_i(i,j,k)  = u(i,j,k)
-               vx_i(i,j,k) = vx(i,j,k)
-               vy_i(i,j,k) = vy(i,j,k)
-               vz_i(i,j,k) = vz(i,j,k)
+               u_i(i,j,k)  = u_p(i,j,k)
+               vx_i(i,j,k) = vx_p(i,j,k)
+               vy_i(i,j,k) = vy_p(i,j,k)
+               vz_i(i,j,k) = vz_p(i,j,k)
                
             end do
          end do
@@ -59,10 +59,10 @@ c     Copy
          do j=1,cctk_lsh(2)
             do i=1,cctk_lsh(1)
                
-               u_i(i,j,k)  = u_n(i,j,k)
-               vx_i(i,j,k) = vx_n(i,j,k)
-               vy_i(i,j,k) = vy_n(i,j,k)
-               vz_i(i,j,k) = vz_n(i,j,k)
+               u_i(i,j,k)  = u(i,j,k)
+               vx_i(i,j,k) = vx(i,j,k)
+               vy_i(i,j,k) = vy(i,j,k)
+               vz_i(i,j,k) = vz(i,j,k)
                
             end do
          end do
@@ -76,10 +76,10 @@ c     Average
          do j=1,cctk_lsh(2)
             do i=1,cctk_lsh(1)
                
-               u_n(i,j,k)  = half * (u(i,j,k) + u_n(i,j,k))
-               vx_n(i,j,k) = half * (vx(i,j,k) + vx_n(i,j,k))
-               vy_n(i,j,k) = half * (vy(i,j,k) + vy_n(i,j,k))
-               vz_n(i,j,k) = half * (vz(i,j,k) + vz_n(i,j,k))
+               u(i,j,k)  = half * (u_p(i,j,k)  + u(i,j,k))
+               vx(i,j,k) = half * (vx_p(i,j,k) + vx(i,j,k))
+               vy(i,j,k) = half * (vy_p(i,j,k) + vy(i,j,k))
+               vz(i,j,k) = half * (vz_p(i,j,k) + vz(i,j,k))
                
             end do
          end do
@@ -109,20 +109,20 @@ c     Apply boundaries
       dt = CCTK_DELTA_TIME
       
 c     Evolve
-      do k=2,cctk_lsh(3)-1
-         do j=2,cctk_lsh(2)-1
-            do i=2,cctk_lsh(1)-1
+      do k=1+cctk_nghostzones(3),cctk_lsh(3)-cctk_nghostzones(3)
+         do j=1+cctk_nghostzones(2),cctk_lsh(2)-cctk_nghostzones(2)
+            do i=1+cctk_nghostzones(1),cctk_lsh(1)-cctk_nghostzones(1)
                
-               u_n(i,j,k)  = u_i(i,j,k)
+               u(i,j,k)  = u_i(i,j,k)
      $              + dt * (vx_i(i+1,j,k) - vx_i(i-1,j,k)) / (2*dx)
      $              + dt * (vy_i(i,j+1,k) - vy_i(i,j-1,k)) / (2*dy)
      $              + dt * (vz_i(i,j,k+1) - vz_i(i,j,k-1)) / (2*dz)
                
-               vx_n(i,j,k) = vx_i(i,j,k)
+               vx(i,j,k) = vx_i(i,j,k)
      $              + dt * (u_i(i+1,j,k) - u_i(i-1,j,k)) / (2*dx)
-               vy_n(i,j,k) = vy_i(i,j,k)
+               vy(i,j,k) = vy_i(i,j,k)
      $              + dt * (u_i(i,j+1,k) - u_i(i,j-1,k)) / (2*dy)
-               vz_n(i,j,k) = vz_i(i,j,k)
+               vz(i,j,k) = vz_i(i,j,k)
      $              + dt * (u_i(i,j,k+1) - u_i(i,j,k-1)) / (2*dz)
                
             end do
@@ -144,15 +144,17 @@ c     Evolve
       CCTK_REAL zero, one
       parameter (zero=0, one=1)
       
-      CCTK_REAL finf, npow
-      parameter (finf=1, npow=1)
+      CCTK_REAL finf
+      parameter (finf=1)
+      integer npow
+      parameter (npow=1)
       
       integer sw(3)
       integer ierr
       
-      sw(1) = 1
-      sw(2) = 1
-      sw(3) = 1
+      sw(1) = cctk_nghostzones(1)
+      sw(2) = cctk_nghostzones(2)
+      sw(3) = cctk_nghostzones(3)
       
 c     Apply boundary condition
       if (CCTK_EQUALS(bound, "flat")) then
diff --git a/CarpetExtra/SpaceTimeToy/par/convtest.gnuplot b/CarpetExtra/SpaceTimeToy/par/convtest.gnuplot
index 17c3c4bf4..a1042c939 100644
--- a/CarpetExtra/SpaceTimeToy/par/convtest.gnuplot
+++ b/CarpetExtra/SpaceTimeToy/par/convtest.gnuplot
@@ -9,17 +9,17 @@ omega=sqrt(kx**2 + ky**2 + kz**2)
 # without refinement
 
 # solutions
-p "spacetimetoy_periodic/phi.zl" u 8:($1==time&&$3==0?$9:0/0) w lp, "spacetimetoy_periodic_coarse/phi.zl" u (2*$8):(2*$1==time&&$3==0?$9:0/0) w lp, cos((kz*(0.3*x-9) + omega*(0.15*time))*pi) w l
+p "spacetimetoy_periodic/phi.zl" u ($8-1):($1==time&&$3==0?$9:0/0) w lp, "spacetimetoy_periodic_coarse/phi.zl" u (2*($8-1)):(2*$1==time&&$3==0?$9:0/0) w lp, cos((kz*(0.3*x-9) + omega*(0.15*time))*pi) w l
 
 # errors
-p "spacetimetoy_periodic/phi.zl" u 8:($1==time&&$3==0?$9-cos((kz*(0.3*$8-9) + omega*(0.15*time))*pi):0/0) w lp, "spacetimetoy_periodic_coarse/phi.zl" u (2*$8):(2*$1==time&&$3==0?$9-cos((kz*(0.3*(2*$8)-9) + omega*(0.15*time))*pi):0/0) w lp
+p "spacetimetoy_periodic/phi.zl" u ($8-1):($1==time&&$3==0?$9-cos((kz*(0.3*($8-1)-9) + omega*(0.15*time))*pi):0/0) w lp, "spacetimetoy_periodic_coarse/phi.zl" u (2*$8):(2*$1==time&&$3==0?$9-cos((kz*(0.3*(2*($8-1))-9) + omega*(0.15*time))*pi):0/0) w lp
 
 
 
 # with refinement
 
 # solutions
-p "spacetimetoy_periodic_rl2/phi.zl" u 8:($1==time&&$3==0?$9:0/0) w lp, "spacetimetoy_periodic_coarse_rl2/phi.zl" u (2*$8):(2*$1==time&&$3==0?$9:0/0) w lp, cos((kz*(0.15*x-9) + omega*(0.075*time))*pi) w l
+p "spacetimetoy_periodic_rl2/phi.zl" u ($8-2):($1==time&&$3==0?$9:0/0) w lp, "spacetimetoy_periodic_coarse_rl2/phi.zl" u (2*($8-2)):(2*$1==time&&$3==0?$9:0/0) w lp, cos((kz*(0.15*x-9) + omega*(0.075*time))*pi) w l
 
 # errors
-p "spacetimetoy_periodic_rl2/phi.zl" u 8:($1==time&&$3==0?$9-cos((kz*(0.15*$8-9) + omega*(0.075*time))*pi):0/0) w lp, "spacetimetoy_periodic_coarse_rl2/phi.zl" u (2*$8):(2*$1==time&&$3==0?$9-cos((kz*(0.15*(2*$8)-9) + omega*(0.075*time))*pi):0/0) w lp
+p "spacetimetoy_periodic_rl2/phi.zl" u ($8-2):($1==time&&$3==0?$9-cos((kz*(0.15*($8-2)-9) + omega*(0.075*time))*pi):0/0) w lp, "spacetimetoy_periodic_coarse_rl2/phi.zl" u (2*($8-2)):(2*$1==time&&$3==0?$9-cos((kz*(0.15*(2*($8-2))-9) + omega*(0.075*time))*pi):0/0) w lp
diff --git a/CarpetExtra/SpaceTimeToy/par/convtest_double.gnuplot b/CarpetExtra/SpaceTimeToy/par/convtest_double.gnuplot
index bd9f2dee1..660430e24 100644
--- a/CarpetExtra/SpaceTimeToy/par/convtest_double.gnuplot
+++ b/CarpetExtra/SpaceTimeToy/par/convtest_double.gnuplot
@@ -9,27 +9,28 @@ omega=sqrt(kx**2 + ky**2 + kz**2)
 # compare to uncoupled systems
 
 # coarse solutions
-p "spacetimetoy_periodic_coarse/phi.zl" u (2*$8):(2*$1==time&&$3==0?$9:0/0) w lp, "hydrotoy_periodic_coarse/u.zl" u (2*$8):(2*$1==time&&$3==0?$9:0/0) w lp, "doubletoy_periodic_coarse/phi.zl" u (2*$8):(2*$1==time&&$3==0?$9:0/0) w lp, "doubletoy_periodic_coarse/u.zl" u (2*$8):(2*$1==time&&$3==0?$9:0/0) w lp, cos((kz*(0.3*x-9) + omega*(0.15*time))*pi) w l
+p "spacetimetoy_periodic_coarse/phi.zl" u (2*($8-1)):(2*$1==time&&$3==0?$9:0/0) w lp, "hydrotoy_periodic_coarse/u.zl" u (2*($8-1)):(2*$1==time&&$3==0?$9:0/0) w lp, "doubletoy_periodic_coarse/phi.zl" u (2*($8-1)):(2*$1==time&&$3==0?$9:0/0) w lp, "doubletoy_periodic_coarse/u.zl" u (2*($8-1)):(2*$1==time&&$3==0?$9:0/0) w lp, cos((kz*(0.3*x-9) + omega*(0.15*time))*pi) w l
 
 # fine solutions
-p "spacetimetoy_periodic/phi.zl" u 8:($1==time&&$3==0?$9:0/0) w lp, "hydrotoy_periodic/u.zl" u 8:($1==time&&$3==0?$9:0/0) w lp, "doubletoy_periodic/phi.zl" u 8:($1==time&&$3==0?$9:0/0) w lp, "doubletoy_periodic/u.zl" u 8:($1==time&&$3==0?$9:0/0) w lp, cos((kz*(0.3*x-9) + omega*(0.15*time))*pi) w l
+p "spacetimetoy_periodic/phi.zl" u ($8-2):($1==time&&$3==0?$9:0/0) w lp, "hydrotoy_periodic/u.zl" u ($8-2):($1==time&&$3==0?$9:0/0) w lp, "doubletoy_periodic/phi.zl" u ($8-2):($1==time&&$3==0?$9:0/0) w lp, "doubletoy_periodic/u.zl" u ($8-2):($1==time&&$3==0?$9:0/0) w lp, cos((kz*(0.3*x-9) + omega*(0.15*time))*pi) w l
 
 
 
 # without refinement
 
 # solutions
-p "doubletoy_periodic/phi.zl" u 8:($1==time&&$3==0?$9:0/0) w lp, "doubletoy_periodic_coarse/phi.zl" u (2*$8):(2*$1==time&&$3==0?$9:0/0) w lp, cos((kz*(0.3*x-9) + omega*(0.15*time))*pi) w l
+
+p "doubletoy_periodic/phi.zl" u ($8-1):($1==time&&$3==0?$9:0/0) w lp, "doubletoy_periodic_coarse/phi.zl" u (2*($8-1)):(2*$1==time&&$3==0?$9:0/0) w lp, cos((kz*(0.3*x-9) + omega*(0.15*time))*pi) w l
 
 # errors
-p "doubletoy_periodic/phi.zl" u 8:($1==time&&$3==0?$9-cos((kz*(0.3*($8)-9) + omega*(0.15*time))*pi):0/0) w lp, "doubletoy_periodic_coarse/phi.zl" u (2*$8):(2*$1==time&&$3==0?$9-cos((kz*(0.3*(2*$8)-9) + omega*(0.15*time))*pi):0/0) w lp
+p "doubletoy_periodic/phi.zl" u ($8-1):($1==time&&$3==0?$9-cos((kz*(0.3*($8-1)-9) + omega*(0.15*time))*pi):0/0) w lp, "doubletoy_periodic_coarse/phi.zl" u (2*$8):(2*$1==time&&$3==0?$9-cos((kz*(0.3*(2*($8-1))-9) + omega*(0.15*time))*pi):0/0) w lp
 
 
 
 # with refinement
 
 # solutions
-p "doubletoy_periodic_rl2/phi.zl" u 8:($1==time&&$3==0?$9:0/0) w lp, "doubletoy_periodic_coarse_rl2/phi.zl" u (2*$8):(2*$1==time&&$3==0?$9:0/0) w lp, cos((kz*(0.15*x-9) + omega*(0.075*time))*pi) w l
+p "doubletoy_periodic_rl2/phi.zl" u ($8-2):($1==time&&$3==0?$9:0/0) w lp, "doubletoy_periodic_coarse_rl2/phi.zl" u (2*($8-2)):(2*$1==time&&$3==0?$9:0/0) w lp, cos((kz*(0.15*x-9) + omega*(0.075*time))*pi) w l
 
 # errors
-p "doubletoy_periodic_rl2/phi.zl" u 8:($1==time&&$3==0?$9-cos((kz*(0.15*($8)-9) + omega*(0.075*time))*pi):0/0) w lp, "doubletoy_periodic_coarse_rl2/phi.zl" u (2*$8):(2*$1==time&&$3==0?$9-cos((kz*(0.15*(2*$8)-9) + omega*(0.075*time))*pi):0/0) w lp
+p "doubletoy_periodic_rl2/phi.zl" u ($8-2):($1==time&&$3==0?$9-cos((kz*(0.15*($8-2)-9) + omega*(0.075*time))*pi):0/0) w lp, "doubletoy_periodic_coarse_rl2/phi.zl" u (2*($8-2)):(2*$1==time&&$3==0?$9-cos((kz*(0.15*(2*($8-2))-9) + omega*(0.075*time))*pi):0/0) w lp
diff --git a/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic.par b/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic.par
index d985792fb..2c22914c6 100644
--- a/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic.par
+++ b/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic.par
@@ -7,7 +7,7 @@
 #   @enddesc
 # @@*/
 #
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic.par,v 1.2 2001/03/30 00:50:48 eschnett Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic.par,v 1.3 2001/04/23 08:10:20 schnetter Exp $
 
 ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetSlab IDSpaceTimeToy SpaceTimeToy IDHydroToy HydroToy"
 
@@ -19,17 +19,19 @@ Cactus::cctk_itlast		= 120
 
 Time::dtfac			= 0.5
 
-driver::global_nx		= 32
-driver::global_ny		= 46
-driver::global_nz		= 62
+driver::global_nx		= 34
+driver::global_ny		= 48
+driver::global_nz		= 64
+
+driver::ghost_size		= 2
 
 grid::type			= byrange
-grid::xmin			= -4.8
-grid::ymin			= -6.6
-grid::zmin			= -9.0
-grid::xmax			=  4.5
-grid::ymax			=  6.9
-grid::zmax			=  9.3
+grid::xmin			= -5.1
+grid::ymin			= -6.9
+grid::zmin			= -9.3
+grid::xmax			=  4.8
+grid::ymax			=  7.2
+grid::zmax			=  9.6
 grid::mode			= periodic
 
 IO::outdir			= "doubletoy_periodic"
diff --git a/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_coarse.par b/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_coarse.par
index 4f38d9ca5..b4a2b41a4 100644
--- a/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_coarse.par
+++ b/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_coarse.par
@@ -7,7 +7,7 @@
 #   @enddesc
 # @@*/
 #
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_coarse.par,v 1.2 2001/03/30 00:50:48 eschnett Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_coarse.par,v 1.3 2001/04/23 08:10:20 schnetter Exp $
 
 ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetSlab IDSpaceTimeToy SpaceTimeToy IDHydroToy HydroToy"
 
@@ -19,17 +19,19 @@ Cactus::cctk_itlast		= 60
 
 Time::dtfac			= 0.5
 
-driver::global_nx		= 17
-driver::global_ny		= 24
-driver::global_nz		= 32
+driver::global_nx		= 19
+driver::global_ny		= 26
+driver::global_nz		= 34
+
+driver::ghost_size		= 2
 
 grid::type			= byrange
-grid::xmin			= -4.8
-grid::ymin			= -6.6
-grid::zmin			= -9.0
-grid::xmax			=  4.8
-grid::ymax			=  7.2
-grid::zmax			=  9.6
+grid::xmin			= -5.4
+grid::ymin			= -7.2
+grid::zmin			= -9.6
+grid::xmax			=  5.4
+grid::ymax			=  7.8
+grid::zmax			= 10.2
 grid::mode			= periodic
 
 IO::outdir			= "doubletoy_periodic_coarse"
diff --git a/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_coarse_rl2.par b/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_coarse_rl2.par
index f0b08d896..549747e1f 100644
--- a/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_coarse_rl2.par
+++ b/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_coarse_rl2.par
@@ -7,7 +7,7 @@
 #   @enddesc
 # @@*/
 #
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_coarse_rl2.par,v 1.3 2001/03/30 00:50:48 eschnett Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_coarse_rl2.par,v 1.4 2001/04/23 08:10:20 schnetter Exp $
 
 ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetSlab IDSpaceTimeToy SpaceTimeToy IDHydroToy HydroToy"
 
@@ -19,21 +19,23 @@ Cactus::cctk_itlast		= 120
 
 Time::dtfac			= 0.5
 
-driver::global_nx		= 17
-driver::global_ny		= 24
-driver::global_nz		= 32
+driver::global_nx		= 19
+driver::global_ny		= 26
+driver::global_nz		= 34
+
+driver::ghost_size		= 2
 
 Carpet::max_refinement_levels	= 2
 Carpet::prolongation_order_space= 3
 Carpet::prolongation_order_time	= 2
 
 grid::type			= byrange
-grid::xmin			= -4.8
-grid::ymin			= -6.6
-grid::zmin			= -9.0
-grid::xmax			=  4.8
-grid::ymax			=  7.2
-grid::zmax			=  9.6
+grid::xmin			= -5.4
+grid::ymin			= -7.2
+grid::zmin			= -9.6
+grid::xmax			=  5.4
+grid::ymax			=  7.8
+grid::zmax			= 10.2
 grid::mode			= periodic
 
 IO::outdir			= "doubletoy_periodic_coarse_rl2"
diff --git a/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_coarse_rl3.par b/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_coarse_rl3.par
index c313ecff1..5b529f7d2 100644
--- a/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_coarse_rl3.par
+++ b/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_coarse_rl3.par
@@ -7,7 +7,7 @@
 #   @enddesc
 # @@*/
 #
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_coarse_rl3.par,v 1.3 2001/03/30 00:50:48 eschnett Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_coarse_rl3.par,v 1.4 2001/04/23 08:10:20 schnetter Exp $
 
 ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetSlab IDSpaceTimeToy SpaceTimeToy IDHydroToy HydroToy"
 
@@ -19,21 +19,23 @@ Cactus::cctk_itlast		= 240
 
 Time::dtfac			= 0.5
 
-driver::global_nx		= 17
-driver::global_ny		= 24
-driver::global_nz		= 32
+driver::global_nx		= 19
+driver::global_ny		= 26
+driver::global_nz		= 34
+
+driver::ghost_size		= 2
 
 Carpet::max_refinement_levels	= 3
 Carpet::prolongation_order_space= 3
 Carpet::prolongation_order_time	= 2
 
 grid::type			= byrange
-grid::xmin			= -4.8
-grid::ymin			= -6.6
-grid::zmin			= -9.0
-grid::xmax			=  4.8
-grid::ymax			=  7.2
-grid::zmax			=  9.6
+grid::xmin			= -5.4
+grid::ymin			= -7.2
+grid::zmin			= -9.6
+grid::xmax			=  5.4
+grid::ymax			=  7.8
+grid::zmax			= 10.2
 grid::mode			= periodic
 
 IO::outdir			= "doubletoy_periodic_coarse_rl3"
diff --git a/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_rl2.par b/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_rl2.par
index 63f308484..cd0233846 100644
--- a/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_rl2.par
+++ b/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_rl2.par
@@ -7,7 +7,7 @@
 #   @enddesc
 # @@*/
 #
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_rl2.par,v 1.3 2001/03/30 00:50:48 eschnett Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_rl2.par,v 1.4 2001/04/23 08:10:20 schnetter Exp $
 
 ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetSlab IDSpaceTimeToy SpaceTimeToy IDHydroToy HydroToy"
 
@@ -19,21 +19,23 @@ Cactus::cctk_itlast		= 240
 
 Time::dtfac			= 0.5
 
-driver::global_nx		= 32
-driver::global_ny		= 46
-driver::global_nz		= 62
+driver::global_nx		= 34
+driver::global_ny		= 48
+driver::global_nz		= 64
+
+driver::ghost_size		= 2
 
 Carpet::max_refinement_levels	= 2
 Carpet::prolongation_order_space= 3
 Carpet::prolongation_order_time	= 2
 
 grid::type			= byrange
-grid::xmin			= -4.8
-grid::ymin			= -6.6
-grid::zmin			= -9.0
-grid::xmax			=  4.5
-grid::ymax			=  6.9
-grid::zmax			=  9.3
+grid::xmin			= -5.1
+grid::ymin			= -6.9
+grid::zmin			= -9.3
+grid::xmax			=  4.8
+grid::ymax			=  7.2
+grid::zmax			=  9.6
 grid::mode			= periodic
 
 IO::outdir			= "doubletoy_periodic_rl2"
diff --git a/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_rl3.par b/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_rl3.par
index be4eeead0..fcb06b511 100644
--- a/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_rl3.par
+++ b/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_rl3.par
@@ -7,7 +7,7 @@
 #   @enddesc
 # @@*/
 #
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_rl3.par,v 1.3 2001/03/30 00:50:48 eschnett Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_rl3.par,v 1.4 2001/04/23 08:10:20 schnetter Exp $
 
 ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetSlab IDSpaceTimeToy SpaceTimeToy IDHydroToy HydroToy"
 
@@ -19,21 +19,23 @@ Cactus::cctk_itlast		= 480
 
 Time::dtfac			= 0.5
 
-driver::global_nx		= 32
-driver::global_ny		= 46
-driver::global_nz		= 62
+driver::global_nx		= 34
+driver::global_ny		= 48
+driver::global_nz		= 64
+
+driver::ghost_size		= 2
 
 Carpet::max_refinement_levels	= 3
 Carpet::prolongation_order_space= 3
 Carpet::prolongation_order_time	= 2
 
 grid::type			= byrange
-grid::xmin			= -4.8
-grid::ymin			= -6.6
-grid::zmin			= -9.0
-grid::xmax			=  4.5
-grid::ymax			=  6.9
-grid::zmax			=  9.3
+grid::xmin			= -5.1
+grid::ymin			= -6.9
+grid::zmin			= -9.3
+grid::xmax			=  4.8
+grid::ymax			=  7.2
+grid::zmax			=  9.6
 grid::mode			= periodic
 
 IO::outdir			= "doubletoy_periodic_rl3"
diff --git a/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic.par b/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic.par
index 98496c2ea..481e1f24d 100644
--- a/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic.par
+++ b/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic.par
@@ -7,7 +7,7 @@
 #   @enddesc
 # @@*/
 #
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic.par,v 1.2 2001/03/30 00:50:48 eschnett Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic.par,v 1.3 2001/04/23 08:10:20 schnetter Exp $
 
 ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetSlab IDSpaceTimeToy SpaceTimeToy"
 
@@ -19,17 +19,19 @@ Cactus::cctk_itlast		= 120
 
 Time::dtfac			= 0.5
 
-driver::global_nx		= 32
-driver::global_ny		= 46
-driver::global_nz		= 62
+driver::global_nx		= 34
+driver::global_ny		= 48
+driver::global_nz		= 64
+
+driver::ghost_size		= 2
 
 grid::type			= byrange
-grid::xmin			= -4.8
-grid::ymin			= -6.6
-grid::zmin			= -9.0
-grid::xmax			=  4.5
-grid::ymax			=  6.9
-grid::zmax			=  9.3
+grid::xmin			= -5.1
+grid::ymin			= -6.9
+grid::zmin			= -9.3
+grid::xmax			=  4.8
+grid::ymax			=  7.2
+grid::zmax			=  9.6
 grid::mode			= periodic
 
 IO::outdir			= "spacetimetoy_periodic"
diff --git a/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_coarse.par b/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_coarse.par
index ca7fc2964..95b1884e9 100644
--- a/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_coarse.par
+++ b/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_coarse.par
@@ -7,7 +7,7 @@
 #   @enddesc
 # @@*/
 #
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_coarse.par,v 1.4 2001/03/30 00:50:48 eschnett Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_coarse.par,v 1.5 2001/04/23 08:10:21 schnetter Exp $
 
 ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetSlab IDSpaceTimeToy SpaceTimeToy"
 
@@ -19,17 +19,19 @@ Cactus::cctk_itlast		= 60
 
 Time::dtfac			= 0.5
 
-driver::global_nx		= 17
-driver::global_ny		= 24
-driver::global_nz		= 32
+driver::global_nx		= 19
+driver::global_ny		= 26
+driver::global_nz		= 34
+
+driver::ghost_size		= 2
 
 grid::type			= byrange
-grid::xmin			= -4.8
-grid::ymin			= -6.6
-grid::zmin			= -9.0
-grid::xmax			=  4.8
-grid::ymax			=  7.2
-grid::zmax			=  9.6
+grid::xmin			= -5.4
+grid::ymin			= -7.2
+grid::zmin			= -9.6
+grid::xmax			=  5.4
+grid::ymax			=  7.8
+grid::zmax			= 10.2
 grid::mode			= periodic
 
 IO::outdir			= "spacetimetoy_periodic_coarse"
diff --git a/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_coarse_rl2.par b/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_coarse_rl2.par
index ab01833e1..df1ab595d 100644
--- a/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_coarse_rl2.par
+++ b/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_coarse_rl2.par
@@ -7,7 +7,7 @@
 #   @enddesc
 # @@*/
 #
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_coarse_rl2.par,v 1.4 2001/03/30 00:50:48 eschnett Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_coarse_rl2.par,v 1.5 2001/04/23 08:10:21 schnetter Exp $
 
 ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetSlab IDSpaceTimeToy SpaceTimeToy"
 
@@ -19,21 +19,23 @@ Cactus::cctk_itlast		= 120
 
 Time::dtfac			= 0.5
 
-driver::global_nx		= 17
-driver::global_ny		= 24
-driver::global_nz		= 32
+driver::global_nx		= 19
+driver::global_ny		= 26
+driver::global_nz		= 34
+
+driver::ghost_size		= 2
 
 Carpet::max_refinement_levels	= 2
 Carpet::prolongation_order_space= 3
 Carpet::prolongation_order_time	= 2
 
 grid::type			= byrange
-grid::xmin			= -4.8
-grid::ymin			= -6.6
-grid::zmin			= -9.0
-grid::xmax			=  4.8
-grid::ymax			=  7.2
-grid::zmax			=  9.6
+grid::xmin			= -5.4
+grid::ymin			= -7.2
+grid::zmin			= -9.6
+grid::xmax			=  5.4
+grid::ymax			=  7.8
+grid::zmax			= 10.2
 grid::mode			= periodic
 
 IO::outdir			= "spacetimetoy_periodic_coarse_rl2"
diff --git a/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_coarse_rl3.par b/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_coarse_rl3.par
index dfceb4631..ec078235d 100644
--- a/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_coarse_rl3.par
+++ b/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_coarse_rl3.par
@@ -7,7 +7,7 @@
 #   @enddesc
 # @@*/
 #
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_coarse_rl3.par,v 1.5 2001/03/30 00:50:48 eschnett Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_coarse_rl3.par,v 1.6 2001/04/23 08:10:21 schnetter Exp $
 
 ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetSlab IDSpaceTimeToy SpaceTimeToy"
 
@@ -19,21 +19,23 @@ Cactus::cctk_itlast		= 240
 
 Time::dtfac			= 0.5
 
-driver::global_nx		= 17
-driver::global_ny		= 24
-driver::global_nz		= 32
+driver::global_nx		= 19
+driver::global_ny		= 26
+driver::global_nz		= 34
+
+driver::ghost_size		= 2
 
 Carpet::max_refinement_levels	= 3
 Carpet::prolongation_order_space= 3
 Carpet::prolongation_order_time	= 2
 
 grid::type			= byrange
-grid::xmin			= -4.8
-grid::ymin			= -6.6
-grid::zmin			= -9.0
-grid::xmax			=  4.8
-grid::ymax			=  7.2
-grid::zmax			=  9.6
+grid::xmin			= -5.4
+grid::ymin			= -7.2
+grid::zmin			= -9.6
+grid::xmax			=  5.4
+grid::ymax			=  7.8
+grid::zmax			= 10.2
 grid::mode			= periodic
 
 IO::outdir			= "spacetimetoy_periodic_coarse_rl3"
diff --git a/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_rl2.par b/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_rl2.par
index c31d64ada..14175ee15 100644
--- a/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_rl2.par
+++ b/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_rl2.par
@@ -7,7 +7,7 @@
 #   @enddesc
 # @@*/
 #
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_rl2.par,v 1.4 2001/03/30 00:50:48 eschnett Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_rl2.par,v 1.5 2001/04/23 08:10:21 schnetter Exp $
 
 ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetSlab IDSpaceTimeToy SpaceTimeToy"
 
@@ -19,21 +19,23 @@ Cactus::cctk_itlast		= 240
 
 Time::dtfac			= 0.5
 
-driver::global_nx		= 32
-driver::global_ny		= 46
-driver::global_nz		= 62
+driver::global_nx		= 34
+driver::global_ny		= 48
+driver::global_nz		= 64
+
+driver::ghost_size		= 2
 
 Carpet::max_refinement_levels	= 2
 Carpet::prolongation_order_space= 3
 Carpet::prolongation_order_time	= 2
 
 grid::type			= byrange
-grid::xmin			= -4.8
-grid::ymin			= -6.6
-grid::zmin			= -9.0
-grid::xmax			=  4.5
-grid::ymax			=  6.9
-grid::zmax			=  9.3
+grid::xmin			= -5.1
+grid::ymin			= -6.9
+grid::zmin			= -9.3
+grid::xmax			=  4.8
+grid::ymax			=  7.2
+grid::zmax			=  9.6
 grid::mode			= periodic
 
 IO::outdir			= "spacetimetoy_periodic_rl2"
diff --git a/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_rl3.par b/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_rl3.par
index dcdf804a8..6dfb5e485 100644
--- a/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_rl3.par
+++ b/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_rl3.par
@@ -7,7 +7,7 @@
 #   @enddesc
 # @@*/
 #
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_rl3.par,v 1.3 2001/03/30 00:50:48 eschnett Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_rl3.par,v 1.4 2001/04/23 08:10:21 schnetter Exp $
 
 ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetSlab IDSpaceTimeToy SpaceTimeToy"
 
@@ -19,21 +19,23 @@ Cactus::cctk_itlast		= 480
 
 Time::dtfac			= 0.5
 
-driver::global_nx		= 32
-driver::global_ny		= 46
-driver::global_nz		= 62
+driver::global_nx		= 34
+driver::global_ny		= 48
+driver::global_nz		= 64
+
+driver::ghost_size		= 2
 
 Carpet::max_refinement_levels	= 3
 Carpet::prolongation_order_space= 3
 Carpet::prolongation_order_time	= 2
 
 grid::type			= byrange
-grid::xmin			= -4.8
-grid::ymin			= -6.6
-grid::zmin			= -9.0
-grid::xmax			=  4.5
-grid::ymax			=  6.9
-grid::zmax			=  9.3
+grid::xmin			= -5.1
+grid::ymin			= -6.9
+grid::zmin			= -9.3
+grid::xmax			=  4.8
+grid::ymax			=  7.2
+grid::zmax			=  9.6
 grid::mode			= periodic
 
 IO::outdir			= "spacetimetoy_periodic_rl3"
diff --git a/CarpetExtra/SpaceTimeToy/src/SpaceTimeToy.F77 b/CarpetExtra/SpaceTimeToy/src/SpaceTimeToy.F77
index ecb245028..a5d8eab8c 100644
--- a/CarpetExtra/SpaceTimeToy/src/SpaceTimeToy.F77
+++ b/CarpetExtra/SpaceTimeToy/src/SpaceTimeToy.F77
@@ -1,5 +1,5 @@
 c     -*-Fortran-*-
-c     $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/src/SpaceTimeToy.F77,v 1.7 2001/03/26 02:29:24 eschnett Exp $
+c     $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/src/SpaceTimeToy.F77,v 1.8 2001/04/23 08:10:22 schnetter Exp $
       
 #include "cctk.h" 
 #include "cctk_Parameters.h"
@@ -22,8 +22,8 @@ c     Copy
          do j=1,cctk_lsh(2)
             do i=1,cctk_lsh(1)
                
-               phi_i(i,j,k) = phi(i,j,k)
-               psi_i(i,j,k) = psi(i,j,k)
+               phi_i(i,j,k) = phi_p(i,j,k)
+               psi_i(i,j,k) = psi_p(i,j,k)
                
             end do
          end do
@@ -35,10 +35,10 @@ c     Copy
             do j=1,cctk_lsh(2)
                do i=1,cctk_lsh(1)
                
-                  u_i(i,j,k)  = u(i,j,k)
-                  vx_i(i,j,k) = vx(i,j,k)
-                  vy_i(i,j,k) = vy(i,j,k)
-                  vz_i(i,j,k) = vz(i,j,k)
+                  u_i(i,j,k)  = u_p(i,j,k)
+                  vx_i(i,j,k) = vx_p(i,j,k)
+                  vy_i(i,j,k) = vy_p(i,j,k)
+                  vz_i(i,j,k) = vz_p(i,j,k)
                   
                end do
             end do
@@ -96,8 +96,8 @@ c     Average
          do j=1,cctk_lsh(2)
             do i=1,cctk_lsh(1)
                
-               phi_i(i,j,k) = half * (phi(i,j,k) + phi_n(i,j,k))
-               psi_i(i,j,k) = half * (psi(i,j,k) + psi_n(i,j,k))
+               phi_i(i,j,k) = half * (phi_p(i,j,k) + phi(i,j,k))
+               psi_i(i,j,k) = half * (psi_p(i,j,k) + psi(i,j,k))
                
             end do
          end do
@@ -109,10 +109,10 @@ c     Average
             do j=1,cctk_lsh(2)
                do i=1,cctk_lsh(1)
                   
-                  u_i(i,j,k)  = half * (u(i,j,k)  + u_n(i,j,k))
-                  vx_i(i,j,k) = half * (vx(i,j,k) + vx_n(i,j,k))
-                  vy_i(i,j,k) = half * (vy(i,j,k) + vy_n(i,j,k))
-                  vz_i(i,j,k) = half * (vz(i,j,k) + vz_n(i,j,k))
+                  u_i(i,j,k)  = half * (u_p(i,j,k)  + u(i,j,k))
+                  vx_i(i,j,k) = half * (vx_p(i,j,k) + vx(i,j,k))
+                  vy_i(i,j,k) = half * (vy_p(i,j,k) + vy(i,j,k))
+                  vz_i(i,j,k) = half * (vz_p(i,j,k) + vz(i,j,k))
                   
                end do
             end do
@@ -168,15 +168,15 @@ c     Step ICN iterations
       dt = CCTK_DELTA_TIME
       
 c     Evolve
-      do k=2,cctk_lsh(3)-1
-         do j=2,cctk_lsh(2)-1
-            do i=2,cctk_lsh(1)-1
+      do k=1+cctk_nghostzones(3),cctk_lsh(3)-cctk_nghostzones(3)
+         do j=1+cctk_nghostzones(2),cctk_lsh(2)-cctk_nghostzones(2)
+            do i=1+cctk_nghostzones(1),cctk_lsh(1)-cctk_nghostzones(1)
                
-               phi_n(i,j,k) = phi(i,j,k)
+               phi(i,j,k) = phi_p(i,j,k)
      $              + dt * psi_i(i,j,k)
      $              + dt * u_i(i,j,k)
                
-               psi_n(i,j,k) = psi(i,j,k)
+               psi(i,j,k) = psi_p(i,j,k)
      $              + dt * (phi_i(i-1,j,k) - 2*phi_i(i,j,k) + phi_i(i+1,j,k)) / dx**2
      $              + dt * (phi_i(i,j-1,k) - 2*phi_i(i,j,k) + phi_i(i,j+1,k)) / dy**2
      $              + dt * (phi_i(i,j,k-1) - 2*phi_i(i,j,k) + phi_i(i,j,k+1)) / dz**2
@@ -203,15 +203,17 @@ c     Evolve
       CCTK_REAL zero, one
       parameter (zero=0, one=1)
       
-      CCTK_REAL finf, npow
-      parameter (finf=1, npow=1)
+      CCTK_REAL finf
+      parameter (finf=1)
+      integer npow
+      parameter (npow=1)
       
       integer sw(3)
       integer ierr
       
-      sw(1) = 1
-      sw(2) = 1
-      sw(3) = 1
+      sw(1) = cctk_nghostzones(1)
+      sw(2) = cctk_nghostzones(2)
+      sw(3) = cctk_nghostzones(3)
       
 c     Apply boundary condition
       if (CCTK_EQUALS(bound, "flat")) then
diff --git a/CarpetExtra/WaveToyF77/src/WaveToy.F77 b/CarpetExtra/WaveToyF77/src/WaveToy.F77
index adcdea62a..bbdf70457 100644
--- a/CarpetExtra/WaveToyF77/src/WaveToy.F77
+++ b/CarpetExtra/WaveToyF77/src/WaveToy.F77
@@ -65,13 +65,13 @@ c     -----------------
       dy2i = 1/dy2
       dz2i = 1/dz2
       
-      istart = 2
-      jstart = 2
-      kstart = 2
+      istart = 1+cctk_nghostzones(1)
+      jstart = 1+cctk_nghostzones(2)
+      kstart = 1+cctk_nghostzones(3)
       
-      iend = cctk_lsh(1)-1
-      jend = cctk_lsh(2)-1
-      kend = cctk_lsh(3)-1
+      iend = cctk_lsh(1)-cctk_nghostzones(1)
+      jend = cctk_lsh(2)-cctk_nghostzones(2)
+      kend = cctk_lsh(3)-cctk_nghostzones(3)
       
       factor = 2 * (1 - dt2 * (dx2i + dy2i + dz2i))
       
@@ -81,11 +81,11 @@ c     ----------------
          do j = jstart, jend
             do i = istart, iend
                
-               phi_n(i,j,k) = factor*phi(i,j,k) -
-     $              phi_p(i,j,k) + (dt2) * 
-     $              ((phi(i+1,j,k)+phi(i-1,j,k))*dx2i
-     $              +(phi(i,j+1,k)+phi(i,j-1,k))*dy2i
-     $              +(phi(i,j,k+1)+phi(i,j,k-1))*dz2i)
+               phi(i,j,k) = factor*phi_p(i,j,k) -
+     $              phi_p_p(i,j,k) + (dt2) * 
+     $              ((phi_p(i+1,j,k)+phi_p(i-1,j,k))*dx2i
+     $              +(phi_p(i,j+1,k)+phi_p(i,j-1,k))*dy2i
+     $              +(phi_p(i,j,k+1)+phi_p(i,j,k-1))*dz2i)
                
             end do
          end do
@@ -132,9 +132,9 @@ c     call CCTK_INFO ("WaveToyF77_Boundaries")
       
 c     Set the stencil width
 c     ---------------------
-      sw(1) = 1  
-      sw(2) = 1
-      sw(3) = 1
+      sw(1) = cctk_nghostzones(1)
+      sw(2) = cctk_nghostzones(2)
+      sw(3) = cctk_nghostzones(3)
       
 c     Apply the outer boundary conditions
 c     -----------------------------------