Regenerate code, removing the *_O* and *_MP thorns

1 files changed, 609 insertions, 225 deletions

diff --git a/ML_BSSN/schedule.ccl b/ML_BSSN/schedule.ccl
index 3e657c9..9819cbc 100644
--- a/ML_BSSN/schedule.ccl
+++ b/ML_BSSN/schedule.ccl
@@ -278,15 +278,31 @@ if (CCTK_EQUALS(my_initial_data, "Minkowski"))
   schedule ML_BSSN_Minkowski IN ADMBase_InitialData
   {
     LANG: C
-    WRITES:   ML_BSSN::ML_curv
-    WRITES:   ML_BSSN::ML_dtlapse
-    WRITES:   ML_BSSN::ML_dtshift
-    WRITES:   ML_BSSN::ML_Gamma
-    WRITES:   ML_BSSN::ML_lapse
-    WRITES:   ML_BSSN::ML_log_confac
-    WRITES:   ML_BSSN::ML_metric
-    WRITES:   ML_BSSN::ML_shift
-    WRITES:   ML_BSSN::ML_trace_curv
+    WRITES:   ML_BSSN::A
+    WRITES:   ML_BSSN::alpha
+    WRITES:   ML_BSSN::At11
+    WRITES:   ML_BSSN::At12
+    WRITES:   ML_BSSN::At13
+    WRITES:   ML_BSSN::At22
+    WRITES:   ML_BSSN::At23
+    WRITES:   ML_BSSN::At33
+    WRITES:   ML_BSSN::B1
+    WRITES:   ML_BSSN::B2
+    WRITES:   ML_BSSN::B3
+    WRITES:   ML_BSSN::beta1
+    WRITES:   ML_BSSN::beta2
+    WRITES:   ML_BSSN::beta3
+    WRITES:   ML_BSSN::gt11
+    WRITES:   ML_BSSN::gt12
+    WRITES:   ML_BSSN::gt13
+    WRITES:   ML_BSSN::gt22
+    WRITES:   ML_BSSN::gt23
+    WRITES:   ML_BSSN::gt33
+    WRITES:   ML_BSSN::phi
+    WRITES:   ML_BSSN::trK
+    WRITES:   ML_BSSN::Xt1
+    WRITES:   ML_BSSN::Xt2
+    WRITES:   ML_BSSN::Xt3
   } "ML_BSSN_Minkowski"
 }
 
@@ -296,18 +312,42 @@ if (CCTK_EQUALS(my_initial_data, "ADMBase"))
   schedule ML_BSSN_convertFromADMBase AT initial AFTER ADMBase_PostInitial
   {
     LANG: C
-    READS:    ADMBase::curv
-    READS:    ADMBase::lapse
-    READS:    ADMBase::metric
-    READS:    ADMBase::shift
-    READS:    ML_BSSN::ML_log_confac
-    READS:    ML_BSSN::ML_trace_curv
-    WRITES:   ML_BSSN::ML_curv
-    WRITES:   ML_BSSN::ML_lapse
-    WRITES:   ML_BSSN::ML_log_confac
-    WRITES:   ML_BSSN::ML_metric
-    WRITES:   ML_BSSN::ML_shift
-    WRITES:   ML_BSSN::ML_trace_curv
+    READS:    ADMBase::alp
+    READS:    ADMBase::betax
+    READS:    ADMBase::betay
+    READS:    ADMBase::betaz
+    READS:    ADMBase::gxx
+    READS:    ADMBase::gxy
+    READS:    ADMBase::gxz
+    READS:    ADMBase::gyy
+    READS:    ADMBase::gyz
+    READS:    ADMBase::gzz
+    READS:    ADMBase::kxx
+    READS:    ADMBase::kxy
+    READS:    ADMBase::kxz
+    READS:    ADMBase::kyy
+    READS:    ADMBase::kyz
+    READS:    ADMBase::kzz
+    READS:    ML_BSSN::phi
+    READS:    ML_BSSN::trK
+    WRITES:   ML_BSSN::alpha
+    WRITES:   ML_BSSN::At11
+    WRITES:   ML_BSSN::At12
+    WRITES:   ML_BSSN::At13
+    WRITES:   ML_BSSN::At22
+    WRITES:   ML_BSSN::At23
+    WRITES:   ML_BSSN::At33
+    WRITES:   ML_BSSN::beta1
+    WRITES:   ML_BSSN::beta2
+    WRITES:   ML_BSSN::beta3
+    WRITES:   ML_BSSN::gt11
+    WRITES:   ML_BSSN::gt12
+    WRITES:   ML_BSSN::gt13
+    WRITES:   ML_BSSN::gt22
+    WRITES:   ML_BSSN::gt23
+    WRITES:   ML_BSSN::gt33
+    WRITES:   ML_BSSN::phi
+    WRITES:   ML_BSSN::trK
   } "ML_BSSN_convertFromADMBase"
 }
 
@@ -317,9 +357,13 @@ if (CCTK_EQUALS(my_initial_data, "ADMBase"))
   schedule ML_BSSN_InitGamma AT initial BEFORE ML_BSSN_convertFromADMBaseGamma
   {
     LANG: C
-    WRITES:   ML_BSSN::ML_dtlapse
-    WRITES:   ML_BSSN::ML_dtshift
-    WRITES:   ML_BSSN::ML_Gamma
+    WRITES:   ML_BSSN::A
+    WRITES:   ML_BSSN::B1
+    WRITES:   ML_BSSN::B2
+    WRITES:   ML_BSSN::B3
+    WRITES:   ML_BSSN::Xt1
+    WRITES:   ML_BSSN::Xt2
+    WRITES:   ML_BSSN::Xt3
   } "ML_BSSN_InitGamma"
 }
 
@@ -332,62 +376,132 @@ if (CCTK_EQUALS(my_initial_data, "ADMBase"))
     SYNC: ML_dtlapse
     SYNC: ML_dtshift
     SYNC: ML_Gamma
-    READS:    ADMBase::dtlapse
-    READS:    ADMBase::dtshift
-    READS:    grid::coordinates
-    READS:    Grid::coordinates
-    READS:    ML_BSSN::ML_lapse
-    READS:    ML_BSSN::ML_metric
-    READS:    ML_BSSN::ML_shift
-    WRITES:   ML_BSSN::ML_dtlapse
-    WRITES:   ML_BSSN::ML_dtshift
-    WRITES:   ML_BSSN::ML_Gamma
+    READS:    ML_BSSN::alpha
+    READS:    ML_BSSN::beta1
+    READS:    ML_BSSN::beta2
+    READS:    ML_BSSN::beta3
+    READS:    ADMBase::dtalp
+    READS:    ADMBase::dtbetax
+    READS:    ADMBase::dtbetay
+    READS:    ADMBase::dtbetaz
+    READS:    ML_BSSN::gt11
+    READS:    ML_BSSN::gt12
+    READS:    ML_BSSN::gt13
+    READS:    ML_BSSN::gt22
+    READS:    ML_BSSN::gt23
+    READS:    ML_BSSN::gt33
+    READS:    grid::r
+    WRITES:   ML_BSSN::A
+    WRITES:   ML_BSSN::B1
+    WRITES:   ML_BSSN::B2
+    WRITES:   ML_BSSN::B3
+    WRITES:   ML_BSSN::Xt1
+    WRITES:   ML_BSSN::Xt2
+    WRITES:   ML_BSSN::Xt3
   } "ML_BSSN_convertFromADMBaseGamma"
 }
 
 schedule ML_BSSN_RHS1 IN ML_BSSN_evolCalcGroup
 {
   LANG: C
-  READS:    grid::coordinates
-  READS:    Grid::coordinates
-  READS:    ML_BSSN::ML_curv
-  READS:    ML_BSSN::ML_dtlapse
-  READS:    ML_BSSN::ML_dtshift
-  READS:    ML_BSSN::ML_Gamma
-  READS:    ML_BSSN::ML_lapse
-  READS:    ML_BSSN::ML_log_confac
-  READS:    ML_BSSN::ML_metric
-  READS:    ML_BSSN::ML_shift
-  READS:    ML_BSSN::ML_trace_curv
-  READS:    TmunuBase::stress_energy_scalar
-  READS:    TmunuBase::stress_energy_tensor
-  READS:    TmunuBase::stress_energy_vector
-  WRITES:   ML_BSSN::ML_dtlapserhs
-  WRITES:   ML_BSSN::ML_dtshiftrhs
-  WRITES:   ML_BSSN::ML_Gammarhs
-  WRITES:   ML_BSSN::ML_lapserhs
-  WRITES:   ML_BSSN::ML_log_confacrhs
-  WRITES:   ML_BSSN::ML_metricrhs
-  WRITES:   ML_BSSN::ML_shiftrhs
-  WRITES:   ML_BSSN::ML_trace_curvrhs
+  READS:    ML_BSSN::A
+  READS:    ML_BSSN::alpha
+  READS:    ML_BSSN::At11
+  READS:    ML_BSSN::At12
+  READS:    ML_BSSN::At13
+  READS:    ML_BSSN::At22
+  READS:    ML_BSSN::At23
+  READS:    ML_BSSN::At33
+  READS:    ML_BSSN::B1
+  READS:    ML_BSSN::B2
+  READS:    ML_BSSN::B3
+  READS:    ML_BSSN::beta1
+  READS:    ML_BSSN::beta2
+  READS:    ML_BSSN::beta3
+  READS:    TmunuBase::eTtt
+  READS:    TmunuBase::eTtx
+  READS:    TmunuBase::eTty
+  READS:    TmunuBase::eTtz
+  READS:    TmunuBase::eTxx
+  READS:    TmunuBase::eTxy
+  READS:    TmunuBase::eTxz
+  READS:    TmunuBase::eTyy
+  READS:    TmunuBase::eTyz
+  READS:    TmunuBase::eTzz
+  READS:    ML_BSSN::gt11
+  READS:    ML_BSSN::gt12
+  READS:    ML_BSSN::gt13
+  READS:    ML_BSSN::gt22
+  READS:    ML_BSSN::gt23
+  READS:    ML_BSSN::gt33
+  READS:    ML_BSSN::phi
+  READS:    grid::r
+  READS:    ML_BSSN::trK
+  READS:    ML_BSSN::Xt1
+  READS:    ML_BSSN::Xt2
+  READS:    ML_BSSN::Xt3
+  WRITES:   ML_BSSN::alpharhs
+  WRITES:   ML_BSSN::Arhs
+  WRITES:   ML_BSSN::B1rhs
+  WRITES:   ML_BSSN::B2rhs
+  WRITES:   ML_BSSN::B3rhs
+  WRITES:   ML_BSSN::beta1rhs
+  WRITES:   ML_BSSN::beta2rhs
+  WRITES:   ML_BSSN::beta3rhs
+  WRITES:   ML_BSSN::gt11rhs
+  WRITES:   ML_BSSN::gt12rhs
+  WRITES:   ML_BSSN::gt13rhs
+  WRITES:   ML_BSSN::gt22rhs
+  WRITES:   ML_BSSN::gt23rhs
+  WRITES:   ML_BSSN::gt33rhs
+  WRITES:   ML_BSSN::phirhs
+  WRITES:   ML_BSSN::trKrhs
+  WRITES:   ML_BSSN::Xt1rhs
+  WRITES:   ML_BSSN::Xt2rhs
+  WRITES:   ML_BSSN::Xt3rhs
 } "ML_BSSN_RHS1"
 
 schedule ML_BSSN_RHS2 IN ML_BSSN_evolCalcGroup
 {
   LANG: C
-  READS:    grid::coordinates
-  READS:    Grid::coordinates
-  READS:    ML_BSSN::ML_curv
-  READS:    ML_BSSN::ML_Gamma
-  READS:    ML_BSSN::ML_lapse
-  READS:    ML_BSSN::ML_log_confac
-  READS:    ML_BSSN::ML_metric
-  READS:    ML_BSSN::ML_shift
-  READS:    ML_BSSN::ML_trace_curv
-  READS:    TmunuBase::stress_energy_scalar
-  READS:    TmunuBase::stress_energy_tensor
-  READS:    TmunuBase::stress_energy_vector
-  WRITES:   ML_BSSN::ML_curvrhs
+  READS:    ML_BSSN::alpha
+  READS:    ML_BSSN::At11
+  READS:    ML_BSSN::At12
+  READS:    ML_BSSN::At13
+  READS:    ML_BSSN::At22
+  READS:    ML_BSSN::At23
+  READS:    ML_BSSN::At33
+  READS:    ML_BSSN::beta1
+  READS:    ML_BSSN::beta2
+  READS:    ML_BSSN::beta3
+  READS:    TmunuBase::eTtt
+  READS:    TmunuBase::eTtx
+  READS:    TmunuBase::eTty
+  READS:    TmunuBase::eTtz
+  READS:    TmunuBase::eTxx
+  READS:    TmunuBase::eTxy
+  READS:    TmunuBase::eTxz
+  READS:    TmunuBase::eTyy
+  READS:    TmunuBase::eTyz
+  READS:    TmunuBase::eTzz
+  READS:    ML_BSSN::gt11
+  READS:    ML_BSSN::gt12
+  READS:    ML_BSSN::gt13
+  READS:    ML_BSSN::gt22
+  READS:    ML_BSSN::gt23
+  READS:    ML_BSSN::gt33
+  READS:    ML_BSSN::phi
+  READS:    grid::r
+  READS:    ML_BSSN::trK
+  READS:    ML_BSSN::Xt1
+  READS:    ML_BSSN::Xt2
+  READS:    ML_BSSN::Xt3
+  WRITES:   ML_BSSN::At11rhs
+  WRITES:   ML_BSSN::At12rhs
+  WRITES:   ML_BSSN::At13rhs
+  WRITES:   ML_BSSN::At22rhs
+  WRITES:   ML_BSSN::At23rhs
+  WRITES:   ML_BSSN::At33rhs
 } "ML_BSSN_RHS2"
 
 
@@ -396,80 +510,192 @@ if (CCTK_EQUALS(apply_dissipation, "always"))
   schedule ML_BSSN_Dissipation IN ML_BSSN_evolCalcGroup AFTER (ML_BSSN_RHS1 ML_BSSN_RHS2)
   {
     LANG: C
-    READS:    ML_BSSN::ML_curv
-    READS:    ML_BSSN::ML_curvrhs
-    READS:    ML_BSSN::ML_dtlapse
-    READS:    ML_BSSN::ML_dtlapserhs
-    READS:    ML_BSSN::ML_dtshift
-    READS:    ML_BSSN::ML_dtshiftrhs
-    READS:    ML_BSSN::ML_Gamma
-    READS:    ML_BSSN::ML_Gammarhs
-    READS:    ML_BSSN::ML_lapse
-    READS:    ML_BSSN::ML_lapserhs
-    READS:    ML_BSSN::ML_log_confac
-    READS:    ML_BSSN::ML_log_confacrhs
-    READS:    ML_BSSN::ML_metric
-    READS:    ML_BSSN::ML_metricrhs
-    READS:    ML_BSSN::ML_shift
-    READS:    ML_BSSN::ML_shiftrhs
-    READS:    ML_BSSN::ML_trace_curv
-    READS:    ML_BSSN::ML_trace_curvrhs
-    WRITES:   ML_BSSN::ML_curvrhs
-    WRITES:   ML_BSSN::ML_dtlapserhs
-    WRITES:   ML_BSSN::ML_dtshiftrhs
-    WRITES:   ML_BSSN::ML_Gammarhs
-    WRITES:   ML_BSSN::ML_lapserhs
-    WRITES:   ML_BSSN::ML_log_confacrhs
-    WRITES:   ML_BSSN::ML_metricrhs
-    WRITES:   ML_BSSN::ML_shiftrhs
-    WRITES:   ML_BSSN::ML_trace_curvrhs
+    READS:    ML_BSSN::A
+    READS:    ML_BSSN::alpha
+    READS:    ML_BSSN::alpharhs
+    READS:    ML_BSSN::Arhs
+    READS:    ML_BSSN::At11
+    READS:    ML_BSSN::At11rhs
+    READS:    ML_BSSN::At12
+    READS:    ML_BSSN::At12rhs
+    READS:    ML_BSSN::At13
+    READS:    ML_BSSN::At13rhs
+    READS:    ML_BSSN::At22
+    READS:    ML_BSSN::At22rhs
+    READS:    ML_BSSN::At23
+    READS:    ML_BSSN::At23rhs
+    READS:    ML_BSSN::At33
+    READS:    ML_BSSN::At33rhs
+    READS:    ML_BSSN::B1
+    READS:    ML_BSSN::B1rhs
+    READS:    ML_BSSN::B2
+    READS:    ML_BSSN::B2rhs
+    READS:    ML_BSSN::B3
+    READS:    ML_BSSN::B3rhs
+    READS:    ML_BSSN::beta1
+    READS:    ML_BSSN::beta1rhs
+    READS:    ML_BSSN::beta2
+    READS:    ML_BSSN::beta2rhs
+    READS:    ML_BSSN::beta3
+    READS:    ML_BSSN::beta3rhs
+    READS:    ML_BSSN::gt11
+    READS:    ML_BSSN::gt11rhs
+    READS:    ML_BSSN::gt12
+    READS:    ML_BSSN::gt12rhs
+    READS:    ML_BSSN::gt13
+    READS:    ML_BSSN::gt13rhs
+    READS:    ML_BSSN::gt22
+    READS:    ML_BSSN::gt22rhs
+    READS:    ML_BSSN::gt23
+    READS:    ML_BSSN::gt23rhs
+    READS:    ML_BSSN::gt33
+    READS:    ML_BSSN::gt33rhs
+    READS:    ML_BSSN::phi
+    READS:    ML_BSSN::phirhs
+    READS:    ML_BSSN::trK
+    READS:    ML_BSSN::trKrhs
+    READS:    ML_BSSN::Xt1
+    READS:    ML_BSSN::Xt1rhs
+    READS:    ML_BSSN::Xt2
+    READS:    ML_BSSN::Xt2rhs
+    READS:    ML_BSSN::Xt3
+    READS:    ML_BSSN::Xt3rhs
+    WRITES:   ML_BSSN::alpharhs
+    WRITES:   ML_BSSN::Arhs
+    WRITES:   ML_BSSN::At11rhs
+    WRITES:   ML_BSSN::At12rhs
+    WRITES:   ML_BSSN::At13rhs
+    WRITES:   ML_BSSN::At22rhs
+    WRITES:   ML_BSSN::At23rhs
+    WRITES:   ML_BSSN::At33rhs
+    WRITES:   ML_BSSN::B1rhs
+    WRITES:   ML_BSSN::B2rhs
+    WRITES:   ML_BSSN::B3rhs
+    WRITES:   ML_BSSN::beta1rhs
+    WRITES:   ML_BSSN::beta2rhs
+    WRITES:   ML_BSSN::beta3rhs
+    WRITES:   ML_BSSN::gt11rhs
+    WRITES:   ML_BSSN::gt12rhs
+    WRITES:   ML_BSSN::gt13rhs
+    WRITES:   ML_BSSN::gt22rhs
+    WRITES:   ML_BSSN::gt23rhs
+    WRITES:   ML_BSSN::gt33rhs
+    WRITES:   ML_BSSN::phirhs
+    WRITES:   ML_BSSN::trKrhs
+    WRITES:   ML_BSSN::Xt1rhs
+    WRITES:   ML_BSSN::Xt2rhs
+    WRITES:   ML_BSSN::Xt3rhs
   } "ML_BSSN_Dissipation"
 }
 
 schedule ML_BSSN_Advect IN ML_BSSN_evolCalcGroup AFTER (ML_BSSN_RHS1 ML_BSSN_RHS2)
 {
   LANG: C
-  READS:    ML_BSSN::ML_curv
-  READS:    ML_BSSN::ML_curvrhs
-  READS:    ML_BSSN::ML_dtlapse
-  READS:    ML_BSSN::ML_dtlapserhs
-  READS:    ML_BSSN::ML_dtshift
-  READS:    ML_BSSN::ML_dtshiftrhs
-  READS:    ML_BSSN::ML_Gamma
-  READS:    ML_BSSN::ML_Gammarhs
-  READS:    ML_BSSN::ML_lapse
-  READS:    ML_BSSN::ML_lapserhs
-  READS:    ML_BSSN::ML_log_confac
-  READS:    ML_BSSN::ML_log_confacrhs
-  READS:    ML_BSSN::ML_metric
-  READS:    ML_BSSN::ML_metricrhs
-  READS:    ML_BSSN::ML_shift
-  READS:    ML_BSSN::ML_shiftrhs
-  READS:    ML_BSSN::ML_trace_curv
-  READS:    ML_BSSN::ML_trace_curvrhs
-  WRITES:   ML_BSSN::ML_curvrhs
-  WRITES:   ML_BSSN::ML_dtlapserhs
-  WRITES:   ML_BSSN::ML_dtshiftrhs
-  WRITES:   ML_BSSN::ML_Gammarhs
-  WRITES:   ML_BSSN::ML_lapserhs
-  WRITES:   ML_BSSN::ML_log_confacrhs
-  WRITES:   ML_BSSN::ML_metricrhs
-  WRITES:   ML_BSSN::ML_shiftrhs
-  WRITES:   ML_BSSN::ML_trace_curvrhs
+  READS:    ML_BSSN::A
+  READS:    ML_BSSN::alpha
+  READS:    ML_BSSN::alpharhs
+  READS:    ML_BSSN::Arhs
+  READS:    ML_BSSN::At11
+  READS:    ML_BSSN::At11rhs
+  READS:    ML_BSSN::At12
+  READS:    ML_BSSN::At12rhs
+  READS:    ML_BSSN::At13
+  READS:    ML_BSSN::At13rhs
+  READS:    ML_BSSN::At22
+  READS:    ML_BSSN::At22rhs
+  READS:    ML_BSSN::At23
+  READS:    ML_BSSN::At23rhs
+  READS:    ML_BSSN::At33
+  READS:    ML_BSSN::At33rhs
+  READS:    ML_BSSN::B1
+  READS:    ML_BSSN::B1rhs
+  READS:    ML_BSSN::B2
+  READS:    ML_BSSN::B2rhs
+  READS:    ML_BSSN::B3
+  READS:    ML_BSSN::B3rhs
+  READS:    ML_BSSN::beta1
+  READS:    ML_BSSN::beta1rhs
+  READS:    ML_BSSN::beta2
+  READS:    ML_BSSN::beta2rhs
+  READS:    ML_BSSN::beta3
+  READS:    ML_BSSN::beta3rhs
+  READS:    ML_BSSN::gt11
+  READS:    ML_BSSN::gt11rhs
+  READS:    ML_BSSN::gt12
+  READS:    ML_BSSN::gt12rhs
+  READS:    ML_BSSN::gt13
+  READS:    ML_BSSN::gt13rhs
+  READS:    ML_BSSN::gt22
+  READS:    ML_BSSN::gt22rhs
+  READS:    ML_BSSN::gt23
+  READS:    ML_BSSN::gt23rhs
+  READS:    ML_BSSN::gt33
+  READS:    ML_BSSN::gt33rhs
+  READS:    ML_BSSN::phi
+  READS:    ML_BSSN::phirhs
+  READS:    ML_BSSN::trK
+  READS:    ML_BSSN::trKrhs
+  READS:    ML_BSSN::Xt1
+  READS:    ML_BSSN::Xt1rhs
+  READS:    ML_BSSN::Xt2
+  READS:    ML_BSSN::Xt2rhs
+  READS:    ML_BSSN::Xt3
+  READS:    ML_BSSN::Xt3rhs
+  WRITES:   ML_BSSN::alpharhs
+  WRITES:   ML_BSSN::Arhs
+  WRITES:   ML_BSSN::At11rhs
+  WRITES:   ML_BSSN::At12rhs
+  WRITES:   ML_BSSN::At13rhs
+  WRITES:   ML_BSSN::At22rhs
+  WRITES:   ML_BSSN::At23rhs
+  WRITES:   ML_BSSN::At33rhs
+  WRITES:   ML_BSSN::B1rhs
+  WRITES:   ML_BSSN::B2rhs
+  WRITES:   ML_BSSN::B3rhs
+  WRITES:   ML_BSSN::beta1rhs
+  WRITES:   ML_BSSN::beta2rhs
+  WRITES:   ML_BSSN::beta3rhs
+  WRITES:   ML_BSSN::gt11rhs
+  WRITES:   ML_BSSN::gt12rhs
+  WRITES:   ML_BSSN::gt13rhs
+  WRITES:   ML_BSSN::gt22rhs
+  WRITES:   ML_BSSN::gt23rhs
+  WRITES:   ML_BSSN::gt33rhs
+  WRITES:   ML_BSSN::phirhs
+  WRITES:   ML_BSSN::trKrhs
+  WRITES:   ML_BSSN::Xt1rhs
+  WRITES:   ML_BSSN::Xt2rhs
+  WRITES:   ML_BSSN::Xt3rhs
 } "ML_BSSN_Advect"
 
 schedule ML_BSSN_InitRHS AT analysis BEFORE ML_BSSN_evolCalcGroup
 {
   LANG: C
-  WRITES:   ML_BSSN::ML_curvrhs
-  WRITES:   ML_BSSN::ML_dtlapserhs
-  WRITES:   ML_BSSN::ML_dtshiftrhs
-  WRITES:   ML_BSSN::ML_Gammarhs
-  WRITES:   ML_BSSN::ML_lapserhs
-  WRITES:   ML_BSSN::ML_log_confacrhs
-  WRITES:   ML_BSSN::ML_metricrhs
-  WRITES:   ML_BSSN::ML_shiftrhs
-  WRITES:   ML_BSSN::ML_trace_curvrhs
+  WRITES:   ML_BSSN::alpharhs
+  WRITES:   ML_BSSN::Arhs
+  WRITES:   ML_BSSN::At11rhs
+  WRITES:   ML_BSSN::At12rhs
+  WRITES:   ML_BSSN::At13rhs
+  WRITES:   ML_BSSN::At22rhs
+  WRITES:   ML_BSSN::At23rhs
+  WRITES:   ML_BSSN::At33rhs
+  WRITES:   ML_BSSN::B1rhs
+  WRITES:   ML_BSSN::B2rhs
+  WRITES:   ML_BSSN::B3rhs
+  WRITES:   ML_BSSN::beta1rhs
+  WRITES:   ML_BSSN::beta2rhs
+  WRITES:   ML_BSSN::beta3rhs
+  WRITES:   ML_BSSN::gt11rhs
+  WRITES:   ML_BSSN::gt12rhs
+  WRITES:   ML_BSSN::gt13rhs
+  WRITES:   ML_BSSN::gt22rhs
+  WRITES:   ML_BSSN::gt23rhs
+  WRITES:   ML_BSSN::gt33rhs
+  WRITES:   ML_BSSN::phirhs
+  WRITES:   ML_BSSN::trKrhs
+  WRITES:   ML_BSSN::Xt1rhs
+  WRITES:   ML_BSSN::Xt2rhs
+  WRITES:   ML_BSSN::Xt3rhs
 } "ML_BSSN_InitRHS"
 
 
@@ -478,26 +704,57 @@ if (CCTK_EQUALS(my_rhs_boundary_condition, "static"))
   schedule ML_BSSN_RHSStaticBoundary IN MoL_CalcRHS
   {
     LANG: C
-    WRITES:   ML_BSSN::ML_curvrhs
-    WRITES:   ML_BSSN::ML_dtlapserhs
-    WRITES:   ML_BSSN::ML_dtshiftrhs
-    WRITES:   ML_BSSN::ML_Gammarhs
-    WRITES:   ML_BSSN::ML_lapserhs
-    WRITES:   ML_BSSN::ML_log_confacrhs
-    WRITES:   ML_BSSN::ML_metricrhs
-    WRITES:   ML_BSSN::ML_shiftrhs
-    WRITES:   ML_BSSN::ML_trace_curvrhs
+    WRITES:   ML_BSSN::alpharhs
+    WRITES:   ML_BSSN::Arhs
+    WRITES:   ML_BSSN::At11rhs
+    WRITES:   ML_BSSN::At12rhs
+    WRITES:   ML_BSSN::At13rhs
+    WRITES:   ML_BSSN::At22rhs
+    WRITES:   ML_BSSN::At23rhs
+    WRITES:   ML_BSSN::At33rhs
+    WRITES:   ML_BSSN::B1rhs
+    WRITES:   ML_BSSN::B2rhs
+    WRITES:   ML_BSSN::B3rhs
+    WRITES:   ML_BSSN::beta1rhs
+    WRITES:   ML_BSSN::beta2rhs
+    WRITES:   ML_BSSN::beta3rhs
+    WRITES:   ML_BSSN::gt11rhs
+    WRITES:   ML_BSSN::gt12rhs
+    WRITES:   ML_BSSN::gt13rhs
+    WRITES:   ML_BSSN::gt22rhs
+    WRITES:   ML_BSSN::gt23rhs
+    WRITES:   ML_BSSN::gt33rhs
+    WRITES:   ML_BSSN::phirhs
+    WRITES:   ML_BSSN::trKrhs
+    WRITES:   ML_BSSN::Xt1rhs
+    WRITES:   ML_BSSN::Xt2rhs
+    WRITES:   ML_BSSN::Xt3rhs
   } "ML_BSSN_RHSStaticBoundary"
 }
 
 schedule ML_BSSN_enforce IN MoL_PostStepModify
 {
   LANG: C
-  READS:    ML_BSSN::ML_curv
-  READS:    ML_BSSN::ML_lapse
-  READS:    ML_BSSN::ML_metric
-  WRITES:   ML_BSSN::ML_curv
-  WRITES:   ML_BSSN::ML_lapse
+  READS:    ML_BSSN::alpha
+  READS:    ML_BSSN::At11
+  READS:    ML_BSSN::At12
+  READS:    ML_BSSN::At13
+  READS:    ML_BSSN::At22
+  READS:    ML_BSSN::At23
+  READS:    ML_BSSN::At33
+  READS:    ML_BSSN::gt11
+  READS:    ML_BSSN::gt12
+  READS:    ML_BSSN::gt13
+  READS:    ML_BSSN::gt22
+  READS:    ML_BSSN::gt23
+  READS:    ML_BSSN::gt33
+  WRITES:   ML_BSSN::alpha
+  WRITES:   ML_BSSN::At11
+  WRITES:   ML_BSSN::At12
+  WRITES:   ML_BSSN::At13
+  WRITES:   ML_BSSN::At22
+  WRITES:   ML_BSSN::At23
+  WRITES:   ML_BSSN::At33
 } "ML_BSSN_enforce"
 
 
@@ -506,32 +763,77 @@ if (CCTK_EQUALS(my_boundary_condition, "Minkowski"))
   schedule ML_BSSN_boundary IN MoL_PostStep
   {
     LANG: C
-    WRITES:   ML_BSSN::ML_curv
-    WRITES:   ML_BSSN::ML_dtlapse
-    WRITES:   ML_BSSN::ML_dtshift
-    WRITES:   ML_BSSN::ML_Gamma
-    WRITES:   ML_BSSN::ML_lapse
-    WRITES:   ML_BSSN::ML_log_confac
-    WRITES:   ML_BSSN::ML_metric
-    WRITES:   ML_BSSN::ML_shift
-    WRITES:   ML_BSSN::ML_trace_curv
+    WRITES:   ML_BSSN::A
+    WRITES:   ML_BSSN::alpha
+    WRITES:   ML_BSSN::At11
+    WRITES:   ML_BSSN::At12
+    WRITES:   ML_BSSN::At13
+    WRITES:   ML_BSSN::At22
+    WRITES:   ML_BSSN::At23
+    WRITES:   ML_BSSN::At33
+    WRITES:   ML_BSSN::B1
+    WRITES:   ML_BSSN::B2
+    WRITES:   ML_BSSN::B3
+    WRITES:   ML_BSSN::beta1
+    WRITES:   ML_BSSN::beta2
+    WRITES:   ML_BSSN::beta3
+    WRITES:   ML_BSSN::gt11
+    WRITES:   ML_BSSN::gt12
+    WRITES:   ML_BSSN::gt13
+    WRITES:   ML_BSSN::gt22
+    WRITES:   ML_BSSN::gt23
+    WRITES:   ML_BSSN::gt33
+    WRITES:   ML_BSSN::phi
+    WRITES:   ML_BSSN::trK
+    WRITES:   ML_BSSN::Xt1
+    WRITES:   ML_BSSN::Xt2
+    WRITES:   ML_BSSN::Xt3
   } "ML_BSSN_boundary"
 }
 
 schedule ML_BSSN_convertToADMBase IN ML_BSSN_convertToADMBaseGroup
 {
   LANG: C
-  READS:    ADMBase::metric
-  READS:    ML_BSSN::ML_curv
-  READS:    ML_BSSN::ML_lapse
-  READS:    ML_BSSN::ML_log_confac
-  READS:    ML_BSSN::ML_metric
-  READS:    ML_BSSN::ML_shift
-  READS:    ML_BSSN::ML_trace_curv
-  WRITES:   ADMBase::curv
-  WRITES:   ADMBase::lapse
-  WRITES:   ADMBase::metric
-  WRITES:   ADMBase::shift
+  READS:    ML_BSSN::alpha
+  READS:    ML_BSSN::At11
+  READS:    ML_BSSN::At12
+  READS:    ML_BSSN::At13
+  READS:    ML_BSSN::At22
+  READS:    ML_BSSN::At23
+  READS:    ML_BSSN::At33
+  READS:    ML_BSSN::beta1
+  READS:    ML_BSSN::beta2
+  READS:    ML_BSSN::beta3
+  READS:    ML_BSSN::gt11
+  READS:    ML_BSSN::gt12
+  READS:    ML_BSSN::gt13
+  READS:    ML_BSSN::gt22
+  READS:    ML_BSSN::gt23
+  READS:    ML_BSSN::gt33
+  READS:    ADMBase::gxx
+  READS:    ADMBase::gxy
+  READS:    ADMBase::gxz
+  READS:    ADMBase::gyy
+  READS:    ADMBase::gyz
+  READS:    ADMBase::gzz
+  READS:    ML_BSSN::phi
+  READS:    ML_BSSN::trK
+  WRITES:   ADMBase::alp
+  WRITES:   ADMBase::betax
+  WRITES:   ADMBase::betay
+  WRITES:   ADMBase::betaz
+  WRITES:   ADMBase::gxx
+  WRITES:   ADMBase::gxy
+  WRITES:   ADMBase::gxz
+  WRITES:   ADMBase::gyy
+  WRITES:   ADMBase::gyz
+  WRITES:   ADMBase::gzz
+  WRITES:   ADMBase::kxx
+  WRITES:   ADMBase::kxy
+  WRITES:   ADMBase::kxz
+  WRITES:   ADMBase::kyy
+  WRITES:   ADMBase::kyz
+  WRITES:   ADMBase::kzz
 } "ML_BSSN_convertToADMBase"
 
 
@@ -542,18 +844,30 @@ if (CCTK_EQUALS(dt_lapse_shift_method, "correct"))
     LANG: C
     SYNC: ADMBase::dtlapse
     SYNC: ADMBase::dtshift
-    READS:    grid::coordinates
-    READS:    Grid::coordinates
-    READS:    ML_BSSN::ML_dtlapse
-    READS:    ML_BSSN::ML_dtshift
-    READS:    ML_BSSN::ML_Gamma
-    READS:    ML_BSSN::ML_lapse
-    READS:    ML_BSSN::ML_log_confac
-    READS:    ML_BSSN::ML_metric
-    READS:    ML_BSSN::ML_shift
-    READS:    ML_BSSN::ML_trace_curv
-    WRITES:   ADMBase::dtlapse
-    WRITES:   ADMBase::dtshift
+    READS:    ML_BSSN::A
+    READS:    ML_BSSN::alpha
+    READS:    ML_BSSN::B1
+    READS:    ML_BSSN::B2
+    READS:    ML_BSSN::B3
+    READS:    ML_BSSN::beta1
+    READS:    ML_BSSN::beta2
+    READS:    ML_BSSN::beta3
+    READS:    ML_BSSN::gt11
+    READS:    ML_BSSN::gt12
+    READS:    ML_BSSN::gt13
+    READS:    ML_BSSN::gt22
+    READS:    ML_BSSN::gt23
+    READS:    ML_BSSN::gt33
+    READS:    ML_BSSN::phi
+    READS:    grid::r
+    READS:    ML_BSSN::trK
+    READS:    ML_BSSN::Xt1
+    READS:    ML_BSSN::Xt2
+    READS:    ML_BSSN::Xt3
+    WRITES:   ADMBase::dtalp
+    WRITES:   ADMBase::dtbetax
+    WRITES:   ADMBase::dtbetay
+    WRITES:   ADMBase::dtbetaz
   } "ML_BSSN_convertToADMBaseDtLapseShift"
 }
 
@@ -563,17 +877,29 @@ if (CCTK_EQUALS(dt_lapse_shift_method, "correct"))
   schedule ML_BSSN_convertToADMBaseDtLapseShiftBoundary IN ML_BSSN_convertToADMBaseGroup
   {
     LANG: C
-    READS:    grid::coordinates
-    READS:    Grid::coordinates
-    READS:    ML_BSSN::ML_dtlapse
-    READS:    ML_BSSN::ML_dtshift
-    READS:    ML_BSSN::ML_Gamma
-    READS:    ML_BSSN::ML_lapse
-    READS:    ML_BSSN::ML_metric
-    READS:    ML_BSSN::ML_shift
-    READS:    ML_BSSN::ML_trace_curv
-    WRITES:   ADMBase::dtlapse
-    WRITES:   ADMBase::dtshift
+    READS:    ML_BSSN::A
+    READS:    ML_BSSN::alpha
+    READS:    ML_BSSN::B1
+    READS:    ML_BSSN::B2
+    READS:    ML_BSSN::B3
+    READS:    ML_BSSN::beta1
+    READS:    ML_BSSN::beta2
+    READS:    ML_BSSN::beta3
+    READS:    ML_BSSN::gt11
+    READS:    ML_BSSN::gt12
+    READS:    ML_BSSN::gt13
+    READS:    ML_BSSN::gt22
+    READS:    ML_BSSN::gt23
+    READS:    ML_BSSN::gt33
+    READS:    grid::r
+    READS:    ML_BSSN::trK
+    READS:    ML_BSSN::Xt1
+    READS:    ML_BSSN::Xt2
+    READS:    ML_BSSN::Xt3
+    WRITES:   ADMBase::dtalp
+    WRITES:   ADMBase::dtbetax
+    WRITES:   ADMBase::dtbetay
+    WRITES:   ADMBase::dtbetaz
   } "ML_BSSN_convertToADMBaseDtLapseShiftBoundary"
 }
 
@@ -583,17 +909,29 @@ if (CCTK_EQUALS(dt_lapse_shift_method, "noLapseShiftAdvection"))
   schedule ML_BSSN_convertToADMBaseFakeDtLapseShift IN ML_BSSN_convertToADMBaseGroup
   {
     LANG: C
-    READS:    grid::coordinates
-    READS:    Grid::coordinates
-    READS:    ML_BSSN::ML_dtlapse
-    READS:    ML_BSSN::ML_dtshift
-    READS:    ML_BSSN::ML_Gamma
-    READS:    ML_BSSN::ML_lapse
-    READS:    ML_BSSN::ML_metric
-    READS:    ML_BSSN::ML_shift
-    READS:    ML_BSSN::ML_trace_curv
-    WRITES:   ADMBase::dtlapse
-    WRITES:   ADMBase::dtshift
+    READS:    ML_BSSN::A
+    READS:    ML_BSSN::alpha
+    READS:    ML_BSSN::B1
+    READS:    ML_BSSN::B2
+    READS:    ML_BSSN::B3
+    READS:    ML_BSSN::beta1
+    READS:    ML_BSSN::beta2
+    READS:    ML_BSSN::beta3
+    READS:    ML_BSSN::gt11
+    READS:    ML_BSSN::gt12
+    READS:    ML_BSSN::gt13
+    READS:    ML_BSSN::gt22
+    READS:    ML_BSSN::gt23
+    READS:    ML_BSSN::gt33
+    READS:    grid::r
+    READS:    ML_BSSN::trK
+    READS:    ML_BSSN::Xt1
+    READS:    ML_BSSN::Xt2
+    READS:    ML_BSSN::Xt3
+    WRITES:   ADMBase::dtalp
+    WRITES:   ADMBase::dtbetax
+    WRITES:   ADMBase::dtbetay
+    WRITES:   ADMBase::dtbetaz
   } "ML_BSSN_convertToADMBaseFakeDtLapseShift"
 }
 
@@ -605,17 +943,38 @@ schedule group ML_BSSN_constraints1_group in MoL_PseudoEvolution after MoL_PostS
 schedule ML_BSSN_constraints1 in ML_BSSN_constraints1_group
 {
   LANG: C
-  READS:    ML_BSSN::ML_curv
-  READS:    ML_BSSN::ML_Gamma
-  READS:    ML_BSSN::ML_lapse
-  READS:    ML_BSSN::ML_log_confac
-  READS:    ML_BSSN::ML_metric
-  READS:    ML_BSSN::ML_shift
-  READS:    ML_BSSN::ML_trace_curv
-  READS:    TmunuBase::stress_energy_scalar
-  READS:    TmunuBase::stress_energy_tensor
-  READS:    TmunuBase::stress_energy_vector
-  WRITES:   ML_BSSN::ML_Ham
+  READS:    ML_BSSN::alpha
+  READS:    ML_BSSN::At11
+  READS:    ML_BSSN::At12
+  READS:    ML_BSSN::At13
+  READS:    ML_BSSN::At22
+  READS:    ML_BSSN::At23
+  READS:    ML_BSSN::At33
+  READS:    ML_BSSN::beta1
+  READS:    ML_BSSN::beta2
+  READS:    ML_BSSN::beta3
+  READS:    TmunuBase::eTtt
+  READS:    TmunuBase::eTtx
+  READS:    TmunuBase::eTty
+  READS:    TmunuBase::eTtz
+  READS:    TmunuBase::eTxx
+  READS:    TmunuBase::eTxy
+  READS:    TmunuBase::eTxz
+  READS:    TmunuBase::eTyy
+  READS:    TmunuBase::eTyz
+  READS:    TmunuBase::eTzz
+  READS:    ML_BSSN::gt11
+  READS:    ML_BSSN::gt12
+  READS:    ML_BSSN::gt13
+  READS:    ML_BSSN::gt22
+  READS:    ML_BSSN::gt23
+  READS:    ML_BSSN::gt33
+  READS:    ML_BSSN::phi
+  READS:    ML_BSSN::trK
+  READS:    ML_BSSN::Xt1
+  READS:    ML_BSSN::Xt2
+  READS:    ML_BSSN::Xt3
+  WRITES:   ML_BSSN::H
 } "ML_BSSN_constraints1"
 
 schedule ML_BSSN_constraints1_SelectBCs in ML_BSSN_constraints1_bc_group
@@ -648,20 +1007,45 @@ schedule group ML_BSSN_constraints2_group in MoL_PseudoEvolution after MoL_PostS
 schedule ML_BSSN_constraints2 in ML_BSSN_constraints2_group
 {
   LANG: C
-  READS:    ML_BSSN::ML_curv
-  READS:    ML_BSSN::ML_Gamma
-  READS:    ML_BSSN::ML_lapse
-  READS:    ML_BSSN::ML_log_confac
-  READS:    ML_BSSN::ML_metric
-  READS:    ML_BSSN::ML_shift
-  READS:    ML_BSSN::ML_trace_curv
-  READS:    TmunuBase::stress_energy_scalar
-  READS:    TmunuBase::stress_energy_tensor
-  READS:    TmunuBase::stress_energy_vector
-  WRITES:   ML_BSSN::ML_cons_detg
-  WRITES:   ML_BSSN::ML_cons_Gamma
-  WRITES:   ML_BSSN::ML_cons_traceA
-  WRITES:   ML_BSSN::ML_mom
+  READS:    ML_BSSN::alpha
+  READS:    ML_BSSN::At11
+  READS:    ML_BSSN::At12
+  READS:    ML_BSSN::At13
+  READS:    ML_BSSN::At22
+  READS:    ML_BSSN::At23
+  READS:    ML_BSSN::At33
+  READS:    ML_BSSN::beta1
+  READS:    ML_BSSN::beta2
+  READS:    ML_BSSN::beta3
+  READS:    TmunuBase::eTtt
+  READS:    TmunuBase::eTtx
+  READS:    TmunuBase::eTty
+  READS:    TmunuBase::eTtz
+  READS:    TmunuBase::eTxx
+  READS:    TmunuBase::eTxy
+  READS:    TmunuBase::eTxz
+  READS:    TmunuBase::eTyy
+  READS:    TmunuBase::eTyz
+  READS:    TmunuBase::eTzz
+  READS:    ML_BSSN::gt11
+  READS:    ML_BSSN::gt12
+  READS:    ML_BSSN::gt13
+  READS:    ML_BSSN::gt22
+  READS:    ML_BSSN::gt23
+  READS:    ML_BSSN::gt33
+  READS:    ML_BSSN::phi
+  READS:    ML_BSSN::trK
+  READS:    ML_BSSN::Xt1
+  READS:    ML_BSSN::Xt2
+  READS:    ML_BSSN::Xt3
+  WRITES:   ML_BSSN::cA
+  WRITES:   ML_BSSN::cS
+  WRITES:   ML_BSSN::cXt1
+  WRITES:   ML_BSSN::cXt2
+  WRITES:   ML_BSSN::cXt3
+  WRITES:   ML_BSSN::M1
+  WRITES:   ML_BSSN::M2
+  WRITES:   ML_BSSN::M3
 } "ML_BSSN_constraints2"
 
 schedule ML_BSSN_constraints2_SelectBCs in ML_BSSN_constraints2_bc_group