Regenerate code with current version of Kranc

This is necessary so that Pi is correctly vectorized.

3 files changed, 29 insertions, 16 deletions

diff --git a/ML_ADMConstraints/schedule.ccl b/ML_ADMConstraints/schedule.ccl
index a57f9b5..095a226 100644
--- a/ML_ADMConstraints/schedule.ccl
+++ b/ML_ADMConstraints/schedule.ccl
@@ -33,12 +33,6 @@ schedule ML_ADMConstraints_Startup at STARTUP
   OPTIONS: meta
 } "create banner"
 
-schedule ML_ADMConstraints_RegisterVars in MoL_Register
-{
-  LANG: C
-  OPTIONS: meta
-} "Register Variables for MoL"
-
 schedule ML_ADMConstraints_RegisterSymmetries in SymmetryRegister
 {
   LANG: C
@@ -53,6 +47,15 @@ schedule group ML_ADMConstraints_group in MoL_PseudoEvolution after MoL_PostStep
 schedule ML_ADMConstraints in ML_ADMConstraints_group
 {
   LANG: C
+  READS:    ADMBase::curv
+  READS:    ADMBase::lapse
+  READS:    ADMBase::metric
+  READS:    ADMBase::shift
+  READS:    TmunuBase::stress_energy_scalar
+  READS:    TmunuBase::stress_energy_tensor
+  READS:    TmunuBase::stress_energy_vector
+  WRITES:   ML_ADMConstraints::ML_Ham
+  WRITES:   ML_ADMConstraints::ML_mom
 } "ML_ADMConstraints"
 
 schedule ML_ADMConstraints_SelectBCs in ML_ADMConstraints_bc_group
@@ -90,6 +93,12 @@ schedule ML_ADMConstraints_CheckBoundaries at BASEGRID
   OPTIONS: meta
 } "check boundaries treatment"
 
+schedule ML_ADMConstraints_RegisterVars in MoL_Register
+{
+  LANG: C
+  OPTIONS: meta
+} "Register Variables for MoL"
+
 schedule group ApplyBCs as ML_ADMConstraints_ApplyBCs in MoL_PostStep after ML_ADMConstraints_SelectBoundConds
 {
   # no language specified
diff --git a/ML_ADMConstraints/src/ML_ADMConstraints.cc b/ML_ADMConstraints/src/ML_ADMConstraints.cc
index 1f30b9a..4c59931 100644
--- a/ML_ADMConstraints/src/ML_ADMConstraints.cc
+++ b/ML_ADMConstraints/src/ML_ADMConstraints.cc
@@ -43,8 +43,6 @@ static void ML_ADMConstraints_Body(cGH const * restrict const cctkGH, int const
   DECLARE_CCTK_PARAMETERS;
   
   
-  /* Declare finite differencing variables */
-  
   /* Include user-supplied include files */
   
   /* Initialise finite differencing variables */
@@ -75,9 +73,9 @@ static void ML_ADMConstraints_Body(cGH const * restrict const cctkGH, int const
   CCTK_REAL const p1o12dx = 0.0833333333333333333333333333333*INV(dx);
   CCTK_REAL const p1o12dy = 0.0833333333333333333333333333333*INV(dy);
   CCTK_REAL const p1o12dz = 0.0833333333333333333333333333333*INV(dz);
-  CCTK_REAL const p1o144dxdy = 0.00694444444444444444444444444444*INV(dx)*INV(dy);
-  CCTK_REAL const p1o144dxdz = 0.00694444444444444444444444444444*INV(dx)*INV(dz);
-  CCTK_REAL const p1o144dydz = 0.00694444444444444444444444444444*INV(dy)*INV(dz);
+  CCTK_REAL const p1o144dxdy = 0.00694444444444444444444444444444*INV(dx*dy);
+  CCTK_REAL const p1o144dxdz = 0.00694444444444444444444444444444*INV(dx*dz);
+  CCTK_REAL const p1o144dydz = 0.00694444444444444444444444444444*INV(dy*dz);
   CCTK_REAL const pm1o12dx2 = -0.0833333333333333333333333333333*INV(SQR(dx));
   CCTK_REAL const pm1o12dy2 = -0.0833333333333333333333333333333*INV(SQR(dy));
   CCTK_REAL const pm1o12dz2 = -0.0833333333333333333333333333333*INV(SQR(dz));
@@ -92,7 +90,7 @@ static void ML_ADMConstraints_Body(cGH const * restrict const cctkGH, int const
   
   /* Loop over the grid points */
   #pragma omp parallel
-  CCTK_LOOP3 (ML_ADMConstraints,
+  CCTK_LOOP3(ML_ADMConstraints,
     i,j,k, imin[0],imin[1],imin[2], imax[0],imax[1],imax[2],
     cctk_lsh[0],cctk_lsh[1],cctk_lsh[2])
   {
@@ -501,7 +499,7 @@ static void ML_ADMConstraints_Body(cGH const * restrict const cctkGH, int const
     M2[index] = M2L;
     M3[index] = M3L;
   }
-  CCTK_ENDLOOP3 (ML_ADMConstraints);
+  CCTK_ENDLOOP3(ML_ADMConstraints);
 }
 
 extern "C" void ML_ADMConstraints(CCTK_ARGUMENTS)
@@ -520,12 +518,18 @@ extern "C" void ML_ADMConstraints(CCTK_ARGUMENTS)
     return;
   }
   
-  const char *groups[] = {"ADMBase::curv","ADMBase::lapse","ADMBase::metric","ADMBase::shift","ML_ADMConstraints::ML_Ham","ML_ADMConstraints::ML_mom"};
+  const char *const groups[] = {
+    "ADMBase::curv",
+    "ADMBase::lapse",
+    "ADMBase::metric",
+    "ADMBase::shift",
+    "ML_ADMConstraints::ML_Ham",
+    "ML_ADMConstraints::ML_mom"};
   GenericFD_AssertGroupStorage(cctkGH, "ML_ADMConstraints", 6, groups);
   
   GenericFD_EnsureStencilFits(cctkGH, "ML_ADMConstraints", 2, 2, 2);
   
-  GenericFD_LoopOverInterior(cctkGH, &ML_ADMConstraints_Body);
+  GenericFD_LoopOverInterior(cctkGH, ML_ADMConstraints_Body);
   
   if (verbose > 1)
   {
diff --git a/ML_ADMConstraints/src/make.code.defn b/ML_ADMConstraints/src/make.code.defn
index e9b2afb..d94f02e 100644
--- a/ML_ADMConstraints/src/make.code.defn
+++ b/ML_ADMConstraints/src/make.code.defn
@@ -1,3 +1,3 @@
 # File produced by Kranc
 
-SRCS = Startup.cc RegisterMoL.cc RegisterSymmetries.cc ML_ADMConstraints.cc Boundaries.cc 
+SRCS = Startup.cc RegisterSymmetries.cc RegisterMoL.cc ML_ADMConstraints.cc Boundaries.cc