Renamed test cases, and removed old output.

darcs-hash:20010311105716-f6438-188130d70d00bfcad75a4fc80412c65fdfb4e324.gz

3 files changed, 73 insertions, 83 deletions

diff --git a/CarpetExtra/WaveToyF77/test/wavetoyf77.par b/CarpetExtra/WaveToyF77/test/wavetoyf77.par
index bc76c0dea..bb5c5422e 100644
--- a/CarpetExtra/WaveToyF77/test/wavetoyf77.par
+++ b/CarpetExtra/WaveToyF77/test/wavetoyf77.par
@@ -1,40 +1,30 @@
-# /*@@
-#   @file      wavetoyf77.par
-#   @date      2001-03-11
-#   @author    Erik Schnetter
-#   @desc
-#   Wavetoy parameter file demonstrating minimal evolution
-#   @enddesc
-# @@*/
-#
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyF77/test/wavetoyf77.par,v 1.6 2004/03/23 12:00:37 schnetter Exp $
-
 !DESC "Octant evolution with no boundary condition"
 
-ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Slab Carpet CarpetIOASCII CarpetLib CarpetSlab IDScalarWave WaveToyF77"
+ActiveThorns = "time wavetoyf77 idscalarwave pugh pughreduce cartgrid3d ioutil iobasic ioascii"
+
+grid::type  = "box"
 
-Time::dtfac			= 0.5
+time::dtfac = 0.5
 
-Carpet::global_nx		= 20
-Carpet::global_ny		= 20
-Carpet::global_nz		= 20
+idscalarwave::initial_data = "gaussian"
+idscalarwave::sigma        = 0.1
+idscalarwave::radius       = 0
 
-grid::type			= byrange
-grid::xyzmin			= -1.0
-grid::xyzmax			= +1.0
+driver::global_nx = 20
+driver::global_ny = 20
+driver::global_nz = 20
 
-grid::mode			= none
+cactus::cctk_itlast       = 10
 
-WaveToy::bound			= zero
+IOASCII::out1D_every = 2
+IOASCII::out1D_vars = "wavetoy::phi "
+IOASCII::out1D_z = "no"
 
-IO::out_dir			= "wavetoyf77"
+IOBasic::outScalar_every = 2
+IOBasic::outScalar_vars = "wavetoy::phi "
 
-IOBasic::outInfo_every		= 1
-#IOBasic::outInfo_vars		= "wavetoy::phi"
+IOBasic::outInfo_every = 2
+IOBasic::outInfo_vars = "wavetoy::phi "
 
-#IOBasic::outScalar_every	= 1
-#IOBasic::outScalar_vars		= "wavetoy::phi"
-#IOBasic::outScalar_style	= gnuplot
+IO::outdir = "test_wavetoyf77"
 
-IOASCII::out1D_every		= 1
-IOASCII::out1D_vars		= "wavetoy::phi"
diff --git a/CarpetExtra/WaveToyF77/test/wavetoyf77_rad.par b/CarpetExtra/WaveToyF77/test/wavetoyf77_rad.par
index 759b7479b..a3c1a854e 100644
--- a/CarpetExtra/WaveToyF77/test/wavetoyf77_rad.par
+++ b/CarpetExtra/WaveToyF77/test/wavetoyf77_rad.par
@@ -1,43 +1,43 @@
+!DESC "Octant evolution with radiation boundaries"
+# $Id: wavetoyf77_rad.par,v 1.1 2001/03/11 11:57:16 eschnett Exp $
+#
 # /*@@
-#   @file      wavetoyf77_rad.par
-#   @date      2001-03-06
-#   @author    Erik Schnetter
+#   @file      test_rad.par
+#   @date      Saturday 18 Sept 1999
+#   @author    Gabrielle Allen
 #   @desc
-#   Wavetoy parameter file demonstrating radiation boundaries in octant mode
+#   Wavetoy parameter file demonstrating radiation boundaries in Octant
 #   @enddesc
-# @@*/
-#
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyF77/test/wavetoyf77_rad.par,v 1.5 2004/03/23 12:00:37 schnetter Exp $
+# @@*/          
 
-!DESC "Octant evolution with radiation boundaries"
+ActiveThorns = "boundary iobasic idscalarwave time wavetoyf77 pugh pughreduce cartgrid3d ioutil ioascii"
+ 
+time::dtfac = 0.5
 
-ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Slab Carpet CarpetIOASCII CarpetLib CarpetSlab IDScalarWave WaveToyF77"
+idscalarwave::initial_data = "gaussian"
+idscalarwave::sigma = 2.8
+idscalarwave::radius = 5
 
-Cactus::cctk_itlast		= 4
- 
-Time::dtfac			= 0.5
+wavetoyf77::bound = "radiation"
 
-driver::global_nx		= 10
-driver::global_ny		= 10
-driver::global_nz		= 10
+grid::type = "BySpacing"
+grid::domain = "octant"
+grid::dxyz = 0.6
 
-grid::type			= byspacing
-grid::mode			= octant
-grid::dxyz			= 0.6
- 
-IO::out_dir			= "wavetoyf77_rad"
+driver::global_nx = 15
+driver::global_ny = 15
+driver::global_nz = 15
 
-IOBasic::outinfo_every		= 1
-#IOBasic::outinfo_vars		= "wavetoy::phi"
+cactus::cctk_itlast = 10
 
-#IOBasic::outScalar_every	= 1
-#IOBasic::outScalar_vars		= "wavetoy::phi"
+IOBASIC::outScalar_every = 1
+IOBASIC::outScalar_vars = "wavetoy::phi"
 
-IOASCII::out1D_every		= 1
-IOASCII::out1D_vars		= "wavetoy::phi "
+IOASCII::out1D_every = 1
+IOASCII::out1D_z = "no"
+IOASCII::out1D_y = "no"
+IOASCII::out1D_d = "no"
+IOASCII::out1D_vars = "wavetoy::phi "
 
-WaveToyF77::bound		= radiation
+IO::outdir = "test_rad"
 
-IDScalarWave::initial_data	= gaussian
-IDScalarWave::sigma		= 2.8
-IDScalarWave::radius		= 0
diff --git a/CarpetExtra/WaveToyF77/test/wavetoyf77_rob.par b/CarpetExtra/WaveToyF77/test/wavetoyf77_rob.par
index a6d1a4484..3cebed400 100644
--- a/CarpetExtra/WaveToyF77/test/wavetoyf77_rob.par
+++ b/CarpetExtra/WaveToyF77/test/wavetoyf77_rob.par
@@ -1,4 +1,5 @@
-# $Id: wavetoyf77_rob.par,v 1.4 2003/04/09 18:33:01 schnetter Exp $
+!DESC "Octant evolution with robin boundaries"
+# $Id: wavetoyf77_rob.par,v 1.1 2001/03/11 11:57:16 eschnett Exp $
 #
 # /*@@
 #   @file      test_rad.par
@@ -9,35 +10,34 @@
 #   @enddesc
 # @@*/          
 
-!DESC "Octant evolution with robin boundaries"
+ActiveThorns = "boundary iobasic idscalarwave time wavetoyf77 pugh pughreduce cartgrid3d ioutil ioascii"
+ 
+time::dtfac = 0.5
 
-ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Slab Carpet CarpetIOASCII CarpetLib CarpetSlab IDScalarWave WaveToyF77"
+idscalarwave::initial_data = "gaussian"
+idscalarwave::sigma = 2.8
+idscalarwave::radius = 5
 
-Cactus::cctk_itlast		= 4
- 
-Time::dtfac			= 0.5
+wavetoyf77::bound = "robin"
 
-driver::global_nx		= 10
-driver::global_ny		= 10
-driver::global_nz		= 10
+grid::type = "BySpacing"
+grid::domain = "octant"
+grid::dxyz = 0.6
 
-grid::type			= byspacing
-grid::mode			= octant
-grid::dxyz			= 0.6
- 
-IO::out_dir			= "wavetoyf77_rob"
+driver::global_nx = 10
+driver::global_ny = 10
+driver::global_nz = 10
 
-IOBasic::outinfo_every		= 1
-#IOBasic::outinfo_vars		= "wavetoy::phi"
+cactus::cctk_itlast = 4
 
-#IOBasic::outScalar_every	= 1
-#IOBasic::outScalar_vars		= "wavetoy::phi"
+IOBASIC::outScalar_every = 1
+IOBASIC::outScalar_vars = "wavetoy::phi"
 
-IOASCII::out1D_every		= 1
-IOASCII::out1D_vars		= "wavetoy::phi "
+IOASCII::out1D_every = 1
+IOASCII::out1D_z = "no"
+IOASCII::out1D_y = "no"
+IOASCII::out1D_d = "no"
+IOASCII::out1D_vars = "wavetoy::phi "
 
-WaveToyF77::bound		= robin
+IO::outdir = "test_rob"
 
-IDScalarWave::initial_data	= gaussian
-IDScalarWave::sigma		= 2.8
-IDScalarWave::radius		= 5