Add script to re-generate thorns.

15 files changed, 48 insertions, 30 deletions

diff --git a/ML_ADM/schedule.ccl b/ML_ADM/schedule.ccl
index 418de03..01a6f4d 100644
--- a/ML_ADM/schedule.ccl
+++ b/ML_ADM/schedule.ccl
@@ -94,6 +94,8 @@ schedule ML_ADM_constraints AT analysis
 {
   LANG: C
   
+  SYNC: Ham
+  SYNC: mom
 } "ML_ADM_constraints"
 
 schedule ML_ADM_ApplyBoundConds in MoL_PostStep
diff --git a/ML_ADM/src/ML_ADM_Minkowski.c b/ML_ADM/src/ML_ADM_Minkowski.c
index 25d37cf..9319aea 100644
--- a/ML_ADM/src/ML_ADM_Minkowski.c
+++ b/ML_ADM/src/ML_ADM_Minkowski.c
@@ -86,7 +86,7 @@ void ML_ADM_Minkowski_Body(cGH *cctkGH, CCTK_INT dir, CCTK_INT face, CCTK_REAL n
   /* Loop over the grid points */
   LC_LOOP3 (somename,
             i,j,k, min[0],min[1],min[2], max[0],max[1],max[2],
-            max[0]-min[0],max[1]-min[1],max[2]-min[2])
+            cctk_lsh[0],cctk_lsh[1],cctk_lsh[2])
   {
     int index = INITVALUE;
     int subblock_index = INITVALUE;
diff --git a/ML_ADM/src/ML_ADM_RHS.c b/ML_ADM/src/ML_ADM_RHS.c
index 46fecca..2b1d7d4 100644
--- a/ML_ADM/src/ML_ADM_RHS.c
+++ b/ML_ADM/src/ML_ADM_RHS.c
@@ -86,7 +86,7 @@ void ML_ADM_RHS_Body(cGH *cctkGH, CCTK_INT dir, CCTK_INT face, CCTK_REAL normal[
   /* Loop over the grid points */
   LC_LOOP3 (somename,
             i,j,k, min[0],min[1],min[2], max[0],max[1],max[2],
-            max[0]-min[0],max[1]-min[1],max[2]-min[2])
+            cctk_lsh[0],cctk_lsh[1],cctk_lsh[2])
   {
     int index = INITVALUE;
     int subblock_index = INITVALUE;
diff --git a/ML_ADM/src/ML_ADM_constraints.c b/ML_ADM/src/ML_ADM_constraints.c
index f3a9296..420fbe7 100644
--- a/ML_ADM/src/ML_ADM_constraints.c
+++ b/ML_ADM/src/ML_ADM_constraints.c
@@ -86,7 +86,7 @@ void ML_ADM_constraints_Body(cGH *cctkGH, CCTK_INT dir, CCTK_INT face, CCTK_REAL
   /* Loop over the grid points */
   LC_LOOP3 (somename,
             i,j,k, min[0],min[1],min[2], max[0],max[1],max[2],
-            max[0]-min[0],max[1]-min[1],max[2]-min[2])
+            cctk_lsh[0],cctk_lsh[1],cctk_lsh[2])
   {
     int index = INITVALUE;
     int subblock_index = INITVALUE;
@@ -441,5 +441,5 @@ void ML_ADM_constraints(CCTK_ARGUMENTS)
   DECLARE_CCTK_ARGUMENTS
   DECLARE_CCTK_PARAMETERS
   
-  GenericFD_LoopOverEverything(cctkGH, &ML_ADM_constraints_Body);
+  GenericFD_LoopOverInterior(cctkGH, &ML_ADM_constraints_Body);
 }
diff --git a/ML_ADM/src/ML_ADM_convertFromADMBase.c b/ML_ADM/src/ML_ADM_convertFromADMBase.c
index 6f47f79..a634aeb 100644
--- a/ML_ADM/src/ML_ADM_convertFromADMBase.c
+++ b/ML_ADM/src/ML_ADM_convertFromADMBase.c
@@ -86,7 +86,7 @@ void ML_ADM_convertFromADMBase_Body(cGH *cctkGH, CCTK_INT dir, CCTK_INT face, CC
   /* Loop over the grid points */
   LC_LOOP3 (somename,
             i,j,k, min[0],min[1],min[2], max[0],max[1],max[2],
-            max[0]-min[0],max[1]-min[1],max[2]-min[2])
+            cctk_lsh[0],cctk_lsh[1],cctk_lsh[2])
   {
     int index = INITVALUE;
     int subblock_index = INITVALUE;
diff --git a/ML_ADM/src/ML_ADM_convertToADMBase.c b/ML_ADM/src/ML_ADM_convertToADMBase.c
index 0ce9dae..5f010fb 100644
--- a/ML_ADM/src/ML_ADM_convertToADMBase.c
+++ b/ML_ADM/src/ML_ADM_convertToADMBase.c
@@ -86,7 +86,7 @@ void ML_ADM_convertToADMBase_Body(cGH *cctkGH, CCTK_INT dir, CCTK_INT face, CCTK
   /* Loop over the grid points */
   LC_LOOP3 (somename,
             i,j,k, min[0],min[1],min[2], max[0],max[1],max[2],
-            max[0]-min[0],max[1]-min[1],max[2]-min[2])
+            cctk_lsh[0],cctk_lsh[1],cctk_lsh[2])
   {
     int index = INITVALUE;
     int subblock_index = INITVALUE;
diff --git a/ML_BSSN/schedule.ccl b/ML_BSSN/schedule.ccl
index 0d5f280..98438ed 100644
--- a/ML_BSSN/schedule.ccl
+++ b/ML_BSSN/schedule.ccl
@@ -87,6 +87,7 @@ if (CCTK_EQUALS(my_initial_data, "ADMBase"))
   {
     LANG: C
     
+    SYNC: Gamma
   } "ML_BSSN_convertFromADMBaseGamma"
 }
 
@@ -97,6 +98,7 @@ if (CCTK_EQUALS(my_initial_data, "ADMBase"))
   {
     LANG: C
     
+    SYNC: Gamma
   } "ML_BSSN_convertFromADMBaseGamma"
 }
 
@@ -122,6 +124,11 @@ schedule ML_BSSN_constraints AT analysis
 {
   LANG: C
   
+  SYNC: cons_detg
+  SYNC: cons_Gamma
+  SYNC: cons_traceA
+  SYNC: Ham
+  SYNC: mom
 } "ML_BSSN_constraints"
 
 schedule ML_BSSN_ApplyBoundConds in MoL_PostStep
diff --git a/ML_BSSN/src/ML_BSSN_Minkowski.c b/ML_BSSN/src/ML_BSSN_Minkowski.c
index e5d2c78..698abe5 100644
--- a/ML_BSSN/src/ML_BSSN_Minkowski.c
+++ b/ML_BSSN/src/ML_BSSN_Minkowski.c
@@ -86,7 +86,7 @@ void ML_BSSN_Minkowski_Body(cGH *cctkGH, CCTK_INT dir, CCTK_INT face, CCTK_REAL
   /* Loop over the grid points */
   LC_LOOP3 (somename,
             i,j,k, min[0],min[1],min[2], max[0],max[1],max[2],
-            max[0]-min[0],max[1]-min[1],max[2]-min[2])
+            cctk_lsh[0],cctk_lsh[1],cctk_lsh[2])
   {
     int index = INITVALUE;
     int subblock_index = INITVALUE;
diff --git a/ML_BSSN/src/ML_BSSN_constraints.c b/ML_BSSN/src/ML_BSSN_constraints.c
index 008e44b..454745d 100644
--- a/ML_BSSN/src/ML_BSSN_constraints.c
+++ b/ML_BSSN/src/ML_BSSN_constraints.c
@@ -86,7 +86,7 @@ void ML_BSSN_constraints_Body(cGH *cctkGH, CCTK_INT dir, CCTK_INT face, CCTK_REA
   /* Loop over the grid points */
   LC_LOOP3 (somename,
             i,j,k, min[0],min[1],min[2], max[0],max[1],max[2],
-            max[0]-min[0],max[1]-min[1],max[2]-min[2])
+            cctk_lsh[0],cctk_lsh[1],cctk_lsh[2])
   {
     int index = INITVALUE;
     int subblock_index = INITVALUE;
@@ -976,5 +976,5 @@ void ML_BSSN_constraints(CCTK_ARGUMENTS)
   DECLARE_CCTK_ARGUMENTS
   DECLARE_CCTK_PARAMETERS
   
-  GenericFD_LoopOverEverything(cctkGH, &ML_BSSN_constraints_Body);
+  GenericFD_LoopOverInterior(cctkGH, &ML_BSSN_constraints_Body);
 }
diff --git a/ML_BSSN/src/ML_BSSN_convertFromADMBase.c b/ML_BSSN/src/ML_BSSN_convertFromADMBase.c
index f7e505e..24c57f9 100644
--- a/ML_BSSN/src/ML_BSSN_convertFromADMBase.c
+++ b/ML_BSSN/src/ML_BSSN_convertFromADMBase.c
@@ -86,7 +86,7 @@ void ML_BSSN_convertFromADMBase_Body(cGH *cctkGH, CCTK_INT dir, CCTK_INT face, C
   /* Loop over the grid points */
   LC_LOOP3 (somename,
             i,j,k, min[0],min[1],min[2], max[0],max[1],max[2],
-            max[0]-min[0],max[1]-min[1],max[2]-min[2])
+            cctk_lsh[0],cctk_lsh[1],cctk_lsh[2])
   {
     int index = INITVALUE;
     int subblock_index = INITVALUE;
diff --git a/ML_BSSN/src/ML_BSSN_convertFromADMBaseGamma.c b/ML_BSSN/src/ML_BSSN_convertFromADMBaseGamma.c
index 4623f59..0dc3bfe 100644
--- a/ML_BSSN/src/ML_BSSN_convertFromADMBaseGamma.c
+++ b/ML_BSSN/src/ML_BSSN_convertFromADMBaseGamma.c
@@ -86,7 +86,7 @@ void ML_BSSN_convertFromADMBaseGamma_Body(cGH *cctkGH, CCTK_INT dir, CCTK_INT fa
   /* Loop over the grid points */
   LC_LOOP3 (somename,
             i,j,k, min[0],min[1],min[2], max[0],max[1],max[2],
-            max[0]-min[0],max[1]-min[1],max[2]-min[2])
+            cctk_lsh[0],cctk_lsh[1],cctk_lsh[2])
   {
     int index = INITVALUE;
     int subblock_index = INITVALUE;
@@ -250,5 +250,5 @@ void ML_BSSN_convertFromADMBaseGamma(CCTK_ARGUMENTS)
   DECLARE_CCTK_ARGUMENTS
   DECLARE_CCTK_PARAMETERS
   
-  GenericFD_LoopOverEverything(cctkGH, &ML_BSSN_convertFromADMBaseGamma_Body);
+  GenericFD_LoopOverInterior(cctkGH, &ML_BSSN_convertFromADMBaseGamma_Body);
 }
diff --git a/ML_BSSN/src/ML_BSSN_convertToADMBase.c b/ML_BSSN/src/ML_BSSN_convertToADMBase.c
index 75cbd4b..03e3004 100644
--- a/ML_BSSN/src/ML_BSSN_convertToADMBase.c
+++ b/ML_BSSN/src/ML_BSSN_convertToADMBase.c
@@ -86,7 +86,7 @@ void ML_BSSN_convertToADMBase_Body(cGH *cctkGH, CCTK_INT dir, CCTK_INT face, CCT
   /* Loop over the grid points */
   LC_LOOP3 (somename,
             i,j,k, min[0],min[1],min[2], max[0],max[1],max[2],
-            max[0]-min[0],max[1]-min[1],max[2]-min[2])
+            cctk_lsh[0],cctk_lsh[1],cctk_lsh[2])
   {
     int index = INITVALUE;
     int subblock_index = INITVALUE;
diff --git a/ML_BSSN/src/ML_BSSN_enforce.c b/ML_BSSN/src/ML_BSSN_enforce.c
index e183cb3..9442ff9 100644
--- a/ML_BSSN/src/ML_BSSN_enforce.c
+++ b/ML_BSSN/src/ML_BSSN_enforce.c
@@ -86,7 +86,7 @@ void ML_BSSN_enforce_Body(cGH *cctkGH, CCTK_INT dir, CCTK_INT face, CCTK_REAL no
   /* Loop over the grid points */
   LC_LOOP3 (somename,
             i,j,k, min[0],min[1],min[2], max[0],max[1],max[2],
-            max[0]-min[0],max[1]-min[1],max[2]-min[2])
+            cctk_lsh[0],cctk_lsh[1],cctk_lsh[2])
   {
     int index = INITVALUE;
     int subblock_index = INITVALUE;
diff --git a/McLachlan.m b/McLachlan.m
index 07328d3..8762230 100644
--- a/McLachlan.m
+++ b/McLachlan.m
@@ -1,4 +1,4 @@
-(* < ADM.m /Applications/Mathematica.app/Contents/MacOS/MathKernel | tee ADM.out && rsync -Prl --delete ADM BSSN ~/Calpha/arrangements/KrancEinstein *)
+(* < McLachlan.m /Applications/Mathematica.app/Contents/MacOS/MathKernel | tee McLachlan.out *)
 
 $Path = Join[$Path, {"~/Calpha/Kranc-devel/Tools/CodeGen",
                      "~/Calpha/Kranc-devel/Tools/MathematicaMisc"}];
@@ -140,7 +140,7 @@ groupsBSSN = Join [declaredGroupsBSSN, extraGroups];
 
 initialCalc =
 {
-  Name -> "ADM_Minkowski",
+  Name -> "ML_ADM_Minkowski",
   Schedule -> {"IN ADMBase_InitialData"},
   ConditionalOnKeyword -> {"my_initial_data", "Minkowski"},
   (* Where -> Boundary, *)
@@ -156,7 +156,7 @@ initialCalc =
 
 initialCalcBSSN =
 {
-  Name -> "BSSN_Minkowski",
+  Name -> "ML_BSSN_Minkowski",
   Schedule -> {"IN ADMBase_InitialData"},
   ConditionalOnKeyword -> {"my_initial_data", "Minkowski"},
   (* Where -> Boundary, *)
@@ -181,7 +181,7 @@ initialCalcBSSN =
 
 convertFromADMBaseCalc =
 {
-  Name -> "ADM_convertFromADMBase",
+  Name -> "ML_ADM_convertFromADMBase",
   Schedule -> {"AT initial", "AFTER ADMBase_PostInitial"},
   ConditionalOnKeyword -> {"my_initial_data", "ADMBase"},
   Equations -> 
@@ -208,7 +208,7 @@ convertFromADMBaseCalc =
 
 convertFromADMBaseCalcBSSN =
 {
-  Name -> "BSSN_convertFromADMBase",
+  Name -> "ML_BSSN_convertFromADMBase",
   Schedule -> {"AT initial", "AFTER ADMBase_PostInitial"},
   ConditionalOnKeyword -> {"my_initial_data", "ADMBase"},
   Shorthands -> {g[la,lb], detg, gu[ua,ub], em4phi, K[la,lb], Km[ua,lb]},
@@ -255,9 +255,10 @@ convertFromADMBaseCalcBSSN =
 
 convertFromADMBaseCalcBSSNGamma =
 {
-  Name -> "BSSN_convertFromADMBaseGamma",
-  Schedule -> {"AT initial", "AFTER BSSN_convertFromADMBase"},
+  Name -> "ML_BSSN_convertFromADMBaseGamma",
+  Schedule -> {"AT initial", "AFTER ML_BSSN_convertFromADMBase"},
   ConditionalOnKeyword -> {"my_initial_data", "ADMBase"},
+  Where -> Interior,
   Shorthands -> {detgt, gtu[ua,ub], Gt[ua,lb,lc]},
   Equations -> 
   {
@@ -275,7 +276,7 @@ convertFromADMBaseCalcBSSNGamma =
 
 convertToADMBaseCalc =
 {
-  Name -> "ADM_convertToADMBase",
+  Name -> "ML_ADM_convertToADMBase",
   Schedule -> {"IN MoL_PostStep", "AFTER ADM_ApplyBoundConds"},
   Equations -> 
   {
@@ -305,8 +306,8 @@ convertToADMBaseCalc =
 
 convertToADMBaseCalcBSSN =
 {
-  Name -> "BSSN_convertToADMBase",
-  Schedule -> {"IN MoL_PostStep", "AFTER ADM_ApplyBoundConds"},
+  Name -> "ML_BSSN_convertToADMBase",
+  Schedule -> {"IN MoL_PostStep", "AFTER ML_ADM_ApplyBoundConds"},
   Shorthands -> {e4phi, g[la,lb], K[la,lb]},
   Equations -> 
   {
@@ -342,7 +343,7 @@ convertToADMBaseCalcBSSN =
 
 evolCalc =
 {
-  Name -> "ADM_RHS",
+  Name -> "ML_ADM_RHS",
   Schedule -> {"IN MoL_CalcRHS"},
   Shorthands -> {detg, gu[ua,ub], G[ua,lb,lc], R[la,lb], Km[ua,lb], trK},
   Equations -> 
@@ -369,7 +370,7 @@ evolCalc =
 
 enforceCalcBSSN =
 {
-  Name -> "BSSN_enforce",
+  Name -> "ML_BSSN_enforce",
   Schedule -> {"IN MoL_PostStep"},
   Shorthands -> {detgt, gtu[ua,ub], trA},
   Equations -> 
@@ -389,8 +390,9 @@ enforceCalcBSSN =
 
 constraintsCalc =
 {
-  Name -> "ADM_constraints",
+  Name -> "ML_ADM_constraints",
   Schedule -> {"AT analysis"},
+  Where -> Interior,
   Shorthands -> {detg, gu[ua,ub], G[ua,lb,lc], R[la,lb], trR, Km[ua,lb], trK},
   Equations -> 
   {
@@ -412,8 +414,9 @@ constraintsCalc =
 
 constraintsCalcBSSN =
 {
-  Name -> "BSSN_constraints",
+  Name -> "ML_BSSN_constraints",
   Schedule -> {"AT analysis"},
+  Where -> Interior,
   Shorthands -> {detgt, ddetgt[la], gtu[ua,ub], Gt[ua,lb,lc], e4phi,
                  g[la,lb], detg, gu[ua,ub], ddetg[la], G[ua,lb,lc],
                  Rt[la,lb], Rphi[la,lb], R[la,lb], trR,
@@ -510,7 +513,7 @@ calculations =
   constraintsCalc
 };
 
-CreateKrancThornTT [groups, ".", "ADM",
+CreateKrancThornTT [groups, ".", "ML_ADM",
   Calculations -> calculations,
   DeclaredGroups -> declaredGroupNames,
   PartialDerivatives -> derivatives,
@@ -530,7 +533,7 @@ calculationsBSSN =
   constraintsCalcBSSN
 };
 
-CreateKrancThornTT [groupsBSSN, ".", "BSSN",
+CreateKrancThornTT [groupsBSSN, ".", "ML_BSSN",
   Calculations -> calculationsBSSN,
   DeclaredGroups -> declaredGroupNamesBSSN,
   PartialDerivatives -> derivatives,
diff --git a/McLachlan.sh b/McLachlan.sh
new file mode 100755
index 0000000..fdf0810
--- /dev/null
+++ b/McLachlan.sh
@@ -0,0 +1,6 @@
+#! /bin/bash
+
+MATHEMATICA="/Applications/Mathematica.app/Contents/MacOS/MathKernel"
+
+# Run Mathematica to regenerate the code
+< McLachlan.m "$MATHEMATICA" | tee McLachlan.out