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

1 files changed, 184 insertions, 48 deletions

diff --git a/ML_ADM/schedule.ccl b/ML_ADM/schedule.ccl
index c5c8a2b..f5f7977 100644
--- a/ML_ADM/schedule.ccl
+++ b/ML_ADM/schedule.ccl
@@ -133,10 +133,22 @@ if (CCTK_EQUALS(my_initial_data, "Minkowski"))
   schedule ML_ADM_Minkowski IN ADMBase_InitialData
   {
     LANG: C
-    WRITES:   ML_ADM::ML_curv
-    WRITES:   ML_ADM::ML_lapse
-    WRITES:   ML_ADM::ML_metric
-    WRITES:   ML_ADM::ML_shift
+    WRITES:   ML_ADM::alpha
+    WRITES:   ML_ADM::beta1
+    WRITES:   ML_ADM::beta2
+    WRITES:   ML_ADM::beta3
+    WRITES:   ML_ADM::g11
+    WRITES:   ML_ADM::g12
+    WRITES:   ML_ADM::g13
+    WRITES:   ML_ADM::g22
+    WRITES:   ML_ADM::g23
+    WRITES:   ML_ADM::g33
+    WRITES:   ML_ADM::K11
+    WRITES:   ML_ADM::K12
+    WRITES:   ML_ADM::K13
+    WRITES:   ML_ADM::K22
+    WRITES:   ML_ADM::K23
+    WRITES:   ML_ADM::K33
   } "ML_ADM_Minkowski"
 }
 
@@ -146,28 +158,76 @@ if (CCTK_EQUALS(my_initial_data, "ADMBase"))
   schedule ML_ADM_convertFromADMBase AT initial AFTER ADMBase_PostInitial
   {
     LANG: C
-    READS:    ADMBase::curv
-    READS:    ADMBase::lapse
-    READS:    ADMBase::metric
-    READS:    ADMBase::shift
-    WRITES:   ML_ADM::ML_curv
-    WRITES:   ML_ADM::ML_lapse
-    WRITES:   ML_ADM::ML_metric
-    WRITES:   ML_ADM::ML_shift
+    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
+    WRITES:   ML_ADM::alpha
+    WRITES:   ML_ADM::beta1
+    WRITES:   ML_ADM::beta2
+    WRITES:   ML_ADM::beta3
+    WRITES:   ML_ADM::g11
+    WRITES:   ML_ADM::g12
+    WRITES:   ML_ADM::g13
+    WRITES:   ML_ADM::g22
+    WRITES:   ML_ADM::g23
+    WRITES:   ML_ADM::g33
+    WRITES:   ML_ADM::K11
+    WRITES:   ML_ADM::K12
+    WRITES:   ML_ADM::K13
+    WRITES:   ML_ADM::K22
+    WRITES:   ML_ADM::K23
+    WRITES:   ML_ADM::K33
   } "ML_ADM_convertFromADMBase"
 }
 
 schedule ML_ADM_RHS IN MoL_CalcRHS
 {
   LANG: C
-  READS:    ML_ADM::ML_curv
-  READS:    ML_ADM::ML_lapse
-  READS:    ML_ADM::ML_metric
-  READS:    ML_ADM::ML_shift
-  WRITES:   ML_ADM::ML_curvrhs
-  WRITES:   ML_ADM::ML_lapserhs
-  WRITES:   ML_ADM::ML_metricrhs
-  WRITES:   ML_ADM::ML_shiftrhs
+  READS:    ML_ADM::alpha
+  READS:    ML_ADM::beta1
+  READS:    ML_ADM::beta2
+  READS:    ML_ADM::beta3
+  READS:    ML_ADM::g11
+  READS:    ML_ADM::g12
+  READS:    ML_ADM::g13
+  READS:    ML_ADM::g22
+  READS:    ML_ADM::g23
+  READS:    ML_ADM::g33
+  READS:    ML_ADM::K11
+  READS:    ML_ADM::K12
+  READS:    ML_ADM::K13
+  READS:    ML_ADM::K22
+  READS:    ML_ADM::K23
+  READS:    ML_ADM::K33
+  WRITES:   ML_ADM::alpharhs
+  WRITES:   ML_ADM::beta1rhs
+  WRITES:   ML_ADM::beta2rhs
+  WRITES:   ML_ADM::beta3rhs
+  WRITES:   ML_ADM::g11rhs
+  WRITES:   ML_ADM::g12rhs
+  WRITES:   ML_ADM::g13rhs
+  WRITES:   ML_ADM::g22rhs
+  WRITES:   ML_ADM::g23rhs
+  WRITES:   ML_ADM::g33rhs
+  WRITES:   ML_ADM::K11rhs
+  WRITES:   ML_ADM::K12rhs
+  WRITES:   ML_ADM::K13rhs
+  WRITES:   ML_ADM::K22rhs
+  WRITES:   ML_ADM::K23rhs
+  WRITES:   ML_ADM::K33rhs
 } "ML_ADM_RHS"
 
 schedule ML_ADM_RHS AT analysis
@@ -177,14 +237,38 @@ schedule ML_ADM_RHS AT analysis
   SYNC: ML_lapserhs
   SYNC: ML_metricrhs
   SYNC: ML_shiftrhs
-  READS:    ML_ADM::ML_curv
-  READS:    ML_ADM::ML_lapse
-  READS:    ML_ADM::ML_metric
-  READS:    ML_ADM::ML_shift
-  WRITES:   ML_ADM::ML_curvrhs
-  WRITES:   ML_ADM::ML_lapserhs
-  WRITES:   ML_ADM::ML_metricrhs
-  WRITES:   ML_ADM::ML_shiftrhs
+  READS:    ML_ADM::alpha
+  READS:    ML_ADM::beta1
+  READS:    ML_ADM::beta2
+  READS:    ML_ADM::beta3
+  READS:    ML_ADM::g11
+  READS:    ML_ADM::g12
+  READS:    ML_ADM::g13
+  READS:    ML_ADM::g22
+  READS:    ML_ADM::g23
+  READS:    ML_ADM::g33
+  READS:    ML_ADM::K11
+  READS:    ML_ADM::K12
+  READS:    ML_ADM::K13
+  READS:    ML_ADM::K22
+  READS:    ML_ADM::K23
+  READS:    ML_ADM::K33
+  WRITES:   ML_ADM::alpharhs
+  WRITES:   ML_ADM::beta1rhs
+  WRITES:   ML_ADM::beta2rhs
+  WRITES:   ML_ADM::beta3rhs
+  WRITES:   ML_ADM::g11rhs
+  WRITES:   ML_ADM::g12rhs
+  WRITES:   ML_ADM::g13rhs
+  WRITES:   ML_ADM::g22rhs
+  WRITES:   ML_ADM::g23rhs
+  WRITES:   ML_ADM::g33rhs
+  WRITES:   ML_ADM::K11rhs
+  WRITES:   ML_ADM::K12rhs
+  WRITES:   ML_ADM::K13rhs
+  WRITES:   ML_ADM::K22rhs
+  WRITES:   ML_ADM::K23rhs
+  WRITES:   ML_ADM::K33rhs
 } "ML_ADM_RHS"
 
 
@@ -193,26 +277,64 @@ if (CCTK_EQUALS(my_boundary_condition, "Minkowski"))
   schedule ML_ADM_boundary IN MoL_PostStep
   {
     LANG: C
-    WRITES:   ML_ADM::ML_curv
-    WRITES:   ML_ADM::ML_lapse
-    WRITES:   ML_ADM::ML_metric
-    WRITES:   ML_ADM::ML_shift
+    WRITES:   ML_ADM::alpha
+    WRITES:   ML_ADM::beta1
+    WRITES:   ML_ADM::beta2
+    WRITES:   ML_ADM::beta3
+    WRITES:   ML_ADM::g11
+    WRITES:   ML_ADM::g12
+    WRITES:   ML_ADM::g13
+    WRITES:   ML_ADM::g22
+    WRITES:   ML_ADM::g23
+    WRITES:   ML_ADM::g33
+    WRITES:   ML_ADM::K11
+    WRITES:   ML_ADM::K12
+    WRITES:   ML_ADM::K13
+    WRITES:   ML_ADM::K22
+    WRITES:   ML_ADM::K23
+    WRITES:   ML_ADM::K33
   } "ML_ADM_boundary"
 }
 
 schedule ML_ADM_convertToADMBase IN MoL_PostStep AFTER ML_ADM_ApplyBCs
 {
   LANG: C
-  READS:    ML_ADM::ML_curv
-  READS:    ML_ADM::ML_lapse
-  READS:    ML_ADM::ML_metric
-  READS:    ML_ADM::ML_shift
-  WRITES:   ADMBase::curv
-  WRITES:   ADMBase::dtlapse
-  WRITES:   ADMBase::dtshift
-  WRITES:   ADMBase::lapse
-  WRITES:   ADMBase::metric
-  WRITES:   ADMBase::shift
+  READS:    ML_ADM::alpha
+  READS:    ML_ADM::beta1
+  READS:    ML_ADM::beta2
+  READS:    ML_ADM::beta3
+  READS:    ML_ADM::g11
+  READS:    ML_ADM::g12
+  READS:    ML_ADM::g13
+  READS:    ML_ADM::g22
+  READS:    ML_ADM::g23
+  READS:    ML_ADM::g33
+  READS:    ML_ADM::K11
+  READS:    ML_ADM::K12
+  READS:    ML_ADM::K13
+  READS:    ML_ADM::K22
+  READS:    ML_ADM::K23
+  READS:    ML_ADM::K33
+  WRITES:   ADMBase::alp
+  WRITES:   ADMBase::betax
+  WRITES:   ADMBase::betay
+  WRITES:   ADMBase::betaz
+  WRITES:   ADMBase::dtalp
+  WRITES:   ADMBase::dtbetax
+  WRITES:   ADMBase::dtbetay
+  WRITES:   ADMBase::dtbetaz
+  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_ADM_convertToADMBase"
 
 schedule ML_ADM_constraints AT analysis
@@ -222,17 +344,31 @@ schedule ML_ADM_constraints AT analysis
   SYNC: ML_mom
   TRIGGERS: ML_Ham
   TRIGGERS: ML_mom
-  READS:    ML_ADM::ML_curv
-  READS:    ML_ADM::ML_metric
-  WRITES:   ML_ADM::ML_Ham
-  WRITES:   ML_ADM::ML_mom
+  READS:    ML_ADM::g11
+  READS:    ML_ADM::g12
+  READS:    ML_ADM::g13
+  READS:    ML_ADM::g22
+  READS:    ML_ADM::g23
+  READS:    ML_ADM::g33
+  READS:    ML_ADM::K11
+  READS:    ML_ADM::K12
+  READS:    ML_ADM::K13
+  READS:    ML_ADM::K22
+  READS:    ML_ADM::K23
+  READS:    ML_ADM::K33
+  WRITES:   ML_ADM::H
+  WRITES:   ML_ADM::M1
+  WRITES:   ML_ADM::M2
+  WRITES:   ML_ADM::M3
 } "ML_ADM_constraints"
 
 schedule ML_ADM_constraints_boundary AT analysis AFTER ML_ADM_constraints
 {
   LANG: C
-  WRITES:   ML_ADM::ML_Ham
-  WRITES:   ML_ADM::ML_mom
+  WRITES:   ML_ADM::H
+  WRITES:   ML_ADM::M1
+  WRITES:   ML_ADM::M2
+  WRITES:   ML_ADM::M3
 } "ML_ADM_constraints_boundary"
 
 schedule ML_ADM_SelectBoundConds in MoL_PostStep