Adapt O8 and MP test parameter files to use ML_BSSN thorn and update

* Enable dissipation after parameter default change in 129cc3ba1a89b8336ffa0355fc74c2f1b60e8255

* Remove memory limitation as it seems to cause a segfault

Existing test data should be OK.  O8 test passes, multipatch test fails, possibly due to a change in grid structure in Llama.

2 files changed, 47 insertions, 43 deletions

diff --git a/ML_BSSN_Test/test/ML_BSSN_MP_O8_bh.par b/ML_BSSN_Test/test/ML_BSSN_MP_O8_bh.par
index 08745ae..2c4081e 100644
--- a/ML_BSSN_Test/test/ML_BSSN_MP_O8_bh.par
+++ b/ML_BSSN_Test/test/ML_BSSN_MP_O8_bh.par
@@ -1,27 +1,29 @@
 
-ActiveThorns = "CoordBase SymBase Boundary NanChecker CartGrid3d Time MoL CarpetIOBasic CarpetIOScalar IOUtil Carpet CarpetLib CarpetReduce CarpetInterp CarpetSlab CarpetIOASCII ADMBase StaticConformal SpaceMask Slab GenericFD CoordGauge ADMCoupling LoopControl ML_BSSN_MP_O8 ML_BSSN_MP_O8_Helper GenericFD TMuNuBase SphericalSurface ADMMacros Coordinates CarpetInterp2 Interpolate2 TimerReport IDAnalyticBH NewRad"
+ActiveThorns = "CoordBase SymBase Boundary NanChecker CartGrid3d Time MoL CarpetIOBasic CarpetIOScalar IOUtil Carpet CarpetLib CarpetReduce CarpetInterp CarpetSlab CarpetIOASCII ADMBase StaticConformal SpaceMask Slab GenericFD CoordGauge ADMCoupling LoopControl ML_BSSN ML_BSSN_Helper GenericFD TMuNuBase SphericalSurface ADMMacros Coordinates CarpetInterp2 Interpolate2 TimerReport IDAnalyticBH NewRad"
 
-ADMBase::evolution_method         = "ML_BSSN_MP_O8"
-ADMBase::lapse_evolution_method   = "ML_BSSN_MP_O8"
-ADMBase::shift_evolution_method   = "ML_BSSN_MP_O8"
-ADMBase::dtlapse_evolution_method = "ML_BSSN_MP_O8"
-ADMBase::dtshift_evolution_method = "ML_BSSN_MP_O8"
+ADMBase::evolution_method         = "ML_BSSN"
+ADMBase::lapse_evolution_method   = "ML_BSSN"
+ADMBase::shift_evolution_method   = "ML_BSSN"
+ADMBase::dtlapse_evolution_method = "ML_BSSN"
+ADMBase::dtshift_evolution_method = "ML_BSSN"
 
 # We use the BBH gauge to ensure it is regression-tested.  Also, there
 # is no harmonic shift in McLachlan
-ML_BSSN_MP_O8::harmonicN           = 1      # 1+log
-ML_BSSN_MP_O8::harmonicF           = 2.0    # 1+log
-ML_BSSN_MP_O8::ShiftGammaCoeff     = 0.75
-ML_BSSN_MP_O8::BetaDriver          = 1.0
-ML_BSSN_MP_O8::LapseAdvectionCoeff = 1.0
-ML_BSSN_MP_O8::ShiftAdvectionCoeff = 1.0
-
-ML_BSSN_MP_O8::MinimumLapse        = 1.0e-8
-ML_BSSN_MP_O8::conformalMethod = 1 # 1 for W, 0 for phi
-ML_BSSN_MP_O8::my_initial_boundary_condition = "extrapolate-gammas"
-ML_BSSN_MP_O8::my_rhs_boundary_condition     = "static"
-
-ML_BSSN_MP_O8::EpsDiss             = 0.1
+ML_BSSN::harmonicN           = 1      # 1+log
+ML_BSSN::harmonicF           = 2.0    # 1+log
+ML_BSSN::ShiftGammaCoeff     = 0.75
+ML_BSSN::BetaDriver          = 1.0
+ML_BSSN::LapseAdvectionCoeff = 1.0
+ML_BSSN::ShiftAdvectionCoeff = 1.0
+
+ML_BSSN::MinimumLapse        = 1.0e-8
+ML_BSSN::conformalMethod = 1 # 1 for W, 0 for phi
+ML_BSSN::my_initial_boundary_condition = "extrapolate-gammas"
+ML_BSSN::my_rhs_boundary_condition     = "static"
+
+ML_BSSN::apply_dissipation   = "always"
+ML_BSSN::EpsDiss             = 0.1
+ML_BSSN::fdOrder             = 8
 
 GenericFD::jacobian_group = "Coordinates::jacobian"
 GenericFD::jacobian_derivative_group = "Coordinates::jacobian2"
@@ -59,13 +61,13 @@ Interpolate::interpolator_order         = 5 # Interpatch interpolation
 
 Carpet::ghost_size                      = 5
 Carpet::init_3_timelevels               = "no"
-Carpet::max_memory_size_MB              = 500
+#CarpetLib::max_memory_size_MB           = 500
 Carpet::poison_new_timelevels           = yes
 
 NaNChecker::check_every                 = 1
 NaNChecker::verbose                     = "all"
 NaNChecker::action_if_found             = "just warn"
-NaNChecker::check_vars                  = "ADMBase::metric ADMBase::curv ADMBase::lapse ADMBase::shift ML_BSSN_MP_O8::ML_curv ML_BSSN_MP_O8::ML_dtlapse ML_BSSN_MP_O8::ML_dtshift ML_BSSN_MP_O8::ML_Gamma ML_BSSN_MP_O8::ML_lapse ML_BSSN_MP_O8::ML_log_confac ML_BSSN_MP_O8::ML_metric ML_BSSN_MP_O8::ML_shift ML_BSSN_MP_O8::ML_trace_curv ML_BSSN_MP_O8::ML_cons_detg ML_BSSN_MP_O8::ML_cons_Gamma ML_BSSN_MP_O8::ML_cons_traceA"
+NaNChecker::check_vars                  = "ADMBase::metric ADMBase::curv ADMBase::lapse ADMBase::shift ML_BSSN::ML_curv ML_BSSN::ML_dtlapse ML_BSSN::ML_dtshift ML_BSSN::ML_Gamma ML_BSSN::ML_lapse ML_BSSN::ML_log_confac ML_BSSN::ML_metric ML_BSSN::ML_shift ML_BSSN::ML_trace_curv ML_BSSN::ML_cons_detg ML_BSSN::ML_cons_Gamma ML_BSSN::ML_cons_traceA"
 NaNChecker::report_max                  = 10
 
 #############################################################
@@ -121,7 +123,7 @@ IO::out_dir                   = $parfile
 IO::out_fileinfo              = "none"
 IO::parfile_write             = "no"
 CarpetIOBasic::outInfo_every        = 1
-CarpetIOBasic::outInfo_vars         = "ML_BSSN_MP_O8::ML_log_confac"
+CarpetIOBasic::outInfo_vars         = "ML_BSSN::ML_log_confac"
 
 IOASCII::out1D_every          = 1
 IOASCII::out_precision        = 19
@@ -129,4 +131,4 @@ IOASCII::out1D_x              = "no"
 IOASCII::out1D_y              = "no"
 IOASCII::out1D_z              = "yes"
 IOASCII::out1D_d              = "no"
-IOASCII::out1D_vars           = "ADMBase::gxx ADMBase::kxx ML_BSSN_MP_O8::ML_cons_detg ML_BSSN_MP_O8::ML_cons_Gamma ML_BSSN_MP_O8::ML_cons_traceA ML_BSSN_MP_O8::ML_curv ML_BSSN_MP_O8::ML_dtlapse ML_BSSN_MP_O8::ML_dtshift ML_BSSN_MP_O8::ML_Gamma ML_BSSN_MP_O8::ML_lapse ML_BSSN_MP_O8::ML_log_confac ML_BSSN_MP_O8::ML_metric ML_BSSN_MP_O8::ML_shift ML_BSSN_MP_O8::ML_trace_curv ML_BSSN_MP_O8::At11rhs"
+IOASCII::out1D_vars           = "ADMBase::gxx ADMBase::kxx ML_BSSN::ML_cons_detg ML_BSSN::ML_cons_Gamma ML_BSSN::ML_cons_traceA ML_BSSN::ML_curv ML_BSSN::ML_dtlapse ML_BSSN::ML_dtshift ML_BSSN::ML_Gamma ML_BSSN::ML_lapse ML_BSSN::ML_log_confac ML_BSSN::ML_metric ML_BSSN::ML_shift ML_BSSN::ML_trace_curv ML_BSSN::At11rhs"
diff --git a/ML_BSSN_Test/test/ML_BSSN_O8_sgw3d.par b/ML_BSSN_Test/test/ML_BSSN_O8_sgw3d.par
index b574a6a..c822b1e 100644
--- a/ML_BSSN_Test/test/ML_BSSN_O8_sgw3d.par
+++ b/ML_BSSN_Test/test/ML_BSSN_O8_sgw3d.par
@@ -1,27 +1,29 @@
 
-ActiveThorns = "CoordBase SymBase Boundary NanChecker CartGrid3d Time MoL CarpetIOBasic CarpetIOScalar IOUtil Carpet CarpetLib CarpetReduce CarpetInterp CarpetSlab CarpetIOASCII ADMBase StaticConformal SpaceMask Slab Periodic Exact GenericFD CoordGauge ADMCoupling LoopControl ML_BSSN_O8 ML_BSSN_O8_Helper GenericFD TMuNuBase SphericalSurface ADMMacros TimerReport"
+ActiveThorns = "CoordBase SymBase Boundary NanChecker CartGrid3d Time MoL CarpetIOBasic CarpetIOScalar IOUtil Carpet CarpetLib CarpetReduce CarpetInterp CarpetSlab CarpetIOASCII ADMBase StaticConformal SpaceMask Slab Periodic Exact GenericFD CoordGauge ADMCoupling LoopControl ML_BSSN ML_BSSN_Helper GenericFD TMuNuBase SphericalSurface ADMMacros TimerReport"
 
-ADMBase::evolution_method         = "ML_BSSN_O8"
-ADMBase::lapse_evolution_method   = "ML_BSSN_O8"
-ADMBase::shift_evolution_method   = "ML_BSSN_O8"
-ADMBase::dtlapse_evolution_method = "ML_BSSN_O8"
-ADMBase::dtshift_evolution_method = "ML_BSSN_O8"
+ADMBase::evolution_method         = "ML_BSSN"
+ADMBase::lapse_evolution_method   = "ML_BSSN"
+ADMBase::shift_evolution_method   = "ML_BSSN"
+ADMBase::dtlapse_evolution_method = "ML_BSSN"
+ADMBase::dtshift_evolution_method = "ML_BSSN"
 
 # We use the BBH gauge to ensure it is regression-tested.  Also, there
 # is no harmonic shift in McLachlan
-ML_BSSN_O8::harmonicN           = 1      # 1+log
-ML_BSSN_O8::harmonicF           = 2.0    # 1+log
-ML_BSSN_O8::ShiftGammaCoeff     = 0.75
-ML_BSSN_O8::BetaDriver          = 1.0
-ML_BSSN_O8::LapseAdvectionCoeff = 1.0
-ML_BSSN_O8::ShiftAdvectionCoeff = 1.0
-
-ML_BSSN_O8::MinimumLapse        = 1.0e-8
-ML_BSSN_O8::conformalMethod = 1 # 1 for W, 0 for phi
-#ML_BSSN_O8::my_initial_boundary_condition = "extrapolate-gammas"
-ML_BSSN_O8::my_rhs_boundary_condition     = "static"
-
-ML_BSSN_O8::EpsDiss             = 0.1
+ML_BSSN::harmonicN           = 1      # 1+log
+ML_BSSN::harmonicF           = 2.0    # 1+log
+ML_BSSN::ShiftGammaCoeff     = 0.75
+ML_BSSN::BetaDriver          = 1.0
+ML_BSSN::LapseAdvectionCoeff = 1.0
+ML_BSSN::ShiftAdvectionCoeff = 1.0
+
+ML_BSSN::MinimumLapse        = 1.0e-8
+ML_BSSN::conformalMethod = 1 # 1 for W, 0 for phi
+#ML_BSSN::my_initial_boundary_condition = "extrapolate-gammas"
+ML_BSSN::my_rhs_boundary_condition     = "static"
+
+ML_BSSN::apply_dissipation   = "always"
+ML_BSSN::EpsDiss             = 0.1
+ML_BSSN::fdOrder             = 8
 
 Boundary::radpower                     = 2
 
@@ -142,4 +144,4 @@ IOASCII::out1D_x              = "yes"
 IOASCII::out1D_y              = "no"
 IOASCII::out1D_z              = "no"
 IOASCII::out1D_d              = "no"
-IOASCII::out1D_vars           = "ADMBase::gxx ADMBase::kxx ML_BSSN_O8::ML_cons_detg ML_BSSN_O8::ML_cons_Gamma ML_BSSN_O8::ML_cons_traceA ML_BSSN_O8::ML_curv ML_BSSN_O8::ML_dtlapse ML_BSSN_O8::ML_dtshift ML_BSSN_O8::ML_Gamma ML_BSSN_O8::ML_lapse ML_BSSN_O8::ML_log_confac ML_BSSN_O8::ML_metric ML_BSSN_O8::ML_shift ML_BSSN_O8::ML_trace_curv"
+IOASCII::out1D_vars           = "ADMBase::gxx ADMBase::kxx ML_BSSN::ML_cons_detg ML_BSSN::ML_cons_Gamma ML_BSSN::ML_cons_traceA ML_BSSN::ML_curv ML_BSSN::ML_dtlapse ML_BSSN::ML_dtshift ML_BSSN::ML_Gamma ML_BSSN::ML_lapse ML_BSSN::ML_log_confac ML_BSSN::ML_metric ML_BSSN::ML_shift ML_BSSN::ML_trace_curv"