- also activate thorn InitBase and set Carpet::init_each_timelevel = "yes"

- don't output sum norms (not suitable for testsuites)

5 files changed, 13 insertions, 16 deletions

diff --git a/Carpet/CarpetIOHDF5/test/CarpetWaveToyCheckpoint_test.parfile b/Carpet/CarpetIOHDF5/test/CarpetWaveToyCheckpoint_test.parfile
index c07d2b8c7..d5c7852b4 100644
--- a/Carpet/CarpetIOHDF5/test/CarpetWaveToyCheckpoint_test.parfile
+++ b/Carpet/CarpetIOHDF5/test/CarpetWaveToyCheckpoint_test.parfile
@@ -1,4 +1,4 @@
-ActiveThorns = "Boundary CartGrid3D Time CoordBase SymBase Carpet CarpetLib CarpetRegrid CarpetReduce CarpetSlab IOUtil CarpetIOBasic CarpetIOScalar CarpetIOASCII CarpetIOHDF5 IDScalarWaveC WaveToyC"
+ActiveThorns = "Boundary CartGrid3D Time CoordBase InitBase SymBase Carpet CarpetLib CarpetRegrid CarpetReduce CarpetSlab IOUtil CarpetIOBasic CarpetIOScalar CarpetIOASCII CarpetIOHDF5 IDScalarWaveC WaveToyC"
 
 
 Cactus::cctk_itlast = 64
@@ -9,6 +9,8 @@ Grid::avoid_origin = "no"
 Grid::type         = "byrange"
 Grid::dxyz         = 1
 
+InitBase::initial_data_setup_method = "init_all_levels"
+
 IDScalarWave::initial_data = "gaussian"
 IDScalarWave::sigma        = 2.8
 IDScalarWave::radius       = 0.0
@@ -18,7 +20,6 @@ Driver::ghost_size   = 2
 
 Carpet::prolongation_order_space = 3
 Carpet::prolongation_order_time  = 2
-Carpet::init_each_timelevel      = "yes"
 Carpet::max_refinement_levels    = 4
 CarpetRegrid::refinement_levels  = 4
 
@@ -31,7 +32,7 @@ IOBasic::outInfo_every         = 1
 IOBasic::outInfo_vars          = "wavetoy::phi"
 IOScalar::outScalar_every      = 32
 IOScalar::outScalar_vars       = "wavetoy::phi"
-IOScalar::outScalar_reductions = "average count maximum minimum  norm1 norm2 norm_inf product sum sum_abs sum_squared"
+IOScalar::outScalar_reductions = "average count maximum minimum  norm1 norm2 norm_inf product"
 
 IOASCII::out1D_vars  = "wavetoy::phi"
 IOASCII::out1D_every = 32
diff --git a/Carpet/CarpetIOHDF5/test/CarpetWaveToyRecover_test_1proc.par b/Carpet/CarpetIOHDF5/test/CarpetWaveToyRecover_test_1proc.par
index 5295dd002..fe100c8e0 100644
--- a/Carpet/CarpetIOHDF5/test/CarpetWaveToyRecover_test_1proc.par
+++ b/Carpet/CarpetIOHDF5/test/CarpetWaveToyRecover_test_1proc.par
@@ -1,4 +1,4 @@
-ActiveThorns = "Boundary CartGrid3D Time CoordBase SymBase Carpet CarpetLib CarpetRegrid CarpetReduce CarpetSlab IOUtil CarpetIOBasic CarpetIOScalar CarpetIOASCII CarpetIOHDF5 IDScalarWaveC WaveToyC"
+ActiveThorns = "Boundary CartGrid3D Time CoordBase InitBase SymBase Carpet CarpetLib CarpetRegrid CarpetReduce CarpetSlab IOUtil CarpetIOBasic CarpetIOScalar CarpetIOASCII CarpetIOHDF5 IDScalarWaveC WaveToyC"
 
 
 Cactus::cctk_itlast = 128
@@ -11,7 +11,4 @@ IO::recover_dir  = "../../../arrangements/Carpet/CarpetIOHDF5/test"
 IO::recover      = "manual"
 IO::recover_file = "CarpetWaveToyCheckpoint_test.it_64"
 
-# omit sum norms in the reduction output
-IOScalar::outScalar_reductions = "average count maximum minimum norm1 norm2 norm_inf product"
-
 IOHDF5::checkpoint = "no"
diff --git a/Carpet/CarpetIOHDF5/test/CarpetWaveToyRecover_test_4proc.par b/Carpet/CarpetIOHDF5/test/CarpetWaveToyRecover_test_4proc.par
index 5295dd002..fe100c8e0 100644
--- a/Carpet/CarpetIOHDF5/test/CarpetWaveToyRecover_test_4proc.par
+++ b/Carpet/CarpetIOHDF5/test/CarpetWaveToyRecover_test_4proc.par
@@ -1,4 +1,4 @@
-ActiveThorns = "Boundary CartGrid3D Time CoordBase SymBase Carpet CarpetLib CarpetRegrid CarpetReduce CarpetSlab IOUtil CarpetIOBasic CarpetIOScalar CarpetIOASCII CarpetIOHDF5 IDScalarWaveC WaveToyC"
+ActiveThorns = "Boundary CartGrid3D Time CoordBase InitBase SymBase Carpet CarpetLib CarpetRegrid CarpetReduce CarpetSlab IOUtil CarpetIOBasic CarpetIOScalar CarpetIOASCII CarpetIOHDF5 IDScalarWaveC WaveToyC"
 
 
 Cactus::cctk_itlast = 128
@@ -11,7 +11,4 @@ IO::recover_dir  = "../../../arrangements/Carpet/CarpetIOHDF5/test"
 IO::recover      = "manual"
 IO::recover_file = "CarpetWaveToyCheckpoint_test.it_64"
 
-# omit sum norms in the reduction output
-IOScalar::outScalar_reductions = "average count maximum minimum norm1 norm2 norm_inf product"
-
 IOHDF5::checkpoint = "no"
diff --git a/Carpet/CarpetIOHDF5/test/input_initial_data.par b/Carpet/CarpetIOHDF5/test/input_initial_data.par
index 20f908f7c..2cd6fef92 100644
--- a/Carpet/CarpetIOHDF5/test/input_initial_data.par
+++ b/Carpet/CarpetIOHDF5/test/input_initial_data.par
@@ -1,7 +1,7 @@
 # deactivate the IDScalarWaveMoL thorn
 # initial data is read from files using the filereader
-ActiveThorns = "Carpet CarpetLib CarpetRegrid CarpetInterp CarpetReduce CarpetSlab Boundary CoordBase SymBase CartGrid3D Periodic LocalInterp NaNChecker Slab Time MoL WaveToyMoL IOUtil CarpetIOBasic CarpetIOScalar CarpetIOHDF5"
-#ActiveThorns = "Carpet CarpetLib CarpetRegrid CarpetInterp CarpetReduce CarpetSlab Boundary CoordBase SymBase CartGrid3D Periodic LocalInterp NaNChecker Slab Time MoL WaveToyMoL IOUtil CarpetIOBasic CarpetIOScalar CarpetIOHDF5 IDScalarWaveMoL"
+ActiveThorns = "Carpet CarpetLib CarpetRegrid CarpetInterp CarpetReduce CarpetSlab Boundary CoordBase InitBase SymBase CartGrid3D Periodic LocalInterp NaNChecker Slab Time MoL WaveToyMoL IOUtil CarpetIOBasic CarpetIOScalar CarpetIOHDF5"
+#ActiveThorns = "Carpet CarpetLib CarpetRegrid CarpetInterp CarpetReduce CarpetSlab Boundary CoordBase InitBase SymBase CartGrid3D Periodic LocalInterp NaNChecker Slab Time MoL WaveToyMoL IOUtil CarpetIOBasic CarpetIOScalar CarpetIOHDF5 IDScalarWaveMoL"
 
 
 Cactus::cctk_itlast = 128
@@ -11,10 +11,11 @@ Driver::global_ny  = 5
 Driver::global_nz  = 5
 Driver::ghost_size = 2
 
+InitBase::initial_data_setup_method = "init_all_levels"
+
 Carpet::max_refinement_levels    = 3
 Carpet::prolongation_order_space = 3
 Carpet::prolongation_order_time  = 2
-Carpet::init_each_timelevel      = "yes"
 
 CarpetRegrid::refinement_levels = 1
 CarpetRegrid::refined_regions   = "manual-gridpoint-list"
diff --git a/Carpet/CarpetIOHDF5/test/output_initial_data.parfile b/Carpet/CarpetIOHDF5/test/output_initial_data.parfile
index 8940ef6d9..3798833d1 100644
--- a/Carpet/CarpetIOHDF5/test/output_initial_data.parfile
+++ b/Carpet/CarpetIOHDF5/test/output_initial_data.parfile
@@ -1,4 +1,4 @@
-ActiveThorns = "Carpet CarpetLib CarpetRegrid CarpetInterp CarpetReduce CarpetSlab Boundary CoordBase SymBase CartGrid3D Periodic LocalInterp NaNChecker Slab Time MoL IDScalarWaveMoL WaveToyMoL IOUtil CarpetIOBasic CarpetIOScalar CarpetIOHDF5"
+ActiveThorns = "Carpet CarpetLib CarpetRegrid CarpetInterp CarpetReduce CarpetSlab Boundary CoordBase InitBase SymBase CartGrid3D Periodic LocalInterp NaNChecker Slab Time MoL IDScalarWaveMoL WaveToyMoL IOUtil CarpetIOBasic CarpetIOScalar CarpetIOHDF5"
 
 
 Cactus::cctk_itlast = 128
@@ -8,10 +8,11 @@ Driver::global_ny  = 5
 Driver::global_nz  = 5
 Driver::ghost_size = 2
 
+InitBase::initial_data_setup_method = "init_all_levels"
+
 Carpet::max_refinement_levels    = 3
 Carpet::prolongation_order_space = 3
 Carpet::prolongation_order_time  = 2
-Carpet::init_each_timelevel      = "yes"
 
 CarpetRegrid::refinement_levels = 1
 CarpetRegrid::refined_regions   = "manual-gridpoint-list"