Coupled initial data as well.

Coupled initial data as well.
Added parameter files and a gnuplot examination script.

darcs-hash:20010320162726-f6438-3a4b060ec6665c40e10bf3a2995649a34e6bf071.gz

8 files changed, 100 insertions, 159 deletions

diff --git a/CarpetExtra/SpaceTimeToy/par/convtest_double.gnuplot b/CarpetExtra/SpaceTimeToy/par/convtest_double.gnuplot
index 660430e24..044460f27 100644
--- a/CarpetExtra/SpaceTimeToy/par/convtest_double.gnuplot
+++ b/CarpetExtra/SpaceTimeToy/par/convtest_double.gnuplot
@@ -6,31 +6,30 @@ omega=sqrt(kx**2 + ky**2 + kz**2)
 
 
 
-# compare to uncoupled systems
+# compare to uncoubled systems
 
 # coarse solutions
-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
+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
 
 # fine solutions
-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
+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
 
 
 
 # without refinement
 
 # solutions
-
-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
+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
 
 # errors
-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
+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
 
 
 
 # with refinement
 
 # solutions
-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
+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
 
 # errors
-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
+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
diff --git a/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic.par b/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic.par
index 7210fc79a..6c7a52c6d 100644
--- a/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic.par
+++ b/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic.par
@@ -7,40 +7,34 @@
 #   @enddesc
 # @@*/
 #
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic.par,v 1.7 2004/03/23 12:00:15 schnetter Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic.par,v 1.1 2001/03/20 17:27:26 eschnett Exp $
 
-ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetReduce CarpetRegrid CarpetSlab IDSpaceTimeToy SpaceTimeToy IDHydroToy HydroToy"
-
-Carpet::poison_new_timelevels	= yes
-Carpet::check_for_poison	= yes
-Carpet::checksum_timelevels	= yes
+ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetSlab IDSpaceTimeToy SpaceTimeToy IDHydroToy HydroToy"
 
 Cactus::cctk_itlast		= 120
 
 Time::dtfac			= 0.5
 
-driver::global_nx		= 34
-driver::global_ny		= 48
-driver::global_nz		= 64
-
-driver::ghost_size		= 2
+driver::global_nx		= 32
+driver::global_ny		= 46
+driver::global_nz		= 62
 
 grid::type			= byrange
-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::xmin			= -4.8
+grid::ymin			= -6.6
+grid::zmin			= -9.0
+grid::xmax			=  4.5
+grid::ymax			=  6.9
+grid::zmax			=  9.3
 grid::mode			= periodic
 
-IO::out_dir			= "doubletoy_periodic"
+IO::outdir			= "doubletoy_periodic"
 
 IOBasic::outinfo_every		= 1 # 10
-IOBasic::outinfo_vars		= "spacetimetoy::spacetimeevolve hydrotoy::hydroevolve"
+#IOBasic::outinfo_vars		= "spacetimetoy::spacetimeevolve hydrotoy::hydroevolve"
 
-IOBasic::outScalar_every	= 1 # 2
-IOBasic::outScalar_vars		= "spacetimetoy::spacetimeevolve hydrotoy::hydroevolve"
+#IOBasic::outScalar_every	= 2
+#IOBasic::outScalar_vars		= "spacetimetoy::spacetimeevolve hydrotoy::hydroevolve"
 
 IOASCII::out1D_every		= 1 # 2
 IOASCII::out1D_vars		= "spacetimetoy::spacetimeevolve hydrotoy::hydroevolve grid::coordinates"
@@ -48,7 +42,6 @@ IOASCII::out1D_vars		= "spacetimetoy::spacetimeevolve hydrotoy::hydroevolve grid
 IOFlexIO::out3D_every		= 24
 IOFlexIO::out3D_vars		= "spacetimetoy::spacetimeevolve hydrotoy::hydroevolve"
 IOFlexIO::out3D_format		= IEEE
-IOFlexIO::out3D_extension	= ".vcamr"
 
 SpaceTimeToy::icn_iterations	= 2
 SpaceTimeToy::bound		= radiation
diff --git a/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_coarse.par b/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_coarse.par
index 2985234ef..b53af3a4e 100644
--- a/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_coarse.par
+++ b/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_coarse.par
@@ -7,40 +7,34 @@
 #   @enddesc
 # @@*/
 #
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_coarse.par,v 1.7 2004/03/23 12:00:15 schnetter Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_coarse.par,v 1.1 2001/03/20 17:27:26 eschnett Exp $
 
-ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetReduce CarpetRegrid CarpetSlab IDSpaceTimeToy SpaceTimeToy IDHydroToy HydroToy"
-
-Carpet::poison_new_timelevels	= yes
-Carpet::check_for_poison	= yes
-Carpet::checksum_timelevels	= yes
+ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetSlab IDSpaceTimeToy SpaceTimeToy IDHydroToy HydroToy"
 
 Cactus::cctk_itlast		= 60
 
 Time::dtfac			= 0.5
 
-driver::global_nx		= 19
-driver::global_ny		= 26
-driver::global_nz		= 34
-
-driver::ghost_size		= 2
+driver::global_nx		= 17
+driver::global_ny		= 24
+driver::global_nz		= 32
 
 grid::type			= byrange
-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::xmin			= -4.8
+grid::ymin			= -6.6
+grid::zmin			= -9.0
+grid::xmax			=  4.8
+grid::ymax			=  7.2
+grid::zmax			=  9.6
 grid::mode			= periodic
 
-IO::out_dir			= "doubletoy_periodic_coarse"
+IO::outdir			= "doubletoy_periodic_coarse"
 
 IOBasic::outinfo_every		= 1 # 10
-IOBasic::outinfo_vars		= "spacetimetoy::spacetimeevolve hydrotoy::hydroevolve"
+#IOBasic::outinfo_vars		= "spacetimetoy::spacetimeevolve hydrotoy::hydroevolve"
 
-IOBasic::outScalar_every	= 1 # 2
-IOBasic::outScalar_vars		= "spacetimetoy::spacetimeevolve hydrotoy::hydroevolve"
+#IOBasic::outScalar_every	= 2
+#IOBasic::outScalar_vars		= "spacetimetoy::spacetimeevolve hydrotoy::hydroevolve"
 
 IOASCII::out1D_every		= 1 # 2
 IOASCII::out1D_vars		= "spacetimetoy::spacetimeevolve hydrotoy::hydroevolve grid::coordinates"
@@ -48,7 +42,6 @@ IOASCII::out1D_vars		= "spacetimetoy::spacetimeevolve hydrotoy::hydroevolve grid
 IOFlexIO::out3D_every		= 12
 IOFlexIO::out3D_vars		= "spacetimetoy::spacetimeevolve hydrotoy::hydroevolve"
 IOFlexIO::out3D_format		= IEEE
-IOFlexIO::out3D_extension	= ".vcamr"
 
 SpaceTimeToy::icn_iterations	= 2
 SpaceTimeToy::bound		= radiation
diff --git a/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_coarse_rl2.par b/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_coarse_rl2.par
index 55534b4a5..68306029b 100644
--- a/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_coarse_rl2.par
+++ b/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_coarse_rl2.par
@@ -7,46 +7,36 @@
 #   @enddesc
 # @@*/
 #
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_coarse_rl2.par,v 1.8 2004/03/23 12:00:15 schnetter Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_coarse_rl2.par,v 1.1 2001/03/20 17:27:26 eschnett Exp $
 
-ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetReduce CarpetRegrid CarpetSlab IDSpaceTimeToy SpaceTimeToy IDHydroToy HydroToy"
-
-Carpet::poison_new_timelevels	= yes
-Carpet::check_for_poison	= yes
-Carpet::checksum_timelevels	= yes
+ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetSlab IDSpaceTimeToy SpaceTimeToy IDHydroToy HydroToy"
 
 Cactus::cctk_itlast		= 120
 
 Time::dtfac			= 0.5
 
-driver::global_nx		= 19
-driver::global_ny		= 26
-driver::global_nz		= 34
-
-driver::ghost_size		= 2
+driver::global_nx		= 17
+driver::global_ny		= 24
+driver::global_nz		= 32
 
 Carpet::max_refinement_levels	= 2
-Carpet::prolongation_order_space= 3
-Carpet::prolongation_order_time	= 2
-
-CarpetRegrid::refinement_levels	= 2
 
 grid::type			= byrange
-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::xmin			= -4.8
+grid::ymin			= -6.6
+grid::zmin			= -9.0
+grid::xmax			=  4.8
+grid::ymax			=  7.2
+grid::zmax			=  9.6
 grid::mode			= periodic
 
-IO::out_dir			= "doubletoy_periodic_coarse_rl2"
+IO::outdir			= "doubletoy_periodic_coarse_rl2"
 
 IOBasic::outinfo_every		= 1 # 10
-IOBasic::outinfo_vars		= "spacetimetoy::spacetimeevolve hydrotoy::hydroevolve"
+#IOBasic::outinfo_vars		= "spacetimetoy::spacetimeevolve hydrotoy::hydroevolve"
 
-IOBasic::outScalar_every	= 1 # 2
-IOBasic::outScalar_vars		= "spacetimetoy::spacetimeevolve hydrotoy::hydroevolve"
+#IOBasic::outScalar_every	= 2
+#IOBasic::outScalar_vars		= "spacetimetoy::spacetimeevolve hydrotoy::hydroevolve"
 
 IOASCII::out1D_every		= 1 # 2
 IOASCII::out1D_vars		= "spacetimetoy::spacetimeevolve hydrotoy::hydroevolve grid::coordinates"
@@ -54,7 +44,6 @@ IOASCII::out1D_vars		= "spacetimetoy::spacetimeevolve hydrotoy::hydroevolve grid
 IOFlexIO::out3D_every		= 24
 IOFlexIO::out3D_vars		= "spacetimetoy::spacetimeevolve hydrotoy::hydroevolve"
 IOFlexIO::out3D_format		= IEEE
-IOFlexIO::out3D_extension	= ".vcamr"
 
 SpaceTimeToy::icn_iterations	= 2
 SpaceTimeToy::bound		= radiation
diff --git a/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_coarse_rl3.par b/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_coarse_rl3.par
index 2b7442bce..d284abfc9 100644
--- a/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_coarse_rl3.par
+++ b/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_coarse_rl3.par
@@ -7,46 +7,36 @@
 #   @enddesc
 # @@*/
 #
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_coarse_rl3.par,v 1.8 2004/03/23 12:00:15 schnetter Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_coarse_rl3.par,v 1.1 2001/03/20 17:27:26 eschnett Exp $
 
-ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetReduce CarpetRegrid CarpetSlab IDSpaceTimeToy SpaceTimeToy IDHydroToy HydroToy"
-
-Carpet::poison_new_timelevels	= yes
-Carpet::check_for_poison	= yes
-Carpet::checksum_timelevels	= yes
+ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetSlab IDSpaceTimeToy SpaceTimeToy IDHydroToy HydroToy"
 
 Cactus::cctk_itlast		= 240
 
 Time::dtfac			= 0.5
 
-driver::global_nx		= 19
-driver::global_ny		= 26
-driver::global_nz		= 34
-
-driver::ghost_size		= 2
+driver::global_nx		= 17
+driver::global_ny		= 24
+driver::global_nz		= 32
 
 Carpet::max_refinement_levels	= 3
-Carpet::prolongation_order_space= 3
-Carpet::prolongation_order_time	= 2
-
-CarpetRegrid::refinement_levels	= 3
 
 grid::type			= byrange
-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::xmin			= -4.8
+grid::ymin			= -6.6
+grid::zmin			= -9.0
+grid::xmax			=  4.8
+grid::ymax			=  7.2
+grid::zmax			=  9.6
 grid::mode			= periodic
 
-IO::out_dir			= "doubletoy_periodic_coarse_rl3"
+IO::outdir			= "doubletoy_periodic_coarse_rl3"
 
 IOBasic::outinfo_every		= 1 # 10
-IOBasic::outinfo_vars		= "spacetimetoy::spacetimeevolve hydrotoy::hydroevolve"
+#IOBasic::outinfo_vars		= "spacetimetoy::spacetimeevolve hydrotoy::hydroevolve"
 
-IOBasic::outScalar_every	= 1 # 2
-IOBasic::outScalar_vars		= "spacetimetoy::spacetimeevolve hydrotoy::hydroevolve"
+#IOBasic::outScalar_every	= 2
+#IOBasic::outScalar_vars		= "spacetimetoy::spacetimeevolve hydrotoy::hydroevolve"
 
 IOASCII::out1D_every		= 1 # 2
 IOASCII::out1D_vars		= "spacetimetoy::spacetimeevolve hydrotoy::hydroevolve grid::coordinates"
@@ -54,7 +44,6 @@ IOASCII::out1D_vars		= "spacetimetoy::spacetimeevolve hydrotoy::hydroevolve grid
 IOFlexIO::out3D_every		= 48
 IOFlexIO::out3D_vars		= "spacetimetoy::spacetimeevolve hydrotoy::hydroevolve"
 IOFlexIO::out3D_format		= IEEE
-IOFlexIO::out3D_extension	= ".vcamr"
 
 SpaceTimeToy::icn_iterations	= 2
 SpaceTimeToy::bound		= radiation
diff --git a/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_rl2.par b/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_rl2.par
index 2611c62c4..a4cbfce9d 100644
--- a/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_rl2.par
+++ b/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_rl2.par
@@ -7,46 +7,36 @@
 #   @enddesc
 # @@*/
 #
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_rl2.par,v 1.8 2004/03/23 12:00:15 schnetter Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_rl2.par,v 1.1 2001/03/20 17:27:26 eschnett Exp $
 
-ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetReduce CarpetRegrid CarpetSlab IDSpaceTimeToy SpaceTimeToy IDHydroToy HydroToy"
-
-Carpet::poison_new_timelevels	= yes
-Carpet::check_for_poison	= yes
-Carpet::checksum_timelevels	= yes
+ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetSlab IDSpaceTimeToy SpaceTimeToy IDHydroToy HydroToy"
 
 Cactus::cctk_itlast		= 240
 
 Time::dtfac			= 0.5
 
-driver::global_nx		= 34
-driver::global_ny		= 48
-driver::global_nz		= 64
-
-driver::ghost_size		= 2
+driver::global_nx		= 32
+driver::global_ny		= 46
+driver::global_nz		= 62
 
 Carpet::max_refinement_levels	= 2
-Carpet::prolongation_order_space= 3
-Carpet::prolongation_order_time	= 2
-
-CarpetRegrid::refinement_levels	= 2
 
 grid::type			= byrange
-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::xmin			= -4.8
+grid::ymin			= -6.6
+grid::zmin			= -9.0
+grid::xmax			=  4.5
+grid::ymax			=  6.9
+grid::zmax			=  9.3
 grid::mode			= periodic
 
-IO::out_dir			= "doubletoy_periodic_rl2"
+IO::outdir			= "doubletoy_periodic_rl2"
 
 IOBasic::outinfo_every		= 1 # 10
-IOBasic::outinfo_vars		= "spacetimetoy::spacetimeevolve hydrotoy::hydroevolve"
+#IOBasic::outinfo_vars		= "spacetimetoy::spacetimeevolve hydrotoy::hydroevolve"
 
-IOBasic::outScalar_every	= 1 # 2
-IOBasic::outScalar_vars		= "spacetimetoy::spacetimeevolve hydrotoy::hydroevolve"
+#IOBasic::outScalar_every	= 2
+#IOBasic::outScalar_vars		= "spacetimetoy::spacetimeevolve hydrotoy::hydroevolve"
 
 IOASCII::out1D_every		= 1 # 2
 IOASCII::out1D_vars		= "spacetimetoy::spacetimeevolve hydrotoy::hydroevolve grid::coordinates"
@@ -54,7 +44,6 @@ IOASCII::out1D_vars		= "spacetimetoy::spacetimeevolve hydrotoy::hydroevolve grid
 IOFlexIO::out3D_every		= 48
 IOFlexIO::out3D_vars		= "spacetimetoy::spacetimeevolve hydrotoy::hydroevolve"
 IOFlexIO::out3D_format		= IEEE
-IOFlexIO::out3D_extension	= ".vcamr"
 
 SpaceTimeToy::icn_iterations	= 2
 SpaceTimeToy::bound		= radiation
diff --git a/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_rl3.par b/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_rl3.par
index 5cbcc1290..3c2ba436d 100644
--- a/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_rl3.par
+++ b/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_rl3.par
@@ -7,46 +7,36 @@
 #   @enddesc
 # @@*/
 #
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_rl3.par,v 1.8 2004/03/23 12:00:15 schnetter Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_rl3.par,v 1.1 2001/03/20 17:27:26 eschnett Exp $
 
-ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetReduce CarpetRegrid CarpetSlab IDSpaceTimeToy SpaceTimeToy IDHydroToy HydroToy"
-
-Carpet::poison_new_timelevels	= yes
-Carpet::check_for_poison	= yes
-Carpet::checksum_timelevels	= yes
+ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetSlab IDSpaceTimeToy SpaceTimeToy IDHydroToy HydroToy"
 
 Cactus::cctk_itlast		= 480
 
 Time::dtfac			= 0.5
 
-driver::global_nx		= 34
-driver::global_ny		= 48
-driver::global_nz		= 64
-
-driver::ghost_size		= 2
+driver::global_nx		= 32
+driver::global_ny		= 46
+driver::global_nz		= 62
 
 Carpet::max_refinement_levels	= 3
-Carpet::prolongation_order_space= 3
-Carpet::prolongation_order_time	= 2
-
-CarpetRegrid::refinement_levels	= 3
 
 grid::type			= byrange
-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::xmin			= -4.8
+grid::ymin			= -6.6
+grid::zmin			= -9.0
+grid::xmax			=  4.5
+grid::ymax			=  6.9
+grid::zmax			=  9.3
 grid::mode			= periodic
 
-IO::out_dir			= "doubletoy_periodic_rl3"
+IO::outdir			= "doubletoy_periodic_rl3"
 
 IOBasic::outinfo_every		= 1 # 10
-IOBasic::outinfo_vars		= "spacetimetoy::spacetimeevolve hydrotoy::hydroevolve"
+#IOBasic::outinfo_vars		= "spacetimetoy::spacetimeevolve hydrotoy::hydroevolve"
 
-IOBasic::outScalar_every	= 1 # 2
-IOBasic::outScalar_vars		= "spacetimetoy::spacetimeevolve hydrotoy::hydroevolve"
+#IOBasic::outScalar_every	= 2
+#IOBasic::outScalar_vars		= "spacetimetoy::spacetimeevolve hydrotoy::hydroevolve"
 
 IOASCII::out1D_every		= 1 # 2
 IOASCII::out1D_vars		= "spacetimetoy::spacetimeevolve hydrotoy::hydroevolve grid::coordinates"
@@ -54,7 +44,6 @@ IOASCII::out1D_vars		= "spacetimetoy::spacetimeevolve hydrotoy::hydroevolve grid
 IOFlexIO::out3D_every		= 96
 IOFlexIO::out3D_vars		= "spacetimetoy::spacetimeevolve hydrotoy::hydroevolve"
 IOFlexIO::out3D_format		= IEEE
-IOFlexIO::out3D_extension	= ".vcamr"
 
 SpaceTimeToy::icn_iterations	= 2
 SpaceTimeToy::bound		= radiation
diff --git a/CarpetExtra/SpaceTimeToy/schedule.ccl b/CarpetExtra/SpaceTimeToy/schedule.ccl
index e536f3b56..af4820e8b 100644
--- a/CarpetExtra/SpaceTimeToy/schedule.ccl
+++ b/CarpetExtra/SpaceTimeToy/schedule.ccl
@@ -1,5 +1,5 @@
 # Schedule definitions for thorn SpaceTimeToy
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/schedule.ccl,v 1.3 2001/03/20 16:29:52 eschnett Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/schedule.ccl,v 1.4 2001/03/20 17:27:26 eschnett Exp $
 
 STORAGE: spacetimeevolve
 STORAGE: icn_state
@@ -27,7 +27,7 @@ schedule SpaceTimeToy_EulerStep at EVOL \
 	after HydroToy_EulerPredictor
 {
   LANG: Fortran
-  STORAGE: spacetimetemps
+  STORAGE: spacetimetemps hydrotemps
   SYNC: spacetimeevolve
 } "Initial Euler step"
   
@@ -38,6 +38,6 @@ schedule SpaceTimeToy_ICNStep at EVOL \
 	while SpaceTimeToy::do_iterate
 {
   LANG: Fortran
-  STORAGE: spacetimetemps
+  STORAGE: spacetimetemps hydrotemps
   SYNC: spacetimeevolve
 } "One ICN step"