Added new thorns CarpetReduce and CarpetRegrid to parameter files.

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

9 files changed, 63 insertions, 45 deletions

diff --git a/CarpetExtra/HydroToy/par/hydrotoy_periodic.par b/CarpetExtra/HydroToy/par/hydrotoy_periodic.par
index ac96d3e85..20d133da1 100644
--- a/CarpetExtra/HydroToy/par/hydrotoy_periodic.par
+++ b/CarpetExtra/HydroToy/par/hydrotoy_periodic.par
@@ -7,9 +7,9 @@
 #   @enddesc
 # @@*/
 #
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/HydroToy/par/hydrotoy_periodic.par,v 1.4 2001/04/23 08:10:18 schnetter Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/HydroToy/par/hydrotoy_periodic.par,v 1.5 2001/12/14 17:59:57 schnetter Exp $
 
-ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetSlab IDHydroToy HydroToy"
+ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetReduce CarpetRegrid CarpetSlab IDHydroToy HydroToy"
 
 Carpet::poison_new_timelevels	= yes
 Carpet::check_for_poison	= yes
@@ -37,10 +37,10 @@ grid::mode			= periodic
 IO::outdir			= "hydrotoy_periodic"
 
 IOBasic::outinfo_every		= 1 # 10
-#IOBasic::outinfo_vars		= "hydrotoy::hydroevolve"
+IOBasic::outinfo_vars		= "hydrotoy::hydroevolve"
 
-#IOBasic::outScalar_every	= 2
-#IOBasic::outScalar_vars		= "hydrotoy::hydroevolve"
+IOBasic::outScalar_every	= 1 # 2
+IOBasic::outScalar_vars		= "hydrotoy::hydroevolve"
 
 IOASCII::out1D_every		= 1 # 2
 IOASCII::out1D_vars		= "hydrotoy::hydroevolve grid::coordinates"
@@ -48,6 +48,7 @@ IOASCII::out1D_vars		= "hydrotoy::hydroevolve grid::coordinates"
 IOFlexIO::out3D_every		= 24
 IOFlexIO::out3D_vars		= "hydrotoy::hydroevolve"
 IOFlexIO::out3D_format		= IEEE
+IOFlexIO::out3D_extension	= ".amr"
 
 HydroToy::bound			= radiation
 
diff --git a/CarpetExtra/HydroToy/par/hydrotoy_periodic_coarse.par b/CarpetExtra/HydroToy/par/hydrotoy_periodic_coarse.par
index a047c4908..2211b0e37 100644
--- a/CarpetExtra/HydroToy/par/hydrotoy_periodic_coarse.par
+++ b/CarpetExtra/HydroToy/par/hydrotoy_periodic_coarse.par
@@ -7,9 +7,9 @@
 #   @enddesc
 # @@*/
 #
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/HydroToy/par/hydrotoy_periodic_coarse.par,v 1.3 2001/04/23 08:10:18 schnetter Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/HydroToy/par/hydrotoy_periodic_coarse.par,v 1.4 2001/12/14 17:59:57 schnetter Exp $
 
-ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetSlab IDHydroToy HydroToy"
+ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetReduce CarpetRegrid CarpetSlab IDHydroToy HydroToy"
 
 Carpet::poison_new_timelevels	= yes
 Carpet::check_for_poison	= yes
@@ -37,10 +37,10 @@ grid::mode			= periodic
 IO::outdir			= "hydrotoy_periodic_coarse"
 
 IOBasic::outinfo_every		= 1 # 10
-#IOBasic::outinfo_vars		= "hydrotoy::hydroevolve"
+IOBasic::outinfo_vars		= "hydrotoy::hydroevolve"
 
-#IOBasic::outScalar_every	= 2
-#IOBasic::outScalar_vars		= "hydrotoy::hydroevolve"
+IOBasic::outScalar_every	= 1 # 2
+IOBasic::outScalar_vars		= "hydrotoy::hydroevolve"
 
 IOASCII::out1D_every		= 1 # 2
 IOASCII::out1D_vars		= "hydrotoy::hydroevolve grid::coordinates"
@@ -48,6 +48,7 @@ IOASCII::out1D_vars		= "hydrotoy::hydroevolve grid::coordinates"
 IOFlexIO::out3D_every		= 12
 IOFlexIO::out3D_vars		= "hydrotoy::hydroevolve"
 IOFlexIO::out3D_format		= IEEE
+IOFlexIO::out3D_extension	= ".amr"
 
 HydroToy::bound			= radiation
 
diff --git a/CarpetExtra/HydroToy/par/hydrotoy_periodic_coarse_rl2.par b/CarpetExtra/HydroToy/par/hydrotoy_periodic_coarse_rl2.par
index 7f08bca65..b9aae769a 100644
--- a/CarpetExtra/HydroToy/par/hydrotoy_periodic_coarse_rl2.par
+++ b/CarpetExtra/HydroToy/par/hydrotoy_periodic_coarse_rl2.par
@@ -7,9 +7,9 @@
 #   @enddesc
 # @@*/
 #
-# $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 $
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/HydroToy/par/hydrotoy_periodic_coarse_rl2.par,v 1.5 2001/12/14 17:59:58 schnetter Exp $
 
-ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetSlab IDHydroToy HydroToy"
+ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetReduce CarpetRegrid CarpetSlab IDHydroToy HydroToy"
 
 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			= "hydrotoy_periodic_coarse_rl2"
 
 IOBasic::outinfo_every		= 1 # 10
-#IOBasic::outinfo_vars		= "hydrotoy::hydroevolve"
+IOBasic::outinfo_vars		= "hydrotoy::hydroevolve"
 
-#IOBasic::outScalar_every	= 2
-#IOBasic::outScalar_vars		= "hydrotoy::hydroevolve"
+IOBasic::outScalar_every	= 1 # 2
+IOBasic::outScalar_vars		= "hydrotoy::hydroevolve"
 
 IOASCII::out1D_every		= 1 # 2
 IOASCII::out1D_vars		= "hydrotoy::hydroevolve grid::coordinates"
@@ -52,6 +54,7 @@ IOASCII::out1D_vars		= "hydrotoy::hydroevolve grid::coordinates"
 IOFlexIO::out3D_every		= 24
 IOFlexIO::out3D_vars		= "hydrotoy::hydroevolve"
 IOFlexIO::out3D_format		= IEEE
+IOFlexIO::out3D_extension	= ".amr"
 
 HydroToy::bound			= radiation
 
diff --git a/CarpetExtra/HydroToy/par/hydrotoy_periodic_coarse_rl3.par b/CarpetExtra/HydroToy/par/hydrotoy_periodic_coarse_rl3.par
index 5f9cf7790..72cde35ee 100644
--- a/CarpetExtra/HydroToy/par/hydrotoy_periodic_coarse_rl3.par
+++ b/CarpetExtra/HydroToy/par/hydrotoy_periodic_coarse_rl3.par
@@ -7,9 +7,9 @@
 #   @enddesc
 # @@*/
 #
-# $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 $
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/HydroToy/par/hydrotoy_periodic_coarse_rl3.par,v 1.5 2001/12/14 17:59:58 schnetter Exp $
 
-ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetSlab IDHydroToy HydroToy"
+ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetReduce CarpetRegrid CarpetSlab IDHydroToy HydroToy"
 
 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			= "hydrotoy_periodic_coarse_rl3"
 
 IOBasic::outinfo_every		= 1 # 10
-#IOBasic::outinfo_vars		= "hydrotoy::hydroevolve"
+IOBasic::outinfo_vars		= "hydrotoy::hydroevolve"
 
-#IOBasic::outScalar_every	= 2
-#IOBasic::outScalar_vars		= "hydrotoy::hydroevolve"
+IOBasic::outScalar_every	= 1 # 2
+IOBasic::outScalar_vars		= "hydrotoy::hydroevolve"
 
 IOASCII::out1D_every		= 1 # 2
 IOASCII::out1D_vars		= "hydrotoy::hydroevolve grid::coordinates"
@@ -52,6 +54,7 @@ IOASCII::out1D_vars		= "hydrotoy::hydroevolve grid::coordinates"
 IOFlexIO::out3D_every		= 48
 IOFlexIO::out3D_vars		= "hydrotoy::hydroevolve"
 IOFlexIO::out3D_format		= IEEE
+IOFlexIO::out3D_extension	= ".amr"
 
 HydroToy::bound			= radiation
 
diff --git a/CarpetExtra/HydroToy/par/hydrotoy_periodic_rl2.par b/CarpetExtra/HydroToy/par/hydrotoy_periodic_rl2.par
index 5b1fe7f03..252547e5e 100644
--- a/CarpetExtra/HydroToy/par/hydrotoy_periodic_rl2.par
+++ b/CarpetExtra/HydroToy/par/hydrotoy_periodic_rl2.par
@@ -7,9 +7,9 @@
 #   @enddesc
 # @@*/
 #
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/HydroToy/par/hydrotoy_periodic_rl2.par,v 1.4 2001/04/23 08:10:18 schnetter Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/HydroToy/par/hydrotoy_periodic_rl2.par,v 1.5 2001/12/14 17:59:58 schnetter Exp $
 
-ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetSlab IDHydroToy HydroToy"
+ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetReduc CarpetRegrid CarpetSlab IDHydroToy HydroToy"
 
 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.1
 grid::ymin			= -6.9
@@ -41,10 +43,10 @@ grid::mode			= periodic
 IO::outdir			= "hydrotoy_periodic_rl2"
 
 IOBasic::outinfo_every		= 1 # 10
-#IOBasic::outinfo_vars		= "hydrotoy::hydroevolve"
+IOBasic::outinfo_vars		= "hydrotoy::hydroevolve"
 
-#IOBasic::outScalar_every	= 2
-#IOBasic::outScalar_vars		= "hydrotoy::hydroevolve"
+IOBasic::outScalar_every	= 1 # 2
+IOBasic::outScalar_vars		= "hydrotoy::hydroevolve"
 
 IOASCII::out1D_every		= 1 # 2
 IOASCII::out1D_vars		= "hydrotoy::hydroevolve grid::coordinates"
@@ -52,6 +54,7 @@ IOASCII::out1D_vars		= "hydrotoy::hydroevolve grid::coordinates"
 IOFlexIO::out3D_every		= 48
 IOFlexIO::out3D_vars		= "hydrotoy::hydroevolve"
 IOFlexIO::out3D_format		= IEEE
+IOFlexIO::out3D_extension	= ".amr"
 
 HydroToy::bound			= radiation
 
diff --git a/CarpetExtra/HydroToy/par/hydrotoy_periodic_rl3.par b/CarpetExtra/HydroToy/par/hydrotoy_periodic_rl3.par
index d1fd53bbb..4363da750 100644
--- a/CarpetExtra/HydroToy/par/hydrotoy_periodic_rl3.par
+++ b/CarpetExtra/HydroToy/par/hydrotoy_periodic_rl3.par
@@ -7,9 +7,9 @@
 #   @enddesc
 # @@*/
 #
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/HydroToy/par/hydrotoy_periodic_rl3.par,v 1.4 2001/04/23 08:10:18 schnetter Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/HydroToy/par/hydrotoy_periodic_rl3.par,v 1.5 2001/12/14 17:59:58 schnetter Exp $
 
-ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetSlab IDHydroToy HydroToy"
+ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetReduce CarpetRegrid CarpetSlab IDHydroToy HydroToy"
 
 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	= 2
+
 grid::type			= byrange
 grid::xmin			= -5.1
 grid::ymin			= -6.9
@@ -41,10 +43,10 @@ grid::mode			= periodic
 IO::outdir			= "hydrotoy_periodic_rl3"
 
 IOBasic::outinfo_every		= 1 # 10
-#IOBasic::outinfo_vars		= "hydrotoy::hydroevolve"
+IOBasic::outinfo_vars		= "hydrotoy::hydroevolve"
 
-#IOBasic::outScalar_every	= 2
-#IOBasic::outScalar_vars		= "hydrotoy::hydroevolve"
+IOBasic::outScalar_every	= 1 # 2
+IOBasic::outScalar_vars		= "hydrotoy::hydroevolve"
 
 IOASCII::out1D_every		= 1 # 2
 IOASCII::out1D_vars		= "hydrotoy::hydroevolve grid::coordinates"
@@ -52,6 +54,7 @@ IOASCII::out1D_vars		= "hydrotoy::hydroevolve grid::coordinates"
 IOFlexIO::out3D_every		= 96
 IOFlexIO::out3D_vars		= "hydrotoy::hydroevolve"
 IOFlexIO::out3D_format		= IEEE
+IOFlexIO::out3D_extension	= ".amr"
 
 HydroToy::bound			= radiation
 
diff --git a/CarpetExtra/HydroToy/test/hydrotoy_periodic_coarse.par b/CarpetExtra/HydroToy/test/hydrotoy_periodic_coarse.par
index 874668850..896b0953e 100644
--- a/CarpetExtra/HydroToy/test/hydrotoy_periodic_coarse.par
+++ b/CarpetExtra/HydroToy/test/hydrotoy_periodic_coarse.par
@@ -1,8 +1,8 @@
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/HydroToy/test/hydrotoy_periodic_coarse.par,v 1.1 2001/12/03 17:26:30 schnetter Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/HydroToy/test/hydrotoy_periodic_coarse.par,v 1.2 2001/12/14 17:59:59 schnetter Exp $
 
 !DESC "HydroToy with periodic boundaries, no refinement"
 
-ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetLib CarpetSlab IDHydroToy HydroToy"
+ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetLib CarpetReduce CarpetRegrid CarpetSlab IDHydroToy HydroToy"
 
 Carpet::poison_new_timelevels	= yes
 Carpet::check_for_poison	= yes
@@ -30,10 +30,10 @@ grid::mode			= periodic
 IO::outdir			= "hydrotoy_periodic_coarse"
 
 IOBasic::outinfo_every		= 1 # 10
-#IOBasic::outinfo_vars		= "hydrotoy::hydroevolve"
+IOBasic::outinfo_vars		= "hydrotoy::hydroevolve"
 
-#IOBasic::outScalar_every	= 2
-#IOBasic::outScalar_vars		= "hydrotoy::hydroevolve"
+IOBasic::outScalar_every	= 1 # 2
+IOBasic::outScalar_vars		= "hydrotoy::hydroevolve"
 
 IOASCII::out1D_every		= 1 # 2
 IOASCII::out1D_vars		= "hydrotoy::hydroevolve grid::coordinates"
diff --git a/CarpetExtra/HydroToy/test/hydrotoy_periodic_coarse_rl2.par b/CarpetExtra/HydroToy/test/hydrotoy_periodic_coarse_rl2.par
index 80a8b9500..614d35b13 100644
--- a/CarpetExtra/HydroToy/test/hydrotoy_periodic_coarse_rl2.par
+++ b/CarpetExtra/HydroToy/test/hydrotoy_periodic_coarse_rl2.par
@@ -1,8 +1,8 @@
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/HydroToy/test/hydrotoy_periodic_coarse_rl2.par,v 1.1 2001/12/03 17:26:30 schnetter Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/HydroToy/test/hydrotoy_periodic_coarse_rl2.par,v 1.2 2001/12/14 17:59:59 schnetter Exp $
 
 !DESC "HydroToy with periodic boundaries, 1 refinement level"
 
-ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetLib CarpetSlab IDHydroToy HydroToy"
+ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetLib CarpetReduce CarpetRegrid CarpetSlab IDHydroToy HydroToy"
 
 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			= "hydrotoy_periodic_coarse_rl2"
 
 IOBasic::outinfo_every		= 1 # 10
-#IOBasic::outinfo_vars		= "hydrotoy::hydroevolve"
+IOBasic::outinfo_vars		= "hydrotoy::hydroevolve"
 
-#IOBasic::outScalar_every	= 2
-#IOBasic::outScalar_vars		= "hydrotoy::hydroevolve"
+IOBasic::outScalar_every	= 1 # 2
+IOBasic::outScalar_vars		= "hydrotoy::hydroevolve"
 
 IOASCII::out1D_every		= 1 # 2
 IOASCII::out1D_vars		= "hydrotoy::hydroevolve grid::coordinates"
diff --git a/CarpetExtra/HydroToy/test/hydrotoy_periodic_coarse_rl3.par b/CarpetExtra/HydroToy/test/hydrotoy_periodic_coarse_rl3.par
index 6cab609e0..48ebcfe02 100644
--- a/CarpetExtra/HydroToy/test/hydrotoy_periodic_coarse_rl3.par
+++ b/CarpetExtra/HydroToy/test/hydrotoy_periodic_coarse_rl3.par
@@ -1,8 +1,8 @@
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/HydroToy/test/hydrotoy_periodic_coarse_rl3.par,v 1.1 2001/12/03 17:26:31 schnetter Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/HydroToy/test/hydrotoy_periodic_coarse_rl3.par,v 1.2 2001/12/14 17:59:59 schnetter Exp $
 
 !DESC "WaveToy with periodic boundaries, 2 refinement levels"
 
-ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetLib CarpetSlab IDHydroToy HydroToy"
+ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetLib CarpetReduce CarpetRegrid CarpetSlab IDHydroToy HydroToy"
 
 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	= 3
+
 grid::type			= byrange
 grid::xmin			= -5.4
 grid::ymin			= -7.2
@@ -34,10 +36,10 @@ grid::mode			= periodic
 IO::outdir			= "hydrotoy_periodic_coarse_rl3"
 
 IOBasic::outinfo_every		= 1 # 10
-#IOBasic::outinfo_vars		= "hydrotoy::hydroevolve"
+IOBasic::outinfo_vars		= "hydrotoy::hydroevolve"
 
-#IOBasic::outScalar_every	= 2
-#IOBasic::outScalar_vars		= "hydrotoy::hydroevolve"
+IOBasic::outScalar_every	= 1 # 2
+IOBasic::outScalar_vars		= "hydrotoy::hydroevolve"
 
 IOASCII::out1D_every		= 1 # 2
 IOASCII::out1D_vars		= "hydrotoy::hydroevolve grid::coordinates"