Regenerate code with current version of Kranc

This is necessary so that Pi is correctly vectorized.

3 files changed, 39 insertions, 16 deletions

diff --git a/ML_ADMQuantities/schedule.ccl b/ML_ADMQuantities/schedule.ccl
index 3316295..cd3e5dd 100644
--- a/ML_ADMQuantities/schedule.ccl
+++ b/ML_ADMQuantities/schedule.ccl
@@ -33,12 +33,6 @@ schedule ML_ADMQuantities_Startup at STARTUP
   OPTIONS: meta
 } "create banner"
 
-schedule ML_ADMQuantities_RegisterVars in MoL_Register
-{
-  LANG: C
-  OPTIONS: meta
-} "Register Variables for MoL"
-
 schedule ML_ADMQuantities_RegisterSymmetries in SymmetryRegister
 {
   LANG: C
@@ -53,6 +47,20 @@ schedule group ML_ADMQuantities_group in MoL_PseudoEvolution after MoL_PostStep
 schedule ML_ADMQuantities in ML_ADMQuantities_group
 {
   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_ADMQuantities::ML_Jadm
+  WRITES:   ML_ADMQuantities::ML_Madm
 } "ML_ADMQuantities"
 
 schedule ML_ADMQuantities_SelectBCs in ML_ADMQuantities_bc_group
@@ -90,6 +98,12 @@ schedule ML_ADMQuantities_CheckBoundaries at BASEGRID
   OPTIONS: meta
 } "check boundaries treatment"
 
+schedule ML_ADMQuantities_RegisterVars in MoL_Register
+{
+  LANG: C
+  OPTIONS: meta
+} "Register Variables for MoL"
+
 schedule group ApplyBCs as ML_ADMQuantities_ApplyBCs in MoL_PostStep after ML_ADMQuantities_SelectBoundConds
 {
   # no language specified
diff --git a/ML_ADMQuantities/src/ML_ADMQuantities.cc b/ML_ADMQuantities/src/ML_ADMQuantities.cc
index 301cf82..4bf679f 100644
--- a/ML_ADMQuantities/src/ML_ADMQuantities.cc
+++ b/ML_ADMQuantities/src/ML_ADMQuantities.cc
@@ -43,8 +43,6 @@ static void ML_ADMQuantities_Body(cGH const * restrict const cctkGH, int const d
   DECLARE_CCTK_PARAMETERS;
   
   
-  /* Declare finite differencing variables */
-  
   /* Include user-supplied include files */
   
   /* Initialise finite differencing variables */
@@ -75,9 +73,9 @@ static void ML_ADMQuantities_Body(cGH const * restrict const cctkGH, int const d
   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 p1odx = INV(dx);
   CCTK_REAL const p1ody = INV(dy);
   CCTK_REAL const p1odz = INV(dz);
@@ -95,7 +93,7 @@ static void ML_ADMQuantities_Body(cGH const * restrict const cctkGH, int const d
   
   /* Loop over the grid points */
   #pragma omp parallel
-  CCTK_LOOP3 (ML_ADMQuantities,
+  CCTK_LOOP3(ML_ADMQuantities,
     i,j,k, imin[0],imin[1],imin[2], imax[0],imax[1],imax[2],
     cctk_lsh[0],cctk_lsh[1],cctk_lsh[2])
   {
@@ -653,7 +651,7 @@ static void ML_ADMQuantities_Body(cGH const * restrict const cctkGH, int const d
     Jadm3[index] = Jadm3L;
     Madm[index] = MadmL;
   }
-  CCTK_ENDLOOP3 (ML_ADMQuantities);
+  CCTK_ENDLOOP3(ML_ADMQuantities);
 }
 
 extern "C" void ML_ADMQuantities(CCTK_ARGUMENTS)
@@ -672,12 +670,23 @@ extern "C" void ML_ADMQuantities(CCTK_ARGUMENTS)
     return;
   }
   
-  const char *groups[] = {"grid::coordinates","Grid::coordinates","ML_BSSN::ML_curv","ML_BSSN::ML_Gamma","ML_BSSN::ML_lapse","ML_BSSN::ML_log_confac","ML_BSSN::ML_metric","ML_BSSN::ML_shift","ML_BSSN::ML_trace_curv","ML_ADMQuantities::ML_Jadm","ML_ADMQuantities::ML_Madm"};
+  const char *const groups[] = {
+    "grid::coordinates",
+    "Grid::coordinates",
+    "ML_BSSN::ML_curv",
+    "ML_BSSN::ML_Gamma",
+    "ML_BSSN::ML_lapse",
+    "ML_BSSN::ML_log_confac",
+    "ML_BSSN::ML_metric",
+    "ML_BSSN::ML_shift",
+    "ML_BSSN::ML_trace_curv",
+    "ML_ADMQuantities::ML_Jadm",
+    "ML_ADMQuantities::ML_Madm"};
   GenericFD_AssertGroupStorage(cctkGH, "ML_ADMQuantities", 11, groups);
   
   GenericFD_EnsureStencilFits(cctkGH, "ML_ADMQuantities", 2, 2, 2);
   
-  GenericFD_LoopOverInterior(cctkGH, &ML_ADMQuantities_Body);
+  GenericFD_LoopOverInterior(cctkGH, ML_ADMQuantities_Body);
   
   if (verbose > 1)
   {
diff --git a/ML_ADMQuantities/src/make.code.defn b/ML_ADMQuantities/src/make.code.defn
index 65932ec..c0f1ce4 100644
--- a/ML_ADMQuantities/src/make.code.defn
+++ b/ML_ADMQuantities/src/make.code.defn
@@ -1,3 +1,3 @@
 # File produced by Kranc
 
-SRCS = Startup.cc RegisterMoL.cc RegisterSymmetries.cc ML_ADMQuantities.cc Boundaries.cc 
+SRCS = Startup.cc RegisterSymmetries.cc RegisterMoL.cc ML_ADMQuantities.cc Boundaries.cc