* updated cp/recovery par files -- now using CarpetRegrid2

* added new cp/recovery par files for cell-centered case

4 files changed, 272 insertions, 13 deletions

diff --git a/Carpet/CarpetIOHDF5/par/CarpetWaveToyCheckpointTest.par b/Carpet/CarpetIOHDF5/par/CarpetWaveToyCheckpointTest.par
index df45c33b7..1ce04b2e0 100644
--- a/Carpet/CarpetIOHDF5/par/CarpetWaveToyCheckpointTest.par
+++ b/Carpet/CarpetIOHDF5/par/CarpetWaveToyCheckpointTest.par
@@ -1,9 +1,9 @@
-ActiveThorns = "Boundary CartGrid3D Time CoordBase InitBase SymBase Carpet CarpetReduce LoopControl GSL CarpetLib CarpetRegrid IOUtil CarpetIOBasic CarpetIOASCII HDF5 CarpetIOHDF5 HDF5 IDScalarWaveC WaveToyC"
+ActiveThorns = "Boundary CartGrid3D Time CoordBase InitBase SymBase Carpet CarpetReduce LoopControl GSL CarpetLib CarpetRegrid2 IOUtil CarpetIOBasic CarpetIOASCII HDF5 CarpetIOHDF5 HDF5 IDScalarWaveC WaveToyC Coordbase CarpetIOScalar"
 
 
-Cactus::cctk_itlast = 12
+Cactus::cctk_itlast = 24
 
-Time::dtfac = 0.5
+Time::dtfac = 0.25
 
 InitBase::initial_data_setup_method = "init_all_levels"
 
@@ -11,18 +11,44 @@ IDScalarWave::initial_data = "gaussian"
 IDScalarWave::sigma        = 2.8
 IDScalarWave::radius       = 0.0
 
-Grid::avoid_origin = "no"
-Grid::type         = "byrange"
-Grid::dxyz         = 1
 
-Driver::global_nsize = 20
-Driver::ghost_size   = 2
+CartGrid3D::type           = "coordbase"
+CartGrid3D::domain         = "full"
+CartGrid3D::avoid_originx  = no
+CartGrid3D::avoid_originy  = no
+CartGrid3D::avoid_originz  = no
+CoordBase::domainsize = "minmax"
+CoordBase::xmin       = -10.0
+CoordBase::ymin       = -10.0
+CoordBase::zmin       = -10.0
+CoordBase::xmax       = 10.0
+CoordBase::ymax       = 10.0
+CoordBase::zmax       = 10.0
+CoordBase::spacing  = "gridspacing"
+CoordBase::dx = 0.5
+CoordBase::dy = 0.5
+CoordBase::dz = 0.5
+
+CoordBase::boundary_size_x_lower      = 2
+CoordBase::boundary_size_y_lower      = 2
+CoordBase::boundary_size_z_lower      = 2
+CoordBase::boundary_size_x_upper      = 2
+CoordBase::boundary_size_y_upper      = 2
+CoordBase::boundary_size_z_upper      = 2
 
+Carpet::domain_from_coordbase = yes
+Driver::ghost_size   = 2
 Carpet::prolongation_order_space = 3
 Carpet::prolongation_order_time  = 2
 Carpet::max_refinement_levels    = 2
 
-CarpetRegrid::refinement_levels  = 2
+CarpetRegrid2::ensure_proper_nesting = yes
+CarpetRegrid2::num_centres      = 1
+CarpetRegrid2::position_x_1 	= 0
+CarpetRegrid2::position_y_1 	= 0
+CarpetRegrid2::position_z_1 	= 0
+CarpetRegrid2::num_levels_1     = 1
+CarpetRegrid2::radius_1[1]      = 5.0
 
 # Output
 IO::out_dir = $parfile
@@ -35,9 +61,14 @@ IOASCII::out1D_every = 12
 IOASCII::out3D_vars  = "wavetoy::phi"
 IOASCII::out3D_every = 12
 
+carpetioscalar::outScalar_vars = "wavetoy::phi"
+carpetioscalar::outScalar_every = 1
+
+
 # Checkpoint
 IO::checkpoint_every = 12
 IO::checkpoint_keep  = 2
-IO::verbose          = "full"
+#IO::verbose          = "full"
 
 IOHDF5::checkpoint = "yes"
+IO::recover = "no"
diff --git a/Carpet/CarpetIOHDF5/par/CarpetWaveToyCheckpointTestCC.par b/Carpet/CarpetIOHDF5/par/CarpetWaveToyCheckpointTestCC.par
new file mode 100644
index 000000000..15cde62f8
--- /dev/null
+++ b/Carpet/CarpetIOHDF5/par/CarpetWaveToyCheckpointTestCC.par
@@ -0,0 +1,83 @@
+ActiveThorns = "Boundary CartGrid3D Time CoordBase InitBase SymBase Carpet CarpetReduce LoopControl GSL CarpetLib CarpetRegrid2 IOUtil CarpetIOBasic CarpetIOASCII HDF5 CarpetIOHDF5 HDF5 IDScalarWaveC WaveToyC Coordbase CarpetIOScalar"
+
+
+Cactus::cctk_itlast = 24
+
+Time::dtfac = 0.25
+
+InitBase::initial_data_setup_method = "init_all_levels"
+
+IDScalarWave::initial_data = "gaussian"
+IDScalarWave::sigma        = 2.8
+IDScalarWave::radius       = 0.0
+
+
+CartGrid3D::type           = "coordbase"
+CartGrid3D::domain         = "full"
+CartGrid3D::avoid_originx  = no
+CartGrid3D::avoid_originy  = no
+CartGrid3D::avoid_originz  = no
+CoordBase::domainsize = "minmax"
+CoordBase::xmin       = -10.0
+CoordBase::ymin       = -10.0
+CoordBase::zmin       = -10.0
+CoordBase::xmax       = 10.0
+CoordBase::ymax       = 10.0
+CoordBase::zmax       = 10.0
+CoordBase::spacing  = "gridspacing"
+CoordBase::dx = 0.5
+CoordBase::dy = 0.5
+CoordBase::dz = 0.5
+
+CoordBase::boundary_size_x_lower      = 2
+CoordBase::boundary_size_y_lower      = 2
+CoordBase::boundary_size_z_lower      = 2
+CoordBase::boundary_size_x_upper      = 2
+CoordBase::boundary_size_y_upper      = 2
+CoordBase::boundary_size_z_upper      = 2
+CoordBase::boundary_staggered_x_lower = "yes"
+CoordBase::boundary_staggered_y_lower = "yes"
+CoordBase::boundary_staggered_z_lower = "yes"
+CoordBase::boundary_staggered_x_upper = "yes"
+CoordBase::boundary_staggered_y_upper = "yes"
+CoordBase::boundary_staggered_z_upper = "yes"
+
+
+
+Carpet::domain_from_coordbase = yes
+Carpet::refinement_centering = cell
+Driver::ghost_size   = 2
+Carpet::prolongation_order_space = 3
+Carpet::prolongation_order_time  = 2
+Carpet::max_refinement_levels    = 2
+
+CarpetRegrid2::ensure_proper_nesting = yes
+CarpetRegrid2::num_centres      = 1
+CarpetRegrid2::position_x_1 	= 0
+CarpetRegrid2::position_y_1 	= 0
+CarpetRegrid2::position_z_1 	= 0
+CarpetRegrid2::num_levels_1     = 2
+CarpetRegrid2::radius_1[1]      = 5.0
+
+# Output
+IO::out_dir = $parfile
+
+IOBasic::outInfo_every = 1
+IOBasic::outInfo_vars  = "wavetoy::phi"
+
+IOASCII::out1D_vars  = "wavetoy::phi"
+IOASCII::out1D_every = 12
+IOASCII::out3D_vars  = "wavetoy::phi"
+IOASCII::out3D_every = 12
+
+carpetioscalar::outScalar_vars = "wavetoy::phi"
+carpetioscalar::outScalar_every = 1
+
+
+# Checkpoint
+IO::checkpoint_every = 12
+IO::checkpoint_keep  = 2
+#IO::verbose          = "full"
+
+IOHDF5::checkpoint = "yes"
+IO::recover = "no"
diff --git a/Carpet/CarpetIOHDF5/par/CarpetWaveToyRecoverTest.par b/Carpet/CarpetIOHDF5/par/CarpetWaveToyRecoverTest.par
index 390f5fc71..d576ba48f 100644
--- a/Carpet/CarpetIOHDF5/par/CarpetWaveToyRecoverTest.par
+++ b/Carpet/CarpetIOHDF5/par/CarpetWaveToyRecoverTest.par
@@ -1,12 +1,74 @@
-ActiveThorns = "Boundary CartGrid3D Time CoordBase InitBase SymBase Carpet CarpetReduce LoopControl GSL CarpetLib CarpetRegrid IOUtil CarpetIOBasic CarpetIOASCII HDF5 CarpetIOHDF5 HDF5 IDScalarWaveC WaveToyC"
+ActiveThorns = "Boundary CartGrid3D Time CoordBase InitBase SymBase Carpet CarpetReduce LoopControl GSL CarpetLib CarpetRegrid2 IOUtil CarpetIOBasic CarpetIOASCII HDF5 CarpetIOHDF5 HDF5 IDScalarWaveC WaveToyC Coordbase carpetioscalar"
 
 
 Cactus::cctk_itlast = 24
 
+Time::dtfac = 0.25
+
+InitBase::initial_data_setup_method = "init_all_levels"
+
+IDScalarWave::initial_data = "gaussian"
+IDScalarWave::sigma        = 2.8
+IDScalarWave::radius       = 0.0
+
+
+CartGrid3D::type           = "coordbase"
+CartGrid3D::domain         = "full"
+CartGrid3D::avoid_originx  = no
+CartGrid3D::avoid_originy  = no
+CartGrid3D::avoid_originz  = no
+CoordBase::domainsize = "minmax"
+CoordBase::xmin       = -10.0
+CoordBase::ymin       = -10.0
+CoordBase::zmin       = -10.0
+CoordBase::xmax       = 10.0
+CoordBase::ymax       = 10.0
+CoordBase::zmax       = 10.0
+CoordBase::spacing  = "gridspacing"
+CoordBase::dx = 0.5
+CoordBase::dy = 0.5
+CoordBase::dz = 0.5
+
+CoordBase::boundary_size_x_lower      = 2
+CoordBase::boundary_size_y_lower      = 2
+CoordBase::boundary_size_z_lower      = 2
+CoordBase::boundary_size_x_upper      = 2
+CoordBase::boundary_size_y_upper      = 2
+CoordBase::boundary_size_z_upper      = 2
+
+Carpet::domain_from_coordbase = yes
+Driver::ghost_size   = 2
+Carpet::prolongation_order_space = 3
+Carpet::prolongation_order_time  = 2
+Carpet::max_refinement_levels    = 2
+
+CarpetRegrid2::ensure_proper_nesting = yes
+CarpetRegrid2::num_centres      = 1
+CarpetRegrid2::position_x_1 	= 0
+CarpetRegrid2::position_y_1 	= 0
+CarpetRegrid2::position_z_1 	= 0
+CarpetRegrid2::num_levels_1     = 1
+CarpetRegrid2::radius_1[1]      = 5.0
+
 # Output
 IO::out_dir = $parfile
 
-# Recovery
-IO::recover = "auto"
+IOBasic::outInfo_every = 1
+IOBasic::outInfo_vars  = "wavetoy::phi"
+
+carpetioscalar::outScalar_vars = "wavetoy::phi"
+carpetioscalar::outScalar_every = 1
+
+
+IOASCII::out1D_vars  = "wavetoy::phi"
+IOASCII::out1D_every = 12
+IOASCII::out3D_vars  = "wavetoy::phi"
+IOASCII::out3D_every = 12
+
+# Checkpoint
+IO::checkpoint_every = 12
+IO::checkpoint_keep  = 2
+#IO::verbose          = "full"
 
 IOHDF5::checkpoint = "no"
+IO::recover = "auto"
diff --git a/Carpet/CarpetIOHDF5/par/CarpetWaveToyRecoverTestCC.par b/Carpet/CarpetIOHDF5/par/CarpetWaveToyRecoverTestCC.par
new file mode 100644
index 000000000..67baca4d5
--- /dev/null
+++ b/Carpet/CarpetIOHDF5/par/CarpetWaveToyRecoverTestCC.par
@@ -0,0 +1,83 @@
+ActiveThorns = "Boundary CartGrid3D Time CoordBase InitBase SymBase Carpet CarpetReduce LoopControl GSL CarpetLib CarpetRegrid2 IOUtil CarpetIOBasic CarpetIOASCII HDF5 CarpetIOHDF5 HDF5 IDScalarWaveC WaveToyC Coordbase CarpetIOScalar"
+
+
+Cactus::cctk_itlast = 24
+
+Time::dtfac = 0.25
+
+InitBase::initial_data_setup_method = "init_all_levels"
+
+IDScalarWave::initial_data = "gaussian"
+IDScalarWave::sigma        = 2.8
+IDScalarWave::radius       = 0.0
+
+
+CartGrid3D::type           = "coordbase"
+CartGrid3D::domain         = "full"
+CartGrid3D::avoid_originx  = no
+CartGrid3D::avoid_originy  = no
+CartGrid3D::avoid_originz  = no
+CoordBase::domainsize = "minmax"
+CoordBase::xmin       = -10.0
+CoordBase::ymin       = -10.0
+CoordBase::zmin       = -10.0
+CoordBase::xmax       = 10.0
+CoordBase::ymax       = 10.0
+CoordBase::zmax       = 10.0
+CoordBase::spacing  = "gridspacing"
+CoordBase::dx = 0.5
+CoordBase::dy = 0.5
+CoordBase::dz = 0.5
+
+CoordBase::boundary_size_x_lower      = 2
+CoordBase::boundary_size_y_lower      = 2
+CoordBase::boundary_size_z_lower      = 2
+CoordBase::boundary_size_x_upper      = 2
+CoordBase::boundary_size_y_upper      = 2
+CoordBase::boundary_size_z_upper      = 2
+CoordBase::boundary_staggered_x_lower = "yes"
+CoordBase::boundary_staggered_y_lower = "yes"
+CoordBase::boundary_staggered_z_lower = "yes"
+CoordBase::boundary_staggered_x_upper = "yes"
+CoordBase::boundary_staggered_y_upper = "yes"
+CoordBase::boundary_staggered_z_upper = "yes"
+
+
+
+Carpet::domain_from_coordbase = yes
+Carpet::refinement_centering = cell
+Driver::ghost_size   = 2
+Carpet::prolongation_order_space = 3
+Carpet::prolongation_order_time  = 2
+Carpet::max_refinement_levels    = 2
+
+CarpetRegrid2::ensure_proper_nesting = yes
+CarpetRegrid2::num_centres      = 1
+CarpetRegrid2::position_x_1 	= 0
+CarpetRegrid2::position_y_1 	= 0
+CarpetRegrid2::position_z_1 	= 0
+CarpetRegrid2::num_levels_1     = 2
+CarpetRegrid2::radius_1[1]      = 5.0
+
+# Output
+IO::out_dir = $parfile
+
+IOBasic::outInfo_every = 1
+IOBasic::outInfo_vars  = "wavetoy::phi"
+
+IOASCII::out1D_vars  = "wavetoy::phi"
+IOASCII::out1D_every = 12
+IOASCII::out3D_vars  = "wavetoy::phi"
+IOASCII::out3D_every = 12
+
+carpetioscalar::outScalar_vars = "wavetoy::phi"
+carpetioscalar::outScalar_every = 1
+
+
+# Checkpoint
+IO::checkpoint_every = 12
+IO::checkpoint_keep  = 2
+#IO::verbose          = "full"
+
+IOHDF5::checkpoint = "no"
+IO::recover = "auto"