Added new thorns CarpetReduce and CarpetRegrid to parameter files.

darcs-hash:20011214165954-07bb3-e68f15a15027098cd26981663394a4365aee510d.gz

6 files changed, 41 insertions, 30 deletions

diff --git a/CarpetExtra/WaveToyF77/par/wavetoyf77_periodic_coarse.par b/CarpetExtra/WaveToyF77/par/wavetoyf77_periodic_coarse.par
index be0cb3621..2dc0e8ef8 100644
--- a/CarpetExtra/WaveToyF77/par/wavetoyf77_periodic_coarse.par
+++ b/CarpetExtra/WaveToyF77/par/wavetoyf77_periodic_coarse.par
@@ -7,9 +7,9 @@
 #   @enddesc
 # @@*/
 #
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyF77/par/wavetoyf77_periodic_coarse.par,v 1.6 2001/03/30 00:50:49 eschnett Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyF77/par/wavetoyf77_periodic_coarse.par,v 1.7 2001/12/14 18:00:07 schnetter Exp $
 
-ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetSlab IDScalarWave WaveToyF77"
+ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetReduce CarpetRegrid CarpetSlab IDScalarWave WaveToyF77"
 
 Carpet::poison_new_timelevels	= yes
 Carpet::check_for_poison	= yes
@@ -37,10 +37,10 @@ grid::mode			= periodic
 IO::outdir			= "wavetoyf77_periodic_coarse"
 
 IOBasic::outinfo_every		= 1 # 10
-#IOBasic::outinfo_vars		= "wavetoy::phi"
+IOBasic::outinfo_vars		= "wavetoy::phi"
 
-#IOBasic::outScalar_every	= 2
-#IOBasic::outScalar_vars		= "wavetoy::phi"
+IOBasic::outScalar_every	= 1 # 2
+IOBasic::outScalar_vars		= "wavetoy::phi"
 
 IOASCII::out1D_every		= 1 # 2
 IOASCII::out1D_vars		= "wavetoy::phi grid::coordinates"
@@ -48,6 +48,7 @@ IOASCII::out1D_vars		= "wavetoy::phi grid::coordinates"
 IOFlexIO::out3D_every		= 12
 IOFlexIO::out3D_vars		= "wavetoy::phi"
 IOFlexIO::out3D_format		= IEEE
+IOFlexIO::out3D_extension	= ".amr"
 
 WaveToyF77::bound		= radiation
 
diff --git a/CarpetExtra/WaveToyF77/par/wavetoyf77_periodic_coarse_rl2.par b/CarpetExtra/WaveToyF77/par/wavetoyf77_periodic_coarse_rl2.par
index 2f2f9181c..6a28f956b 100644
--- a/CarpetExtra/WaveToyF77/par/wavetoyf77_periodic_coarse_rl2.par
+++ b/CarpetExtra/WaveToyF77/par/wavetoyf77_periodic_coarse_rl2.par
@@ -7,9 +7,9 @@
 #   @enddesc
 # @@*/
 #
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyF77/par/wavetoyf77_periodic_coarse_rl2.par,v 1.9 2001/03/30 00:50:49 eschnett Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyF77/par/wavetoyf77_periodic_coarse_rl2.par,v 1.10 2001/12/14 18:00:07 schnetter Exp $
 
-ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetSlab IDScalarWave WaveToyF77"
+ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetReduce CarpetRegrid CarpetSlab IDScalarWave WaveToyF77"
 
 Carpet::poison_new_timelevels	= yes
 Carpet::check_for_poison	= yes
@@ -29,6 +29,8 @@ 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
@@ -41,10 +43,10 @@ grid::mode			= periodic
 IO::outdir			= "wavetoyf77_periodic_coarse_rl2"
 
 IOBasic::outinfo_every		= 1 # 10
-#IOBasic::outinfo_vars		= "wavetoy::phi"
+IOBasic::outinfo_vars		= "wavetoy::phi"
 
-#IOBasic::outScalar_every	= 2
-#IOBasic::outScalar_vars		= "wavetoy::phi"
+IOBasic::outScalar_every	= 1 # 2
+IOBasic::outScalar_vars		= "wavetoy::phi"
 
 IOASCII::out1D_every		= 1 # 2
 IOASCII::out1D_vars		= "wavetoy::phi grid::coordinates"
@@ -52,6 +54,7 @@ IOASCII::out1D_vars		= "wavetoy::phi grid::coordinates"
 IOFlexIO::out3D_every		= 24
 IOFlexIO::out3D_vars		= "wavetoy::phi"
 IOFlexIO::out3D_format		= IEEE
+IOFlexIO::out3D_extension	= ".amr"
 
 WaveToyF77::bound		= radiation
 
diff --git a/CarpetExtra/WaveToyF77/par/wavetoyf77_periodic_coarse_rl3.par b/CarpetExtra/WaveToyF77/par/wavetoyf77_periodic_coarse_rl3.par
index 6d5d978f9..5e11bea6d 100644
--- a/CarpetExtra/WaveToyF77/par/wavetoyf77_periodic_coarse_rl3.par
+++ b/CarpetExtra/WaveToyF77/par/wavetoyf77_periodic_coarse_rl3.par
@@ -7,9 +7,9 @@
 #   @enddesc
 # @@*/
 #
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyF77/par/wavetoyf77_periodic_coarse_rl3.par,v 1.8 2001/03/30 00:50:49 eschnett Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyF77/par/wavetoyf77_periodic_coarse_rl3.par,v 1.9 2001/12/14 18:00:07 schnetter Exp $
 
-ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetSlab IDScalarWave WaveToyF77"
+ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetReduce CarpetRegrid CarpetSlab IDScalarWave WaveToyF77"
 
 Carpet::poison_new_timelevels	= yes
 Carpet::check_for_poison	= yes
@@ -29,6 +29,8 @@ 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
@@ -41,10 +43,10 @@ grid::mode			= periodic
 IO::outdir			= "wavetoyf77_periodic_coarse_rl3"
 
 IOBasic::outinfo_every		= 1 # 10
-#IOBasic::outinfo_vars		= "wavetoy::phi"
+IOBasic::outinfo_vars		= "wavetoy::phi"
 
-#IOBasic::outScalar_every	= 2
-#IOBasic::outScalar_vars		= "wavetoy::phi"
+IOBasic::outScalar_every	= 1 # 2
+IOBasic::outScalar_vars		= "wavetoy::phi"
 
 IOASCII::out1D_every		= 1 # 2
 IOASCII::out1D_vars		= "wavetoy::phi grid::coordinates"
@@ -52,6 +54,7 @@ IOASCII::out1D_vars		= "wavetoy::phi grid::coordinates"
 IOFlexIO::out3D_every		= 48
 IOFlexIO::out3D_vars		= "wavetoy::phi"
 IOFlexIO::out3D_format		= IEEE
+IOFlexIO::out3D_extension	= ".amr"
 
 WaveToyF77::bound		= radiation
 
diff --git a/CarpetExtra/WaveToyF77/test/wavetoyf77_periodic_coarse.par b/CarpetExtra/WaveToyF77/test/wavetoyf77_periodic_coarse.par
index fd559492c..5860eb508 100644
--- a/CarpetExtra/WaveToyF77/test/wavetoyf77_periodic_coarse.par
+++ b/CarpetExtra/WaveToyF77/test/wavetoyf77_periodic_coarse.par
@@ -1,8 +1,8 @@
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyF77/test/wavetoyf77_periodic_coarse.par,v 1.3 2001/12/03 17:22:09 schnetter Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyF77/test/wavetoyf77_periodic_coarse.par,v 1.4 2001/12/14 18:00:08 schnetter Exp $
 
 !DESC "WaveToy with periodic boundaries, no refinement"
 
-ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetLib CarpetSlab IDScalarWave WaveToyF77"
+ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetLib CarpetReduce CarpetRegrid CarpetSlab IDScalarWave WaveToyF77"
 
 Carpet::poison_new_timelevels	= yes
 Carpet::check_for_poison	= yes
@@ -30,10 +30,10 @@ grid::mode			= periodic
 IO::outdir			= "wavetoyf77_periodic_coarse"
 
 IOBasic::outinfo_every		= 1 # 10
-#IOBasic::outinfo_vars		= "wavetoy::phi"
+IOBasic::outinfo_vars		= "wavetoy::phi"
 
-#IOBasic::outScalar_every	= 2
-#IOBasic::outScalar_vars		= "wavetoy::phi"
+IOBasic::outScalar_every	= 1 # 2
+IOBasic::outScalar_vars		= "wavetoy::phi"
 
 IOASCII::out1D_every		= 1 # 2
 IOASCII::out1D_vars		= "wavetoy::phi grid::coordinates"
diff --git a/CarpetExtra/WaveToyF77/test/wavetoyf77_periodic_coarse_rl2.par b/CarpetExtra/WaveToyF77/test/wavetoyf77_periodic_coarse_rl2.par
index 32a33264d..11589634f 100644
--- a/CarpetExtra/WaveToyF77/test/wavetoyf77_periodic_coarse_rl2.par
+++ b/CarpetExtra/WaveToyF77/test/wavetoyf77_periodic_coarse_rl2.par
@@ -1,8 +1,8 @@
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyF77/test/wavetoyf77_periodic_coarse_rl2.par,v 1.3 2001/12/03 17:22:09 schnetter Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyF77/test/wavetoyf77_periodic_coarse_rl2.par,v 1.4 2001/12/14 18:00:08 schnetter Exp $
 
 !DESC "WaveToy with periodic boundaries, 1 refinement level"
 
-ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetLib CarpetSlab IDScalarWave WaveToyF77"
+ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetLib CarpetReduce CarpetRegrid CarpetSlab IDScalarWave WaveToyF77"
 
 Carpet::poison_new_timelevels	= yes
 Carpet::check_for_poison	= yes
@@ -22,6 +22,8 @@ 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
@@ -34,10 +36,10 @@ grid::mode			= periodic
 IO::outdir			= "wavetoyf77_periodic_coarse_rl2"
 
 IOBasic::outinfo_every		= 1 # 10
-#IOBasic::outinfo_vars		= "wavetoy::phi"
+IOBasic::outinfo_vars		= "wavetoy::phi"
 
-#IOBasic::outScalar_every	= 2
-#IOBasic::outScalar_vars		= "wavetoy::phi"
+IOBasic::outScalar_every	= 1 # 2
+IOBasic::outScalar_vars		= "wavetoy::phi"
 
 IOASCII::out1D_every		= 1 # 2
 IOASCII::out1D_vars		= "wavetoy::phi grid::coordinates"
diff --git a/CarpetExtra/WaveToyF77/test/wavetoyf77_periodic_coarse_rl3.par b/CarpetExtra/WaveToyF77/test/wavetoyf77_periodic_coarse_rl3.par
index abc941b69..cb248f61f 100644
--- a/CarpetExtra/WaveToyF77/test/wavetoyf77_periodic_coarse_rl3.par
+++ b/CarpetExtra/WaveToyF77/test/wavetoyf77_periodic_coarse_rl3.par
@@ -1,8 +1,8 @@
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyF77/test/wavetoyf77_periodic_coarse_rl3.par,v 1.3 2001/12/03 17:22:09 schnetter Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyF77/test/wavetoyf77_periodic_coarse_rl3.par,v 1.4 2001/12/14 18:00:08 schnetter Exp $
 
 !DESC "WaveToy with periodic boundaries, 2 refinement levels"
 
-ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetLib CarpetSlab IDScalarWave WaveToyF77"
+ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetLib CarpetReduce CarpetRegrid CarpetSlab IDScalarWave WaveToyF77"
 
 Carpet::poison_new_timelevels	= yes
 Carpet::check_for_poison	= yes
@@ -22,6 +22,8 @@ Carpet::max_refinement_levels	= 3
 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
@@ -34,10 +36,10 @@ grid::mode			= periodic
 IO::outdir			= "wavetoyf77_periodic_coarse_rl3"
 
 IOBasic::outinfo_every		= 1 # 10
-#IOBasic::outinfo_vars		= "wavetoy::phi"
+IOBasic::outinfo_vars		= "wavetoy::phi"
 
-#IOBasic::outScalar_every	= 2
-#IOBasic::outScalar_vars		= "wavetoy::phi"
+IOBasic::outScalar_every	= 1 # 2
+IOBasic::outScalar_vars		= "wavetoy::phi"
 
 IOASCII::out1D_every		= 1 # 2
 IOASCII::out1D_vars		= "wavetoy::phi grid::coordinates"