Remove debugging statements

Remove debugging statements.  Add Brill-Lindqiest parameter files.

6 files changed, 329 insertions, 12 deletions

diff --git a/ML_BSSN/src/ML_BSSN_constraints.c b/ML_BSSN/src/ML_BSSN_constraints.c
index 2ee6490..f0f575c 100644
--- a/ML_BSSN/src/ML_BSSN_constraints.c
+++ b/ML_BSSN/src/ML_BSSN_constraints.c
@@ -927,7 +927,7 @@ void ML_BSSN_constraints_Body(cGH *cctkGH, CCTK_INT dir, CCTK_INT face, CCTK_REA
     M3L  =  (-gK113 + gK131)*gu11 + (-2*gK123 + gK132 + gK231)*gu21 + (-gK223 + gK232)*gu22 + (-gK133 + gK331)*gu31 + 
         (-gK233 + gK332)*gu32;
     
-    cSL  =  trR;
+    cSL  =  Log(detgt);
     
     cXt1L  =  Gt111*gtu11 + Gt122*gtu22 + 2*(Gt112*gtu21 + Gt113*gtu31 + Gt123*gtu32) + Gt133*gtu33 - Xt1L;
     
diff --git a/m/McLachlan.m b/m/McLachlan.m
index 308f1cc..299a221 100644
--- a/m/McLachlan.m
+++ b/m/McLachlan.m
@@ -335,6 +335,7 @@ convertToADMBaseCalcBSSN =
     kzz      -> K33,
     alp      -> alpha,
     (* TODO: this is wrong *)
+    (* TODO: rename dtalp->A, dtbeta->B *)
     dtalp    -> dtalpha,
     betax    -> beta1,
     betay    -> beta2,
@@ -543,8 +544,6 @@ constraintsCalcBSSN =
                                + 2 Gt[uk,ll,lj] gt[li,ln] Gt[un,lk,lm]
                                + Gt[uk,li,lm] gt[lk,ln] Gt[un,ll,lj]),
     (* PRD 62, 044034 (2000), eqn. (15) *)
-    (* TODO: this term seems to be wrong;
-       the Ricci scalar is not zero for BL data *)
     Rphi[li,lj] -> - 2 CDt[phi,lj,li]
                    - 2 gt[li,lj] gtu[ul,un] CDt[phi,ll,ln]
                    + 4 CDt[phi,li] CDt[phi,lj]
@@ -579,9 +578,7 @@ constraintsCalcBSSN =
     M[la] -> gu[ub,uc] (gK[lc,la,lb] - gK[lc,lb,la]),
     
     (* det gamma-tilde *)
-    (* TODO cS -> Log [detgt], *)
-    (* TODO: output the Ricci scalar for debugging *)
-    cS -> trR,
+    cS -> Log [detgt],
     
     (* Gamma constraint *)
     cXt[ua] -> gtu[ub,uc] Gt[ua,lb,lc] - Xt[ua],
diff --git a/par/bl_bssn_1.par b/par/bl_bssn_1.par
new file mode 100644
index 0000000..92231ec
--- /dev/null
+++ b/par/bl_bssn_1.par
@@ -0,0 +1,161 @@
+ActiveThorns = "
+        Boundary
+        CartGrid3D
+        CoordBase
+        IOUtil
+        InitBase
+        MoL
+        SymBase
+
+        ADMAnalysis
+        ADMBase
+        ADMConstraints
+        ADMCoupling
+        ADMMacros
+        CoordGauge
+        SpaceMask
+        StaticConformal
+
+        NaNChecker
+
+        Carpet
+        CarpetIOASCII
+        CarpetIOBasic
+        CarpetIOScalar
+        CarpetLib
+        CarpetReduce
+        LoopControl
+
+        ReflectionSymmetry
+
+        Exact
+        Formaline
+        GSL
+
+        Slab
+
+        GenericFD
+
+        ML_BSSN
+"
+
+
+
+Cactus::cctk_itlast = 0
+
+grid::type = "CoordBase"
+
+CoordBase::domainsize = "minmax"
+
+CoordBase::xmax = 4.0
+CoordBase::ymax = 4.0
+CoordBase::zmax = 4.0
+CoordBase::dx   = 0.2
+CoordBase::dy   = 0.2
+CoordBase::dz   = 0.2
+
+ReflectionSymmetry::reflection_x   = yes
+ReflectionSymmetry::reflection_y   = yes
+ReflectionSymmetry::reflection_z   = yes
+ReflectionSymmetry::avoid_origin_x = no
+ReflectionSymmetry::avoid_origin_y = no
+ReflectionSymmetry::avoid_origin_z = no
+
+CoordBase::boundary_shiftout_x_lower = 1
+CoordBase::boundary_shiftout_y_lower = 1
+CoordBase::boundary_shiftout_z_lower = 1
+
+Carpet::domain_from_coordbase = yes
+driver::ghost_size            = 2
+Carpet::use_buffer_zones      = yes
+
+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
+
+
+
+ADMBase::initial_data    = "exact"
+ADMBase::initial_lapse   = "exact"
+ADMBase::initial_shift   = "exact"
+ADMBase::initial_dtlapse = "zero"
+ADMBase::initial_dtshift = "zero"
+
+Exact::exact_model = "Schwarzschild/BL"
+Exact::Schwarzschild_BL__mass = 1.0
+
+ML_BSSN::harmonicN       = 0      # 1+log
+ML_BSSN::harmonicF       = 2.0    # 1+log
+ML_BSSN::ShiftGammaCoeff = 0.75
+ML_BSSN::BetaDriver      = 0.5
+
+ADMMacros::spatial_order = 4
+
+
+
+IO::out_dir = $parfile
+
+IOBasic::outInfo_every = 1
+IOBasic::outInfo_vars = "
+        ML_BSSN::H
+        ML_BSSN::trKrhs
+"
+
+IOScalar::one_file_per_group = yes
+IOScalar::outScalar_every    = 1
+IOScalar::outScalar_vars     = "
+        ADMBase::metric
+        ADMBase::curv
+        ADMBase::lapse
+        ADMBase::shift
+        ADMAnalysis::trace_of_K
+        ADMAnalysis::ricci_scalar
+        ADMConstraints::Hamiltonian
+        ADMConstraints::momentum
+        ML_BSSN::log_confac
+        ML_BSSN::metric
+        ML_BSSN::trace_curv
+        ML_BSSN::curv
+        ML_BSSN::Gamma
+        ML_BSSN::Ham
+        ML_BSSN::mom
+        ML_BSSN::cons_detg
+        ML_BSSN::cons_Gamma
+        ML_BSSN::cons_traceA
+        ML_BSSN::log_confacrhs
+        ML_BSSN::metricrhs
+        ML_BSSN::Gammarhs
+        ML_BSSN::trace_curvrhs
+        ML_BSSN::curvrhs
+"
+
+IOASCII::one_file_per_group = yes
+IOASCII::out1D_every        = 1
+IOASCII::out1D_vars         = "
+        ADMBase::metric
+        ADMBase::curv
+        ADMBase::lapse
+        ADMBase::shift
+        ADMAnalysis::trace_of_K
+        ADMAnalysis::ricci_scalar
+        ADMConstraints::Hamiltonian
+        ADMConstraints::momentum
+        ML_BSSN::log_confac
+        ML_BSSN::metric
+        ML_BSSN::trace_curv
+        ML_BSSN::curv
+        ML_BSSN::Gamma
+        ML_BSSN::Ham
+        ML_BSSN::mom
+        ML_BSSN::cons_detg
+        ML_BSSN::cons_Gamma
+        ML_BSSN::cons_traceA
+        ML_BSSN::log_confacrhs
+        ML_BSSN::metricrhs
+        ML_BSSN::Gammarhs
+        ML_BSSN::trace_curvrhs
+        ML_BSSN::curvrhs
+"
diff --git a/par/bl_bssn_2.par b/par/bl_bssn_2.par
new file mode 100644
index 0000000..db6728d
--- /dev/null
+++ b/par/bl_bssn_2.par
@@ -0,0 +1,161 @@
+ActiveThorns = "
+        Boundary
+        CartGrid3D
+        CoordBase
+        IOUtil
+        InitBase
+        MoL
+        SymBase
+
+        ADMAnalysis
+        ADMBase
+        ADMConstraints
+        ADMCoupling
+        ADMMacros
+        CoordGauge
+        SpaceMask
+        StaticConformal
+
+        NaNChecker
+
+        Carpet
+        CarpetIOASCII
+        CarpetIOBasic
+        CarpetIOScalar
+        CarpetLib
+        CarpetReduce
+        LoopControl
+
+        ReflectionSymmetry
+
+        Exact
+        Formaline
+        GSL
+
+        Slab
+
+        GenericFD
+
+        ML_BSSN
+"
+
+
+
+Cactus::cctk_itlast = 0
+
+grid::type = "CoordBase"
+
+CoordBase::domainsize = "minmax"
+
+CoordBase::xmax = 4.0
+CoordBase::ymax = 4.0
+CoordBase::zmax = 4.0
+CoordBase::dx   = 0.1
+CoordBase::dy   = 0.1
+CoordBase::dz   = 0.1
+
+ReflectionSymmetry::reflection_x   = yes
+ReflectionSymmetry::reflection_y   = yes
+ReflectionSymmetry::reflection_z   = yes
+ReflectionSymmetry::avoid_origin_x = no
+ReflectionSymmetry::avoid_origin_y = no
+ReflectionSymmetry::avoid_origin_z = no
+
+CoordBase::boundary_shiftout_x_lower = 1
+CoordBase::boundary_shiftout_y_lower = 1
+CoordBase::boundary_shiftout_z_lower = 1
+
+Carpet::domain_from_coordbase = yes
+driver::ghost_size            = 2
+Carpet::use_buffer_zones      = yes
+
+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
+
+
+
+ADMBase::initial_data    = "exact"
+ADMBase::initial_lapse   = "exact"
+ADMBase::initial_shift   = "exact"
+ADMBase::initial_dtlapse = "zero"
+ADMBase::initial_dtshift = "zero"
+
+Exact::exact_model = "Schwarzschild/BL"
+Exact::Schwarzschild_BL__mass = 1.0
+
+ML_BSSN::harmonicN       = 0      # 1+log
+ML_BSSN::harmonicF       = 2.0    # 1+log
+ML_BSSN::ShiftGammaCoeff = 0.75
+ML_BSSN::BetaDriver      = 0.5
+
+ADMMacros::spatial_order = 4
+
+
+
+IO::out_dir = $parfile
+
+IOBasic::outInfo_every = 1
+IOBasic::outInfo_vars = "
+        ML_BSSN::H
+        ML_BSSN::trKrhs
+"
+
+IOScalar::one_file_per_group = yes
+IOScalar::outScalar_every    = 1
+IOScalar::outScalar_vars     = "
+        ADMBase::metric
+        ADMBase::curv
+        ADMBase::lapse
+        ADMBase::shift
+        ADMAnalysis::trace_of_K
+        ADMAnalysis::ricci_scalar
+        ADMConstraints::Hamiltonian
+        ADMConstraints::momentum
+        ML_BSSN::log_confac
+        ML_BSSN::metric
+        ML_BSSN::trace_curv
+        ML_BSSN::curv
+        ML_BSSN::Gamma
+        ML_BSSN::Ham
+        ML_BSSN::mom
+        ML_BSSN::cons_detg
+        ML_BSSN::cons_Gamma
+        ML_BSSN::cons_traceA
+        ML_BSSN::log_confacrhs
+        ML_BSSN::metricrhs
+        ML_BSSN::Gammarhs
+        ML_BSSN::trace_curvrhs
+        ML_BSSN::curvrhs
+"
+
+IOASCII::one_file_per_group = yes
+IOASCII::out1D_every        = 1
+IOASCII::out1D_vars         = "
+        ADMBase::metric
+        ADMBase::curv
+        ADMBase::lapse
+        ADMBase::shift
+        ADMAnalysis::trace_of_K
+        ADMAnalysis::ricci_scalar
+        ADMConstraints::Hamiltonian
+        ADMConstraints::momentum
+        ML_BSSN::log_confac
+        ML_BSSN::metric
+        ML_BSSN::trace_curv
+        ML_BSSN::curv
+        ML_BSSN::Gamma
+        ML_BSSN::Ham
+        ML_BSSN::mom
+        ML_BSSN::cons_detg
+        ML_BSSN::cons_Gamma
+        ML_BSSN::cons_traceA
+        ML_BSSN::log_confacrhs
+        ML_BSSN::metricrhs
+        ML_BSSN::Gammarhs
+        ML_BSSN::trace_curvrhs
+        ML_BSSN::curvrhs
+"
diff --git a/par/ks_bssn_1.par b/par/ks_bssn_1.par
index 8a13b48..629ca80 100644
--- a/par/ks_bssn_1.par
+++ b/par/ks_bssn_1.par
@@ -84,12 +84,9 @@ ADMBase::initial_shift   = "exact"
 ADMBase::initial_dtlapse = "zero"
 ADMBase::initial_dtshift = "zero"
 
-#Exact::exact_model = "Kerr/Kerr-Schild"
-#Exact::Kerr_KerrSchild__mass = 1.0
-#Exact::Kerr_KerrSchild__spin = 0.0
-
-Exact::exact_model = "Schwarzschild/BL"
-Exact::Schwarzschild_BL__mass = 1.0
+Exact::exact_model = "Kerr/Kerr-Schild"
+Exact::Kerr_KerrSchild__mass = 1.0
+Exact::Kerr_KerrSchild__spin = 0.0
 
 ML_BSSN::harmonicN       = 0      # 1+log
 ML_BSSN::harmonicF       = 2.0    # 1+log
diff --git a/par/ks_bssn_2.par b/par/ks_bssn_2.par
index ac12b53..1afdc0e 100644
--- a/par/ks_bssn_2.par
+++ b/par/ks_bssn_2.par
@@ -7,6 +7,7 @@ ActiveThorns = "
         MoL
         SymBase
 
+        ADMAnalysis
         ADMBase
         ADMConstraints
         ADMCoupling