Carpet: Set NPROCS for kasner test cases

3 files changed, 10 insertions, 448 deletions

diff --git a/Carpet/Carpet/test/kasner/kasner.par b/Carpet/Carpet/test/kasner/kasner.par
deleted file mode 100644
index e6438bc48..000000000
--- a/Carpet/Carpet/test/kasner/kasner.par
+++ /dev/null
@@ -1,230 +0,0 @@
-######################################
-# Flesh parameters
-######################################
-
-Cactus::cctk_run_title = "Kasner spacetime"
-
-Cactus::cctk_full_warnings         = yes
-Cactus::highlight_warning_messages = no
-Cactus::cctk_timer_output          = "full"
-
-Cactus::terminate       = "time"
-Cactus::cctk_initial_time = 1
-Cactus::cctk_final_time = 1
-
-
-#############################################################################################
-ActiveThorns = "Boundary CartGrid3D CoordBase Slab SymBase Periodic"
-#############################################################################################
-
-CoordBase::domainsize = "minmax"
-
-CoordBase::xmin =  -5.00
-CoordBase::ymin =  -5.00
-CoordBase::zmin =  -5.00
-CoordBase::xmax =  +5.00
-CoordBase::ymax =  +5.00
-CoordBase::zmax =  +5.00
-CoordBase::dx   =   1
-CoordBase::dy   =   1
-CoordBase::dz   =   1
-
-CoordBase::boundary_size_x_lower     = 3
-CoordBase::boundary_size_y_lower     = 3
-CoordBase::boundary_size_z_lower     = 3
-CoordBase::boundary_size_x_upper     = 3
-CoordBase::boundary_size_y_upper     = 3
-CoordBase::boundary_size_z_upper     = 3
-
-CoordBase::boundary_shiftout_x_lower = 1
-CoordBase::boundary_shiftout_y_lower = 1
-CoordBase::boundary_shiftout_z_lower = 1
-CoordBase::boundary_shiftout_x_upper = 1
-CoordBase::boundary_shiftout_y_upper = 1
-CoordBase::boundary_shiftout_z_upper = 1
-
-CartGrid3D::type = "coordbase"
-
-Periodic::periodic = "yes"
-Periodic::periodic_x = "yes"
-Periodic::periodic_y = "yes"
-Periodic::periodic_z = "yes"
-
-##################################################################################
-ActiveThorns = "IOUtil Carpet CarpetLib CarpetInterp LoopControl CarpetReduce CarpetSlab"
-##################################################################################
-
-Carpet::schedule_barriers = no
-CarpetLib::output_bboxes  = no
-Carpet::init_each_timelevel = "yes"
-
-Carpet::domain_from_coordbase = yes
-Carpet::max_refinement_levels = 1
-
-driver::ghost_size       = 3
-Carpet::use_buffer_zones = yes
-
-Carpet::prolongation_order_space = 5
-Carpet::prolongation_order_time  = 2
-
-Carpet::convergence_level = 0
-
-Carpet::poison_new_timelevels = yes
-CarpetLib::poison_new_memory  = yes
-
-Carpet::output_timers_every      = -1
-CarpetLib::print_timestats_every = -1
-CarpetLib::print_memstats_every  = -1
-
-CarpetLib::max_allowed_memory_MB = 2048
-
-##################################################################
-ActiveThorns = "SphericalSurface ADMBase"
-##################################################################
-
-#################################
-ActiveThorns = "AEILocalInterp"
-ActiveThorns = "BLAS LAPACK"
-ActiveThorns = "Fortran"
-ActiveThorns = "GenericFD"
-ActiveThorns = "HDF5"
-ActiveThorns = "InitBase"
-ActiveThorns = "LocalInterp"
-ActiveThorns = "TGRtensor"
-#################################
-
-InitBase::initial_data_setup_method = "init_all_levels"
-
-#################################
-ActiveThorns = "MoL Time"
-#################################
-
-MoL::ODE_Method             = "RK4"
-MoL::MoL_Intermediate_Steps = 4
-MoL::MoL_Num_Scratch_Levels = 1
-
-Time::dtfac = 0.1
-
-###################################################################################################
-ActiveThorns = "ADMCoupling ADMMacros CoordGauge SpaceMask StaticConformal TmunuBase"
-###################################################################################################
-
-ADMMacros::spatial_order = 4
-
-#################################
-ActiveThorns = "Exact"
-#################################
-
-ADMBase::metric_type = "physical"
-
-Exact::exact_model		= "Kasner-like"
-
-#################################
-ActiveThorns = "ML_BSSN ML_BSSN_Helper ML_ADMConstraints"
-#################################
-
-ADMBase::initial_data    = "exact"
-ADMBase::initial_lapse   = "one"
-ADMBase::initial_shift   = "zero"
-ADMBase::initial_dtlapse = "zero"
-ADMBase::initial_dtshift = "zero"
-ADMBase::lapse_timelevels = 1
-ADMBase::shift_timelevels = 1
-
-ADMBase::evolution_method       = "ML_BSSN"
-ADMBase::lapse_evolution_method = "static"
-ADMBase::shift_evolution_method = "static"
-ADMBase::dtlapse_evolution_method = "static"
-ADMBase::dtshift_evolution_method = "static"
-
-ML_BSSN::ML_log_confac_bound = "none"
-ML_BSSN::ML_metric_bound     = "none"
-ML_BSSN::ML_Gamma_bound      = "none"
-ML_BSSN::ML_trace_curv_bound = "none"
-ML_BSSN::ML_curv_bound       = "none"
-ML_BSSN::ML_lapse_bound      = "none"
-ML_BSSN::ML_dtlapse_bound    = "none"
-ML_BSSN::ML_shift_bound      = "none"
-ML_BSSN::ML_dtshift_bound    = "none"
-
-
-#################################
-ActiveThorns = "NaNChecker"
-#################################
-
-NaNChecker::check_every = 1
-NaNChecker::report_max = 1
-
-NaNChecker::action_if_found = "terminate"
-
-NaNChecker::verbose = "all"
-NaNChecker::check_vars  = "
-	ML_BSSN::ML_curv
-	ML_BSSN::ML_Gamma
-	ML_BSSN::ML_log_confac
-	ML_BSSN::ML_metric
-	ML_BSSN::ML_lapse
-	ML_BSSN::ML_shift
-	ML_BSSN::ML_trace_curv
-"
-
-#################################
-ActiveThorns = "CarpetIOBasic"
-#################################
-
-IO::out_dir = $parfile
-
-IOBasic::outInfo_every      = 1
-IOBasic::outInfo_reductions = "norm2"
-IOBasic::outInfo_vars       = "
-	ADMBase::lapse
-	ADMBase::gxx
-	ADMBase::Kxx
-        ML_ADMConstraints::ML_ham
-        Carpet::physical_time_per_hour
-"
-
-
-#################################
-ActiveThorns = "CarpetIOScalar"
-#################################
-
-IOScalar::one_file_per_group = yes
-
-IOScalar::outScalar_every = 0
-IOScalar::outScalar_vars  = "
-"
-
-#################################
-ActiveThorns = "CarpetIOASCII"
-#################################
-
-IOASCII::one_file_per_group = yes
-
-IOASCII::output_symmetry_points = no
-IOASCII::out3D_ghosts           = no
-IOASCII::output_all_timelevels  = yes
-
-IOASCII::out0D_every = 0
-IOASCII::out0D_vars  = "
-        Carpet::timing
-"
-
-IOASCII::out1D_every = 1
-IOASCII::out1D_vars  = "
-	ADMBase::metric
-"
-
-IOASCII::out2D_every = 0
-IOASCII::out2D_vars  = "
-"
-
-#################################
-Activethorns = "CarpetIOHDF5"
-#################################
-
-IOHDF5::out_every          = 0
-IOHDF5::one_file_per_group = yes
-IOHDF5::compression_level  = 0
-IOHDF5::out_vars  = "
-"
diff --git a/Carpet/Carpet/test/kasner_amr/kasner_amr.par b/Carpet/Carpet/test/kasner_amr/kasner_amr.par
deleted file mode 100644
index 8c03c0ae3..000000000
--- a/Carpet/Carpet/test/kasner_amr/kasner_amr.par
+++ /dev/null
@@ -1,218 +0,0 @@
-######################################
-# Flesh parameters
-######################################
-
-Cactus::cctk_run_title = "Kasner spacetime"
-
-Cactus::cctk_full_warnings         = yes
-Cactus::highlight_warning_messages = no
-Cactus::cctk_timer_output          = "off"
-
-Cactus::terminate       = "time"
-Cactus::cctk_initial_time = 1
-Cactus::cctk_final_time = 1
-
-
-#############################################################################################
-ActiveThorns = "Boundary CartGrid3D CoordBase Slab SymBase Periodic"
-#############################################################################################
-
-CoordBase::domainsize = "minmax"
-
-CoordBase::xmin =  -5.00
-CoordBase::ymin =  -5.00
-CoordBase::zmin =  -5.00
-CoordBase::xmax =  +5.00
-CoordBase::ymax =  +5.00
-CoordBase::zmax =  +5.00
-CoordBase::dx   =   0.5
-CoordBase::dy   =   0.5
-CoordBase::dz   =   0.5
-
-CoordBase::boundary_size_x_lower     = 3
-CoordBase::boundary_size_y_lower     = 3
-CoordBase::boundary_size_z_lower     = 3
-CoordBase::boundary_size_x_upper     = 3
-CoordBase::boundary_size_y_upper     = 3
-CoordBase::boundary_size_z_upper     = 3
-
-CoordBase::boundary_shiftout_x_lower = 1
-CoordBase::boundary_shiftout_y_lower = 1
-CoordBase::boundary_shiftout_z_lower = 1
-CoordBase::boundary_shiftout_x_upper = 1
-CoordBase::boundary_shiftout_y_upper = 1
-CoordBase::boundary_shiftout_z_upper = 1
-
-CartGrid3D::type = "coordbase"
-
-Periodic::periodic = "yes"
-Periodic::periodic_x = "yes"
-Periodic::periodic_y = "yes"
-Periodic::periodic_z = "yes"
-
-##################################################################################
-ActiveThorns = "IOUtil Carpet CarpetLib CarpetInterp LoopControl CarpetReduce CarpetSlab"
-##################################################################################
-
-Carpet::schedule_barriers = no
-CarpetLib::output_bboxes  = no
-Carpet::init_each_timelevel = "yes"
-
-Carpet::domain_from_coordbase = yes
-Carpet::max_refinement_levels = 2
-
-driver::ghost_size       = 3
-Carpet::use_buffer_zones = yes
-
-Carpet::prolongation_order_space = 5
-Carpet::prolongation_order_time  = 2
-
-Carpet::convergence_level = 0
-
-Carpet::poison_new_timelevels = yes
-CarpetLib::poison_new_memory  = yes
-
-Carpet::output_timers_every      = -1
-CarpetLib::print_timestats_every = -1
-CarpetLib::print_memstats_every  = -1
-
-CarpetLib::max_allowed_memory_MB = 2048
-
-##################################################################
-ActiveThorns = "SphericalSurface ADMBase"
-##################################################################
-
-##################################################################
-ActiveThorns = "CarpetRegrid2"
-##################################################################
-
-CarpetRegrid2::num_centres  = 1
-CarpetRegrid2::num_levels_1 = 2
-CarpetRegrid2::radius_1[1]  = 1
-
-#################################
-ActiveThorns = "AEILocalInterp"
-ActiveThorns = "BLAS LAPACK"
-ActiveThorns = "Fortran"
-ActiveThorns = "GenericFD"
-ActiveThorns = "HDF5"
-ActiveThorns = "InitBase"
-ActiveThorns = "LocalInterp"
-ActiveThorns = "TGRtensor"
-#################################
-
-InitBase::initial_data_setup_method = "init_single_level"
-
-#################################
-ActiveThorns = "MoL Time"
-#################################
-
-MoL::ODE_Method             = "RK4"
-MoL::MoL_Intermediate_Steps = 4
-MoL::MoL_Num_Scratch_Levels = 1
-
-Time::dtfac = 0.1
-
-###################################################################################################
-ActiveThorns = "ADMCoupling ADMMacros CoordGauge SpaceMask StaticConformal TmunuBase"
-###################################################################################################
-
-ADMMacros::spatial_order = 4
-
-#################################
-ActiveThorns = "Exact"
-#################################
-
-ADMBase::metric_type = "physical"
-
-Exact::exact_model  	 = "Kasner-like"
-
-ADMBase::initial_data    = "exact"
-ADMBase::initial_lapse   = "one"
-ADMBase::initial_shift   = "zero"
-ADMBase::initial_dtlapse = "zero"
-ADMBase::initial_dtshift = "zero"
-ADMBase::metric_timelevels = 3
-ADMBase::lapse_timelevels = 3
-ADMBase::shift_timelevels = 3
-
-ADMBase::evolution_method       = "static"
-ADMBase::lapse_evolution_method = "static"
-ADMBase::shift_evolution_method = "static"
-ADMBase::dtlapse_evolution_method = "static"
-ADMBase::dtshift_evolution_method = "static"
-
-#################################
-ActiveThorns = "NaNChecker"
-#################################
-
-NaNChecker::check_every = 1
-NaNChecker::report_max = 1
-
-NaNChecker::action_if_found = "terminate"
-
-NaNChecker::verbose = "all"
-NaNChecker::check_vars  = "
-	ADMBase::metric
-	ADMBase::curv
-"
-
-#################################
-ActiveThorns = "CarpetIOBasic"
-#################################
-
-IO::out_dir = $parfile
-
-IOBasic::outInfo_every      = 1
-IOBasic::outInfo_reductions = "norm2"
-IOBasic::outInfo_vars       = "
-	ADMBase::lapse
-	ADMBase::gxx
-	ADMBase::Kxx
-        Carpet::physical_time_per_hour
-"
-
-
-#################################
-ActiveThorns = "CarpetIOScalar"
-#################################
-
-IOScalar::one_file_per_group = yes
-
-IOScalar::outScalar_every = 0
-IOScalar::outScalar_vars  = "
-"
-
-#################################
-ActiveThorns = "CarpetIOASCII"
-#################################
-
-IOASCII::one_file_per_group = yes
-
-IOASCII::output_symmetry_points = no
-IOASCII::out3D_ghosts           = yes
-IOASCII::output_all_timelevels  = yes
-
-IOASCII::out0D_every = 0
-IOASCII::out0D_vars  = "
-        Carpet::timing
-"
-
-IOASCII::out1D_every = 1
-IOASCII::out1D_vars  = "
-	ADMBase::metric
-"
-
-IOASCII::out2D_every = 0
-IOASCII::out2D_vars  = "
-"
-
-#################################
-Activethorns = "CarpetIOHDF5"
-#################################
-
-IOHDF5::out_every          = 0
-IOHDF5::one_file_per_group = yes
-IOHDF5::compression_level  = 0
-IOHDF5::out_vars  = "
-"
diff --git a/Carpet/Carpet/test/test.ccl b/Carpet/Carpet/test/test.ccl
index e203fa1ca..2002a10b8 100644
--- a/Carpet/Carpet/test/test.ccl
+++ b/Carpet/Carpet/test/test.ccl
@@ -1,3 +1,13 @@
+TEST kasner
+{
+  NPROCS 2
+}
+
+TEST kasner_amr
+{
+  NPROCS 2
+}
+
 TEST no-overlap
 {
   NPROCS 2