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

1 files changed, 626 insertions, 242 deletions

diff --git a/ML_CCZ4/schedule.ccl b/ML_CCZ4/schedule.ccl
index ae25c0e..ca5cbeb 100644
--- a/ML_CCZ4/schedule.ccl
+++ b/ML_CCZ4/schedule.ccl
@@ -304,16 +304,32 @@ if (CCTK_EQUALS(my_initial_data, "Minkowski"))
   schedule ML_CCZ4_Minkowski IN ADMBase_InitialData
   {
     LANG: C
-    WRITES:   ML_CCZ4::ML_curv
-    WRITES:   ML_CCZ4::ML_dtlapse
-    WRITES:   ML_CCZ4::ML_dtshift
-    WRITES:   ML_CCZ4::ML_Gamma
-    WRITES:   ML_CCZ4::ML_lapse
-    WRITES:   ML_CCZ4::ML_log_confac
-    WRITES:   ML_CCZ4::ML_metric
-    WRITES:   ML_CCZ4::ML_shift
-    WRITES:   ML_CCZ4::ML_Theta
-    WRITES:   ML_CCZ4::ML_trace_curv
+    WRITES:   ML_CCZ4::A
+    WRITES:   ML_CCZ4::alpha
+    WRITES:   ML_CCZ4::At11
+    WRITES:   ML_CCZ4::At12
+    WRITES:   ML_CCZ4::At13
+    WRITES:   ML_CCZ4::At22
+    WRITES:   ML_CCZ4::At23
+    WRITES:   ML_CCZ4::At33
+    WRITES:   ML_CCZ4::B1
+    WRITES:   ML_CCZ4::B2
+    WRITES:   ML_CCZ4::B3
+    WRITES:   ML_CCZ4::beta1
+    WRITES:   ML_CCZ4::beta2
+    WRITES:   ML_CCZ4::beta3
+    WRITES:   ML_CCZ4::gt11
+    WRITES:   ML_CCZ4::gt12
+    WRITES:   ML_CCZ4::gt13
+    WRITES:   ML_CCZ4::gt22
+    WRITES:   ML_CCZ4::gt23
+    WRITES:   ML_CCZ4::gt33
+    WRITES:   ML_CCZ4::phi
+    WRITES:   ML_CCZ4::Theta
+    WRITES:   ML_CCZ4::trK
+    WRITES:   ML_CCZ4::Xt1
+    WRITES:   ML_CCZ4::Xt2
+    WRITES:   ML_CCZ4::Xt3
   } "ML_CCZ4_Minkowski"
 }
 
@@ -323,19 +339,43 @@ if (CCTK_EQUALS(my_initial_data, "ADMBase"))
   schedule ML_CCZ4_convertFromADMBase AT initial AFTER ADMBase_PostInitial
   {
     LANG: C
-    READS:    ADMBase::curv
-    READS:    ADMBase::lapse
-    READS:    ADMBase::metric
-    READS:    ADMBase::shift
-    READS:    ML_CCZ4::ML_log_confac
-    READS:    ML_CCZ4::ML_trace_curv
-    WRITES:   ML_CCZ4::ML_curv
-    WRITES:   ML_CCZ4::ML_lapse
-    WRITES:   ML_CCZ4::ML_log_confac
-    WRITES:   ML_CCZ4::ML_metric
-    WRITES:   ML_CCZ4::ML_shift
-    WRITES:   ML_CCZ4::ML_Theta
-    WRITES:   ML_CCZ4::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_CCZ4::phi
+    READS:    ML_CCZ4::trK
+    WRITES:   ML_CCZ4::alpha
+    WRITES:   ML_CCZ4::At11
+    WRITES:   ML_CCZ4::At12
+    WRITES:   ML_CCZ4::At13
+    WRITES:   ML_CCZ4::At22
+    WRITES:   ML_CCZ4::At23
+    WRITES:   ML_CCZ4::At33
+    WRITES:   ML_CCZ4::beta1
+    WRITES:   ML_CCZ4::beta2
+    WRITES:   ML_CCZ4::beta3
+    WRITES:   ML_CCZ4::gt11
+    WRITES:   ML_CCZ4::gt12
+    WRITES:   ML_CCZ4::gt13
+    WRITES:   ML_CCZ4::gt22
+    WRITES:   ML_CCZ4::gt23
+    WRITES:   ML_CCZ4::gt33
+    WRITES:   ML_CCZ4::phi
+    WRITES:   ML_CCZ4::Theta
+    WRITES:   ML_CCZ4::trK
   } "ML_CCZ4_convertFromADMBase"
 }
 
@@ -345,9 +385,13 @@ if (CCTK_EQUALS(my_initial_data, "ADMBase"))
   schedule ML_CCZ4_InitGamma AT initial BEFORE ML_CCZ4_convertFromADMBaseGamma
   {
     LANG: C
-    WRITES:   ML_CCZ4::ML_dtlapse
-    WRITES:   ML_CCZ4::ML_dtshift
-    WRITES:   ML_CCZ4::ML_Gamma
+    WRITES:   ML_CCZ4::A
+    WRITES:   ML_CCZ4::B1
+    WRITES:   ML_CCZ4::B2
+    WRITES:   ML_CCZ4::B3
+    WRITES:   ML_CCZ4::Xt1
+    WRITES:   ML_CCZ4::Xt2
+    WRITES:   ML_CCZ4::Xt3
   } "ML_CCZ4_InitGamma"
 }
 
@@ -360,65 +404,135 @@ 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_CCZ4::ML_lapse
-    READS:    ML_CCZ4::ML_metric
-    READS:    ML_CCZ4::ML_shift
-    WRITES:   ML_CCZ4::ML_dtlapse
-    WRITES:   ML_CCZ4::ML_dtshift
-    WRITES:   ML_CCZ4::ML_Gamma
+    READS:    ML_CCZ4::alpha
+    READS:    ML_CCZ4::beta1
+    READS:    ML_CCZ4::beta2
+    READS:    ML_CCZ4::beta3
+    READS:    ADMBase::dtalp
+    READS:    ADMBase::dtbetax
+    READS:    ADMBase::dtbetay
+    READS:    ADMBase::dtbetaz
+    READS:    ML_CCZ4::gt11
+    READS:    ML_CCZ4::gt12
+    READS:    ML_CCZ4::gt13
+    READS:    ML_CCZ4::gt22
+    READS:    ML_CCZ4::gt23
+    READS:    ML_CCZ4::gt33
+    READS:    grid::r
+    WRITES:   ML_CCZ4::A
+    WRITES:   ML_CCZ4::B1
+    WRITES:   ML_CCZ4::B2
+    WRITES:   ML_CCZ4::B3
+    WRITES:   ML_CCZ4::Xt1
+    WRITES:   ML_CCZ4::Xt2
+    WRITES:   ML_CCZ4::Xt3
   } "ML_CCZ4_convertFromADMBaseGamma"
 }
 
 schedule ML_CCZ4_RHS1 IN ML_CCZ4_evolCalcGroup
 {
   LANG: C
-  READS:    grid::coordinates
-  READS:    Grid::coordinates
-  READS:    ML_CCZ4::ML_curv
-  READS:    ML_CCZ4::ML_dtlapse
-  READS:    ML_CCZ4::ML_dtshift
-  READS:    ML_CCZ4::ML_Gamma
-  READS:    ML_CCZ4::ML_lapse
-  READS:    ML_CCZ4::ML_log_confac
-  READS:    ML_CCZ4::ML_metric
-  READS:    ML_CCZ4::ML_shift
-  READS:    ML_CCZ4::ML_Theta
-  READS:    ML_CCZ4::ML_trace_curv
-  READS:    TmunuBase::stress_energy_scalar
-  READS:    TmunuBase::stress_energy_tensor
-  READS:    TmunuBase::stress_energy_vector
-  WRITES:   ML_CCZ4::ML_dtlapserhs
-  WRITES:   ML_CCZ4::ML_dtshiftrhs
-  WRITES:   ML_CCZ4::ML_Gammarhs
-  WRITES:   ML_CCZ4::ML_lapserhs
-  WRITES:   ML_CCZ4::ML_log_confacrhs
-  WRITES:   ML_CCZ4::ML_metricrhs
-  WRITES:   ML_CCZ4::ML_shiftrhs
-  WRITES:   ML_CCZ4::ML_Thetarhs
-  WRITES:   ML_CCZ4::ML_trace_curvrhs
+  READS:    ML_CCZ4::A
+  READS:    ML_CCZ4::alpha
+  READS:    ML_CCZ4::At11
+  READS:    ML_CCZ4::At12
+  READS:    ML_CCZ4::At13
+  READS:    ML_CCZ4::At22
+  READS:    ML_CCZ4::At23
+  READS:    ML_CCZ4::At33
+  READS:    ML_CCZ4::B1
+  READS:    ML_CCZ4::B2
+  READS:    ML_CCZ4::B3
+  READS:    ML_CCZ4::beta1
+  READS:    ML_CCZ4::beta2
+  READS:    ML_CCZ4::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_CCZ4::gt11
+  READS:    ML_CCZ4::gt12
+  READS:    ML_CCZ4::gt13
+  READS:    ML_CCZ4::gt22
+  READS:    ML_CCZ4::gt23
+  READS:    ML_CCZ4::gt33
+  READS:    ML_CCZ4::phi
+  READS:    grid::r
+  READS:    ML_CCZ4::Theta
+  READS:    ML_CCZ4::trK
+  READS:    ML_CCZ4::Xt1
+  READS:    ML_CCZ4::Xt2
+  READS:    ML_CCZ4::Xt3
+  WRITES:   ML_CCZ4::alpharhs
+  WRITES:   ML_CCZ4::Arhs
+  WRITES:   ML_CCZ4::B1rhs
+  WRITES:   ML_CCZ4::B2rhs
+  WRITES:   ML_CCZ4::B3rhs
+  WRITES:   ML_CCZ4::beta1rhs
+  WRITES:   ML_CCZ4::beta2rhs
+  WRITES:   ML_CCZ4::beta3rhs
+  WRITES:   ML_CCZ4::gt11rhs
+  WRITES:   ML_CCZ4::gt12rhs
+  WRITES:   ML_CCZ4::gt13rhs
+  WRITES:   ML_CCZ4::gt22rhs
+  WRITES:   ML_CCZ4::gt23rhs
+  WRITES:   ML_CCZ4::gt33rhs
+  WRITES:   ML_CCZ4::phirhs
+  WRITES:   ML_CCZ4::Thetarhs
+  WRITES:   ML_CCZ4::trKrhs
+  WRITES:   ML_CCZ4::Xt1rhs
+  WRITES:   ML_CCZ4::Xt2rhs
+  WRITES:   ML_CCZ4::Xt3rhs
 } "ML_CCZ4_RHS1"
 
 schedule ML_CCZ4_RHS2 IN ML_CCZ4_evolCalcGroup
 {
   LANG: C
-  READS:    grid::coordinates
-  READS:    Grid::coordinates
-  READS:    ML_CCZ4::ML_curv
-  READS:    ML_CCZ4::ML_Gamma
-  READS:    ML_CCZ4::ML_lapse
-  READS:    ML_CCZ4::ML_log_confac
-  READS:    ML_CCZ4::ML_metric
-  READS:    ML_CCZ4::ML_shift
-  READS:    ML_CCZ4::ML_Theta
-  READS:    ML_CCZ4::ML_trace_curv
-  READS:    TmunuBase::stress_energy_scalar
-  READS:    TmunuBase::stress_energy_tensor
-  READS:    TmunuBase::stress_energy_vector
-  WRITES:   ML_CCZ4::ML_curvrhs
+  READS:    ML_CCZ4::alpha
+  READS:    ML_CCZ4::At11
+  READS:    ML_CCZ4::At12
+  READS:    ML_CCZ4::At13
+  READS:    ML_CCZ4::At22
+  READS:    ML_CCZ4::At23
+  READS:    ML_CCZ4::At33
+  READS:    ML_CCZ4::beta1
+  READS:    ML_CCZ4::beta2
+  READS:    ML_CCZ4::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_CCZ4::gt11
+  READS:    ML_CCZ4::gt12
+  READS:    ML_CCZ4::gt13
+  READS:    ML_CCZ4::gt22
+  READS:    ML_CCZ4::gt23
+  READS:    ML_CCZ4::gt33
+  READS:    ML_CCZ4::phi
+  READS:    grid::r
+  READS:    ML_CCZ4::Theta
+  READS:    ML_CCZ4::trK
+  READS:    ML_CCZ4::Xt1
+  READS:    ML_CCZ4::Xt2
+  READS:    ML_CCZ4::Xt3
+  WRITES:   ML_CCZ4::At11rhs
+  WRITES:   ML_CCZ4::At12rhs
+  WRITES:   ML_CCZ4::At13rhs
+  WRITES:   ML_CCZ4::At22rhs
+  WRITES:   ML_CCZ4::At23rhs
+  WRITES:   ML_CCZ4::At33rhs
 } "ML_CCZ4_RHS2"
 
 
@@ -427,87 +541,199 @@ if (CCTK_EQUALS(apply_dissipation, "always"))
   schedule ML_CCZ4_Dissipation IN ML_CCZ4_evolCalcGroup AFTER (ML_CCZ4_RHS1 ML_CCZ4_RHS2)
   {
     LANG: C
-    READS:    ML_CCZ4::ML_curv
-    READS:    ML_CCZ4::ML_curvrhs
-    READS:    ML_CCZ4::ML_dtlapse
-    READS:    ML_CCZ4::ML_dtlapserhs
-    READS:    ML_CCZ4::ML_dtshift
-    READS:    ML_CCZ4::ML_dtshiftrhs
-    READS:    ML_CCZ4::ML_Gamma
-    READS:    ML_CCZ4::ML_Gammarhs
-    READS:    ML_CCZ4::ML_lapse
-    READS:    ML_CCZ4::ML_lapserhs
-    READS:    ML_CCZ4::ML_log_confac
-    READS:    ML_CCZ4::ML_log_confacrhs
-    READS:    ML_CCZ4::ML_metric
-    READS:    ML_CCZ4::ML_metricrhs
-    READS:    ML_CCZ4::ML_shift
-    READS:    ML_CCZ4::ML_shiftrhs
-    READS:    ML_CCZ4::ML_Theta
-    READS:    ML_CCZ4::ML_Thetarhs
-    READS:    ML_CCZ4::ML_trace_curv
-    READS:    ML_CCZ4::ML_trace_curvrhs
-    WRITES:   ML_CCZ4::ML_curvrhs
-    WRITES:   ML_CCZ4::ML_dtlapserhs
-    WRITES:   ML_CCZ4::ML_dtshiftrhs
-    WRITES:   ML_CCZ4::ML_Gammarhs
-    WRITES:   ML_CCZ4::ML_lapserhs
-    WRITES:   ML_CCZ4::ML_log_confacrhs
-    WRITES:   ML_CCZ4::ML_metricrhs
-    WRITES:   ML_CCZ4::ML_shiftrhs
-    WRITES:   ML_CCZ4::ML_Thetarhs
-    WRITES:   ML_CCZ4::ML_trace_curvrhs
+    READS:    ML_CCZ4::A
+    READS:    ML_CCZ4::alpha
+    READS:    ML_CCZ4::alpharhs
+    READS:    ML_CCZ4::Arhs
+    READS:    ML_CCZ4::At11
+    READS:    ML_CCZ4::At11rhs
+    READS:    ML_CCZ4::At12
+    READS:    ML_CCZ4::At12rhs
+    READS:    ML_CCZ4::At13
+    READS:    ML_CCZ4::At13rhs
+    READS:    ML_CCZ4::At22
+    READS:    ML_CCZ4::At22rhs
+    READS:    ML_CCZ4::At23
+    READS:    ML_CCZ4::At23rhs
+    READS:    ML_CCZ4::At33
+    READS:    ML_CCZ4::At33rhs
+    READS:    ML_CCZ4::B1
+    READS:    ML_CCZ4::B1rhs
+    READS:    ML_CCZ4::B2
+    READS:    ML_CCZ4::B2rhs
+    READS:    ML_CCZ4::B3
+    READS:    ML_CCZ4::B3rhs
+    READS:    ML_CCZ4::beta1
+    READS:    ML_CCZ4::beta1rhs
+    READS:    ML_CCZ4::beta2
+    READS:    ML_CCZ4::beta2rhs
+    READS:    ML_CCZ4::beta3
+    READS:    ML_CCZ4::beta3rhs
+    READS:    ML_CCZ4::gt11
+    READS:    ML_CCZ4::gt11rhs
+    READS:    ML_CCZ4::gt12
+    READS:    ML_CCZ4::gt12rhs
+    READS:    ML_CCZ4::gt13
+    READS:    ML_CCZ4::gt13rhs
+    READS:    ML_CCZ4::gt22
+    READS:    ML_CCZ4::gt22rhs
+    READS:    ML_CCZ4::gt23
+    READS:    ML_CCZ4::gt23rhs
+    READS:    ML_CCZ4::gt33
+    READS:    ML_CCZ4::gt33rhs
+    READS:    ML_CCZ4::phi
+    READS:    ML_CCZ4::phirhs
+    READS:    ML_CCZ4::Theta
+    READS:    ML_CCZ4::Thetarhs
+    READS:    ML_CCZ4::trK
+    READS:    ML_CCZ4::trKrhs
+    READS:    ML_CCZ4::Xt1
+    READS:    ML_CCZ4::Xt1rhs
+    READS:    ML_CCZ4::Xt2
+    READS:    ML_CCZ4::Xt2rhs
+    READS:    ML_CCZ4::Xt3
+    READS:    ML_CCZ4::Xt3rhs
+    WRITES:   ML_CCZ4::alpharhs
+    WRITES:   ML_CCZ4::Arhs
+    WRITES:   ML_CCZ4::At11rhs
+    WRITES:   ML_CCZ4::At12rhs
+    WRITES:   ML_CCZ4::At13rhs
+    WRITES:   ML_CCZ4::At22rhs
+    WRITES:   ML_CCZ4::At23rhs
+    WRITES:   ML_CCZ4::At33rhs
+    WRITES:   ML_CCZ4::B1rhs
+    WRITES:   ML_CCZ4::B2rhs
+    WRITES:   ML_CCZ4::B3rhs
+    WRITES:   ML_CCZ4::beta1rhs
+    WRITES:   ML_CCZ4::beta2rhs
+    WRITES:   ML_CCZ4::beta3rhs
+    WRITES:   ML_CCZ4::gt11rhs
+    WRITES:   ML_CCZ4::gt12rhs
+    WRITES:   ML_CCZ4::gt13rhs
+    WRITES:   ML_CCZ4::gt22rhs
+    WRITES:   ML_CCZ4::gt23rhs
+    WRITES:   ML_CCZ4::gt33rhs
+    WRITES:   ML_CCZ4::phirhs
+    WRITES:   ML_CCZ4::Thetarhs
+    WRITES:   ML_CCZ4::trKrhs
+    WRITES:   ML_CCZ4::Xt1rhs
+    WRITES:   ML_CCZ4::Xt2rhs
+    WRITES:   ML_CCZ4::Xt3rhs
   } "ML_CCZ4_Dissipation"
 }
 
 schedule ML_CCZ4_Advect IN ML_CCZ4_evolCalcGroup AFTER (ML_CCZ4_RHS1 ML_CCZ4_RHS2)
 {
   LANG: C
-  READS:    ML_CCZ4::ML_curv
-  READS:    ML_CCZ4::ML_curvrhs
-  READS:    ML_CCZ4::ML_dtlapse
-  READS:    ML_CCZ4::ML_dtlapserhs
-  READS:    ML_CCZ4::ML_dtshift
-  READS:    ML_CCZ4::ML_dtshiftrhs
-  READS:    ML_CCZ4::ML_Gamma
-  READS:    ML_CCZ4::ML_Gammarhs
-  READS:    ML_CCZ4::ML_lapse
-  READS:    ML_CCZ4::ML_lapserhs
-  READS:    ML_CCZ4::ML_log_confac
-  READS:    ML_CCZ4::ML_log_confacrhs
-  READS:    ML_CCZ4::ML_metric
-  READS:    ML_CCZ4::ML_metricrhs
-  READS:    ML_CCZ4::ML_shift
-  READS:    ML_CCZ4::ML_shiftrhs
-  READS:    ML_CCZ4::ML_Theta
-  READS:    ML_CCZ4::ML_Thetarhs
-  READS:    ML_CCZ4::ML_trace_curv
-  READS:    ML_CCZ4::ML_trace_curvrhs
-  WRITES:   ML_CCZ4::ML_curvrhs
-  WRITES:   ML_CCZ4::ML_dtlapserhs
-  WRITES:   ML_CCZ4::ML_dtshiftrhs
-  WRITES:   ML_CCZ4::ML_Gammarhs
-  WRITES:   ML_CCZ4::ML_lapserhs
-  WRITES:   ML_CCZ4::ML_log_confacrhs
-  WRITES:   ML_CCZ4::ML_metricrhs
-  WRITES:   ML_CCZ4::ML_shiftrhs
-  WRITES:   ML_CCZ4::ML_Thetarhs
-  WRITES:   ML_CCZ4::ML_trace_curvrhs
+  READS:    ML_CCZ4::A
+  READS:    ML_CCZ4::alpha
+  READS:    ML_CCZ4::alpharhs
+  READS:    ML_CCZ4::Arhs
+  READS:    ML_CCZ4::At11
+  READS:    ML_CCZ4::At11rhs
+  READS:    ML_CCZ4::At12
+  READS:    ML_CCZ4::At12rhs
+  READS:    ML_CCZ4::At13
+  READS:    ML_CCZ4::At13rhs
+  READS:    ML_CCZ4::At22
+  READS:    ML_CCZ4::At22rhs
+  READS:    ML_CCZ4::At23
+  READS:    ML_CCZ4::At23rhs
+  READS:    ML_CCZ4::At33
+  READS:    ML_CCZ4::At33rhs
+  READS:    ML_CCZ4::B1
+  READS:    ML_CCZ4::B1rhs
+  READS:    ML_CCZ4::B2
+  READS:    ML_CCZ4::B2rhs
+  READS:    ML_CCZ4::B3
+  READS:    ML_CCZ4::B3rhs
+  READS:    ML_CCZ4::beta1
+  READS:    ML_CCZ4::beta1rhs
+  READS:    ML_CCZ4::beta2
+  READS:    ML_CCZ4::beta2rhs
+  READS:    ML_CCZ4::beta3
+  READS:    ML_CCZ4::beta3rhs
+  READS:    ML_CCZ4::gt11
+  READS:    ML_CCZ4::gt11rhs
+  READS:    ML_CCZ4::gt12
+  READS:    ML_CCZ4::gt12rhs
+  READS:    ML_CCZ4::gt13
+  READS:    ML_CCZ4::gt13rhs
+  READS:    ML_CCZ4::gt22
+  READS:    ML_CCZ4::gt22rhs
+  READS:    ML_CCZ4::gt23
+  READS:    ML_CCZ4::gt23rhs
+  READS:    ML_CCZ4::gt33
+  READS:    ML_CCZ4::gt33rhs
+  READS:    ML_CCZ4::phi
+  READS:    ML_CCZ4::phirhs
+  READS:    ML_CCZ4::Theta
+  READS:    ML_CCZ4::Thetarhs
+  READS:    ML_CCZ4::trK
+  READS:    ML_CCZ4::trKrhs
+  READS:    ML_CCZ4::Xt1
+  READS:    ML_CCZ4::Xt1rhs
+  READS:    ML_CCZ4::Xt2
+  READS:    ML_CCZ4::Xt2rhs
+  READS:    ML_CCZ4::Xt3
+  READS:    ML_CCZ4::Xt3rhs
+  WRITES:   ML_CCZ4::alpharhs
+  WRITES:   ML_CCZ4::Arhs
+  WRITES:   ML_CCZ4::At11rhs
+  WRITES:   ML_CCZ4::At12rhs
+  WRITES:   ML_CCZ4::At13rhs
+  WRITES:   ML_CCZ4::At22rhs
+  WRITES:   ML_CCZ4::At23rhs
+  WRITES:   ML_CCZ4::At33rhs
+  WRITES:   ML_CCZ4::B1rhs
+  WRITES:   ML_CCZ4::B2rhs
+  WRITES:   ML_CCZ4::B3rhs
+  WRITES:   ML_CCZ4::beta1rhs
+  WRITES:   ML_CCZ4::beta2rhs
+  WRITES:   ML_CCZ4::beta3rhs
+  WRITES:   ML_CCZ4::gt11rhs
+  WRITES:   ML_CCZ4::gt12rhs
+  WRITES:   ML_CCZ4::gt13rhs
+  WRITES:   ML_CCZ4::gt22rhs
+  WRITES:   ML_CCZ4::gt23rhs
+  WRITES:   ML_CCZ4::gt33rhs
+  WRITES:   ML_CCZ4::phirhs
+  WRITES:   ML_CCZ4::Thetarhs
+  WRITES:   ML_CCZ4::trKrhs
+  WRITES:   ML_CCZ4::Xt1rhs
+  WRITES:   ML_CCZ4::Xt2rhs
+  WRITES:   ML_CCZ4::Xt3rhs
 } "ML_CCZ4_Advect"
 
 schedule ML_CCZ4_InitRHS AT analysis BEFORE ML_CCZ4_evolCalcGroup
 {
   LANG: C
-  WRITES:   ML_CCZ4::ML_curvrhs
-  WRITES:   ML_CCZ4::ML_dtlapserhs
-  WRITES:   ML_CCZ4::ML_dtshiftrhs
-  WRITES:   ML_CCZ4::ML_Gammarhs
-  WRITES:   ML_CCZ4::ML_lapserhs
-  WRITES:   ML_CCZ4::ML_log_confacrhs
-  WRITES:   ML_CCZ4::ML_metricrhs
-  WRITES:   ML_CCZ4::ML_shiftrhs
-  WRITES:   ML_CCZ4::ML_Thetarhs
-  WRITES:   ML_CCZ4::ML_trace_curvrhs
+  WRITES:   ML_CCZ4::alpharhs
+  WRITES:   ML_CCZ4::Arhs
+  WRITES:   ML_CCZ4::At11rhs
+  WRITES:   ML_CCZ4::At12rhs
+  WRITES:   ML_CCZ4::At13rhs
+  WRITES:   ML_CCZ4::At22rhs
+  WRITES:   ML_CCZ4::At23rhs
+  WRITES:   ML_CCZ4::At33rhs
+  WRITES:   ML_CCZ4::B1rhs
+  WRITES:   ML_CCZ4::B2rhs
+  WRITES:   ML_CCZ4::B3rhs
+  WRITES:   ML_CCZ4::beta1rhs
+  WRITES:   ML_CCZ4::beta2rhs
+  WRITES:   ML_CCZ4::beta3rhs
+  WRITES:   ML_CCZ4::gt11rhs
+  WRITES:   ML_CCZ4::gt12rhs
+  WRITES:   ML_CCZ4::gt13rhs
+  WRITES:   ML_CCZ4::gt22rhs
+  WRITES:   ML_CCZ4::gt23rhs
+  WRITES:   ML_CCZ4::gt33rhs
+  WRITES:   ML_CCZ4::phirhs
+  WRITES:   ML_CCZ4::Thetarhs
+  WRITES:   ML_CCZ4::trKrhs
+  WRITES:   ML_CCZ4::Xt1rhs
+  WRITES:   ML_CCZ4::Xt2rhs
+  WRITES:   ML_CCZ4::Xt3rhs
 } "ML_CCZ4_InitRHS"
 
 
@@ -516,27 +742,58 @@ if (CCTK_EQUALS(my_rhs_boundary_condition, "static"))
   schedule ML_CCZ4_RHSStaticBoundary IN MoL_CalcRHS
   {
     LANG: C
-    WRITES:   ML_CCZ4::ML_curvrhs
-    WRITES:   ML_CCZ4::ML_dtlapserhs
-    WRITES:   ML_CCZ4::ML_dtshiftrhs
-    WRITES:   ML_CCZ4::ML_Gammarhs
-    WRITES:   ML_CCZ4::ML_lapserhs
-    WRITES:   ML_CCZ4::ML_log_confacrhs
-    WRITES:   ML_CCZ4::ML_metricrhs
-    WRITES:   ML_CCZ4::ML_shiftrhs
-    WRITES:   ML_CCZ4::ML_Thetarhs
-    WRITES:   ML_CCZ4::ML_trace_curvrhs
+    WRITES:   ML_CCZ4::alpharhs
+    WRITES:   ML_CCZ4::Arhs
+    WRITES:   ML_CCZ4::At11rhs
+    WRITES:   ML_CCZ4::At12rhs
+    WRITES:   ML_CCZ4::At13rhs
+    WRITES:   ML_CCZ4::At22rhs
+    WRITES:   ML_CCZ4::At23rhs
+    WRITES:   ML_CCZ4::At33rhs
+    WRITES:   ML_CCZ4::B1rhs
+    WRITES:   ML_CCZ4::B2rhs
+    WRITES:   ML_CCZ4::B3rhs
+    WRITES:   ML_CCZ4::beta1rhs
+    WRITES:   ML_CCZ4::beta2rhs
+    WRITES:   ML_CCZ4::beta3rhs
+    WRITES:   ML_CCZ4::gt11rhs
+    WRITES:   ML_CCZ4::gt12rhs
+    WRITES:   ML_CCZ4::gt13rhs
+    WRITES:   ML_CCZ4::gt22rhs
+    WRITES:   ML_CCZ4::gt23rhs
+    WRITES:   ML_CCZ4::gt33rhs
+    WRITES:   ML_CCZ4::phirhs
+    WRITES:   ML_CCZ4::Thetarhs
+    WRITES:   ML_CCZ4::trKrhs
+    WRITES:   ML_CCZ4::Xt1rhs
+    WRITES:   ML_CCZ4::Xt2rhs
+    WRITES:   ML_CCZ4::Xt3rhs
   } "ML_CCZ4_RHSStaticBoundary"
 }
 
 schedule ML_CCZ4_enforce IN MoL_PostStepModify
 {
   LANG: C
-  READS:    ML_CCZ4::ML_curv
-  READS:    ML_CCZ4::ML_lapse
-  READS:    ML_CCZ4::ML_metric
-  WRITES:   ML_CCZ4::ML_curv
-  WRITES:   ML_CCZ4::ML_lapse
+  READS:    ML_CCZ4::alpha
+  READS:    ML_CCZ4::At11
+  READS:    ML_CCZ4::At12
+  READS:    ML_CCZ4::At13
+  READS:    ML_CCZ4::At22
+  READS:    ML_CCZ4::At23
+  READS:    ML_CCZ4::At33
+  READS:    ML_CCZ4::gt11
+  READS:    ML_CCZ4::gt12
+  READS:    ML_CCZ4::gt13
+  READS:    ML_CCZ4::gt22
+  READS:    ML_CCZ4::gt23
+  READS:    ML_CCZ4::gt33
+  WRITES:   ML_CCZ4::alpha
+  WRITES:   ML_CCZ4::At11
+  WRITES:   ML_CCZ4::At12
+  WRITES:   ML_CCZ4::At13
+  WRITES:   ML_CCZ4::At22
+  WRITES:   ML_CCZ4::At23
+  WRITES:   ML_CCZ4::At33
 } "ML_CCZ4_enforce"
 
 
@@ -545,33 +802,78 @@ if (CCTK_EQUALS(my_boundary_condition, "Minkowski"))
   schedule ML_CCZ4_boundary IN MoL_PostStep
   {
     LANG: C
-    WRITES:   ML_CCZ4::ML_curv
-    WRITES:   ML_CCZ4::ML_dtlapse
-    WRITES:   ML_CCZ4::ML_dtshift
-    WRITES:   ML_CCZ4::ML_Gamma
-    WRITES:   ML_CCZ4::ML_lapse
-    WRITES:   ML_CCZ4::ML_log_confac
-    WRITES:   ML_CCZ4::ML_metric
-    WRITES:   ML_CCZ4::ML_shift
-    WRITES:   ML_CCZ4::ML_Theta
-    WRITES:   ML_CCZ4::ML_trace_curv
+    WRITES:   ML_CCZ4::A
+    WRITES:   ML_CCZ4::alpha
+    WRITES:   ML_CCZ4::At11
+    WRITES:   ML_CCZ4::At12
+    WRITES:   ML_CCZ4::At13
+    WRITES:   ML_CCZ4::At22
+    WRITES:   ML_CCZ4::At23
+    WRITES:   ML_CCZ4::At33
+    WRITES:   ML_CCZ4::B1
+    WRITES:   ML_CCZ4::B2
+    WRITES:   ML_CCZ4::B3
+    WRITES:   ML_CCZ4::beta1
+    WRITES:   ML_CCZ4::beta2
+    WRITES:   ML_CCZ4::beta3
+    WRITES:   ML_CCZ4::gt11
+    WRITES:   ML_CCZ4::gt12
+    WRITES:   ML_CCZ4::gt13
+    WRITES:   ML_CCZ4::gt22
+    WRITES:   ML_CCZ4::gt23
+    WRITES:   ML_CCZ4::gt33
+    WRITES:   ML_CCZ4::phi
+    WRITES:   ML_CCZ4::Theta
+    WRITES:   ML_CCZ4::trK
+    WRITES:   ML_CCZ4::Xt1
+    WRITES:   ML_CCZ4::Xt2
+    WRITES:   ML_CCZ4::Xt3
   } "ML_CCZ4_boundary"
 }
 
 schedule ML_CCZ4_convertToADMBase IN ML_CCZ4_convertToADMBaseGroup
 {
   LANG: C
-  READS:    ADMBase::metric
-  READS:    ML_CCZ4::ML_curv
-  READS:    ML_CCZ4::ML_lapse
-  READS:    ML_CCZ4::ML_log_confac
-  READS:    ML_CCZ4::ML_metric
-  READS:    ML_CCZ4::ML_shift
-  READS:    ML_CCZ4::ML_trace_curv
-  WRITES:   ADMBase::curv
-  WRITES:   ADMBase::lapse
-  WRITES:   ADMBase::metric
-  WRITES:   ADMBase::shift
+  READS:    ML_CCZ4::alpha
+  READS:    ML_CCZ4::At11
+  READS:    ML_CCZ4::At12
+  READS:    ML_CCZ4::At13
+  READS:    ML_CCZ4::At22
+  READS:    ML_CCZ4::At23
+  READS:    ML_CCZ4::At33
+  READS:    ML_CCZ4::beta1
+  READS:    ML_CCZ4::beta2
+  READS:    ML_CCZ4::beta3
+  READS:    ML_CCZ4::gt11
+  READS:    ML_CCZ4::gt12
+  READS:    ML_CCZ4::gt13
+  READS:    ML_CCZ4::gt22
+  READS:    ML_CCZ4::gt23
+  READS:    ML_CCZ4::gt33
+  READS:    ADMBase::gxx
+  READS:    ADMBase::gxy
+  READS:    ADMBase::gxz
+  READS:    ADMBase::gyy
+  READS:    ADMBase::gyz
+  READS:    ADMBase::gzz
+  READS:    ML_CCZ4::phi
+  READS:    ML_CCZ4::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_CCZ4_convertToADMBase"
 
 
@@ -582,19 +884,31 @@ if (CCTK_EQUALS(dt_lapse_shift_method, "correct"))
     LANG: C
     SYNC: ADMBase::dtlapse
     SYNC: ADMBase::dtshift
-    READS:    grid::coordinates
-    READS:    Grid::coordinates
-    READS:    ML_CCZ4::ML_dtlapse
-    READS:    ML_CCZ4::ML_dtshift
-    READS:    ML_CCZ4::ML_Gamma
-    READS:    ML_CCZ4::ML_lapse
-    READS:    ML_CCZ4::ML_log_confac
-    READS:    ML_CCZ4::ML_metric
-    READS:    ML_CCZ4::ML_shift
-    READS:    ML_CCZ4::ML_Theta
-    READS:    ML_CCZ4::ML_trace_curv
-    WRITES:   ADMBase::dtlapse
-    WRITES:   ADMBase::dtshift
+    READS:    ML_CCZ4::A
+    READS:    ML_CCZ4::alpha
+    READS:    ML_CCZ4::B1
+    READS:    ML_CCZ4::B2
+    READS:    ML_CCZ4::B3
+    READS:    ML_CCZ4::beta1
+    READS:    ML_CCZ4::beta2
+    READS:    ML_CCZ4::beta3
+    READS:    ML_CCZ4::gt11
+    READS:    ML_CCZ4::gt12
+    READS:    ML_CCZ4::gt13
+    READS:    ML_CCZ4::gt22
+    READS:    ML_CCZ4::gt23
+    READS:    ML_CCZ4::gt33
+    READS:    ML_CCZ4::phi
+    READS:    grid::r
+    READS:    ML_CCZ4::Theta
+    READS:    ML_CCZ4::trK
+    READS:    ML_CCZ4::Xt1
+    READS:    ML_CCZ4::Xt2
+    READS:    ML_CCZ4::Xt3
+    WRITES:   ADMBase::dtalp
+    WRITES:   ADMBase::dtbetax
+    WRITES:   ADMBase::dtbetay
+    WRITES:   ADMBase::dtbetaz
   } "ML_CCZ4_convertToADMBaseDtLapseShift"
 }
 
@@ -604,18 +918,30 @@ if (CCTK_EQUALS(dt_lapse_shift_method, "correct"))
   schedule ML_CCZ4_convertToADMBaseDtLapseShiftBoundary IN ML_CCZ4_convertToADMBaseGroup
   {
     LANG: C
-    READS:    grid::coordinates
-    READS:    Grid::coordinates
-    READS:    ML_CCZ4::ML_dtlapse
-    READS:    ML_CCZ4::ML_dtshift
-    READS:    ML_CCZ4::ML_Gamma
-    READS:    ML_CCZ4::ML_lapse
-    READS:    ML_CCZ4::ML_metric
-    READS:    ML_CCZ4::ML_shift
-    READS:    ML_CCZ4::ML_Theta
-    READS:    ML_CCZ4::ML_trace_curv
-    WRITES:   ADMBase::dtlapse
-    WRITES:   ADMBase::dtshift
+    READS:    ML_CCZ4::A
+    READS:    ML_CCZ4::alpha
+    READS:    ML_CCZ4::B1
+    READS:    ML_CCZ4::B2
+    READS:    ML_CCZ4::B3
+    READS:    ML_CCZ4::beta1
+    READS:    ML_CCZ4::beta2
+    READS:    ML_CCZ4::beta3
+    READS:    ML_CCZ4::gt11
+    READS:    ML_CCZ4::gt12
+    READS:    ML_CCZ4::gt13
+    READS:    ML_CCZ4::gt22
+    READS:    ML_CCZ4::gt23
+    READS:    ML_CCZ4::gt33
+    READS:    grid::r
+    READS:    ML_CCZ4::Theta
+    READS:    ML_CCZ4::trK
+    READS:    ML_CCZ4::Xt1
+    READS:    ML_CCZ4::Xt2
+    READS:    ML_CCZ4::Xt3
+    WRITES:   ADMBase::dtalp
+    WRITES:   ADMBase::dtbetax
+    WRITES:   ADMBase::dtbetay
+    WRITES:   ADMBase::dtbetaz
   } "ML_CCZ4_convertToADMBaseDtLapseShiftBoundary"
 }
 
@@ -625,18 +951,30 @@ if (CCTK_EQUALS(dt_lapse_shift_method, "noLapseShiftAdvection"))
   schedule ML_CCZ4_convertToADMBaseFakeDtLapseShift IN ML_CCZ4_convertToADMBaseGroup
   {
     LANG: C
-    READS:    grid::coordinates
-    READS:    Grid::coordinates
-    READS:    ML_CCZ4::ML_dtlapse
-    READS:    ML_CCZ4::ML_dtshift
-    READS:    ML_CCZ4::ML_Gamma
-    READS:    ML_CCZ4::ML_lapse
-    READS:    ML_CCZ4::ML_metric
-    READS:    ML_CCZ4::ML_shift
-    READS:    ML_CCZ4::ML_Theta
-    READS:    ML_CCZ4::ML_trace_curv
-    WRITES:   ADMBase::dtlapse
-    WRITES:   ADMBase::dtshift
+    READS:    ML_CCZ4::A
+    READS:    ML_CCZ4::alpha
+    READS:    ML_CCZ4::B1
+    READS:    ML_CCZ4::B2
+    READS:    ML_CCZ4::B3
+    READS:    ML_CCZ4::beta1
+    READS:    ML_CCZ4::beta2
+    READS:    ML_CCZ4::beta3
+    READS:    ML_CCZ4::gt11
+    READS:    ML_CCZ4::gt12
+    READS:    ML_CCZ4::gt13
+    READS:    ML_CCZ4::gt22
+    READS:    ML_CCZ4::gt23
+    READS:    ML_CCZ4::gt33
+    READS:    grid::r
+    READS:    ML_CCZ4::Theta
+    READS:    ML_CCZ4::trK
+    READS:    ML_CCZ4::Xt1
+    READS:    ML_CCZ4::Xt2
+    READS:    ML_CCZ4::Xt3
+    WRITES:   ADMBase::dtalp
+    WRITES:   ADMBase::dtbetax
+    WRITES:   ADMBase::dtbetay
+    WRITES:   ADMBase::dtbetaz
   } "ML_CCZ4_convertToADMBaseFakeDtLapseShift"
 }
 
@@ -648,17 +986,38 @@ schedule group ML_CCZ4_constraints1_group in MoL_PseudoEvolution after MoL_PostS
 schedule ML_CCZ4_constraints1 in ML_CCZ4_constraints1_group
 {
   LANG: C
-  READS:    ML_CCZ4::ML_curv
-  READS:    ML_CCZ4::ML_Gamma
-  READS:    ML_CCZ4::ML_lapse
-  READS:    ML_CCZ4::ML_log_confac
-  READS:    ML_CCZ4::ML_metric
-  READS:    ML_CCZ4::ML_shift
-  READS:    ML_CCZ4::ML_trace_curv
-  READS:    TmunuBase::stress_energy_scalar
-  READS:    TmunuBase::stress_energy_tensor
-  READS:    TmunuBase::stress_energy_vector
-  WRITES:   ML_CCZ4::ML_Ham
+  READS:    ML_CCZ4::alpha
+  READS:    ML_CCZ4::At11
+  READS:    ML_CCZ4::At12
+  READS:    ML_CCZ4::At13
+  READS:    ML_CCZ4::At22
+  READS:    ML_CCZ4::At23
+  READS:    ML_CCZ4::At33
+  READS:    ML_CCZ4::beta1
+  READS:    ML_CCZ4::beta2
+  READS:    ML_CCZ4::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_CCZ4::gt11
+  READS:    ML_CCZ4::gt12
+  READS:    ML_CCZ4::gt13
+  READS:    ML_CCZ4::gt22
+  READS:    ML_CCZ4::gt23
+  READS:    ML_CCZ4::gt33
+  READS:    ML_CCZ4::phi
+  READS:    ML_CCZ4::trK
+  READS:    ML_CCZ4::Xt1
+  READS:    ML_CCZ4::Xt2
+  READS:    ML_CCZ4::Xt3
+  WRITES:   ML_CCZ4::H
 } "ML_CCZ4_constraints1"
 
 schedule ML_CCZ4_constraints1_SelectBCs in ML_CCZ4_constraints1_bc_group
@@ -691,20 +1050,45 @@ schedule group ML_CCZ4_constraints2_group in MoL_PseudoEvolution after MoL_PostS
 schedule ML_CCZ4_constraints2 in ML_CCZ4_constraints2_group
 {
   LANG: C
-  READS:    ML_CCZ4::ML_curv
-  READS:    ML_CCZ4::ML_Gamma
-  READS:    ML_CCZ4::ML_lapse
-  READS:    ML_CCZ4::ML_log_confac
-  READS:    ML_CCZ4::ML_metric
-  READS:    ML_CCZ4::ML_shift
-  READS:    ML_CCZ4::ML_trace_curv
-  READS:    TmunuBase::stress_energy_scalar
-  READS:    TmunuBase::stress_energy_tensor
-  READS:    TmunuBase::stress_energy_vector
-  WRITES:   ML_CCZ4::ML_cons_detg
-  WRITES:   ML_CCZ4::ML_cons_Gamma
-  WRITES:   ML_CCZ4::ML_cons_traceA
-  WRITES:   ML_CCZ4::ML_mom
+  READS:    ML_CCZ4::alpha
+  READS:    ML_CCZ4::At11
+  READS:    ML_CCZ4::At12
+  READS:    ML_CCZ4::At13
+  READS:    ML_CCZ4::At22
+  READS:    ML_CCZ4::At23
+  READS:    ML_CCZ4::At33
+  READS:    ML_CCZ4::beta1
+  READS:    ML_CCZ4::beta2
+  READS:    ML_CCZ4::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_CCZ4::gt11
+  READS:    ML_CCZ4::gt12
+  READS:    ML_CCZ4::gt13
+  READS:    ML_CCZ4::gt22
+  READS:    ML_CCZ4::gt23
+  READS:    ML_CCZ4::gt33
+  READS:    ML_CCZ4::phi
+  READS:    ML_CCZ4::trK
+  READS:    ML_CCZ4::Xt1
+  READS:    ML_CCZ4::Xt2
+  READS:    ML_CCZ4::Xt3
+  WRITES:   ML_CCZ4::cA
+  WRITES:   ML_CCZ4::cS
+  WRITES:   ML_CCZ4::cXt1
+  WRITES:   ML_CCZ4::cXt2
+  WRITES:   ML_CCZ4::cXt3
+  WRITES:   ML_CCZ4::M1
+  WRITES:   ML_CCZ4::M2
+  WRITES:   ML_CCZ4::M3
 } "ML_CCZ4_constraints2"
 
 schedule ML_CCZ4_constraints2_SelectBCs in ML_CCZ4_constraints2_bc_group