Regenerate McLachlan (Kranc commit caf12ddfb11ccd9a7bf822cc8ec0d7691cded0aa)

7 files changed, 595 insertions, 590 deletions

diff --git a/ML_ADMQuantities/param.ccl b/ML_ADMQuantities/param.ccl
index ebb4f66..0609b67 100644
--- a/ML_ADMQuantities/param.ccl
+++ b/ML_ADMQuantities/param.ccl
@@ -3,7 +3,11 @@
 
 shares: GenericFD
 
+USES CCTK_INT assume_stress_energy_state
+USES CCTK_INT assume_use_jacobian
 USES CCTK_STRING jacobian_group
+USES CCTK_STRING jacobian_determinant_group
+USES CCTK_STRING jacobian_inverse_group
 USES CCTK_STRING jacobian_derivative_group
 USES CCTK_INT jacobian_identity_map
 
diff --git a/ML_ADMQuantities/schedule.ccl b/ML_ADMQuantities/schedule.ccl
index ca0e024..3c9ab67 100644
--- a/ML_ADMQuantities/schedule.ccl
+++ b/ML_ADMQuantities/schedule.ccl
@@ -1,31 +1,9 @@
 # File produced by Kranc
 
 
-if (timelevels == 1)
-{
-  STORAGE: ML_Jadm[1]
-}
-if (timelevels == 2)
-{
-  STORAGE: ML_Jadm[2]
-}
-if (timelevels == 3)
-{
-  STORAGE: ML_Jadm[3]
-}
+STORAGE: ML_Jadm[timelevels]
 
-if (timelevels == 1)
-{
-  STORAGE: ML_Madm[1]
-}
-if (timelevels == 2)
-{
-  STORAGE: ML_Madm[2]
-}
-if (timelevels == 3)
-{
-  STORAGE: ML_Madm[3]
-}
+STORAGE: ML_Madm[timelevels]
 
 schedule ML_ADMQuantities_Startup at STARTUP
 {
@@ -46,44 +24,44 @@ schedule group ML_ADMQuantities_group in MoL_PseudoEvolution after MoL_PostStep
 schedule ML_ADMQuantities in ML_ADMQuantities_group
 {
   LANG: C
-  READS:    grid::x(Everywhere)
-  READS:    grid::y(Everywhere)
-  READS:    grid::z(Everywhere)
-  READS:    ML_BSSN::At11(Everywhere)
-  READS:    ML_BSSN::At12(Everywhere)
-  READS:    ML_BSSN::At13(Everywhere)
-  READS:    ML_BSSN::At22(Everywhere)
-  READS:    ML_BSSN::At23(Everywhere)
-  READS:    ML_BSSN::At33(Everywhere)
-  READS:    ML_BSSN::Xt1(Everywhere)
-  READS:    ML_BSSN::Xt2(Everywhere)
-  READS:    ML_BSSN::Xt3(Everywhere)
-  READS:    ML_BSSN::alpha(Everywhere)
-  READS:    ML_BSSN::phi(Everywhere)
-  READS:    ML_BSSN::gt11(Everywhere)
-  READS:    ML_BSSN::gt12(Everywhere)
-  READS:    ML_BSSN::gt13(Everywhere)
-  READS:    ML_BSSN::gt22(Everywhere)
-  READS:    ML_BSSN::gt23(Everywhere)
-  READS:    ML_BSSN::gt33(Everywhere)
-  READS:    ML_BSSN::beta1(Everywhere)
-  READS:    ML_BSSN::beta2(Everywhere)
-  READS:    ML_BSSN::beta3(Everywhere)
-  READS:    ML_BSSN::trK(Everywhere)
-  READS:    TmunuBase::eTtt(Everywhere)
-  READS:    TmunuBase::eTxx(Everywhere)
-  READS:    TmunuBase::eTxy(Everywhere)
-  READS:    TmunuBase::eTxz(Everywhere)
-  READS:    TmunuBase::eTyy(Everywhere)
-  READS:    TmunuBase::eTyz(Everywhere)
-  READS:    TmunuBase::eTzz(Everywhere)
-  READS:    TmunuBase::eTtx(Everywhere)
-  READS:    TmunuBase::eTty(Everywhere)
-  READS:    TmunuBase::eTtz(Everywhere)
-  WRITES:   ML_ADMQuantities::Jadm1(Interior)
-  WRITES:   ML_ADMQuantities::Jadm2(Interior)
-  WRITES:   ML_ADMQuantities::Jadm3(Interior)
-  WRITES:   ML_ADMQuantities::Madm(Interior)
+  READS: grid::x(Everywhere)
+  READS: grid::y(Everywhere)
+  READS: grid::z(Everywhere)
+  READS: ML_BSSN::At11(Everywhere)
+  READS: ML_BSSN::At12(Everywhere)
+  READS: ML_BSSN::At13(Everywhere)
+  READS: ML_BSSN::At22(Everywhere)
+  READS: ML_BSSN::At23(Everywhere)
+  READS: ML_BSSN::At33(Everywhere)
+  READS: ML_BSSN::Xt1(Everywhere)
+  READS: ML_BSSN::Xt2(Everywhere)
+  READS: ML_BSSN::Xt3(Everywhere)
+  READS: ML_BSSN::alpha(Everywhere)
+  READS: ML_BSSN::phi(Everywhere)
+  READS: ML_BSSN::gt11(Everywhere)
+  READS: ML_BSSN::gt12(Everywhere)
+  READS: ML_BSSN::gt13(Everywhere)
+  READS: ML_BSSN::gt22(Everywhere)
+  READS: ML_BSSN::gt23(Everywhere)
+  READS: ML_BSSN::gt33(Everywhere)
+  READS: ML_BSSN::beta1(Everywhere)
+  READS: ML_BSSN::beta2(Everywhere)
+  READS: ML_BSSN::beta3(Everywhere)
+  READS: ML_BSSN::trK(Everywhere)
+  READS: TmunuBase::eTtt(Everywhere)
+  READS: TmunuBase::eTxx(Everywhere)
+  READS: TmunuBase::eTxy(Everywhere)
+  READS: TmunuBase::eTxz(Everywhere)
+  READS: TmunuBase::eTyy(Everywhere)
+  READS: TmunuBase::eTyz(Everywhere)
+  READS: TmunuBase::eTzz(Everywhere)
+  READS: TmunuBase::eTtx(Everywhere)
+  READS: TmunuBase::eTty(Everywhere)
+  READS: TmunuBase::eTtz(Everywhere)
+  WRITES: ML_ADMQuantities::Jadm1(Interior)
+  WRITES: ML_ADMQuantities::Jadm2(Interior)
+  WRITES: ML_ADMQuantities::Jadm3(Interior)
+  WRITES: ML_ADMQuantities::Madm(Interior)
 } "ML_ADMQuantities"
 
 schedule ML_ADMQuantities_SelectBCs in ML_ADMQuantities_bc_group
diff --git a/ML_ADMQuantities/src/Boundaries.cc b/ML_ADMQuantities/src/Boundaries.cc
index cd802ea..8c69278 100644
--- a/ML_ADMQuantities/src/Boundaries.cc
+++ b/ML_ADMQuantities/src/Boundaries.cc
@@ -30,7 +30,7 @@ extern "C" void ML_ADMQuantities_SelectBoundConds(CCTK_ARGUMENTS)
   DECLARE_CCTK_ARGUMENTS;
   DECLARE_CCTK_PARAMETERS;
   
-  CCTK_INT ierr CCTK_ATTRIBUTE_UNUSED  = 0;
+  CCTK_INT ierr CCTK_ATTRIBUTE_UNUSED = 0;
   return;
 }
 
diff --git a/ML_ADMQuantities/src/Differencing.h b/ML_ADMQuantities/src/Differencing.h
index 34570eb..d36a164 100644
--- a/ML_ADMQuantities/src/Differencing.h
+++ b/ML_ADMQuantities/src/Differencing.h
@@ -1,216 +1,216 @@
 #ifndef KRANC_DIFF_FUNCTIONS
-#  define PDstandardNth1(u) ((-8.*KRANC_GFOFFSET3D(u,-1,0,0) + 8.*KRANC_GFOFFSET3D(u,1,0,0) + KRANC_GFOFFSET3D(u,-2,0,0) - 1.*KRANC_GFOFFSET3D(u,2,0,0))*p1o12dx)
+#  define PDstandardNth1(u) ((-8*KRANC_GFOFFSET3D(u,-1,0,0) + 8*KRANC_GFOFFSET3D(u,1,0,0) + KRANC_GFOFFSET3D(u,-2,0,0) - KRANC_GFOFFSET3D(u,2,0,0))*p1o12dx)
 #else
 #  define PDstandardNth1(u) (PDstandardNth1_impl(u,p1o12dx,cdj,cdk))
-static CCTK_REAL PDstandardNth1_impl(CCTK_REAL const* restrict const u, CCTK_REAL const p1o12dx, ptrdiff_t const cdj, ptrdiff_t const cdk) CCTK_ATTRIBUTE_NOINLINE CCTK_ATTRIBUTE_UNUSED;
-static CCTK_REAL PDstandardNth1_impl(CCTK_REAL const* restrict const u, CCTK_REAL const p1o12dx, ptrdiff_t const cdj, ptrdiff_t const cdk)
+static CCTK_REAL PDstandardNth1_impl(const CCTK_REAL* restrict const u, const CCTK_REAL p1o12dx, const ptrdiff_t cdj, const ptrdiff_t cdk) CCTK_ATTRIBUTE_NOINLINE CCTK_ATTRIBUTE_UNUSED;
+static CCTK_REAL PDstandardNth1_impl(const CCTK_REAL* restrict const u, const CCTK_REAL p1o12dx, const ptrdiff_t cdj, const ptrdiff_t cdk)
 {
-  ptrdiff_t const cdi CCTK_ATTRIBUTE_UNUSED = sizeof(CCTK_REAL);
-  return (-8.*KRANC_GFOFFSET3D(u,-1,0,0) + 8.*KRANC_GFOFFSET3D(u,1,0,0) + KRANC_GFOFFSET3D(u,-2,0,0) - 1.*KRANC_GFOFFSET3D(u,2,0,0))*p1o12dx;
+  const ptrdiff_t cdi CCTK_ATTRIBUTE_UNUSED = sizeof(CCTK_REAL);
+  return (-8*KRANC_GFOFFSET3D(u,-1,0,0) + 8*KRANC_GFOFFSET3D(u,1,0,0) + KRANC_GFOFFSET3D(u,-2,0,0) - KRANC_GFOFFSET3D(u,2,0,0))*p1o12dx;
 }
 #endif
 
 #ifndef KRANC_DIFF_FUNCTIONS
-#  define PDstandardNth2(u) ((-8.*KRANC_GFOFFSET3D(u,0,-1,0) + 8.*KRANC_GFOFFSET3D(u,0,1,0) + KRANC_GFOFFSET3D(u,0,-2,0) - 1.*KRANC_GFOFFSET3D(u,0,2,0))*p1o12dy)
+#  define PDstandardNth2(u) ((-8*KRANC_GFOFFSET3D(u,0,-1,0) + 8*KRANC_GFOFFSET3D(u,0,1,0) + KRANC_GFOFFSET3D(u,0,-2,0) - KRANC_GFOFFSET3D(u,0,2,0))*p1o12dy)
 #else
 #  define PDstandardNth2(u) (PDstandardNth2_impl(u,p1o12dy,cdj,cdk))
-static CCTK_REAL PDstandardNth2_impl(CCTK_REAL const* restrict const u, CCTK_REAL const p1o12dy, ptrdiff_t const cdj, ptrdiff_t const cdk) CCTK_ATTRIBUTE_NOINLINE CCTK_ATTRIBUTE_UNUSED;
-static CCTK_REAL PDstandardNth2_impl(CCTK_REAL const* restrict const u, CCTK_REAL const p1o12dy, ptrdiff_t const cdj, ptrdiff_t const cdk)
+static CCTK_REAL PDstandardNth2_impl(const CCTK_REAL* restrict const u, const CCTK_REAL p1o12dy, const ptrdiff_t cdj, const ptrdiff_t cdk) CCTK_ATTRIBUTE_NOINLINE CCTK_ATTRIBUTE_UNUSED;
+static CCTK_REAL PDstandardNth2_impl(const CCTK_REAL* restrict const u, const CCTK_REAL p1o12dy, const ptrdiff_t cdj, const ptrdiff_t cdk)
 {
-  ptrdiff_t const cdi CCTK_ATTRIBUTE_UNUSED = sizeof(CCTK_REAL);
-  return (-8.*KRANC_GFOFFSET3D(u,0,-1,0) + 8.*KRANC_GFOFFSET3D(u,0,1,0) + KRANC_GFOFFSET3D(u,0,-2,0) - 1.*KRANC_GFOFFSET3D(u,0,2,0))*p1o12dy;
+  const ptrdiff_t cdi CCTK_ATTRIBUTE_UNUSED = sizeof(CCTK_REAL);
+  return (-8*KRANC_GFOFFSET3D(u,0,-1,0) + 8*KRANC_GFOFFSET3D(u,0,1,0) + KRANC_GFOFFSET3D(u,0,-2,0) - KRANC_GFOFFSET3D(u,0,2,0))*p1o12dy;
 }
 #endif
 
 #ifndef KRANC_DIFF_FUNCTIONS
-#  define PDstandardNth3(u) ((-8.*KRANC_GFOFFSET3D(u,0,0,-1) + 8.*KRANC_GFOFFSET3D(u,0,0,1) + KRANC_GFOFFSET3D(u,0,0,-2) - 1.*KRANC_GFOFFSET3D(u,0,0,2))*p1o12dz)
+#  define PDstandardNth3(u) ((-8*KRANC_GFOFFSET3D(u,0,0,-1) + 8*KRANC_GFOFFSET3D(u,0,0,1) + KRANC_GFOFFSET3D(u,0,0,-2) - KRANC_GFOFFSET3D(u,0,0,2))*p1o12dz)
 #else
 #  define PDstandardNth3(u) (PDstandardNth3_impl(u,p1o12dz,cdj,cdk))
-static CCTK_REAL PDstandardNth3_impl(CCTK_REAL const* restrict const u, CCTK_REAL const p1o12dz, ptrdiff_t const cdj, ptrdiff_t const cdk) CCTK_ATTRIBUTE_NOINLINE CCTK_ATTRIBUTE_UNUSED;
-static CCTK_REAL PDstandardNth3_impl(CCTK_REAL const* restrict const u, CCTK_REAL const p1o12dz, ptrdiff_t const cdj, ptrdiff_t const cdk)
+static CCTK_REAL PDstandardNth3_impl(const CCTK_REAL* restrict const u, const CCTK_REAL p1o12dz, const ptrdiff_t cdj, const ptrdiff_t cdk) CCTK_ATTRIBUTE_NOINLINE CCTK_ATTRIBUTE_UNUSED;
+static CCTK_REAL PDstandardNth3_impl(const CCTK_REAL* restrict const u, const CCTK_REAL p1o12dz, const ptrdiff_t cdj, const ptrdiff_t cdk)
 {
-  ptrdiff_t const cdi CCTK_ATTRIBUTE_UNUSED = sizeof(CCTK_REAL);
-  return (-8.*KRANC_GFOFFSET3D(u,0,0,-1) + 8.*KRANC_GFOFFSET3D(u,0,0,1) + KRANC_GFOFFSET3D(u,0,0,-2) - 1.*KRANC_GFOFFSET3D(u,0,0,2))*p1o12dz;
+  const ptrdiff_t cdi CCTK_ATTRIBUTE_UNUSED = sizeof(CCTK_REAL);
+  return PDstandardNth2_impl(u, p1o12dz, cdk, cdj);
 }
 #endif
 
 #ifndef KRANC_DIFF_FUNCTIONS
-#  define PDstandardNth11(u) ((30.*KRANC_GFOFFSET3D(u,0,0,0) - 16.*(KRANC_GFOFFSET3D(u,-1,0,0) + KRANC_GFOFFSET3D(u,1,0,0)) + KRANC_GFOFFSET3D(u,-2,0,0) + KRANC_GFOFFSET3D(u,2,0,0))*pm1o12dx2)
+#  define PDstandardNth11(u) ((30*KRANC_GFOFFSET3D(u,0,0,0) - 16*(KRANC_GFOFFSET3D(u,-1,0,0) + KRANC_GFOFFSET3D(u,1,0,0)) + KRANC_GFOFFSET3D(u,-2,0,0) + KRANC_GFOFFSET3D(u,2,0,0))*pm1o12dx2)
 #else
 #  define PDstandardNth11(u) (PDstandardNth11_impl(u,pm1o12dx2,cdj,cdk))
-static CCTK_REAL PDstandardNth11_impl(CCTK_REAL const* restrict const u, CCTK_REAL const pm1o12dx2, ptrdiff_t const cdj, ptrdiff_t const cdk) CCTK_ATTRIBUTE_NOINLINE CCTK_ATTRIBUTE_UNUSED;
-static CCTK_REAL PDstandardNth11_impl(CCTK_REAL const* restrict const u, CCTK_REAL const pm1o12dx2, ptrdiff_t const cdj, ptrdiff_t const cdk)
+static CCTK_REAL PDstandardNth11_impl(const CCTK_REAL* restrict const u, const CCTK_REAL pm1o12dx2, const ptrdiff_t cdj, const ptrdiff_t cdk) CCTK_ATTRIBUTE_NOINLINE CCTK_ATTRIBUTE_UNUSED;
+static CCTK_REAL PDstandardNth11_impl(const CCTK_REAL* restrict const u, const CCTK_REAL pm1o12dx2, const ptrdiff_t cdj, const ptrdiff_t cdk)
 {
-  ptrdiff_t const cdi CCTK_ATTRIBUTE_UNUSED = sizeof(CCTK_REAL);
-  return (30.*KRANC_GFOFFSET3D(u,0,0,0) - 16.*(KRANC_GFOFFSET3D(u,-1,0,0) + KRANC_GFOFFSET3D(u,1,0,0)) + KRANC_GFOFFSET3D(u,-2,0,0) + KRANC_GFOFFSET3D(u,2,0,0))*pm1o12dx2;
+  const ptrdiff_t cdi CCTK_ATTRIBUTE_UNUSED = sizeof(CCTK_REAL);
+  return (30*KRANC_GFOFFSET3D(u,0,0,0) - 16*(KRANC_GFOFFSET3D(u,-1,0,0) + KRANC_GFOFFSET3D(u,1,0,0)) + KRANC_GFOFFSET3D(u,-2,0,0) + KRANC_GFOFFSET3D(u,2,0,0))*pm1o12dx2;
 }
 #endif
 
 #ifndef KRANC_DIFF_FUNCTIONS
-#  define PDstandardNth22(u) ((30.*KRANC_GFOFFSET3D(u,0,0,0) - 16.*(KRANC_GFOFFSET3D(u,0,-1,0) + KRANC_GFOFFSET3D(u,0,1,0)) + KRANC_GFOFFSET3D(u,0,-2,0) + KRANC_GFOFFSET3D(u,0,2,0))*pm1o12dy2)
+#  define PDstandardNth22(u) ((30*KRANC_GFOFFSET3D(u,0,0,0) - 16*(KRANC_GFOFFSET3D(u,0,-1,0) + KRANC_GFOFFSET3D(u,0,1,0)) + KRANC_GFOFFSET3D(u,0,-2,0) + KRANC_GFOFFSET3D(u,0,2,0))*pm1o12dy2)
 #else
 #  define PDstandardNth22(u) (PDstandardNth22_impl(u,pm1o12dy2,cdj,cdk))
-static CCTK_REAL PDstandardNth22_impl(CCTK_REAL const* restrict const u, CCTK_REAL const pm1o12dy2, ptrdiff_t const cdj, ptrdiff_t const cdk) CCTK_ATTRIBUTE_NOINLINE CCTK_ATTRIBUTE_UNUSED;
-static CCTK_REAL PDstandardNth22_impl(CCTK_REAL const* restrict const u, CCTK_REAL const pm1o12dy2, ptrdiff_t const cdj, ptrdiff_t const cdk)
+static CCTK_REAL PDstandardNth22_impl(const CCTK_REAL* restrict const u, const CCTK_REAL pm1o12dy2, const ptrdiff_t cdj, const ptrdiff_t cdk) CCTK_ATTRIBUTE_NOINLINE CCTK_ATTRIBUTE_UNUSED;
+static CCTK_REAL PDstandardNth22_impl(const CCTK_REAL* restrict const u, const CCTK_REAL pm1o12dy2, const ptrdiff_t cdj, const ptrdiff_t cdk)
 {
-  ptrdiff_t const cdi CCTK_ATTRIBUTE_UNUSED = sizeof(CCTK_REAL);
-  return (30.*KRANC_GFOFFSET3D(u,0,0,0) - 16.*(KRANC_GFOFFSET3D(u,0,-1,0) + KRANC_GFOFFSET3D(u,0,1,0)) + KRANC_GFOFFSET3D(u,0,-2,0) + KRANC_GFOFFSET3D(u,0,2,0))*pm1o12dy2;
+  const ptrdiff_t cdi CCTK_ATTRIBUTE_UNUSED = sizeof(CCTK_REAL);
+  return (30*KRANC_GFOFFSET3D(u,0,0,0) - 16*(KRANC_GFOFFSET3D(u,0,-1,0) + KRANC_GFOFFSET3D(u,0,1,0)) + KRANC_GFOFFSET3D(u,0,-2,0) + KRANC_GFOFFSET3D(u,0,2,0))*pm1o12dy2;
 }
 #endif
 
 #ifndef KRANC_DIFF_FUNCTIONS
-#  define PDstandardNth33(u) ((30.*KRANC_GFOFFSET3D(u,0,0,0) - 16.*(KRANC_GFOFFSET3D(u,0,0,-1) + KRANC_GFOFFSET3D(u,0,0,1)) + KRANC_GFOFFSET3D(u,0,0,-2) + KRANC_GFOFFSET3D(u,0,0,2))*pm1o12dz2)
+#  define PDstandardNth33(u) ((30*KRANC_GFOFFSET3D(u,0,0,0) - 16*(KRANC_GFOFFSET3D(u,0,0,-1) + KRANC_GFOFFSET3D(u,0,0,1)) + KRANC_GFOFFSET3D(u,0,0,-2) + KRANC_GFOFFSET3D(u,0,0,2))*pm1o12dz2)
 #else
 #  define PDstandardNth33(u) (PDstandardNth33_impl(u,pm1o12dz2,cdj,cdk))
-static CCTK_REAL PDstandardNth33_impl(CCTK_REAL const* restrict const u, CCTK_REAL const pm1o12dz2, ptrdiff_t const cdj, ptrdiff_t const cdk) CCTK_ATTRIBUTE_NOINLINE CCTK_ATTRIBUTE_UNUSED;
-static CCTK_REAL PDstandardNth33_impl(CCTK_REAL const* restrict const u, CCTK_REAL const pm1o12dz2, ptrdiff_t const cdj, ptrdiff_t const cdk)
+static CCTK_REAL PDstandardNth33_impl(const CCTK_REAL* restrict const u, const CCTK_REAL pm1o12dz2, const ptrdiff_t cdj, const ptrdiff_t cdk) CCTK_ATTRIBUTE_NOINLINE CCTK_ATTRIBUTE_UNUSED;
+static CCTK_REAL PDstandardNth33_impl(const CCTK_REAL* restrict const u, const CCTK_REAL pm1o12dz2, const ptrdiff_t cdj, const ptrdiff_t cdk)
 {
-  ptrdiff_t const cdi CCTK_ATTRIBUTE_UNUSED = sizeof(CCTK_REAL);
-  return (30.*KRANC_GFOFFSET3D(u,0,0,0) - 16.*(KRANC_GFOFFSET3D(u,0,0,-1) + KRANC_GFOFFSET3D(u,0,0,1)) + KRANC_GFOFFSET3D(u,0,0,-2) + KRANC_GFOFFSET3D(u,0,0,2))*pm1o12dz2;
+  const ptrdiff_t cdi CCTK_ATTRIBUTE_UNUSED = sizeof(CCTK_REAL);
+  return PDstandardNth22_impl(u, pm1o12dz2, cdk, cdj);
 }
 #endif
 
 #ifndef KRANC_DIFF_FUNCTIONS
-#  define PDstandardNth12(u) ((-64.*(KRANC_GFOFFSET3D(u,-1,1,0) + KRANC_GFOFFSET3D(u,1,-1,0)) + 64.*(KRANC_GFOFFSET3D(u,-1,-1,0) + KRANC_GFOFFSET3D(u,1,1,0)) + 8.*(KRANC_GFOFFSET3D(u,-1,2,0) + KRANC_GFOFFSET3D(u,1,-2,0) + KRANC_GFOFFSET3D(u,-2,1,0) + KRANC_GFOFFSET3D(u,2,-1,0)) - 8.*(KRANC_GFOFFSET3D(u,-1,-2,0) + KRANC_GFOFFSET3D(u,1,2,0) + KRANC_GFOFFSET3D(u,-2,-1,0) + KRANC_GFOFFSET3D(u,2,1,0)) + KRANC_GFOFFSET3D(u,-2,-2,0) - 1.*(KRANC_GFOFFSET3D(u,-2,2,0) + KRANC_GFOFFSET3D(u,2,-2,0)) + KRANC_GFOFFSET3D(u,2,2,0))*p1o144dxdy)
+#  define PDstandardNth12(u) ((-64*(KRANC_GFOFFSET3D(u,-1,1,0) + KRANC_GFOFFSET3D(u,1,-1,0)) + 64*(KRANC_GFOFFSET3D(u,-1,-1,0) + KRANC_GFOFFSET3D(u,1,1,0)) + 8*(KRANC_GFOFFSET3D(u,-1,2,0) + KRANC_GFOFFSET3D(u,1,-2,0) + KRANC_GFOFFSET3D(u,-2,1,0) + KRANC_GFOFFSET3D(u,2,-1,0)) - 8*(KRANC_GFOFFSET3D(u,-1,-2,0) + KRANC_GFOFFSET3D(u,1,2,0) + KRANC_GFOFFSET3D(u,-2,-1,0) + KRANC_GFOFFSET3D(u,2,1,0)) + KRANC_GFOFFSET3D(u,-2,-2,0) - KRANC_GFOFFSET3D(u,-2,2,0) - KRANC_GFOFFSET3D(u,2,-2,0) + KRANC_GFOFFSET3D(u,2,2,0))*p1o144dxdy)
 #else
 #  define PDstandardNth12(u) (PDstandardNth12_impl(u,p1o144dxdy,cdj,cdk))
-static CCTK_REAL PDstandardNth12_impl(CCTK_REAL const* restrict const u, CCTK_REAL const p1o144dxdy, ptrdiff_t const cdj, ptrdiff_t const cdk) CCTK_ATTRIBUTE_NOINLINE CCTK_ATTRIBUTE_UNUSED;
-static CCTK_REAL PDstandardNth12_impl(CCTK_REAL const* restrict const u, CCTK_REAL const p1o144dxdy, ptrdiff_t const cdj, ptrdiff_t const cdk)
+static CCTK_REAL PDstandardNth12_impl(const CCTK_REAL* restrict const u, const CCTK_REAL p1o144dxdy, const ptrdiff_t cdj, const ptrdiff_t cdk) CCTK_ATTRIBUTE_NOINLINE CCTK_ATTRIBUTE_UNUSED;
+static CCTK_REAL PDstandardNth12_impl(const CCTK_REAL* restrict const u, const CCTK_REAL p1o144dxdy, const ptrdiff_t cdj, const ptrdiff_t cdk)
 {
-  ptrdiff_t const cdi CCTK_ATTRIBUTE_UNUSED = sizeof(CCTK_REAL);
-  return (-64.*(KRANC_GFOFFSET3D(u,-1,1,0) + KRANC_GFOFFSET3D(u,1,-1,0)) + 64.*(KRANC_GFOFFSET3D(u,-1,-1,0) + KRANC_GFOFFSET3D(u,1,1,0)) + 8.*(KRANC_GFOFFSET3D(u,-1,2,0) + KRANC_GFOFFSET3D(u,1,-2,0) + KRANC_GFOFFSET3D(u,-2,1,0) + KRANC_GFOFFSET3D(u,2,-1,0)) - 8.*(KRANC_GFOFFSET3D(u,-1,-2,0) + KRANC_GFOFFSET3D(u,1,2,0) + KRANC_GFOFFSET3D(u,-2,-1,0) + KRANC_GFOFFSET3D(u,2,1,0)) + KRANC_GFOFFSET3D(u,-2,-2,0) - 1.*(KRANC_GFOFFSET3D(u,-2,2,0) + KRANC_GFOFFSET3D(u,2,-2,0)) + KRANC_GFOFFSET3D(u,2,2,0))*p1o144dxdy;
+  const ptrdiff_t cdi CCTK_ATTRIBUTE_UNUSED = sizeof(CCTK_REAL);
+  return (-64*(KRANC_GFOFFSET3D(u,-1,1,0) + KRANC_GFOFFSET3D(u,1,-1,0)) + 64*(KRANC_GFOFFSET3D(u,-1,-1,0) + KRANC_GFOFFSET3D(u,1,1,0)) + 8*(KRANC_GFOFFSET3D(u,-1,2,0) + KRANC_GFOFFSET3D(u,1,-2,0) + KRANC_GFOFFSET3D(u,-2,1,0) + KRANC_GFOFFSET3D(u,2,-1,0)) - 8*(KRANC_GFOFFSET3D(u,-1,-2,0) + KRANC_GFOFFSET3D(u,1,2,0) + KRANC_GFOFFSET3D(u,-2,-1,0) + KRANC_GFOFFSET3D(u,2,1,0)) + KRANC_GFOFFSET3D(u,-2,-2,0) - KRANC_GFOFFSET3D(u,-2,2,0) - KRANC_GFOFFSET3D(u,2,-2,0) + KRANC_GFOFFSET3D(u,2,2,0))*p1o144dxdy;
 }
 #endif
 
 #ifndef KRANC_DIFF_FUNCTIONS
-#  define PDstandardNth13(u) ((-64.*(KRANC_GFOFFSET3D(u,-1,0,1) + KRANC_GFOFFSET3D(u,1,0,-1)) + 64.*(KRANC_GFOFFSET3D(u,-1,0,-1) + KRANC_GFOFFSET3D(u,1,0,1)) + 8.*(KRANC_GFOFFSET3D(u,-1,0,2) + KRANC_GFOFFSET3D(u,1,0,-2) + KRANC_GFOFFSET3D(u,-2,0,1) + KRANC_GFOFFSET3D(u,2,0,-1)) - 8.*(KRANC_GFOFFSET3D(u,-1,0,-2) + KRANC_GFOFFSET3D(u,1,0,2) + KRANC_GFOFFSET3D(u,-2,0,-1) + KRANC_GFOFFSET3D(u,2,0,1)) + KRANC_GFOFFSET3D(u,-2,0,-2) - 1.*(KRANC_GFOFFSET3D(u,-2,0,2) + KRANC_GFOFFSET3D(u,2,0,-2)) + KRANC_GFOFFSET3D(u,2,0,2))*p1o144dxdz)
+#  define PDstandardNth13(u) ((-64*(KRANC_GFOFFSET3D(u,-1,0,1) + KRANC_GFOFFSET3D(u,1,0,-1)) + 64*(KRANC_GFOFFSET3D(u,-1,0,-1) + KRANC_GFOFFSET3D(u,1,0,1)) + 8*(KRANC_GFOFFSET3D(u,-1,0,2) + KRANC_GFOFFSET3D(u,1,0,-2) + KRANC_GFOFFSET3D(u,-2,0,1) + KRANC_GFOFFSET3D(u,2,0,-1)) - 8*(KRANC_GFOFFSET3D(u,-1,0,-2) + KRANC_GFOFFSET3D(u,1,0,2) + KRANC_GFOFFSET3D(u,-2,0,-1) + KRANC_GFOFFSET3D(u,2,0,1)) + KRANC_GFOFFSET3D(u,-2,0,-2) - KRANC_GFOFFSET3D(u,-2,0,2) - KRANC_GFOFFSET3D(u,2,0,-2) + KRANC_GFOFFSET3D(u,2,0,2))*p1o144dxdz)
 #else
 #  define PDstandardNth13(u) (PDstandardNth13_impl(u,p1o144dxdz,cdj,cdk))
-static CCTK_REAL PDstandardNth13_impl(CCTK_REAL const* restrict const u, CCTK_REAL const p1o144dxdz, ptrdiff_t const cdj, ptrdiff_t const cdk) CCTK_ATTRIBUTE_NOINLINE CCTK_ATTRIBUTE_UNUSED;
-static CCTK_REAL PDstandardNth13_impl(CCTK_REAL const* restrict const u, CCTK_REAL const p1o144dxdz, ptrdiff_t const cdj, ptrdiff_t const cdk)
+static CCTK_REAL PDstandardNth13_impl(const CCTK_REAL* restrict const u, const CCTK_REAL p1o144dxdz, const ptrdiff_t cdj, const ptrdiff_t cdk) CCTK_ATTRIBUTE_NOINLINE CCTK_ATTRIBUTE_UNUSED;
+static CCTK_REAL PDstandardNth13_impl(const CCTK_REAL* restrict const u, const CCTK_REAL p1o144dxdz, const ptrdiff_t cdj, const ptrdiff_t cdk)
 {
-  ptrdiff_t const cdi CCTK_ATTRIBUTE_UNUSED = sizeof(CCTK_REAL);
-  return (-64.*(KRANC_GFOFFSET3D(u,-1,0,1) + KRANC_GFOFFSET3D(u,1,0,-1)) + 64.*(KRANC_GFOFFSET3D(u,-1,0,-1) + KRANC_GFOFFSET3D(u,1,0,1)) + 8.*(KRANC_GFOFFSET3D(u,-1,0,2) + KRANC_GFOFFSET3D(u,1,0,-2) + KRANC_GFOFFSET3D(u,-2,0,1) + KRANC_GFOFFSET3D(u,2,0,-1)) - 8.*(KRANC_GFOFFSET3D(u,-1,0,-2) + KRANC_GFOFFSET3D(u,1,0,2) + KRANC_GFOFFSET3D(u,-2,0,-1) + KRANC_GFOFFSET3D(u,2,0,1)) + KRANC_GFOFFSET3D(u,-2,0,-2) - 1.*(KRANC_GFOFFSET3D(u,-2,0,2) + KRANC_GFOFFSET3D(u,2,0,-2)) + KRANC_GFOFFSET3D(u,2,0,2))*p1o144dxdz;
+  const ptrdiff_t cdi CCTK_ATTRIBUTE_UNUSED = sizeof(CCTK_REAL);
+  return PDstandardNth12_impl(u, p1o144dxdz, cdk, cdj);
 }
 #endif
 
 #ifndef KRANC_DIFF_FUNCTIONS
-#  define PDstandardNth21(u) ((-64.*(KRANC_GFOFFSET3D(u,-1,1,0) + KRANC_GFOFFSET3D(u,1,-1,0)) + 64.*(KRANC_GFOFFSET3D(u,-1,-1,0) + KRANC_GFOFFSET3D(u,1,1,0)) + 8.*(KRANC_GFOFFSET3D(u,-1,2,0) + KRANC_GFOFFSET3D(u,1,-2,0) + KRANC_GFOFFSET3D(u,-2,1,0) + KRANC_GFOFFSET3D(u,2,-1,0)) - 8.*(KRANC_GFOFFSET3D(u,-1,-2,0) + KRANC_GFOFFSET3D(u,1,2,0) + KRANC_GFOFFSET3D(u,-2,-1,0) + KRANC_GFOFFSET3D(u,2,1,0)) + KRANC_GFOFFSET3D(u,-2,-2,0) - 1.*(KRANC_GFOFFSET3D(u,-2,2,0) + KRANC_GFOFFSET3D(u,2,-2,0)) + KRANC_GFOFFSET3D(u,2,2,0))*p1o144dxdy)
+#  define PDstandardNth21(u) ((-64*(KRANC_GFOFFSET3D(u,-1,1,0) + KRANC_GFOFFSET3D(u,1,-1,0)) + 64*(KRANC_GFOFFSET3D(u,-1,-1,0) + KRANC_GFOFFSET3D(u,1,1,0)) + 8*(KRANC_GFOFFSET3D(u,-1,2,0) + KRANC_GFOFFSET3D(u,1,-2,0) + KRANC_GFOFFSET3D(u,-2,1,0) + KRANC_GFOFFSET3D(u,2,-1,0)) - 8*(KRANC_GFOFFSET3D(u,-1,-2,0) + KRANC_GFOFFSET3D(u,1,2,0) + KRANC_GFOFFSET3D(u,-2,-1,0) + KRANC_GFOFFSET3D(u,2,1,0)) + KRANC_GFOFFSET3D(u,-2,-2,0) - KRANC_GFOFFSET3D(u,-2,2,0) - KRANC_GFOFFSET3D(u,2,-2,0) + KRANC_GFOFFSET3D(u,2,2,0))*p1o144dxdy)
 #else
 #  define PDstandardNth21(u) (PDstandardNth21_impl(u,p1o144dxdy,cdj,cdk))
-static CCTK_REAL PDstandardNth21_impl(CCTK_REAL const* restrict const u, CCTK_REAL const p1o144dxdy, ptrdiff_t const cdj, ptrdiff_t const cdk) CCTK_ATTRIBUTE_NOINLINE CCTK_ATTRIBUTE_UNUSED;
-static CCTK_REAL PDstandardNth21_impl(CCTK_REAL const* restrict const u, CCTK_REAL const p1o144dxdy, ptrdiff_t const cdj, ptrdiff_t const cdk)
+static CCTK_REAL PDstandardNth21_impl(const CCTK_REAL* restrict const u, const CCTK_REAL p1o144dxdy, const ptrdiff_t cdj, const ptrdiff_t cdk) CCTK_ATTRIBUTE_NOINLINE CCTK_ATTRIBUTE_UNUSED;
+static CCTK_REAL PDstandardNth21_impl(const CCTK_REAL* restrict const u, const CCTK_REAL p1o144dxdy, const ptrdiff_t cdj, const ptrdiff_t cdk)
 {
-  ptrdiff_t const cdi CCTK_ATTRIBUTE_UNUSED = sizeof(CCTK_REAL);
-  return (-64.*(KRANC_GFOFFSET3D(u,-1,1,0) + KRANC_GFOFFSET3D(u,1,-1,0)) + 64.*(KRANC_GFOFFSET3D(u,-1,-1,0) + KRANC_GFOFFSET3D(u,1,1,0)) + 8.*(KRANC_GFOFFSET3D(u,-1,2,0) + KRANC_GFOFFSET3D(u,1,-2,0) + KRANC_GFOFFSET3D(u,-2,1,0) + KRANC_GFOFFSET3D(u,2,-1,0)) - 8.*(KRANC_GFOFFSET3D(u,-1,-2,0) + KRANC_GFOFFSET3D(u,1,2,0) + KRANC_GFOFFSET3D(u,-2,-1,0) + KRANC_GFOFFSET3D(u,2,1,0)) + KRANC_GFOFFSET3D(u,-2,-2,0) - 1.*(KRANC_GFOFFSET3D(u,-2,2,0) + KRANC_GFOFFSET3D(u,2,-2,0)) + KRANC_GFOFFSET3D(u,2,2,0))*p1o144dxdy;
+  const ptrdiff_t cdi CCTK_ATTRIBUTE_UNUSED = sizeof(CCTK_REAL);
+  return PDstandardNth12_impl(u, p1o144dxdy, cdj, cdk);
 }
 #endif
 
 #ifndef KRANC_DIFF_FUNCTIONS
-#  define PDstandardNth23(u) ((-64.*(KRANC_GFOFFSET3D(u,0,-1,1) + KRANC_GFOFFSET3D(u,0,1,-1)) + 64.*(KRANC_GFOFFSET3D(u,0,-1,-1) + KRANC_GFOFFSET3D(u,0,1,1)) + 8.*(KRANC_GFOFFSET3D(u,0,-1,2) + KRANC_GFOFFSET3D(u,0,1,-2) + KRANC_GFOFFSET3D(u,0,-2,1) + KRANC_GFOFFSET3D(u,0,2,-1)) - 8.*(KRANC_GFOFFSET3D(u,0,-1,-2) + KRANC_GFOFFSET3D(u,0,1,2) + KRANC_GFOFFSET3D(u,0,-2,-1) + KRANC_GFOFFSET3D(u,0,2,1)) + KRANC_GFOFFSET3D(u,0,-2,-2) - 1.*(KRANC_GFOFFSET3D(u,0,-2,2) + KRANC_GFOFFSET3D(u,0,2,-2)) + KRANC_GFOFFSET3D(u,0,2,2))*p1o144dydz)
+#  define PDstandardNth23(u) ((-64*(KRANC_GFOFFSET3D(u,0,-1,1) + KRANC_GFOFFSET3D(u,0,1,-1)) + 64*(KRANC_GFOFFSET3D(u,0,-1,-1) + KRANC_GFOFFSET3D(u,0,1,1)) + 8*(KRANC_GFOFFSET3D(u,0,-1,2) + KRANC_GFOFFSET3D(u,0,1,-2) + KRANC_GFOFFSET3D(u,0,-2,1) + KRANC_GFOFFSET3D(u,0,2,-1)) - 8*(KRANC_GFOFFSET3D(u,0,-1,-2) + KRANC_GFOFFSET3D(u,0,1,2) + KRANC_GFOFFSET3D(u,0,-2,-1) + KRANC_GFOFFSET3D(u,0,2,1)) + KRANC_GFOFFSET3D(u,0,-2,-2) - KRANC_GFOFFSET3D(u,0,-2,2) - KRANC_GFOFFSET3D(u,0,2,-2) + KRANC_GFOFFSET3D(u,0,2,2))*p1o144dydz)
 #else
 #  define PDstandardNth23(u) (PDstandardNth23_impl(u,p1o144dydz,cdj,cdk))
-static CCTK_REAL PDstandardNth23_impl(CCTK_REAL const* restrict const u, CCTK_REAL const p1o144dydz, ptrdiff_t const cdj, ptrdiff_t const cdk) CCTK_ATTRIBUTE_NOINLINE CCTK_ATTRIBUTE_UNUSED;
-static CCTK_REAL PDstandardNth23_impl(CCTK_REAL const* restrict const u, CCTK_REAL const p1o144dydz, ptrdiff_t const cdj, ptrdiff_t const cdk)
+static CCTK_REAL PDstandardNth23_impl(const CCTK_REAL* restrict const u, const CCTK_REAL p1o144dydz, const ptrdiff_t cdj, const ptrdiff_t cdk) CCTK_ATTRIBUTE_NOINLINE CCTK_ATTRIBUTE_UNUSED;
+static CCTK_REAL PDstandardNth23_impl(const CCTK_REAL* restrict const u, const CCTK_REAL p1o144dydz, const ptrdiff_t cdj, const ptrdiff_t cdk)
 {
-  ptrdiff_t const cdi CCTK_ATTRIBUTE_UNUSED = sizeof(CCTK_REAL);
-  return (-64.*(KRANC_GFOFFSET3D(u,0,-1,1) + KRANC_GFOFFSET3D(u,0,1,-1)) + 64.*(KRANC_GFOFFSET3D(u,0,-1,-1) + KRANC_GFOFFSET3D(u,0,1,1)) + 8.*(KRANC_GFOFFSET3D(u,0,-1,2) + KRANC_GFOFFSET3D(u,0,1,-2) + KRANC_GFOFFSET3D(u,0,-2,1) + KRANC_GFOFFSET3D(u,0,2,-1)) - 8.*(KRANC_GFOFFSET3D(u,0,-1,-2) + KRANC_GFOFFSET3D(u,0,1,2) + KRANC_GFOFFSET3D(u,0,-2,-1) + KRANC_GFOFFSET3D(u,0,2,1)) + KRANC_GFOFFSET3D(u,0,-2,-2) - 1.*(KRANC_GFOFFSET3D(u,0,-2,2) + KRANC_GFOFFSET3D(u,0,2,-2)) + KRANC_GFOFFSET3D(u,0,2,2))*p1o144dydz;
+  const ptrdiff_t cdi CCTK_ATTRIBUTE_UNUSED = sizeof(CCTK_REAL);
+  return (-64*(KRANC_GFOFFSET3D(u,0,-1,1) + KRANC_GFOFFSET3D(u,0,1,-1)) + 64*(KRANC_GFOFFSET3D(u,0,-1,-1) + KRANC_GFOFFSET3D(u,0,1,1)) + 8*(KRANC_GFOFFSET3D(u,0,-1,2) + KRANC_GFOFFSET3D(u,0,1,-2) + KRANC_GFOFFSET3D(u,0,-2,1) + KRANC_GFOFFSET3D(u,0,2,-1)) - 8*(KRANC_GFOFFSET3D(u,0,-1,-2) + KRANC_GFOFFSET3D(u,0,1,2) + KRANC_GFOFFSET3D(u,0,-2,-1) + KRANC_GFOFFSET3D(u,0,2,1)) + KRANC_GFOFFSET3D(u,0,-2,-2) - KRANC_GFOFFSET3D(u,0,-2,2) - KRANC_GFOFFSET3D(u,0,2,-2) + KRANC_GFOFFSET3D(u,0,2,2))*p1o144dydz;
 }
 #endif
 
 #ifndef KRANC_DIFF_FUNCTIONS
-#  define PDstandardNth31(u) ((-64.*(KRANC_GFOFFSET3D(u,-1,0,1) + KRANC_GFOFFSET3D(u,1,0,-1)) + 64.*(KRANC_GFOFFSET3D(u,-1,0,-1) + KRANC_GFOFFSET3D(u,1,0,1)) + 8.*(KRANC_GFOFFSET3D(u,-1,0,2) + KRANC_GFOFFSET3D(u,1,0,-2) + KRANC_GFOFFSET3D(u,-2,0,1) + KRANC_GFOFFSET3D(u,2,0,-1)) - 8.*(KRANC_GFOFFSET3D(u,-1,0,-2) + KRANC_GFOFFSET3D(u,1,0,2) + KRANC_GFOFFSET3D(u,-2,0,-1) + KRANC_GFOFFSET3D(u,2,0,1)) + KRANC_GFOFFSET3D(u,-2,0,-2) - 1.*(KRANC_GFOFFSET3D(u,-2,0,2) + KRANC_GFOFFSET3D(u,2,0,-2)) + KRANC_GFOFFSET3D(u,2,0,2))*p1o144dxdz)
+#  define PDstandardNth31(u) ((-64*(KRANC_GFOFFSET3D(u,-1,0,1) + KRANC_GFOFFSET3D(u,1,0,-1)) + 64*(KRANC_GFOFFSET3D(u,-1,0,-1) + KRANC_GFOFFSET3D(u,1,0,1)) + 8*(KRANC_GFOFFSET3D(u,-1,0,2) + KRANC_GFOFFSET3D(u,1,0,-2) + KRANC_GFOFFSET3D(u,-2,0,1) + KRANC_GFOFFSET3D(u,2,0,-1)) - 8*(KRANC_GFOFFSET3D(u,-1,0,-2) + KRANC_GFOFFSET3D(u,1,0,2) + KRANC_GFOFFSET3D(u,-2,0,-1) + KRANC_GFOFFSET3D(u,2,0,1)) + KRANC_GFOFFSET3D(u,-2,0,-2) - KRANC_GFOFFSET3D(u,-2,0,2) - KRANC_GFOFFSET3D(u,2,0,-2) + KRANC_GFOFFSET3D(u,2,0,2))*p1o144dxdz)
 #else
 #  define PDstandardNth31(u) (PDstandardNth31_impl(u,p1o144dxdz,cdj,cdk))
-static CCTK_REAL PDstandardNth31_impl(CCTK_REAL const* restrict const u, CCTK_REAL const p1o144dxdz, ptrdiff_t const cdj, ptrdiff_t const cdk) CCTK_ATTRIBUTE_NOINLINE CCTK_ATTRIBUTE_UNUSED;
-static CCTK_REAL PDstandardNth31_impl(CCTK_REAL const* restrict const u, CCTK_REAL const p1o144dxdz, ptrdiff_t const cdj, ptrdiff_t const cdk)
+static CCTK_REAL PDstandardNth31_impl(const CCTK_REAL* restrict const u, const CCTK_REAL p1o144dxdz, const ptrdiff_t cdj, const ptrdiff_t cdk) CCTK_ATTRIBUTE_NOINLINE CCTK_ATTRIBUTE_UNUSED;
+static CCTK_REAL PDstandardNth31_impl(const CCTK_REAL* restrict const u, const CCTK_REAL p1o144dxdz, const ptrdiff_t cdj, const ptrdiff_t cdk)
 {
-  ptrdiff_t const cdi CCTK_ATTRIBUTE_UNUSED = sizeof(CCTK_REAL);
-  return (-64.*(KRANC_GFOFFSET3D(u,-1,0,1) + KRANC_GFOFFSET3D(u,1,0,-1)) + 64.*(KRANC_GFOFFSET3D(u,-1,0,-1) + KRANC_GFOFFSET3D(u,1,0,1)) + 8.*(KRANC_GFOFFSET3D(u,-1,0,2) + KRANC_GFOFFSET3D(u,1,0,-2) + KRANC_GFOFFSET3D(u,-2,0,1) + KRANC_GFOFFSET3D(u,2,0,-1)) - 8.*(KRANC_GFOFFSET3D(u,-1,0,-2) + KRANC_GFOFFSET3D(u,1,0,2) + KRANC_GFOFFSET3D(u,-2,0,-1) + KRANC_GFOFFSET3D(u,2,0,1)) + KRANC_GFOFFSET3D(u,-2,0,-2) - 1.*(KRANC_GFOFFSET3D(u,-2,0,2) + KRANC_GFOFFSET3D(u,2,0,-2)) + KRANC_GFOFFSET3D(u,2,0,2))*p1o144dxdz;
+  const ptrdiff_t cdi CCTK_ATTRIBUTE_UNUSED = sizeof(CCTK_REAL);
+  return PDstandardNth12_impl(u, p1o144dxdz, cdk, cdj);
 }
 #endif
 
 #ifndef KRANC_DIFF_FUNCTIONS
-#  define PDstandardNth32(u) ((-64.*(KRANC_GFOFFSET3D(u,0,-1,1) + KRANC_GFOFFSET3D(u,0,1,-1)) + 64.*(KRANC_GFOFFSET3D(u,0,-1,-1) + KRANC_GFOFFSET3D(u,0,1,1)) + 8.*(KRANC_GFOFFSET3D(u,0,-1,2) + KRANC_GFOFFSET3D(u,0,1,-2) + KRANC_GFOFFSET3D(u,0,-2,1) + KRANC_GFOFFSET3D(u,0,2,-1)) - 8.*(KRANC_GFOFFSET3D(u,0,-1,-2) + KRANC_GFOFFSET3D(u,0,1,2) + KRANC_GFOFFSET3D(u,0,-2,-1) + KRANC_GFOFFSET3D(u,0,2,1)) + KRANC_GFOFFSET3D(u,0,-2,-2) - 1.*(KRANC_GFOFFSET3D(u,0,-2,2) + KRANC_GFOFFSET3D(u,0,2,-2)) + KRANC_GFOFFSET3D(u,0,2,2))*p1o144dydz)
+#  define PDstandardNth32(u) ((-64*(KRANC_GFOFFSET3D(u,0,-1,1) + KRANC_GFOFFSET3D(u,0,1,-1)) + 64*(KRANC_GFOFFSET3D(u,0,-1,-1) + KRANC_GFOFFSET3D(u,0,1,1)) + 8*(KRANC_GFOFFSET3D(u,0,-1,2) + KRANC_GFOFFSET3D(u,0,1,-2) + KRANC_GFOFFSET3D(u,0,-2,1) + KRANC_GFOFFSET3D(u,0,2,-1)) - 8*(KRANC_GFOFFSET3D(u,0,-1,-2) + KRANC_GFOFFSET3D(u,0,1,2) + KRANC_GFOFFSET3D(u,0,-2,-1) + KRANC_GFOFFSET3D(u,0,2,1)) + KRANC_GFOFFSET3D(u,0,-2,-2) - KRANC_GFOFFSET3D(u,0,-2,2) - KRANC_GFOFFSET3D(u,0,2,-2) + KRANC_GFOFFSET3D(u,0,2,2))*p1o144dydz)
 #else
 #  define PDstandardNth32(u) (PDstandardNth32_impl(u,p1o144dydz,cdj,cdk))
-static CCTK_REAL PDstandardNth32_impl(CCTK_REAL const* restrict const u, CCTK_REAL const p1o144dydz, ptrdiff_t const cdj, ptrdiff_t const cdk) CCTK_ATTRIBUTE_NOINLINE CCTK_ATTRIBUTE_UNUSED;
-static CCTK_REAL PDstandardNth32_impl(CCTK_REAL const* restrict const u, CCTK_REAL const p1o144dydz, ptrdiff_t const cdj, ptrdiff_t const cdk)
+static CCTK_REAL PDstandardNth32_impl(const CCTK_REAL* restrict const u, const CCTK_REAL p1o144dydz, const ptrdiff_t cdj, const ptrdiff_t cdk) CCTK_ATTRIBUTE_NOINLINE CCTK_ATTRIBUTE_UNUSED;
+static CCTK_REAL PDstandardNth32_impl(const CCTK_REAL* restrict const u, const CCTK_REAL p1o144dydz, const ptrdiff_t cdj, const ptrdiff_t cdk)
 {
-  ptrdiff_t const cdi CCTK_ATTRIBUTE_UNUSED = sizeof(CCTK_REAL);
-  return (-64.*(KRANC_GFOFFSET3D(u,0,-1,1) + KRANC_GFOFFSET3D(u,0,1,-1)) + 64.*(KRANC_GFOFFSET3D(u,0,-1,-1) + KRANC_GFOFFSET3D(u,0,1,1)) + 8.*(KRANC_GFOFFSET3D(u,0,-1,2) + KRANC_GFOFFSET3D(u,0,1,-2) + KRANC_GFOFFSET3D(u,0,-2,1) + KRANC_GFOFFSET3D(u,0,2,-1)) - 8.*(KRANC_GFOFFSET3D(u,0,-1,-2) + KRANC_GFOFFSET3D(u,0,1,2) + KRANC_GFOFFSET3D(u,0,-2,-1) + KRANC_GFOFFSET3D(u,0,2,1)) + KRANC_GFOFFSET3D(u,0,-2,-2) - 1.*(KRANC_GFOFFSET3D(u,0,-2,2) + KRANC_GFOFFSET3D(u,0,2,-2)) + KRANC_GFOFFSET3D(u,0,2,2))*p1o144dydz;
+  const ptrdiff_t cdi CCTK_ATTRIBUTE_UNUSED = sizeof(CCTK_REAL);
+  return PDstandardNth23_impl(u, p1o144dydz, cdj, cdk);
 }
 #endif
 
 #ifndef KRANC_DIFF_FUNCTIONS
-#  define PDupwindNth1(u) ((-10.*KRANC_GFOFFSET3D(u,0,0,0) - 6.*KRANC_GFOFFSET3D(u,2*dir1,0,0) + KRANC_GFOFFSET3D(u,3*dir1,0,0) - 3.*KRANC_GFOFFSET3D(u,-dir1,0,0) + 18.*KRANC_GFOFFSET3D(u,dir1,0,0))*p1o12dx*dir1)
+#  define PDupwindNth1(u) ((-10*KRANC_GFOFFSET3D(u,0,0,0) - 6*KRANC_GFOFFSET3D(u,2*dir1,0,0) + KRANC_GFOFFSET3D(u,3*dir1,0,0) - 3*KRANC_GFOFFSET3D(u,-dir1,0,0) + 18*KRANC_GFOFFSET3D(u,dir1,0,0))*p1o12dx*dir1)
 #else
 #  define PDupwindNth1(u) (PDupwindNth1_impl(u,p1o12dx,cdj,cdk,dir1,dir2,dir3))
-static CCTK_REAL PDupwindNth1_impl(CCTK_REAL const* restrict const u, CCTK_REAL const p1o12dx, ptrdiff_t const cdj, ptrdiff_t const cdk, ptrdiff_t const dir1, ptrdiff_t const dir2, ptrdiff_t const dir3) CCTK_ATTRIBUTE_NOINLINE CCTK_ATTRIBUTE_UNUSED;
-static CCTK_REAL PDupwindNth1_impl(CCTK_REAL const* restrict const u, CCTK_REAL const p1o12dx, ptrdiff_t const cdj, ptrdiff_t const cdk, ptrdiff_t const dir1, ptrdiff_t const dir2, ptrdiff_t const dir3)
+static CCTK_REAL PDupwindNth1_impl(const CCTK_REAL* restrict const u, const CCTK_REAL p1o12dx, const ptrdiff_t cdj, const ptrdiff_t cdk, const ptrdiff_t dir1, const ptrdiff_t dir2, const ptrdiff_t dir3) CCTK_ATTRIBUTE_NOINLINE CCTK_ATTRIBUTE_UNUSED;
+static CCTK_REAL PDupwindNth1_impl(const CCTK_REAL* restrict const u, const CCTK_REAL p1o12dx, const ptrdiff_t cdj, const ptrdiff_t cdk, const ptrdiff_t dir1, const ptrdiff_t dir2, const ptrdiff_t dir3)
 {
-  ptrdiff_t const cdi CCTK_ATTRIBUTE_UNUSED = sizeof(CCTK_REAL);
-  return (-10.*KRANC_GFOFFSET3D(u,0,0,0) - 6.*KRANC_GFOFFSET3D(u,2*dir1,0,0) + KRANC_GFOFFSET3D(u,3*dir1,0,0) - 3.*KRANC_GFOFFSET3D(u,-dir1,0,0) + 18.*KRANC_GFOFFSET3D(u,dir1,0,0))*p1o12dx*dir1;
+  const ptrdiff_t cdi CCTK_ATTRIBUTE_UNUSED = sizeof(CCTK_REAL);
+  return (-10*KRANC_GFOFFSET3D(u,0,0,0) - 6*KRANC_GFOFFSET3D(u,2*dir1,0,0) + KRANC_GFOFFSET3D(u,3*dir1,0,0) - 3*KRANC_GFOFFSET3D(u,-dir1,0,0) + 18*KRANC_GFOFFSET3D(u,dir1,0,0))*p1o12dx*dir1;
 }
 #endif
 
 #ifndef KRANC_DIFF_FUNCTIONS
-#  define PDupwindNth2(u) ((-10.*KRANC_GFOFFSET3D(u,0,0,0) - 6.*KRANC_GFOFFSET3D(u,0,2*dir2,0) + KRANC_GFOFFSET3D(u,0,3*dir2,0) - 3.*KRANC_GFOFFSET3D(u,0,-dir2,0) + 18.*KRANC_GFOFFSET3D(u,0,dir2,0))*p1o12dy*dir2)
+#  define PDupwindNth2(u) ((-10*KRANC_GFOFFSET3D(u,0,0,0) - 6*KRANC_GFOFFSET3D(u,0,2*dir2,0) + KRANC_GFOFFSET3D(u,0,3*dir2,0) - 3*KRANC_GFOFFSET3D(u,0,-dir2,0) + 18*KRANC_GFOFFSET3D(u,0,dir2,0))*p1o12dy*dir2)
 #else
 #  define PDupwindNth2(u) (PDupwindNth2_impl(u,p1o12dy,cdj,cdk,dir1,dir2,dir3))
-static CCTK_REAL PDupwindNth2_impl(CCTK_REAL const* restrict const u, CCTK_REAL const p1o12dy, ptrdiff_t const cdj, ptrdiff_t const cdk, ptrdiff_t const dir1, ptrdiff_t const dir2, ptrdiff_t const dir3) CCTK_ATTRIBUTE_NOINLINE CCTK_ATTRIBUTE_UNUSED;
-static CCTK_REAL PDupwindNth2_impl(CCTK_REAL const* restrict const u, CCTK_REAL const p1o12dy, ptrdiff_t const cdj, ptrdiff_t const cdk, ptrdiff_t const dir1, ptrdiff_t const dir2, ptrdiff_t const dir3)
+static CCTK_REAL PDupwindNth2_impl(const CCTK_REAL* restrict const u, const CCTK_REAL p1o12dy, const ptrdiff_t cdj, const ptrdiff_t cdk, const ptrdiff_t dir1, const ptrdiff_t dir2, const ptrdiff_t dir3) CCTK_ATTRIBUTE_NOINLINE CCTK_ATTRIBUTE_UNUSED;
+static CCTK_REAL PDupwindNth2_impl(const CCTK_REAL* restrict const u, const CCTK_REAL p1o12dy, const ptrdiff_t cdj, const ptrdiff_t cdk, const ptrdiff_t dir1, const ptrdiff_t dir2, const ptrdiff_t dir3)
 {
-  ptrdiff_t const cdi CCTK_ATTRIBUTE_UNUSED = sizeof(CCTK_REAL);
-  return (-10.*KRANC_GFOFFSET3D(u,0,0,0) - 6.*KRANC_GFOFFSET3D(u,0,2*dir2,0) + KRANC_GFOFFSET3D(u,0,3*dir2,0) - 3.*KRANC_GFOFFSET3D(u,0,-dir2,0) + 18.*KRANC_GFOFFSET3D(u,0,dir2,0))*p1o12dy*dir2;
+  const ptrdiff_t cdi CCTK_ATTRIBUTE_UNUSED = sizeof(CCTK_REAL);
+  return (-10*KRANC_GFOFFSET3D(u,0,0,0) - 6*KRANC_GFOFFSET3D(u,0,2*dir2,0) + KRANC_GFOFFSET3D(u,0,3*dir2,0) - 3*KRANC_GFOFFSET3D(u,0,-dir2,0) + 18*KRANC_GFOFFSET3D(u,0,dir2,0))*p1o12dy*dir2;
 }
 #endif
 
 #ifndef KRANC_DIFF_FUNCTIONS
-#  define PDupwindNth3(u) ((-10.*KRANC_GFOFFSET3D(u,0,0,0) - 6.*KRANC_GFOFFSET3D(u,0,0,2*dir3) + KRANC_GFOFFSET3D(u,0,0,3*dir3) - 3.*KRANC_GFOFFSET3D(u,0,0,-dir3) + 18.*KRANC_GFOFFSET3D(u,0,0,dir3))*p1o12dz*dir3)
+#  define PDupwindNth3(u) ((-10*KRANC_GFOFFSET3D(u,0,0,0) - 6*KRANC_GFOFFSET3D(u,0,0,2*dir3) + KRANC_GFOFFSET3D(u,0,0,3*dir3) - 3*KRANC_GFOFFSET3D(u,0,0,-dir3) + 18*KRANC_GFOFFSET3D(u,0,0,dir3))*p1o12dz*dir3)
 #else
 #  define PDupwindNth3(u) (PDupwindNth3_impl(u,p1o12dz,cdj,cdk,dir1,dir2,dir3))
-static CCTK_REAL PDupwindNth3_impl(CCTK_REAL const* restrict const u, CCTK_REAL const p1o12dz, ptrdiff_t const cdj, ptrdiff_t const cdk, ptrdiff_t const dir1, ptrdiff_t const dir2, ptrdiff_t const dir3) CCTK_ATTRIBUTE_NOINLINE CCTK_ATTRIBUTE_UNUSED;
-static CCTK_REAL PDupwindNth3_impl(CCTK_REAL const* restrict const u, CCTK_REAL const p1o12dz, ptrdiff_t const cdj, ptrdiff_t const cdk, ptrdiff_t const dir1, ptrdiff_t const dir2, ptrdiff_t const dir3)
+static CCTK_REAL PDupwindNth3_impl(const CCTK_REAL* restrict const u, const CCTK_REAL p1o12dz, const ptrdiff_t cdj, const ptrdiff_t cdk, const ptrdiff_t dir1, const ptrdiff_t dir2, const ptrdiff_t dir3) CCTK_ATTRIBUTE_NOINLINE CCTK_ATTRIBUTE_UNUSED;
+static CCTK_REAL PDupwindNth3_impl(const CCTK_REAL* restrict const u, const CCTK_REAL p1o12dz, const ptrdiff_t cdj, const ptrdiff_t cdk, const ptrdiff_t dir1, const ptrdiff_t dir2, const ptrdiff_t dir3)
 {
-  ptrdiff_t const cdi CCTK_ATTRIBUTE_UNUSED = sizeof(CCTK_REAL);
-  return (-10.*KRANC_GFOFFSET3D(u,0,0,0) - 6.*KRANC_GFOFFSET3D(u,0,0,2*dir3) + KRANC_GFOFFSET3D(u,0,0,3*dir3) - 3.*KRANC_GFOFFSET3D(u,0,0,-dir3) + 18.*KRANC_GFOFFSET3D(u,0,0,dir3))*p1o12dz*dir3;
+  const ptrdiff_t cdi CCTK_ATTRIBUTE_UNUSED = sizeof(CCTK_REAL);
+  return PDupwindNth2_impl(u, p1o12dz, cdk, cdj);
 }
 #endif
 
 #ifndef KRANC_DIFF_FUNCTIONS
-#  define PDonesided1(u) ((-1.*KRANC_GFOFFSET3D(u,0,0,0) + KRANC_GFOFFSET3D(u,dir1,0,0))*p1odx*dir1)
+#  define PDonesided1(u) ((-KRANC_GFOFFSET3D(u,0,0,0) + KRANC_GFOFFSET3D(u,dir1,0,0))*p1odx*dir1)
 #else
 #  define PDonesided1(u) (PDonesided1_impl(u,p1odx,cdj,cdk,dir1,dir2,dir3))
-static CCTK_REAL PDonesided1_impl(CCTK_REAL const* restrict const u, CCTK_REAL const p1odx, ptrdiff_t const cdj, ptrdiff_t const cdk, ptrdiff_t const dir1, ptrdiff_t const dir2, ptrdiff_t const dir3) CCTK_ATTRIBUTE_NOINLINE CCTK_ATTRIBUTE_UNUSED;
-static CCTK_REAL PDonesided1_impl(CCTK_REAL const* restrict const u, CCTK_REAL const p1odx, ptrdiff_t const cdj, ptrdiff_t const cdk, ptrdiff_t const dir1, ptrdiff_t const dir2, ptrdiff_t const dir3)
+static CCTK_REAL PDonesided1_impl(const CCTK_REAL* restrict const u, const CCTK_REAL p1odx, const ptrdiff_t cdj, const ptrdiff_t cdk, const ptrdiff_t dir1, const ptrdiff_t dir2, const ptrdiff_t dir3) CCTK_ATTRIBUTE_NOINLINE CCTK_ATTRIBUTE_UNUSED;
+static CCTK_REAL PDonesided1_impl(const CCTK_REAL* restrict const u, const CCTK_REAL p1odx, const ptrdiff_t cdj, const ptrdiff_t cdk, const ptrdiff_t dir1, const ptrdiff_t dir2, const ptrdiff_t dir3)
 {
-  ptrdiff_t const cdi CCTK_ATTRIBUTE_UNUSED = sizeof(CCTK_REAL);
-  return (-1.*KRANC_GFOFFSET3D(u,0,0,0) + KRANC_GFOFFSET3D(u,dir1,0,0))*p1odx*dir1;
+  const ptrdiff_t cdi CCTK_ATTRIBUTE_UNUSED = sizeof(CCTK_REAL);
+  return (-KRANC_GFOFFSET3D(u,0,0,0) + KRANC_GFOFFSET3D(u,dir1,0,0))*p1odx*dir1;
 }
 #endif
 
 #ifndef KRANC_DIFF_FUNCTIONS
-#  define PDonesided2(u) ((-1.*KRANC_GFOFFSET3D(u,0,0,0) + KRANC_GFOFFSET3D(u,0,dir2,0))*p1ody*dir2)
+#  define PDonesided2(u) ((-KRANC_GFOFFSET3D(u,0,0,0) + KRANC_GFOFFSET3D(u,0,dir2,0))*p1ody*dir2)
 #else
 #  define PDonesided2(u) (PDonesided2_impl(u,p1ody,cdj,cdk,dir1,dir2,dir3))
-static CCTK_REAL PDonesided2_impl(CCTK_REAL const* restrict const u, CCTK_REAL const p1ody, ptrdiff_t const cdj, ptrdiff_t const cdk, ptrdiff_t const dir1, ptrdiff_t const dir2, ptrdiff_t const dir3) CCTK_ATTRIBUTE_NOINLINE CCTK_ATTRIBUTE_UNUSED;
-static CCTK_REAL PDonesided2_impl(CCTK_REAL const* restrict const u, CCTK_REAL const p1ody, ptrdiff_t const cdj, ptrdiff_t const cdk, ptrdiff_t const dir1, ptrdiff_t const dir2, ptrdiff_t const dir3)
+static CCTK_REAL PDonesided2_impl(const CCTK_REAL* restrict const u, const CCTK_REAL p1ody, const ptrdiff_t cdj, const ptrdiff_t cdk, const ptrdiff_t dir1, const ptrdiff_t dir2, const ptrdiff_t dir3) CCTK_ATTRIBUTE_NOINLINE CCTK_ATTRIBUTE_UNUSED;
+static CCTK_REAL PDonesided2_impl(const CCTK_REAL* restrict const u, const CCTK_REAL p1ody, const ptrdiff_t cdj, const ptrdiff_t cdk, const ptrdiff_t dir1, const ptrdiff_t dir2, const ptrdiff_t dir3)
 {
-  ptrdiff_t const cdi CCTK_ATTRIBUTE_UNUSED = sizeof(CCTK_REAL);
-  return (-1.*KRANC_GFOFFSET3D(u,0,0,0) + KRANC_GFOFFSET3D(u,0,dir2,0))*p1ody*dir2;
+  const ptrdiff_t cdi CCTK_ATTRIBUTE_UNUSED = sizeof(CCTK_REAL);
+  return (-KRANC_GFOFFSET3D(u,0,0,0) + KRANC_GFOFFSET3D(u,0,dir2,0))*p1ody*dir2;
 }
 #endif
 
 #ifndef KRANC_DIFF_FUNCTIONS
-#  define PDonesided3(u) ((-1.*KRANC_GFOFFSET3D(u,0,0,0) + KRANC_GFOFFSET3D(u,0,0,dir3))*p1odz*dir3)
+#  define PDonesided3(u) ((-KRANC_GFOFFSET3D(u,0,0,0) + KRANC_GFOFFSET3D(u,0,0,dir3))*p1odz*dir3)
 #else
 #  define PDonesided3(u) (PDonesided3_impl(u,p1odz,cdj,cdk,dir1,dir2,dir3))
-static CCTK_REAL PDonesided3_impl(CCTK_REAL const* restrict const u, CCTK_REAL const p1odz, ptrdiff_t const cdj, ptrdiff_t const cdk, ptrdiff_t const dir1, ptrdiff_t const dir2, ptrdiff_t const dir3) CCTK_ATTRIBUTE_NOINLINE CCTK_ATTRIBUTE_UNUSED;
-static CCTK_REAL PDonesided3_impl(CCTK_REAL const* restrict const u, CCTK_REAL const p1odz, ptrdiff_t const cdj, ptrdiff_t const cdk, ptrdiff_t const dir1, ptrdiff_t const dir2, ptrdiff_t const dir3)
+static CCTK_REAL PDonesided3_impl(const CCTK_REAL* restrict const u, const CCTK_REAL p1odz, const ptrdiff_t cdj, const ptrdiff_t cdk, const ptrdiff_t dir1, const ptrdiff_t dir2, const ptrdiff_t dir3) CCTK_ATTRIBUTE_NOINLINE CCTK_ATTRIBUTE_UNUSED;
+static CCTK_REAL PDonesided3_impl(const CCTK_REAL* restrict const u, const CCTK_REAL p1odz, const ptrdiff_t cdj, const ptrdiff_t cdk, const ptrdiff_t dir1, const ptrdiff_t dir2, const ptrdiff_t dir3)
 {
-  ptrdiff_t const cdi CCTK_ATTRIBUTE_UNUSED = sizeof(CCTK_REAL);
-  return (-1.*KRANC_GFOFFSET3D(u,0,0,0) + KRANC_GFOFFSET3D(u,0,0,dir3))*p1odz*dir3;
+  const ptrdiff_t cdi CCTK_ATTRIBUTE_UNUSED = sizeof(CCTK_REAL);
+  return PDonesided2_impl(u, p1odz, cdk, cdj);
 }
 #endif
 
diff --git a/ML_ADMQuantities/src/ML_ADMQuantities.cc b/ML_ADMQuantities/src/ML_ADMQuantities.cc
index 2479b7a..bc63940 100644
--- a/ML_ADMQuantities/src/ML_ADMQuantities.cc
+++ b/ML_ADMQuantities/src/ML_ADMQuantities.cc
@@ -27,7 +27,9 @@ extern "C" void ML_ADMQuantities_SelectBCs(CCTK_ARGUMENTS)
   DECLARE_CCTK_ARGUMENTS;
   DECLARE_CCTK_PARAMETERS;
   
-  CCTK_INT ierr CCTK_ATTRIBUTE_UNUSED  = 0;
+  if (cctk_iteration % ML_ADMQuantities_calc_every != ML_ADMQuantities_calc_offset)
+    return;
+  CCTK_INT ierr CCTK_ATTRIBUTE_UNUSED = 0;
   ierr = Boundary_SelectGroupForBC(cctkGH, CCTK_ALL_FACES, GenericFD_GetBoundaryWidth(cctkGH), -1 /* no table */, "ML_ADMQuantities::ML_Jadm","flat");
   if (ierr < 0)
     CCTK_WARN(1, "Failed to register flat BC for ML_ADMQuantities::ML_Jadm.");
@@ -37,7 +39,7 @@ extern "C" void ML_ADMQuantities_SelectBCs(CCTK_ARGUMENTS)
   return;
 }
 
-static void ML_ADMQuantities_Body(cGH const * restrict const cctkGH, int const dir, int const face, CCTK_REAL const normal[3], CCTK_REAL const tangentA[3], CCTK_REAL const tangentB[3], int const imin[3], int const imax[3], int const n_subblock_gfs, CCTK_REAL * restrict const subblock_gfs[])
+static void ML_ADMQuantities_Body(const cGH* restrict const cctkGH, const int dir, const int face, const CCTK_REAL normal[3], const CCTK_REAL tangentA[3], const CCTK_REAL tangentB[3], const int imin[3], const int imax[3], const int n_subblock_gfs, CCTK_REAL* restrict const subblock_gfs[])
 {
   DECLARE_CCTK_ARGUMENTS;
   DECLARE_CCTK_PARAMETERS;
@@ -46,87 +48,109 @@ static void ML_ADMQuantities_Body(cGH const * restrict const cctkGH, int const d
   /* Include user-supplied include files */
   
   /* Initialise finite differencing variables */
-  ptrdiff_t /*const*/ di CCTK_ATTRIBUTE_UNUSED  = 1;
-  ptrdiff_t /*const*/ dj CCTK_ATTRIBUTE_UNUSED  = CCTK_GFINDEX3D(cctkGH,0,1,0) - CCTK_GFINDEX3D(cctkGH,0,0,0);
-  ptrdiff_t /*const*/ dk CCTK_ATTRIBUTE_UNUSED  = CCTK_GFINDEX3D(cctkGH,0,0,1) - CCTK_GFINDEX3D(cctkGH,0,0,0);
-  ptrdiff_t /*const*/ cdi CCTK_ATTRIBUTE_UNUSED  = sizeof(CCTK_REAL) * di;
-  ptrdiff_t /*const*/ cdj CCTK_ATTRIBUTE_UNUSED  = sizeof(CCTK_REAL) * dj;
-  ptrdiff_t /*const*/ cdk CCTK_ATTRIBUTE_UNUSED  = sizeof(CCTK_REAL) * dk;
-  CCTK_REAL /*const*/ dx CCTK_ATTRIBUTE_UNUSED  = ToReal(CCTK_DELTA_SPACE(0));
-  CCTK_REAL /*const*/ dy CCTK_ATTRIBUTE_UNUSED  = ToReal(CCTK_DELTA_SPACE(1));
-  CCTK_REAL /*const*/ dz CCTK_ATTRIBUTE_UNUSED  = ToReal(CCTK_DELTA_SPACE(2));
-  CCTK_REAL /*const*/ dt CCTK_ATTRIBUTE_UNUSED  = ToReal(CCTK_DELTA_TIME);
-  CCTK_REAL /*const*/ t CCTK_ATTRIBUTE_UNUSED  = ToReal(cctk_time);
-  CCTK_REAL /*const*/ dxi CCTK_ATTRIBUTE_UNUSED  = INV(dx);
-  CCTK_REAL /*const*/ dyi CCTK_ATTRIBUTE_UNUSED  = INV(dy);
-  CCTK_REAL /*const*/ dzi CCTK_ATTRIBUTE_UNUSED  = INV(dz);
-  CCTK_REAL /*const*/ khalf CCTK_ATTRIBUTE_UNUSED  = 0.5;
-  CCTK_REAL /*const*/ kthird CCTK_ATTRIBUTE_UNUSED  = 1/3.0;
-  CCTK_REAL /*const*/ ktwothird CCTK_ATTRIBUTE_UNUSED  = 2.0/3.0;
-  CCTK_REAL /*const*/ kfourthird CCTK_ATTRIBUTE_UNUSED  = 4.0/3.0;
-  CCTK_REAL /*const*/ keightthird CCTK_ATTRIBUTE_UNUSED  = 8.0/3.0;
-  CCTK_REAL /*const*/ hdxi CCTK_ATTRIBUTE_UNUSED  = 0.5 * dxi;
-  CCTK_REAL /*const*/ hdyi CCTK_ATTRIBUTE_UNUSED  = 0.5 * dyi;
-  CCTK_REAL /*const*/ hdzi CCTK_ATTRIBUTE_UNUSED  = 0.5 * dzi;
+  const ptrdiff_t di CCTK_ATTRIBUTE_UNUSED = 1;
+  const ptrdiff_t dj CCTK_ATTRIBUTE_UNUSED = CCTK_GFINDEX3D(cctkGH,0,1,0) - CCTK_GFINDEX3D(cctkGH,0,0,0);
+  const ptrdiff_t dk CCTK_ATTRIBUTE_UNUSED = CCTK_GFINDEX3D(cctkGH,0,0,1) - CCTK_GFINDEX3D(cctkGH,0,0,0);
+  const ptrdiff_t cdi CCTK_ATTRIBUTE_UNUSED = sizeof(CCTK_REAL) * di;
+  const ptrdiff_t cdj CCTK_ATTRIBUTE_UNUSED = sizeof(CCTK_REAL) * dj;
+  const ptrdiff_t cdk CCTK_ATTRIBUTE_UNUSED = sizeof(CCTK_REAL) * dk;
+  const CCTK_REAL dx CCTK_ATTRIBUTE_UNUSED = ToReal(CCTK_DELTA_SPACE(0));
+  const CCTK_REAL dy CCTK_ATTRIBUTE_UNUSED = ToReal(CCTK_DELTA_SPACE(1));
+  const CCTK_REAL dz CCTK_ATTRIBUTE_UNUSED = ToReal(CCTK_DELTA_SPACE(2));
+  const CCTK_REAL dt CCTK_ATTRIBUTE_UNUSED = ToReal(CCTK_DELTA_TIME);
+  const CCTK_REAL t CCTK_ATTRIBUTE_UNUSED = ToReal(cctk_time);
+  const CCTK_REAL dxi CCTK_ATTRIBUTE_UNUSED = INV(dx);
+  const CCTK_REAL dyi CCTK_ATTRIBUTE_UNUSED = INV(dy);
+  const CCTK_REAL dzi CCTK_ATTRIBUTE_UNUSED = INV(dz);
+  const CCTK_REAL khalf CCTK_ATTRIBUTE_UNUSED = 0.5;
+  const CCTK_REAL kthird CCTK_ATTRIBUTE_UNUSED = 1/3.0;
+  const CCTK_REAL ktwothird CCTK_ATTRIBUTE_UNUSED = 2.0/3.0;
+  const CCTK_REAL kfourthird CCTK_ATTRIBUTE_UNUSED = 4.0/3.0;
+  const CCTK_REAL keightthird CCTK_ATTRIBUTE_UNUSED = 8.0/3.0;
+  const CCTK_REAL hdxi CCTK_ATTRIBUTE_UNUSED = 0.5 * dxi;
+  const CCTK_REAL hdyi CCTK_ATTRIBUTE_UNUSED = 0.5 * dyi;
+  const CCTK_REAL hdzi CCTK_ATTRIBUTE_UNUSED = 0.5 * dzi;
   
   /* Initialize predefined quantities */
-  CCTK_REAL /*const*/ p1o12dx CCTK_ATTRIBUTE_UNUSED  = 0.0833333333333333333333333333333*INV(dx);
-  CCTK_REAL /*const*/ p1o12dy CCTK_ATTRIBUTE_UNUSED  = 0.0833333333333333333333333333333*INV(dy);
-  CCTK_REAL /*const*/ p1o12dz CCTK_ATTRIBUTE_UNUSED  = 0.0833333333333333333333333333333*INV(dz);
-  CCTK_REAL /*const*/ p1o144dxdy CCTK_ATTRIBUTE_UNUSED  = 0.00694444444444444444444444444444*INV(dx*dy);
-  CCTK_REAL /*const*/ p1o144dxdz CCTK_ATTRIBUTE_UNUSED  = 0.00694444444444444444444444444444*INV(dx*dz);
-  CCTK_REAL /*const*/ p1o144dydz CCTK_ATTRIBUTE_UNUSED  = 0.00694444444444444444444444444444*INV(dy*dz);
-  CCTK_REAL /*const*/ p1odx CCTK_ATTRIBUTE_UNUSED  = INV(dx);
-  CCTK_REAL /*const*/ p1ody CCTK_ATTRIBUTE_UNUSED  = INV(dy);
-  CCTK_REAL /*const*/ p1odz CCTK_ATTRIBUTE_UNUSED  = INV(dz);
-  CCTK_REAL /*const*/ pm1o12dx2 CCTK_ATTRIBUTE_UNUSED  = -0.0833333333333333333333333333333*INV(SQR(dx));
-  CCTK_REAL /*const*/ pm1o12dy2 CCTK_ATTRIBUTE_UNUSED  = -0.0833333333333333333333333333333*INV(SQR(dy));
-  CCTK_REAL /*const*/ pm1o12dz2 CCTK_ATTRIBUTE_UNUSED  = -0.0833333333333333333333333333333*INV(SQR(dz));
+  const CCTK_REAL p1o12dx CCTK_ATTRIBUTE_UNUSED = 0.0833333333333333333333333333333*INV(dx);
+  const CCTK_REAL p1o12dy CCTK_ATTRIBUTE_UNUSED = 0.0833333333333333333333333333333*INV(dy);
+  const CCTK_REAL p1o12dz CCTK_ATTRIBUTE_UNUSED = 0.0833333333333333333333333333333*INV(dz);
+  const CCTK_REAL p1o144dxdy CCTK_ATTRIBUTE_UNUSED = 0.00694444444444444444444444444444*INV(dx*dy);
+  const CCTK_REAL p1o144dxdz CCTK_ATTRIBUTE_UNUSED = 0.00694444444444444444444444444444*INV(dx*dz);
+  const CCTK_REAL p1o144dydz CCTK_ATTRIBUTE_UNUSED = 0.00694444444444444444444444444444*INV(dy*dz);
+  const CCTK_REAL p1odx CCTK_ATTRIBUTE_UNUSED = INV(dx);
+  const CCTK_REAL p1ody CCTK_ATTRIBUTE_UNUSED = INV(dy);
+  const CCTK_REAL p1odz CCTK_ATTRIBUTE_UNUSED = INV(dz);
+  const CCTK_REAL pm1o12dx2 CCTK_ATTRIBUTE_UNUSED = -0.0833333333333333333333333333333*INV(SQR(dx));
+  const CCTK_REAL pm1o12dy2 CCTK_ATTRIBUTE_UNUSED = -0.0833333333333333333333333333333*INV(SQR(dy));
+  const CCTK_REAL pm1o12dz2 CCTK_ATTRIBUTE_UNUSED = -0.0833333333333333333333333333333*INV(SQR(dz));
   
   /* Jacobian variable pointers */
-  bool const use_jacobian CCTK_ATTRIBUTE_UNUSED = (!CCTK_IsFunctionAliased("MultiPatch_GetMap") || MultiPatch_GetMap(cctkGH) != jacobian_identity_map)
-                       && strlen(jacobian_group) > 0;
-  if (use_jacobian && strlen(jacobian_derivative_group) == 0)
+  const bool use_jacobian1 = (!CCTK_IsFunctionAliased("MultiPatch_GetMap") || MultiPatch_GetMap(cctkGH) != jacobian_identity_map)
+                        && strlen(jacobian_group) > 0;
+  const bool use_jacobian = assume_use_jacobian>=0 ? assume_use_jacobian : use_jacobian1;
+  const bool usejacobian CCTK_ATTRIBUTE_UNUSED = use_jacobian;
+  if (use_jacobian && (strlen(jacobian_determinant_group) == 0 || strlen(jacobian_inverse_group) == 0 || strlen(jacobian_derivative_group) == 0))
   {
-    CCTK_WARN (1, "GenericFD::jacobian_group and GenericFD::jacobian_derivative_group must both be set to valid group names");
+    CCTK_WARN(1, "GenericFD::jacobian_group, GenericFD::jacobian_determinant_group, GenericFD::jacobian_inverse_group, and GenericFD::jacobian_derivative_group must all be set to valid group names");
   }
   
-  CCTK_REAL const *restrict jacobian_ptrs[9];
+  const CCTK_REAL* restrict jacobian_ptrs[9];
   if (use_jacobian) GenericFD_GroupDataPointers(cctkGH, jacobian_group,
                                                 9, jacobian_ptrs);
   
-  CCTK_REAL const *restrict const J11 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_ptrs[0] : 0;
-  CCTK_REAL const *restrict const J12 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_ptrs[1] : 0;
-  CCTK_REAL const *restrict const J13 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_ptrs[2] : 0;
-  CCTK_REAL const *restrict const J21 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_ptrs[3] : 0;
-  CCTK_REAL const *restrict const J22 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_ptrs[4] : 0;
-  CCTK_REAL const *restrict const J23 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_ptrs[5] : 0;
-  CCTK_REAL const *restrict const J31 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_ptrs[6] : 0;
-  CCTK_REAL const *restrict const J32 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_ptrs[7] : 0;
-  CCTK_REAL const *restrict const J33 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_ptrs[8] : 0;
+  const CCTK_REAL* restrict const J11 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_ptrs[0] : 0;
+  const CCTK_REAL* restrict const J12 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_ptrs[1] : 0;
+  const CCTK_REAL* restrict const J13 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_ptrs[2] : 0;
+  const CCTK_REAL* restrict const J21 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_ptrs[3] : 0;
+  const CCTK_REAL* restrict const J22 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_ptrs[4] : 0;
+  const CCTK_REAL* restrict const J23 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_ptrs[5] : 0;
+  const CCTK_REAL* restrict const J31 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_ptrs[6] : 0;
+  const CCTK_REAL* restrict const J32 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_ptrs[7] : 0;
+  const CCTK_REAL* restrict const J33 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_ptrs[8] : 0;
+  
+  const CCTK_REAL* restrict jacobian_determinant_ptrs[1] CCTK_ATTRIBUTE_UNUSED;
+  if (use_jacobian) GenericFD_GroupDataPointers(cctkGH, jacobian_determinant_group,
+                                                1, jacobian_determinant_ptrs);
+  
+  const CCTK_REAL* restrict const detJ CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_ptrs[0] : 0;
+  
+  const CCTK_REAL* restrict jacobian_inverse_ptrs[9] CCTK_ATTRIBUTE_UNUSED;
+  if (use_jacobian) GenericFD_GroupDataPointers(cctkGH, jacobian_inverse_group,
+                                                9, jacobian_inverse_ptrs);
+  
+  const CCTK_REAL* restrict const iJ11 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_inverse_ptrs[0] : 0;
+  const CCTK_REAL* restrict const iJ12 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_inverse_ptrs[1] : 0;
+  const CCTK_REAL* restrict const iJ13 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_inverse_ptrs[2] : 0;
+  const CCTK_REAL* restrict const iJ21 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_inverse_ptrs[3] : 0;
+  const CCTK_REAL* restrict const iJ22 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_inverse_ptrs[4] : 0;
+  const CCTK_REAL* restrict const iJ23 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_inverse_ptrs[5] : 0;
+  const CCTK_REAL* restrict const iJ31 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_inverse_ptrs[6] : 0;
+  const CCTK_REAL* restrict const iJ32 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_inverse_ptrs[7] : 0;
+  const CCTK_REAL* restrict const iJ33 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_inverse_ptrs[8] : 0;
   
-  CCTK_REAL const *restrict jacobian_derivative_ptrs[18] CCTK_ATTRIBUTE_UNUSED;
+  const CCTK_REAL* restrict jacobian_derivative_ptrs[18] CCTK_ATTRIBUTE_UNUSED;
   if (use_jacobian) GenericFD_GroupDataPointers(cctkGH, jacobian_derivative_group,
                                                 18, jacobian_derivative_ptrs);
   
-  CCTK_REAL const *restrict const dJ111  CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_derivative_ptrs[0] : 0;
-  CCTK_REAL const *restrict const dJ112  CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_derivative_ptrs[1] : 0;
-  CCTK_REAL const *restrict const dJ113  CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_derivative_ptrs[2] : 0;
-  CCTK_REAL const *restrict const dJ122  CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_derivative_ptrs[3] : 0;
-  CCTK_REAL const *restrict const dJ123  CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_derivative_ptrs[4] : 0;
-  CCTK_REAL const *restrict const dJ133  CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_derivative_ptrs[5] : 0;
-  CCTK_REAL const *restrict const dJ211  CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_derivative_ptrs[6] : 0;
-  CCTK_REAL const *restrict const dJ212  CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_derivative_ptrs[7] : 0;
-  CCTK_REAL const *restrict const dJ213  CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_derivative_ptrs[8] : 0;
-  CCTK_REAL const *restrict const dJ222  CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_derivative_ptrs[9] : 0;
-  CCTK_REAL const *restrict const dJ223  CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_derivative_ptrs[10] : 0;
-  CCTK_REAL const *restrict const dJ233  CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_derivative_ptrs[11] : 0;
-  CCTK_REAL const *restrict const dJ311  CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_derivative_ptrs[12] : 0;
-  CCTK_REAL const *restrict const dJ312  CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_derivative_ptrs[13] : 0;
-  CCTK_REAL const *restrict const dJ313  CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_derivative_ptrs[14] : 0;
-  CCTK_REAL const *restrict const dJ322  CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_derivative_ptrs[15] : 0;
-  CCTK_REAL const *restrict const dJ323  CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_derivative_ptrs[16] : 0;
-  CCTK_REAL const *restrict const dJ333  CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_derivative_ptrs[17] : 0;
+  const CCTK_REAL* restrict const dJ111 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_derivative_ptrs[0] : 0;
+  const CCTK_REAL* restrict const dJ112 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_derivative_ptrs[1] : 0;
+  const CCTK_REAL* restrict const dJ113 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_derivative_ptrs[2] : 0;
+  const CCTK_REAL* restrict const dJ122 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_derivative_ptrs[3] : 0;
+  const CCTK_REAL* restrict const dJ123 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_derivative_ptrs[4] : 0;
+  const CCTK_REAL* restrict const dJ133 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_derivative_ptrs[5] : 0;
+  const CCTK_REAL* restrict const dJ211 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_derivative_ptrs[6] : 0;
+  const CCTK_REAL* restrict const dJ212 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_derivative_ptrs[7] : 0;
+  const CCTK_REAL* restrict const dJ213 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_derivative_ptrs[8] : 0;
+  const CCTK_REAL* restrict const dJ222 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_derivative_ptrs[9] : 0;
+  const CCTK_REAL* restrict const dJ223 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_derivative_ptrs[10] : 0;
+  const CCTK_REAL* restrict const dJ233 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_derivative_ptrs[11] : 0;
+  const CCTK_REAL* restrict const dJ311 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_derivative_ptrs[12] : 0;
+  const CCTK_REAL* restrict const dJ312 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_derivative_ptrs[13] : 0;
+  const CCTK_REAL* restrict const dJ313 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_derivative_ptrs[14] : 0;
+  const CCTK_REAL* restrict const dJ322 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_derivative_ptrs[15] : 0;
+  const CCTK_REAL* restrict const dJ323 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_derivative_ptrs[16] : 0;
+  const CCTK_REAL* restrict const dJ333 CCTK_ATTRIBUTE_UNUSED = use_jacobian ? jacobian_derivative_ptrs[17] : 0;
   
   /* Assign local copies of arrays functions */
   
@@ -137,12 +161,19 @@ static void ML_ADMQuantities_Body(cGH const * restrict const cctkGH, int const d
   /* Copy local copies back to grid functions */
   
   /* Loop over the grid points */
-  #pragma omp parallel
+  const int imin0=imin[0];
+  const int imin1=imin[1];
+  const int imin2=imin[2];
+  const int imax0=imax[0];
+  const int imax1=imax[1];
+  const int imax2=imax[2];
+  #pragma omp parallel // reduction(+: vec_iter_counter, vec_op_counter, vec_mem_counter)
   CCTK_LOOP3(ML_ADMQuantities,
-    i,j,k, imin[0],imin[1],imin[2], imax[0],imax[1],imax[2],
+    i,j,k, imin0,imin1,imin2, imax0,imax1,imax2,
     cctk_ash[0],cctk_ash[1],cctk_ash[2])
   {
-    ptrdiff_t /*const*/ index CCTK_ATTRIBUTE_UNUSED  = di*i + dj*j + dk*k;
+    const ptrdiff_t index CCTK_ATTRIBUTE_UNUSED = di*i + dj*j + dk*k;
+    // ++vec_iter_counter;
     
     /* Assign local copies of grid functions */
     
@@ -173,7 +204,7 @@ static void ML_ADMQuantities_Body(cGH const * restrict const cctkGH, int const d
     
     CCTK_REAL eTttL, eTtxL, eTtyL, eTtzL, eTxxL, eTxyL, eTxzL, eTyyL, eTyzL, eTzzL CCTK_ATTRIBUTE_UNUSED ;
     
-    if (*stress_energy_state)
+    if (assume_stress_energy_state>=0 ? assume_stress_energy_state : *stress_energy_state)
     {
       eTttL = eTtt[index];
       eTtxL = eTtx[index];
@@ -236,158 +267,158 @@ static void ML_ADMQuantities_Body(cGH const * restrict const cctkGH, int const d
     /* Include user supplied include files */
     
     /* Precompute derivatives */
-    CCTK_REAL /*const*/ PDstandardNth1gt11 CCTK_ATTRIBUTE_UNUSED  = PDstandardNth1(&gt11[index]);
-    CCTK_REAL /*const*/ PDstandardNth2gt11 CCTK_ATTRIBUTE_UNUSED  = PDstandardNth2(&gt11[index]);
-    CCTK_REAL /*const*/ PDstandardNth3gt11 CCTK_ATTRIBUTE_UNUSED  = PDstandardNth3(&gt11[index]);
-    CCTK_REAL /*const*/ PDstandardNth11gt11 CCTK_ATTRIBUTE_UNUSED  = PDstandardNth11(&gt11[index]);
-    CCTK_REAL /*const*/ PDstandardNth22gt11 CCTK_ATTRIBUTE_UNUSED  = PDstandardNth22(&gt11[index]);
-    CCTK_REAL /*const*/ PDstandardNth33gt11 CCTK_ATTRIBUTE_UNUSED  = PDstandardNth33(&gt11[index]);
-    CCTK_REAL /*const*/ PDstandardNth12gt11 CCTK_ATTRIBUTE_UNUSED  = PDstandardNth12(&gt11[index]);
-    CCTK_REAL /*const*/ PDstandardNth13gt11 CCTK_ATTRIBUTE_UNUSED  = PDstandardNth13(&gt11[index]);
-    CCTK_REAL /*const*/ PDstandardNth23gt11 CCTK_ATTRIBUTE_UNUSED  = PDstandardNth23(&gt11[index]);
-    CCTK_REAL /*const*/ PDstandardNth1gt12 CCTK_ATTRIBUTE_UNUSED  = PDstandardNth1(&gt12[index]);
-    CCTK_REAL /*const*/ PDstandardNth2gt12 CCTK_ATTRIBUTE_UNUSED  = PDstandardNth2(&gt12[index]);
-    CCTK_REAL /*const*/ PDstandardNth3gt12 CCTK_ATTRIBUTE_UNUSED  = PDstandardNth3(&gt12[index]);
-    CCTK_REAL /*const*/ PDstandardNth11gt12 CCTK_ATTRIBUTE_UNUSED  = PDstandardNth11(&gt12[index]);
-    CCTK_REAL /*const*/ PDstandardNth22gt12 CCTK_ATTRIBUTE_UNUSED  = PDstandardNth22(&gt12[index]);
-    CCTK_REAL /*const*/ PDstandardNth33gt12 CCTK_ATTRIBUTE_UNUSED  = PDstandardNth33(&gt12[index]);
-    CCTK_REAL /*const*/ PDstandardNth12gt12 CCTK_ATTRIBUTE_UNUSED  = PDstandardNth12(&gt12[index]);
-    CCTK_REAL /*const*/ PDstandardNth13gt12 CCTK_ATTRIBUTE_UNUSED  = PDstandardNth13(&gt12[index]);
-    CCTK_REAL /*const*/ PDstandardNth23gt12 CCTK_ATTRIBUTE_UNUSED  = PDstandardNth23(&gt12[index]);
-    CCTK_REAL /*const*/ PDstandardNth1gt13 CCTK_ATTRIBUTE_UNUSED  = PDstandardNth1(&gt13[index]);
-    CCTK_REAL /*const*/ PDstandardNth2gt13 CCTK_ATTRIBUTE_UNUSED  = PDstandardNth2(&gt13[index]);
-    CCTK_REAL /*const*/ PDstandardNth3gt13 CCTK_ATTRIBUTE_UNUSED  = PDstandardNth3(&gt13[index]);
-    CCTK_REAL /*const*/ PDstandardNth11gt13 CCTK_ATTRIBUTE_UNUSED  = PDstandardNth11(&gt13[index]);
-    CCTK_REAL /*const*/ PDstandardNth22gt13 CCTK_ATTRIBUTE_UNUSED  = PDstandardNth22(&gt13[index]);
-    CCTK_REAL /*const*/ PDstandardNth33gt13 CCTK_ATTRIBUTE_UNUSED  = PDstandardNth33(&gt13[index]);
-    CCTK_REAL /*const*/ PDstandardNth12gt13 CCTK_ATTRIBUTE_UNUSED  = PDstandardNth12(&gt13[index]);
-    CCTK_REAL /*const*/ PDstandardNth13gt13 CCTK_ATTRIBUTE_UNUSED  = PDstandardNth13(&gt13[index]);
-    CCTK_REAL /*const*/ PDstandardNth23gt13 CCTK_ATTRIBUTE_UNUSED  = PDstandardNth23(&gt13[index]);
-    CCTK_REAL /*const*/ PDstandardNth1gt22 CCTK_ATTRIBUTE_UNUSED  = PDstandardNth1(&gt22[index]);
-    CCTK_REAL /*const*/ PDstandardNth2gt22 CCTK_ATTRIBUTE_UNUSED  = PDstandardNth2(&gt22[index]);
-    CCTK_REAL /*const*/ PDstandardNth3gt22 CCTK_ATTRIBUTE_UNUSED  = PDstandardNth3(&gt22[index]);
-    CCTK_REAL /*const*/ PDstandardNth11gt22 CCTK_ATTRIBUTE_UNUSED  = PDstandardNth11(&gt22[index]);
-    CCTK_REAL /*const*/ PDstandardNth22gt22 CCTK_ATTRIBUTE_UNUSED  = PDstandardNth22(&gt22[index]);
-    CCTK_REAL /*const*/ PDstandardNth33gt22 CCTK_ATTRIBUTE_UNUSED  = PDstandardNth33(&gt22[index]);
-    CCTK_REAL /*const*/ PDstandardNth12gt22 CCTK_ATTRIBUTE_UNUSED  = PDstandardNth12(&gt22[index]);
-    CCTK_REAL /*const*/ PDstandardNth13gt22 CCTK_ATTRIBUTE_UNUSED  = PDstandardNth13(&gt22[index]);
-    CCTK_REAL /*const*/ PDstandardNth23gt22 CCTK_ATTRIBUTE_UNUSED  = PDstandardNth23(&gt22[index]);
-    CCTK_REAL /*const*/ PDstandardNth1gt23 CCTK_ATTRIBUTE_UNUSED  = PDstandardNth1(&gt23[index]);
-    CCTK_REAL /*const*/ PDstandardNth2gt23 CCTK_ATTRIBUTE_UNUSED  = PDstandardNth2(&gt23[index]);
-    CCTK_REAL /*const*/ PDstandardNth3gt23 CCTK_ATTRIBUTE_UNUSED  = PDstandardNth3(&gt23[index]);
-    CCTK_REAL /*const*/ PDstandardNth11gt23 CCTK_ATTRIBUTE_UNUSED  = PDstandardNth11(&gt23[index]);
-    CCTK_REAL /*const*/ PDstandardNth22gt23 CCTK_ATTRIBUTE_UNUSED  = PDstandardNth22(&gt23[index]);
-    CCTK_REAL /*const*/ PDstandardNth33gt23 CCTK_ATTRIBUTE_UNUSED  = PDstandardNth33(&gt23[index]);
-    CCTK_REAL /*const*/ PDstandardNth12gt23 CCTK_ATTRIBUTE_UNUSED  = PDstandardNth12(&gt23[index]);
-    CCTK_REAL /*const*/ PDstandardNth13gt23 CCTK_ATTRIBUTE_UNUSED  = PDstandardNth13(&gt23[index]);
-    CCTK_REAL /*const*/ PDstandardNth23gt23 CCTK_ATTRIBUTE_UNUSED  = PDstandardNth23(&gt23[index]);
-    CCTK_REAL /*const*/ PDstandardNth1gt33 CCTK_ATTRIBUTE_UNUSED  = PDstandardNth1(&gt33[index]);
-    CCTK_REAL /*const*/ PDstandardNth2gt33 CCTK_ATTRIBUTE_UNUSED  = PDstandardNth2(&gt33[index]);
-    CCTK_REAL /*const*/ PDstandardNth3gt33 CCTK_ATTRIBUTE_UNUSED  = PDstandardNth3(&gt33[index]);
-    CCTK_REAL /*const*/ PDstandardNth11gt33 CCTK_ATTRIBUTE_UNUSED  = PDstandardNth11(&gt33[index]);
-    CCTK_REAL /*const*/ PDstandardNth22gt33 CCTK_ATTRIBUTE_UNUSED  = PDstandardNth22(&gt33[index]);
-    CCTK_REAL /*const*/ PDstandardNth33gt33 CCTK_ATTRIBUTE_UNUSED  = PDstandardNth33(&gt33[index]);
-    CCTK_REAL /*const*/ PDstandardNth12gt33 CCTK_ATTRIBUTE_UNUSED  = PDstandardNth12(&gt33[index]);
-    CCTK_REAL /*const*/ PDstandardNth13gt33 CCTK_ATTRIBUTE_UNUSED  = PDstandardNth13(&gt33[index]);
-    CCTK_REAL /*const*/ PDstandardNth23gt33 CCTK_ATTRIBUTE_UNUSED  = PDstandardNth23(&gt33[index]);
-    CCTK_REAL /*const*/ PDstandardNth1trK CCTK_ATTRIBUTE_UNUSED  = PDstandardNth1(&trK[index]);
-    CCTK_REAL /*const*/ PDstandardNth2trK CCTK_ATTRIBUTE_UNUSED  = PDstandardNth2(&trK[index]);
-    CCTK_REAL /*const*/ PDstandardNth3trK CCTK_ATTRIBUTE_UNUSED  = PDstandardNth3(&trK[index]);
-    CCTK_REAL /*const*/ PDstandardNth1Xt1 CCTK_ATTRIBUTE_UNUSED  = PDstandardNth1(&Xt1[index]);
-    CCTK_REAL /*const*/ PDstandardNth2Xt1 CCTK_ATTRIBUTE_UNUSED  = PDstandardNth2(&Xt1[index]);
-    CCTK_REAL /*const*/ PDstandardNth3Xt1 CCTK_ATTRIBUTE_UNUSED  = PDstandardNth3(&Xt1[index]);
-    CCTK_REAL /*const*/ PDstandardNth1Xt2 CCTK_ATTRIBUTE_UNUSED  = PDstandardNth1(&Xt2[index]);
-    CCTK_REAL /*const*/ PDstandardNth2Xt2 CCTK_ATTRIBUTE_UNUSED  = PDstandardNth2(&Xt2[index]);
-    CCTK_REAL /*const*/ PDstandardNth3Xt2 CCTK_ATTRIBUTE_UNUSED  = PDstandardNth3(&Xt2[index]);
-    CCTK_REAL /*const*/ PDstandardNth1Xt3 CCTK_ATTRIBUTE_UNUSED  = PDstandardNth1(&Xt3[index]);
-    CCTK_REAL /*const*/ PDstandardNth2Xt3 CCTK_ATTRIBUTE_UNUSED  = PDstandardNth2(&Xt3[index]);
-    CCTK_REAL /*const*/ PDstandardNth3Xt3 CCTK_ATTRIBUTE_UNUSED  = PDstandardNth3(&Xt3[index]);
+    const CCTK_REAL PDstandardNth1gt11 CCTK_ATTRIBUTE_UNUSED = PDstandardNth1(&gt11[index]);
+    const CCTK_REAL PDstandardNth2gt11 CCTK_ATTRIBUTE_UNUSED = PDstandardNth2(&gt11[index]);
+    const CCTK_REAL PDstandardNth3gt11 CCTK_ATTRIBUTE_UNUSED = PDstandardNth3(&gt11[index]);
+    const CCTK_REAL PDstandardNth11gt11 CCTK_ATTRIBUTE_UNUSED = PDstandardNth11(&gt11[index]);
+    const CCTK_REAL PDstandardNth22gt11 CCTK_ATTRIBUTE_UNUSED = PDstandardNth22(&gt11[index]);
+    const CCTK_REAL PDstandardNth33gt11 CCTK_ATTRIBUTE_UNUSED = PDstandardNth33(&gt11[index]);
+    const CCTK_REAL PDstandardNth12gt11 CCTK_ATTRIBUTE_UNUSED = PDstandardNth12(&gt11[index]);
+    const CCTK_REAL PDstandardNth13gt11 CCTK_ATTRIBUTE_UNUSED = PDstandardNth13(&gt11[index]);
+    const CCTK_REAL PDstandardNth23gt11 CCTK_ATTRIBUTE_UNUSED = PDstandardNth23(&gt11[index]);
+    const CCTK_REAL PDstandardNth1gt12 CCTK_ATTRIBUTE_UNUSED = PDstandardNth1(&gt12[index]);
+    const CCTK_REAL PDstandardNth2gt12 CCTK_ATTRIBUTE_UNUSED = PDstandardNth2(&gt12[index]);
+    const CCTK_REAL PDstandardNth3gt12 CCTK_ATTRIBUTE_UNUSED = PDstandardNth3(&gt12[index]);
+    const CCTK_REAL PDstandardNth11gt12 CCTK_ATTRIBUTE_UNUSED = PDstandardNth11(&gt12[index]);
+    const CCTK_REAL PDstandardNth22gt12 CCTK_ATTRIBUTE_UNUSED = PDstandardNth22(&gt12[index]);
+    const CCTK_REAL PDstandardNth33gt12 CCTK_ATTRIBUTE_UNUSED = PDstandardNth33(&gt12[index]);
+    const CCTK_REAL PDstandardNth12gt12 CCTK_ATTRIBUTE_UNUSED = PDstandardNth12(&gt12[index]);
+    const CCTK_REAL PDstandardNth13gt12 CCTK_ATTRIBUTE_UNUSED = PDstandardNth13(&gt12[index]);
+    const CCTK_REAL PDstandardNth23gt12 CCTK_ATTRIBUTE_UNUSED = PDstandardNth23(&gt12[index]);
+    const CCTK_REAL PDstandardNth1gt13 CCTK_ATTRIBUTE_UNUSED = PDstandardNth1(&gt13[index]);
+    const CCTK_REAL PDstandardNth2gt13 CCTK_ATTRIBUTE_UNUSED = PDstandardNth2(&gt13[index]);
+    const CCTK_REAL PDstandardNth3gt13 CCTK_ATTRIBUTE_UNUSED = PDstandardNth3(&gt13[index]);
+    const CCTK_REAL PDstandardNth11gt13 CCTK_ATTRIBUTE_UNUSED = PDstandardNth11(&gt13[index]);
+    const CCTK_REAL PDstandardNth22gt13 CCTK_ATTRIBUTE_UNUSED = PDstandardNth22(&gt13[index]);
+    const CCTK_REAL PDstandardNth33gt13 CCTK_ATTRIBUTE_UNUSED = PDstandardNth33(&gt13[index]);
+    const CCTK_REAL PDstandardNth12gt13 CCTK_ATTRIBUTE_UNUSED = PDstandardNth12(&gt13[index]);
+    const CCTK_REAL PDstandardNth13gt13 CCTK_ATTRIBUTE_UNUSED = PDstandardNth13(&gt13[index]);
+    const CCTK_REAL PDstandardNth23gt13 CCTK_ATTRIBUTE_UNUSED = PDstandardNth23(&gt13[index]);
+    const CCTK_REAL PDstandardNth1gt22 CCTK_ATTRIBUTE_UNUSED = PDstandardNth1(&gt22[index]);
+    const CCTK_REAL PDstandardNth2gt22 CCTK_ATTRIBUTE_UNUSED = PDstandardNth2(&gt22[index]);
+    const CCTK_REAL PDstandardNth3gt22 CCTK_ATTRIBUTE_UNUSED = PDstandardNth3(&gt22[index]);
+    const CCTK_REAL PDstandardNth11gt22 CCTK_ATTRIBUTE_UNUSED = PDstandardNth11(&gt22[index]);
+    const CCTK_REAL PDstandardNth22gt22 CCTK_ATTRIBUTE_UNUSED = PDstandardNth22(&gt22[index]);
+    const CCTK_REAL PDstandardNth33gt22 CCTK_ATTRIBUTE_UNUSED = PDstandardNth33(&gt22[index]);
+    const CCTK_REAL PDstandardNth12gt22 CCTK_ATTRIBUTE_UNUSED = PDstandardNth12(&gt22[index]);
+    const CCTK_REAL PDstandardNth13gt22 CCTK_ATTRIBUTE_UNUSED = PDstandardNth13(&gt22[index]);
+    const CCTK_REAL PDstandardNth23gt22 CCTK_ATTRIBUTE_UNUSED = PDstandardNth23(&gt22[index]);
+    const CCTK_REAL PDstandardNth1gt23 CCTK_ATTRIBUTE_UNUSED = PDstandardNth1(&gt23[index]);
+    const CCTK_REAL PDstandardNth2gt23 CCTK_ATTRIBUTE_UNUSED = PDstandardNth2(&gt23[index]);
+    const CCTK_REAL PDstandardNth3gt23 CCTK_ATTRIBUTE_UNUSED = PDstandardNth3(&gt23[index]);
+    const CCTK_REAL PDstandardNth11gt23 CCTK_ATTRIBUTE_UNUSED = PDstandardNth11(&gt23[index]);
+    const CCTK_REAL PDstandardNth22gt23 CCTK_ATTRIBUTE_UNUSED = PDstandardNth22(&gt23[index]);
+    const CCTK_REAL PDstandardNth33gt23 CCTK_ATTRIBUTE_UNUSED = PDstandardNth33(&gt23[index]);
+    const CCTK_REAL PDstandardNth12gt23 CCTK_ATTRIBUTE_UNUSED = PDstandardNth12(&gt23[index]);
+    const CCTK_REAL PDstandardNth13gt23 CCTK_ATTRIBUTE_UNUSED = PDstandardNth13(&gt23[index]);
+    const CCTK_REAL PDstandardNth23gt23 CCTK_ATTRIBUTE_UNUSED = PDstandardNth23(&gt23[index]);
+    const CCTK_REAL PDstandardNth1gt33 CCTK_ATTRIBUTE_UNUSED = PDstandardNth1(&gt33[index]);
+    const CCTK_REAL PDstandardNth2gt33 CCTK_ATTRIBUTE_UNUSED = PDstandardNth2(&gt33[index]);
+    const CCTK_REAL PDstandardNth3gt33 CCTK_ATTRIBUTE_UNUSED = PDstandardNth3(&gt33[index]);
+    const CCTK_REAL PDstandardNth11gt33 CCTK_ATTRIBUTE_UNUSED = PDstandardNth11(&gt33[index]);
+    const CCTK_REAL PDstandardNth22gt33 CCTK_ATTRIBUTE_UNUSED = PDstandardNth22(&gt33[index]);
+    const CCTK_REAL PDstandardNth33gt33 CCTK_ATTRIBUTE_UNUSED = PDstandardNth33(&gt33[index]);
+    const CCTK_REAL PDstandardNth12gt33 CCTK_ATTRIBUTE_UNUSED = PDstandardNth12(&gt33[index]);
+    const CCTK_REAL PDstandardNth13gt33 CCTK_ATTRIBUTE_UNUSED = PDstandardNth13(&gt33[index]);
+    const CCTK_REAL PDstandardNth23gt33 CCTK_ATTRIBUTE_UNUSED = PDstandardNth23(&gt33[index]);
+    const CCTK_REAL PDstandardNth1trK CCTK_ATTRIBUTE_UNUSED = PDstandardNth1(&trK[index]);
+    const CCTK_REAL PDstandardNth2trK CCTK_ATTRIBUTE_UNUSED = PDstandardNth2(&trK[index]);
+    const CCTK_REAL PDstandardNth3trK CCTK_ATTRIBUTE_UNUSED = PDstandardNth3(&trK[index]);
+    const CCTK_REAL PDstandardNth1Xt1 CCTK_ATTRIBUTE_UNUSED = PDstandardNth1(&Xt1[index]);
+    const CCTK_REAL PDstandardNth2Xt1 CCTK_ATTRIBUTE_UNUSED = PDstandardNth2(&Xt1[index]);
+    const CCTK_REAL PDstandardNth3Xt1 CCTK_ATTRIBUTE_UNUSED = PDstandardNth3(&Xt1[index]);
+    const CCTK_REAL PDstandardNth1Xt2 CCTK_ATTRIBUTE_UNUSED = PDstandardNth1(&Xt2[index]);
+    const CCTK_REAL PDstandardNth2Xt2 CCTK_ATTRIBUTE_UNUSED = PDstandardNth2(&Xt2[index]);
+    const CCTK_REAL PDstandardNth3Xt2 CCTK_ATTRIBUTE_UNUSED = PDstandardNth3(&Xt2[index]);
+    const CCTK_REAL PDstandardNth1Xt3 CCTK_ATTRIBUTE_UNUSED = PDstandardNth1(&Xt3[index]);
+    const CCTK_REAL PDstandardNth2Xt3 CCTK_ATTRIBUTE_UNUSED = PDstandardNth2(&Xt3[index]);
+    const CCTK_REAL PDstandardNth3Xt3 CCTK_ATTRIBUTE_UNUSED = PDstandardNth3(&Xt3[index]);
     
     /* Calculate temporaries and grid functions */
-    CCTK_REAL JacPDstandardNth11gt11 CCTK_ATTRIBUTE_UNUSED ;
-    CCTK_REAL JacPDstandardNth11gt12 CCTK_ATTRIBUTE_UNUSED ;
-    CCTK_REAL JacPDstandardNth11gt13 CCTK_ATTRIBUTE_UNUSED ;
-    CCTK_REAL JacPDstandardNth11gt22 CCTK_ATTRIBUTE_UNUSED ;
-    CCTK_REAL JacPDstandardNth11gt23 CCTK_ATTRIBUTE_UNUSED ;
-    CCTK_REAL JacPDstandardNth11gt33 CCTK_ATTRIBUTE_UNUSED ;
-    CCTK_REAL JacPDstandardNth12gt11 CCTK_ATTRIBUTE_UNUSED ;
-    CCTK_REAL JacPDstandardNth12gt12 CCTK_ATTRIBUTE_UNUSED ;
-    CCTK_REAL JacPDstandardNth12gt13 CCTK_ATTRIBUTE_UNUSED ;
-    CCTK_REAL JacPDstandardNth12gt22 CCTK_ATTRIBUTE_UNUSED ;
-    CCTK_REAL JacPDstandardNth12gt23 CCTK_ATTRIBUTE_UNUSED ;
-    CCTK_REAL JacPDstandardNth12gt33 CCTK_ATTRIBUTE_UNUSED ;
-    CCTK_REAL JacPDstandardNth13gt11 CCTK_ATTRIBUTE_UNUSED ;
-    CCTK_REAL JacPDstandardNth13gt12 CCTK_ATTRIBUTE_UNUSED ;
-    CCTK_REAL JacPDstandardNth13gt13 CCTK_ATTRIBUTE_UNUSED ;
-    CCTK_REAL JacPDstandardNth13gt22 CCTK_ATTRIBUTE_UNUSED ;
-    CCTK_REAL JacPDstandardNth13gt23 CCTK_ATTRIBUTE_UNUSED ;
-    CCTK_REAL JacPDstandardNth13gt33 CCTK_ATTRIBUTE_UNUSED ;
-    CCTK_REAL JacPDstandardNth1gt11 CCTK_ATTRIBUTE_UNUSED ;
-    CCTK_REAL JacPDstandardNth1gt12 CCTK_ATTRIBUTE_UNUSED ;
-    CCTK_REAL JacPDstandardNth1gt13 CCTK_ATTRIBUTE_UNUSED ;
-    CCTK_REAL JacPDstandardNth1gt22 CCTK_ATTRIBUTE_UNUSED ;
-    CCTK_REAL JacPDstandardNth1gt23 CCTK_ATTRIBUTE_UNUSED ;
-    CCTK_REAL JacPDstandardNth1gt33 CCTK_ATTRIBUTE_UNUSED ;
-    CCTK_REAL JacPDstandardNth1trK CCTK_ATTRIBUTE_UNUSED ;
-    CCTK_REAL JacPDstandardNth1Xt1 CCTK_ATTRIBUTE_UNUSED ;
-    CCTK_REAL JacPDstandardNth1Xt2 CCTK_ATTRIBUTE_UNUSED ;
-    CCTK_REAL JacPDstandardNth1Xt3 CCTK_ATTRIBUTE_UNUSED ;
-    CCTK_REAL JacPDstandardNth21gt11 CCTK_ATTRIBUTE_UNUSED ;
-    CCTK_REAL JacPDstandardNth21gt12 CCTK_ATTRIBUTE_UNUSED ;
-    CCTK_REAL JacPDstandardNth21gt13 CCTK_ATTRIBUTE_UNUSED ;
-    CCTK_REAL JacPDstandardNth21gt22 CCTK_ATTRIBUTE_UNUSED ;
-    CCTK_REAL JacPDstandardNth21gt23 CCTK_ATTRIBUTE_UNUSED ;
-    CCTK_REAL JacPDstandardNth21gt33 CCTK_ATTRIBUTE_UNUSED ;
-    CCTK_REAL JacPDstandardNth22gt11 CCTK_ATTRIBUTE_UNUSED ;
-    CCTK_REAL JacPDstandardNth22gt12 CCTK_ATTRIBUTE_UNUSED ;
-    CCTK_REAL JacPDstandardNth22gt13 CCTK_ATTRIBUTE_UNUSED ;
-    CCTK_REAL JacPDstandardNth22gt22 CCTK_ATTRIBUTE_UNUSED ;
-    CCTK_REAL JacPDstandardNth22gt23 CCTK_ATTRIBUTE_UNUSED ;
-    CCTK_REAL JacPDstandardNth22gt33 CCTK_ATTRIBUTE_UNUSED ;
-    CCTK_REAL JacPDstandardNth23gt11 CCTK_ATTRIBUTE_UNUSED ;
-    CCTK_REAL JacPDstandardNth23gt12 CCTK_ATTRIBUTE_UNUSED ;
-    CCTK_REAL JacPDstandardNth23gt13 CCTK_ATTRIBUTE_UNUSED ;
-    CCTK_REAL JacPDstandardNth23gt22 CCTK_ATTRIBUTE_UNUSED ;
-    CCTK_REAL JacPDstandardNth23gt23 CCTK_ATTRIBUTE_UNUSED ;
-    CCTK_REAL JacPDstandardNth23gt33 CCTK_ATTRIBUTE_UNUSED ;
-    CCTK_REAL JacPDstandardNth2gt11 CCTK_ATTRIBUTE_UNUSED ;
-    CCTK_REAL JacPDstandardNth2gt12 CCTK_ATTRIBUTE_UNUSED ;
-    CCTK_REAL JacPDstandardNth2gt13 CCTK_ATTRIBUTE_UNUSED ;
-    CCTK_REAL JacPDstandardNth2gt22 CCTK_ATTRIBUTE_UNUSED ;
-    CCTK_REAL JacPDstandardNth2gt23 CCTK_ATTRIBUTE_UNUSED ;
-    CCTK_REAL JacPDstandardNth2gt33 CCTK_ATTRIBUTE_UNUSED ;
-    CCTK_REAL JacPDstandardNth2trK CCTK_ATTRIBUTE_UNUSED ;
-    CCTK_REAL JacPDstandardNth2Xt1 CCTK_ATTRIBUTE_UNUSED ;
-    CCTK_REAL JacPDstandardNth2Xt2 CCTK_ATTRIBUTE_UNUSED ;
-    CCTK_REAL JacPDstandardNth2Xt3 CCTK_ATTRIBUTE_UNUSED ;
-    CCTK_REAL JacPDstandardNth31gt11 CCTK_ATTRIBUTE_UNUSED ;
-    CCTK_REAL JacPDstandardNth31gt12 CCTK_ATTRIBUTE_UNUSED ;
-    CCTK_REAL JacPDstandardNth31gt13 CCTK_ATTRIBUTE_UNUSED ;
-    CCTK_REAL JacPDstandardNth31gt22 CCTK_ATTRIBUTE_UNUSED ;
-    CCTK_REAL JacPDstandardNth31gt23 CCTK_ATTRIBUTE_UNUSED ;
-    CCTK_REAL JacPDstandardNth31gt33 CCTK_ATTRIBUTE_UNUSED ;
-    CCTK_REAL JacPDstandardNth32gt11 CCTK_ATTRIBUTE_UNUSED ;
-    CCTK_REAL JacPDstandardNth32gt12 CCTK_ATTRIBUTE_UNUSED ;
-    CCTK_REAL JacPDstandardNth32gt13 CCTK_ATTRIBUTE_UNUSED ;
-    CCTK_REAL JacPDstandardNth32gt22 CCTK_ATTRIBUTE_UNUSED ;
-    CCTK_REAL JacPDstandardNth32gt23 CCTK_ATTRIBUTE_UNUSED ;
-    CCTK_REAL JacPDstandardNth32gt33 CCTK_ATTRIBUTE_UNUSED ;
-    CCTK_REAL JacPDstandardNth33gt11 CCTK_ATTRIBUTE_UNUSED ;
-    CCTK_REAL JacPDstandardNth33gt12 CCTK_ATTRIBUTE_UNUSED ;
-    CCTK_REAL JacPDstandardNth33gt13 CCTK_ATTRIBUTE_UNUSED ;
-    CCTK_REAL JacPDstandardNth33gt22 CCTK_ATTRIBUTE_UNUSED ;
-    CCTK_REAL JacPDstandardNth33gt23 CCTK_ATTRIBUTE_UNUSED ;
-    CCTK_REAL JacPDstandardNth33gt33 CCTK_ATTRIBUTE_UNUSED ;
-    CCTK_REAL JacPDstandardNth3gt11 CCTK_ATTRIBUTE_UNUSED ;
-    CCTK_REAL JacPDstandardNth3gt12 CCTK_ATTRIBUTE_UNUSED ;
-    CCTK_REAL JacPDstandardNth3gt13 CCTK_ATTRIBUTE_UNUSED ;
-    CCTK_REAL JacPDstandardNth3gt22 CCTK_ATTRIBUTE_UNUSED ;
-    CCTK_REAL JacPDstandardNth3gt23 CCTK_ATTRIBUTE_UNUSED ;
-    CCTK_REAL JacPDstandardNth3gt33 CCTK_ATTRIBUTE_UNUSED ;
-    CCTK_REAL JacPDstandardNth3trK CCTK_ATTRIBUTE_UNUSED ;
-    CCTK_REAL JacPDstandardNth3Xt1 CCTK_ATTRIBUTE_UNUSED ;
-    CCTK_REAL JacPDstandardNth3Xt2 CCTK_ATTRIBUTE_UNUSED ;
-    CCTK_REAL JacPDstandardNth3Xt3 CCTK_ATTRIBUTE_UNUSED ;
+    CCTK_REAL JacPDstandardNth11gt11 CCTK_ATTRIBUTE_UNUSED;
+    CCTK_REAL JacPDstandardNth11gt12 CCTK_ATTRIBUTE_UNUSED;
+    CCTK_REAL JacPDstandardNth11gt13 CCTK_ATTRIBUTE_UNUSED;
+    CCTK_REAL JacPDstandardNth11gt22 CCTK_ATTRIBUTE_UNUSED;
+    CCTK_REAL JacPDstandardNth11gt23 CCTK_ATTRIBUTE_UNUSED;
+    CCTK_REAL JacPDstandardNth11gt33 CCTK_ATTRIBUTE_UNUSED;
+    CCTK_REAL JacPDstandardNth12gt11 CCTK_ATTRIBUTE_UNUSED;
+    CCTK_REAL JacPDstandardNth12gt12 CCTK_ATTRIBUTE_UNUSED;
+    CCTK_REAL JacPDstandardNth12gt13 CCTK_ATTRIBUTE_UNUSED;
+    CCTK_REAL JacPDstandardNth12gt22 CCTK_ATTRIBUTE_UNUSED;
+    CCTK_REAL JacPDstandardNth12gt23 CCTK_ATTRIBUTE_UNUSED;
+    CCTK_REAL JacPDstandardNth12gt33 CCTK_ATTRIBUTE_UNUSED;
+    CCTK_REAL JacPDstandardNth13gt11 CCTK_ATTRIBUTE_UNUSED;
+    CCTK_REAL JacPDstandardNth13gt12 CCTK_ATTRIBUTE_UNUSED;
+    CCTK_REAL JacPDstandardNth13gt13 CCTK_ATTRIBUTE_UNUSED;
+    CCTK_REAL JacPDstandardNth13gt22 CCTK_ATTRIBUTE_UNUSED;
+    CCTK_REAL JacPDstandardNth13gt23 CCTK_ATTRIBUTE_UNUSED;
+    CCTK_REAL JacPDstandardNth13gt33 CCTK_ATTRIBUTE_UNUSED;
+    CCTK_REAL JacPDstandardNth1gt11 CCTK_ATTRIBUTE_UNUSED;
+    CCTK_REAL JacPDstandardNth1gt12 CCTK_ATTRIBUTE_UNUSED;
+    CCTK_REAL JacPDstandardNth1gt13 CCTK_ATTRIBUTE_UNUSED;
+    CCTK_REAL JacPDstandardNth1gt22 CCTK_ATTRIBUTE_UNUSED;
+    CCTK_REAL JacPDstandardNth1gt23 CCTK_ATTRIBUTE_UNUSED;
+    CCTK_REAL JacPDstandardNth1gt33 CCTK_ATTRIBUTE_UNUSED;
+    CCTK_REAL JacPDstandardNth1trK CCTK_ATTRIBUTE_UNUSED;
+    CCTK_REAL JacPDstandardNth1Xt1 CCTK_ATTRIBUTE_UNUSED;
+    CCTK_REAL JacPDstandardNth1Xt2 CCTK_ATTRIBUTE_UNUSED;
+    CCTK_REAL JacPDstandardNth1Xt3 CCTK_ATTRIBUTE_UNUSED;
+    CCTK_REAL JacPDstandardNth21gt11 CCTK_ATTRIBUTE_UNUSED;
+    CCTK_REAL JacPDstandardNth21gt12 CCTK_ATTRIBUTE_UNUSED;
+    CCTK_REAL JacPDstandardNth21gt13 CCTK_ATTRIBUTE_UNUSED;
+    CCTK_REAL JacPDstandardNth21gt22 CCTK_ATTRIBUTE_UNUSED;
+    CCTK_REAL JacPDstandardNth21gt23 CCTK_ATTRIBUTE_UNUSED;
+    CCTK_REAL JacPDstandardNth21gt33 CCTK_ATTRIBUTE_UNUSED;
+    CCTK_REAL JacPDstandardNth22gt11 CCTK_ATTRIBUTE_UNUSED;
+    CCTK_REAL JacPDstandardNth22gt12 CCTK_ATTRIBUTE_UNUSED;
+    CCTK_REAL JacPDstandardNth22gt13 CCTK_ATTRIBUTE_UNUSED;
+    CCTK_REAL JacPDstandardNth22gt22 CCTK_ATTRIBUTE_UNUSED;
+    CCTK_REAL JacPDstandardNth22gt23 CCTK_ATTRIBUTE_UNUSED;
+    CCTK_REAL JacPDstandardNth22gt33 CCTK_ATTRIBUTE_UNUSED;
+    CCTK_REAL JacPDstandardNth23gt11 CCTK_ATTRIBUTE_UNUSED;
+    CCTK_REAL JacPDstandardNth23gt12 CCTK_ATTRIBUTE_UNUSED;
+    CCTK_REAL JacPDstandardNth23gt13 CCTK_ATTRIBUTE_UNUSED;
+    CCTK_REAL JacPDstandardNth23gt22 CCTK_ATTRIBUTE_UNUSED;
+    CCTK_REAL JacPDstandardNth23gt23 CCTK_ATTRIBUTE_UNUSED;
+    CCTK_REAL JacPDstandardNth23gt33 CCTK_ATTRIBUTE_UNUSED;
+    CCTK_REAL JacPDstandardNth2gt11 CCTK_ATTRIBUTE_UNUSED;
+    CCTK_REAL JacPDstandardNth2gt12 CCTK_ATTRIBUTE_UNUSED;
+    CCTK_REAL JacPDstandardNth2gt13 CCTK_ATTRIBUTE_UNUSED;
+    CCTK_REAL JacPDstandardNth2gt22 CCTK_ATTRIBUTE_UNUSED;
+    CCTK_REAL JacPDstandardNth2gt23 CCTK_ATTRIBUTE_UNUSED;
+    CCTK_REAL JacPDstandardNth2gt33 CCTK_ATTRIBUTE_UNUSED;
+    CCTK_REAL JacPDstandardNth2trK CCTK_ATTRIBUTE_UNUSED;
+    CCTK_REAL JacPDstandardNth2Xt1 CCTK_ATTRIBUTE_UNUSED;
+    CCTK_REAL JacPDstandardNth2Xt2 CCTK_ATTRIBUTE_UNUSED;
+    CCTK_REAL JacPDstandardNth2Xt3 CCTK_ATTRIBUTE_UNUSED;
+    CCTK_REAL JacPDstandardNth31gt11 CCTK_ATTRIBUTE_UNUSED;
+    CCTK_REAL JacPDstandardNth31gt12 CCTK_ATTRIBUTE_UNUSED;
+    CCTK_REAL JacPDstandardNth31gt13 CCTK_ATTRIBUTE_UNUSED;
+    CCTK_REAL JacPDstandardNth31gt22 CCTK_ATTRIBUTE_UNUSED;
+    CCTK_REAL JacPDstandardNth31gt23 CCTK_ATTRIBUTE_UNUSED;
+    CCTK_REAL JacPDstandardNth31gt33 CCTK_ATTRIBUTE_UNUSED;
+    CCTK_REAL JacPDstandardNth32gt11 CCTK_ATTRIBUTE_UNUSED;
+    CCTK_REAL JacPDstandardNth32gt12 CCTK_ATTRIBUTE_UNUSED;
+    CCTK_REAL JacPDstandardNth32gt13 CCTK_ATTRIBUTE_UNUSED;
+    CCTK_REAL JacPDstandardNth32gt22 CCTK_ATTRIBUTE_UNUSED;
+    CCTK_REAL JacPDstandardNth32gt23 CCTK_ATTRIBUTE_UNUSED;
+    CCTK_REAL JacPDstandardNth32gt33 CCTK_ATTRIBUTE_UNUSED;
+    CCTK_REAL JacPDstandardNth33gt11 CCTK_ATTRIBUTE_UNUSED;
+    CCTK_REAL JacPDstandardNth33gt12 CCTK_ATTRIBUTE_UNUSED;
+    CCTK_REAL JacPDstandardNth33gt13 CCTK_ATTRIBUTE_UNUSED;
+    CCTK_REAL JacPDstandardNth33gt22 CCTK_ATTRIBUTE_UNUSED;
+    CCTK_REAL JacPDstandardNth33gt23 CCTK_ATTRIBUTE_UNUSED;
+    CCTK_REAL JacPDstandardNth33gt33 CCTK_ATTRIBUTE_UNUSED;
+    CCTK_REAL JacPDstandardNth3gt11 CCTK_ATTRIBUTE_UNUSED;
+    CCTK_REAL JacPDstandardNth3gt12 CCTK_ATTRIBUTE_UNUSED;
+    CCTK_REAL JacPDstandardNth3gt13 CCTK_ATTRIBUTE_UNUSED;
+    CCTK_REAL JacPDstandardNth3gt22 CCTK_ATTRIBUTE_UNUSED;
+    CCTK_REAL JacPDstandardNth3gt23 CCTK_ATTRIBUTE_UNUSED;
+    CCTK_REAL JacPDstandardNth3gt33 CCTK_ATTRIBUTE_UNUSED;
+    CCTK_REAL JacPDstandardNth3trK CCTK_ATTRIBUTE_UNUSED;
+    CCTK_REAL JacPDstandardNth3Xt1 CCTK_ATTRIBUTE_UNUSED;
+    CCTK_REAL JacPDstandardNth3Xt2 CCTK_ATTRIBUTE_UNUSED;
+    CCTK_REAL JacPDstandardNth3Xt3 CCTK_ATTRIBUTE_UNUSED;
     
     if (use_jacobian)
     {
@@ -482,109 +513,109 @@ static void ML_ADMQuantities_Body(cGH const * restrict const cctkGH, int const d
         J23L*PDstandardNth2Xt3 + J33L*PDstandardNth3Xt3;
       
       JacPDstandardNth11gt11 = dJ111L*PDstandardNth1gt11 + 
-        2.*(J11L*(J21L*PDstandardNth12gt11 + J31L*PDstandardNth13gt11) + 
+        2*(J11L*(J21L*PDstandardNth12gt11 + J31L*PDstandardNth13gt11) + 
         J21L*J31L*PDstandardNth23gt11) + dJ211L*PDstandardNth2gt11 + 
         dJ311L*PDstandardNth3gt11 + PDstandardNth11gt11*SQR(J11L) + 
         PDstandardNth22gt11*SQR(J21L) + PDstandardNth33gt11*SQR(J31L);
       
       JacPDstandardNth11gt12 = dJ111L*PDstandardNth1gt12 + 
-        2.*(J11L*(J21L*PDstandardNth12gt12 + J31L*PDstandardNth13gt12) + 
+        2*(J11L*(J21L*PDstandardNth12gt12 + J31L*PDstandardNth13gt12) + 
         J21L*J31L*PDstandardNth23gt12) + dJ211L*PDstandardNth2gt12 + 
         dJ311L*PDstandardNth3gt12 + PDstandardNth11gt12*SQR(J11L) + 
         PDstandardNth22gt12*SQR(J21L) + PDstandardNth33gt12*SQR(J31L);
       
       JacPDstandardNth11gt13 = dJ111L*PDstandardNth1gt13 + 
-        2.*(J11L*(J21L*PDstandardNth12gt13 + J31L*PDstandardNth13gt13) + 
+        2*(J11L*(J21L*PDstandardNth12gt13 + J31L*PDstandardNth13gt13) + 
         J21L*J31L*PDstandardNth23gt13) + dJ211L*PDstandardNth2gt13 + 
         dJ311L*PDstandardNth3gt13 + PDstandardNth11gt13*SQR(J11L) + 
         PDstandardNth22gt13*SQR(J21L) + PDstandardNth33gt13*SQR(J31L);
       
       JacPDstandardNth11gt22 = dJ111L*PDstandardNth1gt22 + 
-        2.*(J11L*(J21L*PDstandardNth12gt22 + J31L*PDstandardNth13gt22) + 
+        2*(J11L*(J21L*PDstandardNth12gt22 + J31L*PDstandardNth13gt22) + 
         J21L*J31L*PDstandardNth23gt22) + dJ211L*PDstandardNth2gt22 + 
         dJ311L*PDstandardNth3gt22 + PDstandardNth11gt22*SQR(J11L) + 
         PDstandardNth22gt22*SQR(J21L) + PDstandardNth33gt22*SQR(J31L);
       
       JacPDstandardNth11gt23 = dJ111L*PDstandardNth1gt23 + 
-        2.*(J11L*(J21L*PDstandardNth12gt23 + J31L*PDstandardNth13gt23) + 
+        2*(J11L*(J21L*PDstandardNth12gt23 + J31L*PDstandardNth13gt23) + 
         J21L*J31L*PDstandardNth23gt23) + dJ211L*PDstandardNth2gt23 + 
         dJ311L*PDstandardNth3gt23 + PDstandardNth11gt23*SQR(J11L) + 
         PDstandardNth22gt23*SQR(J21L) + PDstandardNth33gt23*SQR(J31L);
       
       JacPDstandardNth11gt33 = dJ111L*PDstandardNth1gt33 + 
-        2.*(J11L*(J21L*PDstandardNth12gt33 + J31L*PDstandardNth13gt33) + 
+        2*(J11L*(J21L*PDstandardNth12gt33 + J31L*PDstandardNth13gt33) + 
         J21L*J31L*PDstandardNth23gt33) + dJ211L*PDstandardNth2gt33 + 
         dJ311L*PDstandardNth3gt33 + PDstandardNth11gt33*SQR(J11L) + 
         PDstandardNth22gt33*SQR(J21L) + PDstandardNth33gt33*SQR(J31L);
       
       JacPDstandardNth22gt11 = dJ122L*PDstandardNth1gt11 + 
-        2.*(J12L*(J22L*PDstandardNth12gt11 + J32L*PDstandardNth13gt11) + 
+        2*(J12L*(J22L*PDstandardNth12gt11 + J32L*PDstandardNth13gt11) + 
         J22L*J32L*PDstandardNth23gt11) + dJ222L*PDstandardNth2gt11 + 
         dJ322L*PDstandardNth3gt11 + PDstandardNth11gt11*SQR(J12L) + 
         PDstandardNth22gt11*SQR(J22L) + PDstandardNth33gt11*SQR(J32L);
       
       JacPDstandardNth22gt12 = dJ122L*PDstandardNth1gt12 + 
-        2.*(J12L*(J22L*PDstandardNth12gt12 + J32L*PDstandardNth13gt12) + 
+        2*(J12L*(J22L*PDstandardNth12gt12 + J32L*PDstandardNth13gt12) + 
         J22L*J32L*PDstandardNth23gt12) + dJ222L*PDstandardNth2gt12 + 
         dJ322L*PDstandardNth3gt12 + PDstandardNth11gt12*SQR(J12L) + 
         PDstandardNth22gt12*SQR(J22L) + PDstandardNth33gt12*SQR(J32L);
       
       JacPDstandardNth22gt13 = dJ122L*PDstandardNth1gt13 + 
-        2.*(J12L*(J22L*PDstandardNth12gt13 + J32L*PDstandardNth13gt13) + 
+        2*(J12L*(J22L*PDstandardNth12gt13 + J32L*PDstandardNth13gt13) + 
         J22L*J32L*PDstandardNth23gt13) + dJ222L*PDstandardNth2gt13 + 
         dJ322L*PDstandardNth3gt13 + PDstandardNth11gt13*SQR(J12L) + 
         PDstandardNth22gt13*SQR(J22L) + PDstandardNth33gt13*SQR(J32L);
       
       JacPDstandardNth22gt22 = dJ122L*PDstandardNth1gt22 + 
-        2.*(J12L*(J22L*PDstandardNth12gt22 + J32L*PDstandardNth13gt22) + 
+        2*(J12L*(J22L*PDstandardNth12gt22 + J32L*PDstandardNth13gt22) + 
         J22L*J32L*PDstandardNth23gt22) + dJ222L*PDstandardNth2gt22 + 
         dJ322L*PDstandardNth3gt22 + PDstandardNth11gt22*SQR(J12L) + 
         PDstandardNth22gt22*SQR(J22L) + PDstandardNth33gt22*SQR(J32L);
       
       JacPDstandardNth22gt23 = dJ122L*PDstandardNth1gt23 + 
-        2.*(J12L*(J22L*PDstandardNth12gt23 + J32L*PDstandardNth13gt23) + 
+        2*(J12L*(J22L*PDstandardNth12gt23 + J32L*PDstandardNth13gt23) + 
         J22L*J32L*PDstandardNth23gt23) + dJ222L*PDstandardNth2gt23 + 
         dJ322L*PDstandardNth3gt23 + PDstandardNth11gt23*SQR(J12L) + 
         PDstandardNth22gt23*SQR(J22L) + PDstandardNth33gt23*SQR(J32L);
       
       JacPDstandardNth22gt33 = dJ122L*PDstandardNth1gt33 + 
-        2.*(J12L*(J22L*PDstandardNth12gt33 + J32L*PDstandardNth13gt33) + 
+        2*(J12L*(J22L*PDstandardNth12gt33 + J32L*PDstandardNth13gt33) + 
         J22L*J32L*PDstandardNth23gt33) + dJ222L*PDstandardNth2gt33 + 
         dJ322L*PDstandardNth3gt33 + PDstandardNth11gt33*SQR(J12L) + 
         PDstandardNth22gt33*SQR(J22L) + PDstandardNth33gt33*SQR(J32L);
       
       JacPDstandardNth33gt11 = dJ133L*PDstandardNth1gt11 + 
-        2.*(J13L*(J23L*PDstandardNth12gt11 + J33L*PDstandardNth13gt11) + 
+        2*(J13L*(J23L*PDstandardNth12gt11 + J33L*PDstandardNth13gt11) + 
         J23L*J33L*PDstandardNth23gt11) + dJ233L*PDstandardNth2gt11 + 
         dJ333L*PDstandardNth3gt11 + PDstandardNth11gt11*SQR(J13L) + 
         PDstandardNth22gt11*SQR(J23L) + PDstandardNth33gt11*SQR(J33L);
       
       JacPDstandardNth33gt12 = dJ133L*PDstandardNth1gt12 + 
-        2.*(J13L*(J23L*PDstandardNth12gt12 + J33L*PDstandardNth13gt12) + 
+        2*(J13L*(J23L*PDstandardNth12gt12 + J33L*PDstandardNth13gt12) + 
         J23L*J33L*PDstandardNth23gt12) + dJ233L*PDstandardNth2gt12 + 
         dJ333L*PDstandardNth3gt12 + PDstandardNth11gt12*SQR(J13L) + 
         PDstandardNth22gt12*SQR(J23L) + PDstandardNth33gt12*SQR(J33L);
       
       JacPDstandardNth33gt13 = dJ133L*PDstandardNth1gt13 + 
-        2.*(J13L*(J23L*PDstandardNth12gt13 + J33L*PDstandardNth13gt13) + 
+        2*(J13L*(J23L*PDstandardNth12gt13 + J33L*PDstandardNth13gt13) + 
         J23L*J33L*PDstandardNth23gt13) + dJ233L*PDstandardNth2gt13 + 
         dJ333L*PDstandardNth3gt13 + PDstandardNth11gt13*SQR(J13L) + 
         PDstandardNth22gt13*SQR(J23L) + PDstandardNth33gt13*SQR(J33L);
       
       JacPDstandardNth33gt22 = dJ133L*PDstandardNth1gt22 + 
-        2.*(J13L*(J23L*PDstandardNth12gt22 + J33L*PDstandardNth13gt22) + 
+        2*(J13L*(J23L*PDstandardNth12gt22 + J33L*PDstandardNth13gt22) + 
         J23L*J33L*PDstandardNth23gt22) + dJ233L*PDstandardNth2gt22 + 
         dJ333L*PDstandardNth3gt22 + PDstandardNth11gt22*SQR(J13L) + 
         PDstandardNth22gt22*SQR(J23L) + PDstandardNth33gt22*SQR(J33L);
       
       JacPDstandardNth33gt23 = dJ133L*PDstandardNth1gt23 + 
-        2.*(J13L*(J23L*PDstandardNth12gt23 + J33L*PDstandardNth13gt23) + 
+        2*(J13L*(J23L*PDstandardNth12gt23 + J33L*PDstandardNth13gt23) + 
         J23L*J33L*PDstandardNth23gt23) + dJ233L*PDstandardNth2gt23 + 
         dJ333L*PDstandardNth3gt23 + PDstandardNth11gt23*SQR(J13L) + 
         PDstandardNth22gt23*SQR(J23L) + PDstandardNth33gt23*SQR(J33L);
       
       JacPDstandardNth33gt33 = dJ133L*PDstandardNth1gt33 + 
-        2.*(J13L*(J23L*PDstandardNth12gt33 + J33L*PDstandardNth13gt33) + 
+        2*(J13L*(J23L*PDstandardNth12gt33 + J33L*PDstandardNth13gt33) + 
         J23L*J33L*PDstandardNth23gt33) + dJ233L*PDstandardNth2gt33 + 
         dJ333L*PDstandardNth3gt33 + PDstandardNth11gt33*SQR(J13L) + 
         PDstandardNth22gt33*SQR(J23L) + PDstandardNth33gt33*SQR(J33L);
@@ -1048,142 +1079,133 @@ static void ML_ADMQuantities_Body(cGH const * restrict const cctkGH, int const d
       JacPDstandardNth32gt33 = PDstandardNth23gt33;
     }
     
-    CCTK_REAL CCTK_ATTRIBUTE_UNUSED detgt = 1.;
+    CCTK_REAL CCTK_ATTRIBUTE_UNUSED detgt = 1;
     
     CCTK_REAL CCTK_ATTRIBUTE_UNUSED gtu11 = INV(detgt)*(gt22L*gt33L - 
-      1.*SQR(gt23L));
+      SQR(gt23L));
     
     CCTK_REAL CCTK_ATTRIBUTE_UNUSED gtu21 = (gt13L*gt23L - 
-      1.*gt12L*gt33L)*INV(detgt);
+      gt12L*gt33L)*INV(detgt);
     
-    CCTK_REAL CCTK_ATTRIBUTE_UNUSED gtu31 = (-1.*gt13L*gt22L + 
+    CCTK_REAL CCTK_ATTRIBUTE_UNUSED gtu31 = (-(gt13L*gt22L) + 
       gt12L*gt23L)*INV(detgt);
     
     CCTK_REAL CCTK_ATTRIBUTE_UNUSED gtu22 = INV(detgt)*(gt11L*gt33L - 
-      1.*SQR(gt13L));
+      SQR(gt13L));
     
     CCTK_REAL CCTK_ATTRIBUTE_UNUSED gtu32 = (gt12L*gt13L - 
-      1.*gt11L*gt23L)*INV(detgt);
+      gt11L*gt23L)*INV(detgt);
     
     CCTK_REAL CCTK_ATTRIBUTE_UNUSED gtu33 = INV(detgt)*(gt11L*gt22L - 
-      1.*SQR(gt12L));
+      SQR(gt12L));
     
     CCTK_REAL CCTK_ATTRIBUTE_UNUSED dgtu111 = 
-      -2.*(gtu11*(gtu21*JacPDstandardNth1gt12 + gtu31*JacPDstandardNth1gt13) 
-      + gtu21*gtu31*JacPDstandardNth1gt23) - 
-      1.*(JacPDstandardNth1gt11*SQR(gtu11) + JacPDstandardNth1gt22*SQR(gtu21) 
-      + JacPDstandardNth1gt33*SQR(gtu31));
+      -2*(gtu11*(gtu21*JacPDstandardNth1gt12 + gtu31*JacPDstandardNth1gt13) + 
+      gtu21*gtu31*JacPDstandardNth1gt23) - JacPDstandardNth1gt11*SQR(gtu11) - 
+      JacPDstandardNth1gt22*SQR(gtu21) - JacPDstandardNth1gt33*SQR(gtu31);
     
     CCTK_REAL CCTK_ATTRIBUTE_UNUSED dgtu211 = 
-      -1.*(gtu21*(gtu11*JacPDstandardNth1gt11 + gtu21*JacPDstandardNth1gt12 + 
-      gtu31*JacPDstandardNth1gt13) + gtu22*(gtu11*JacPDstandardNth1gt12 + 
-      gtu21*JacPDstandardNth1gt22 + gtu31*JacPDstandardNth1gt23) + 
+      -(gtu21*(gtu11*JacPDstandardNth1gt11 + gtu21*JacPDstandardNth1gt12 + 
+      gtu31*JacPDstandardNth1gt13)) - gtu22*(gtu11*JacPDstandardNth1gt12 + 
+      gtu21*JacPDstandardNth1gt22 + gtu31*JacPDstandardNth1gt23) - 
       gtu32*(gtu11*JacPDstandardNth1gt13 + gtu21*JacPDstandardNth1gt23 + 
-      gtu31*JacPDstandardNth1gt33));
+      gtu31*JacPDstandardNth1gt33);
     
     CCTK_REAL CCTK_ATTRIBUTE_UNUSED dgtu311 = 
-      -1.*(gtu11*(gtu31*JacPDstandardNth1gt11 + gtu32*JacPDstandardNth1gt12 + 
-      gtu33*JacPDstandardNth1gt13) + gtu21*(gtu31*JacPDstandardNth1gt12 + 
-      gtu32*JacPDstandardNth1gt22 + gtu33*JacPDstandardNth1gt23) + 
+      -(gtu11*(gtu31*JacPDstandardNth1gt11 + gtu32*JacPDstandardNth1gt12 + 
+      gtu33*JacPDstandardNth1gt13)) - gtu21*(gtu31*JacPDstandardNth1gt12 + 
+      gtu32*JacPDstandardNth1gt22 + gtu33*JacPDstandardNth1gt23) - 
       gtu31*(gtu31*JacPDstandardNth1gt13 + gtu32*JacPDstandardNth1gt23 + 
-      gtu33*JacPDstandardNth1gt33));
+      gtu33*JacPDstandardNth1gt33);
     
     CCTK_REAL CCTK_ATTRIBUTE_UNUSED dgtu221 = 
-      -2.*(gtu21*(gtu22*JacPDstandardNth1gt12 + gtu32*JacPDstandardNth1gt13) 
-      + gtu22*gtu32*JacPDstandardNth1gt23) - 
-      1.*(JacPDstandardNth1gt11*SQR(gtu21) + JacPDstandardNth1gt22*SQR(gtu22) 
-      + JacPDstandardNth1gt33*SQR(gtu32));
+      -2*(gtu21*(gtu22*JacPDstandardNth1gt12 + gtu32*JacPDstandardNth1gt13) + 
+      gtu22*gtu32*JacPDstandardNth1gt23) - JacPDstandardNth1gt11*SQR(gtu21) - 
+      JacPDstandardNth1gt22*SQR(gtu22) - JacPDstandardNth1gt33*SQR(gtu32);
     
     CCTK_REAL CCTK_ATTRIBUTE_UNUSED dgtu321 = 
-      -1.*(gtu21*(gtu31*JacPDstandardNth1gt11 + gtu32*JacPDstandardNth1gt12 + 
-      gtu33*JacPDstandardNth1gt13) + gtu22*(gtu31*JacPDstandardNth1gt12 + 
-      gtu32*JacPDstandardNth1gt22 + gtu33*JacPDstandardNth1gt23) + 
+      -(gtu21*(gtu31*JacPDstandardNth1gt11 + gtu32*JacPDstandardNth1gt12 + 
+      gtu33*JacPDstandardNth1gt13)) - gtu22*(gtu31*JacPDstandardNth1gt12 + 
+      gtu32*JacPDstandardNth1gt22 + gtu33*JacPDstandardNth1gt23) - 
       gtu32*(gtu31*JacPDstandardNth1gt13 + gtu32*JacPDstandardNth1gt23 + 
-      gtu33*JacPDstandardNth1gt33));
+      gtu33*JacPDstandardNth1gt33);
     
     CCTK_REAL CCTK_ATTRIBUTE_UNUSED dgtu331 = 
-      -2.*(gtu31*(gtu32*JacPDstandardNth1gt12 + gtu33*JacPDstandardNth1gt13) 
-      + gtu32*gtu33*JacPDstandardNth1gt23) - 
-      1.*(JacPDstandardNth1gt11*SQR(gtu31) + JacPDstandardNth1gt22*SQR(gtu32) 
-      + JacPDstandardNth1gt33*SQR(gtu33));
+      -2*(gtu31*(gtu32*JacPDstandardNth1gt12 + gtu33*JacPDstandardNth1gt13) + 
+      gtu32*gtu33*JacPDstandardNth1gt23) - JacPDstandardNth1gt11*SQR(gtu31) - 
+      JacPDstandardNth1gt22*SQR(gtu32) - JacPDstandardNth1gt33*SQR(gtu33);
     
     CCTK_REAL CCTK_ATTRIBUTE_UNUSED dgtu112 = 
-      -2.*(gtu11*(gtu21*JacPDstandardNth2gt12 + gtu31*JacPDstandardNth2gt13) 
-      + gtu21*gtu31*JacPDstandardNth2gt23) - 
-      1.*(JacPDstandardNth2gt11*SQR(gtu11) + JacPDstandardNth2gt22*SQR(gtu21) 
-      + JacPDstandardNth2gt33*SQR(gtu31));
+      -2*(gtu11*(gtu21*JacPDstandardNth2gt12 + gtu31*JacPDstandardNth2gt13) + 
+      gtu21*gtu31*JacPDstandardNth2gt23) - JacPDstandardNth2gt11*SQR(gtu11) - 
+      JacPDstandardNth2gt22*SQR(gtu21) - JacPDstandardNth2gt33*SQR(gtu31);
     
     CCTK_REAL CCTK_ATTRIBUTE_UNUSED dgtu212 = 
-      -1.*(gtu21*(gtu11*JacPDstandardNth2gt11 + gtu21*JacPDstandardNth2gt12 + 
-      gtu31*JacPDstandardNth2gt13) + gtu22*(gtu11*JacPDstandardNth2gt12 + 
-      gtu21*JacPDstandardNth2gt22 + gtu31*JacPDstandardNth2gt23) + 
+      -(gtu21*(gtu11*JacPDstandardNth2gt11 + gtu21*JacPDstandardNth2gt12 + 
+      gtu31*JacPDstandardNth2gt13)) - gtu22*(gtu11*JacPDstandardNth2gt12 + 
+      gtu21*JacPDstandardNth2gt22 + gtu31*JacPDstandardNth2gt23) - 
       gtu32*(gtu11*JacPDstandardNth2gt13 + gtu21*JacPDstandardNth2gt23 + 
-      gtu31*JacPDstandardNth2gt33));
+      gtu31*JacPDstandardNth2gt33);
     
     CCTK_REAL CCTK_ATTRIBUTE_UNUSED dgtu312 = 
-      -1.*(gtu11*(gtu31*JacPDstandardNth2gt11 + gtu32*JacPDstandardNth2gt12 + 
-      gtu33*JacPDstandardNth2gt13) + gtu21*(gtu31*JacPDstandardNth2gt12 + 
-      gtu32*JacPDstandardNth2gt22 + gtu33*JacPDstandardNth2gt23) + 
+      -(gtu11*(gtu31*JacPDstandardNth2gt11 + gtu32*JacPDstandardNth2gt12 + 
+      gtu33*JacPDstandardNth2gt13)) - gtu21*(gtu31*JacPDstandardNth2gt12 + 
+      gtu32*JacPDstandardNth2gt22 + gtu33*JacPDstandardNth2gt23) - 
       gtu31*(gtu31*JacPDstandardNth2gt13 + gtu32*JacPDstandardNth2gt23 + 
-      gtu33*JacPDstandardNth2gt33));
+      gtu33*JacPDstandardNth2gt33);
     
     CCTK_REAL CCTK_ATTRIBUTE_UNUSED dgtu222 = 
-      -2.*(gtu21*(gtu22*JacPDstandardNth2gt12 + gtu32*JacPDstandardNth2gt13) 
-      + gtu22*gtu32*JacPDstandardNth2gt23) - 
-      1.*(JacPDstandardNth2gt11*SQR(gtu21) + JacPDstandardNth2gt22*SQR(gtu22) 
-      + JacPDstandardNth2gt33*SQR(gtu32));
+      -2*(gtu21*(gtu22*JacPDstandardNth2gt12 + gtu32*JacPDstandardNth2gt13) + 
+      gtu22*gtu32*JacPDstandardNth2gt23) - JacPDstandardNth2gt11*SQR(gtu21) - 
+      JacPDstandardNth2gt22*SQR(gtu22) - JacPDstandardNth2gt33*SQR(gtu32);
     
     CCTK_REAL CCTK_ATTRIBUTE_UNUSED dgtu322 = 
-      -1.*(gtu21*(gtu31*JacPDstandardNth2gt11 + gtu32*JacPDstandardNth2gt12 + 
-      gtu33*JacPDstandardNth2gt13) + gtu22*(gtu31*JacPDstandardNth2gt12 + 
-      gtu32*JacPDstandardNth2gt22 + gtu33*JacPDstandardNth2gt23) + 
+      -(gtu21*(gtu31*JacPDstandardNth2gt11 + gtu32*JacPDstandardNth2gt12 + 
+      gtu33*JacPDstandardNth2gt13)) - gtu22*(gtu31*JacPDstandardNth2gt12 + 
+      gtu32*JacPDstandardNth2gt22 + gtu33*JacPDstandardNth2gt23) - 
       gtu32*(gtu31*JacPDstandardNth2gt13 + gtu32*JacPDstandardNth2gt23 + 
-      gtu33*JacPDstandardNth2gt33));
+      gtu33*JacPDstandardNth2gt33);
     
     CCTK_REAL CCTK_ATTRIBUTE_UNUSED dgtu332 = 
-      -2.*(gtu31*(gtu32*JacPDstandardNth2gt12 + gtu33*JacPDstandardNth2gt13) 
-      + gtu32*gtu33*JacPDstandardNth2gt23) - 
-      1.*(JacPDstandardNth2gt11*SQR(gtu31) + JacPDstandardNth2gt22*SQR(gtu32) 
-      + JacPDstandardNth2gt33*SQR(gtu33));
+      -2*(gtu31*(gtu32*JacPDstandardNth2gt12 + gtu33*JacPDstandardNth2gt13) + 
+      gtu32*gtu33*JacPDstandardNth2gt23) - JacPDstandardNth2gt11*SQR(gtu31) - 
+      JacPDstandardNth2gt22*SQR(gtu32) - JacPDstandardNth2gt33*SQR(gtu33);
     
     CCTK_REAL CCTK_ATTRIBUTE_UNUSED dgtu113 = 
-      -2.*(gtu11*(gtu21*JacPDstandardNth3gt12 + gtu31*JacPDstandardNth3gt13) 
-      + gtu21*gtu31*JacPDstandardNth3gt23) - 
-      1.*(JacPDstandardNth3gt11*SQR(gtu11) + JacPDstandardNth3gt22*SQR(gtu21) 
-      + JacPDstandardNth3gt33*SQR(gtu31));
+      -2*(gtu11*(gtu21*JacPDstandardNth3gt12 + gtu31*JacPDstandardNth3gt13) + 
+      gtu21*gtu31*JacPDstandardNth3gt23) - JacPDstandardNth3gt11*SQR(gtu11) - 
+      JacPDstandardNth3gt22*SQR(gtu21) - JacPDstandardNth3gt33*SQR(gtu31);
     
     CCTK_REAL CCTK_ATTRIBUTE_UNUSED dgtu213 = 
-      -1.*(gtu21*(gtu11*JacPDstandardNth3gt11 + gtu21*JacPDstandardNth3gt12 + 
-      gtu31*JacPDstandardNth3gt13) + gtu22*(gtu11*JacPDstandardNth3gt12 + 
-      gtu21*JacPDstandardNth3gt22 + gtu31*JacPDstandardNth3gt23) + 
+      -(gtu21*(gtu11*JacPDstandardNth3gt11 + gtu21*JacPDstandardNth3gt12 + 
+      gtu31*JacPDstandardNth3gt13)) - gtu22*(gtu11*JacPDstandardNth3gt12 + 
+      gtu21*JacPDstandardNth3gt22 + gtu31*JacPDstandardNth3gt23) - 
       gtu32*(gtu11*JacPDstandardNth3gt13 + gtu21*JacPDstandardNth3gt23 + 
-      gtu31*JacPDstandardNth3gt33));
+      gtu31*JacPDstandardNth3gt33);
     
     CCTK_REAL CCTK_ATTRIBUTE_UNUSED dgtu313 = 
-      -1.*(gtu11*(gtu31*JacPDstandardNth3gt11 + gtu32*JacPDstandardNth3gt12 + 
-      gtu33*JacPDstandardNth3gt13) + gtu21*(gtu31*JacPDstandardNth3gt12 + 
-      gtu32*JacPDstandardNth3gt22 + gtu33*JacPDstandardNth3gt23) + 
+      -(gtu11*(gtu31*JacPDstandardNth3gt11 + gtu32*JacPDstandardNth3gt12 + 
+      gtu33*JacPDstandardNth3gt13)) - gtu21*(gtu31*JacPDstandardNth3gt12 + 
+      gtu32*JacPDstandardNth3gt22 + gtu33*JacPDstandardNth3gt23) - 
       gtu31*(gtu31*JacPDstandardNth3gt13 + gtu32*JacPDstandardNth3gt23 + 
-      gtu33*JacPDstandardNth3gt33));
+      gtu33*JacPDstandardNth3gt33);
     
     CCTK_REAL CCTK_ATTRIBUTE_UNUSED dgtu223 = 
-      -2.*(gtu21*(gtu22*JacPDstandardNth3gt12 + gtu32*JacPDstandardNth3gt13) 
-      + gtu22*gtu32*JacPDstandardNth3gt23) - 
-      1.*(JacPDstandardNth3gt11*SQR(gtu21) + JacPDstandardNth3gt22*SQR(gtu22) 
-      + JacPDstandardNth3gt33*SQR(gtu32));
+      -2*(gtu21*(gtu22*JacPDstandardNth3gt12 + gtu32*JacPDstandardNth3gt13) + 
+      gtu22*gtu32*JacPDstandardNth3gt23) - JacPDstandardNth3gt11*SQR(gtu21) - 
+      JacPDstandardNth3gt22*SQR(gtu22) - JacPDstandardNth3gt33*SQR(gtu32);
     
     CCTK_REAL CCTK_ATTRIBUTE_UNUSED dgtu323 = 
-      -1.*(gtu21*(gtu31*JacPDstandardNth3gt11 + gtu32*JacPDstandardNth3gt12 + 
-      gtu33*JacPDstandardNth3gt13) + gtu22*(gtu31*JacPDstandardNth3gt12 + 
-      gtu32*JacPDstandardNth3gt22 + gtu33*JacPDstandardNth3gt23) + 
+      -(gtu21*(gtu31*JacPDstandardNth3gt11 + gtu32*JacPDstandardNth3gt12 + 
+      gtu33*JacPDstandardNth3gt13)) - gtu22*(gtu31*JacPDstandardNth3gt12 + 
+      gtu32*JacPDstandardNth3gt22 + gtu33*JacPDstandardNth3gt23) - 
       gtu32*(gtu31*JacPDstandardNth3gt13 + gtu32*JacPDstandardNth3gt23 + 
-      gtu33*JacPDstandardNth3gt33));
+      gtu33*JacPDstandardNth3gt33);
     
     CCTK_REAL CCTK_ATTRIBUTE_UNUSED dgtu333 = 
-      -2.*(gtu31*(gtu32*JacPDstandardNth3gt12 + gtu33*JacPDstandardNth3gt13) 
-      + gtu32*gtu33*JacPDstandardNth3gt23) - 
-      1.*(JacPDstandardNth3gt11*SQR(gtu31) + JacPDstandardNth3gt22*SQR(gtu32) 
-      + JacPDstandardNth3gt33*SQR(gtu33));
+      -2*(gtu31*(gtu32*JacPDstandardNth3gt12 + gtu33*JacPDstandardNth3gt13) + 
+      gtu32*gtu33*JacPDstandardNth3gt23) - JacPDstandardNth3gt11*SQR(gtu31) - 
+      JacPDstandardNth3gt22*SQR(gtu32) - JacPDstandardNth3gt33*SQR(gtu33);
     
     CCTK_REAL CCTK_ATTRIBUTE_UNUSED Gtl111 = 0.5*JacPDstandardNth1gt11;
     
@@ -1194,9 +1216,8 @@ static void ML_ADMQuantities_Body(cGH const * restrict const cctkGH, int const d
     CCTK_REAL CCTK_ATTRIBUTE_UNUSED Gtl122 = -0.5*JacPDstandardNth1gt22 + 
       JacPDstandardNth2gt12;
     
-    CCTK_REAL CCTK_ATTRIBUTE_UNUSED Gtl123 = 
-      0.5*(-1.*JacPDstandardNth1gt23 + JacPDstandardNth2gt13 + 
-      JacPDstandardNth3gt12);
+    CCTK_REAL CCTK_ATTRIBUTE_UNUSED Gtl123 = 0.5*(-JacPDstandardNth1gt23 + 
+      JacPDstandardNth2gt13 + JacPDstandardNth3gt12);
     
     CCTK_REAL CCTK_ATTRIBUTE_UNUSED Gtl133 = -0.5*JacPDstandardNth1gt33 + 
       JacPDstandardNth3gt13;
@@ -1207,7 +1228,7 @@ static void ML_ADMQuantities_Body(cGH const * restrict const cctkGH, int const d
     CCTK_REAL CCTK_ATTRIBUTE_UNUSED Gtl212 = 0.5*JacPDstandardNth1gt22;
     
     CCTK_REAL CCTK_ATTRIBUTE_UNUSED Gtl213 = 0.5*(JacPDstandardNth1gt23 - 
-      1.*JacPDstandardNth2gt13 + JacPDstandardNth3gt12);
+      JacPDstandardNth2gt13 + JacPDstandardNth3gt12);
     
     CCTK_REAL CCTK_ATTRIBUTE_UNUSED Gtl222 = 0.5*JacPDstandardNth2gt22;
     
@@ -1220,7 +1241,7 @@ static void ML_ADMQuantities_Body(cGH const * restrict const cctkGH, int const d
       0.5*JacPDstandardNth3gt11;
     
     CCTK_REAL CCTK_ATTRIBUTE_UNUSED Gtl312 = 0.5*(JacPDstandardNth1gt23 + 
-      JacPDstandardNth2gt13 - 1.*JacPDstandardNth3gt12);
+      JacPDstandardNth2gt13 - JacPDstandardNth3gt12);
     
     CCTK_REAL CCTK_ATTRIBUTE_UNUSED Gtl313 = 0.5*JacPDstandardNth1gt33;
     
@@ -1367,102 +1388,104 @@ static void ML_ADMQuantities_Body(cGH const * restrict const cctkGH, int const d
       Gtl333*gtu33;
     
     CCTK_REAL CCTK_ATTRIBUTE_UNUSED Xtn1 = Gt111*gtu11 + Gt122*gtu22 + 
-      2.*(Gt112*gtu21 + Gt113*gtu31 + Gt123*gtu32) + Gt133*gtu33;
+      2*(Gt112*gtu21 + Gt113*gtu31 + Gt123*gtu32) + Gt133*gtu33;
     
     CCTK_REAL CCTK_ATTRIBUTE_UNUSED Xtn2 = Gt211*gtu11 + Gt222*gtu22 + 
-      2.*(Gt212*gtu21 + Gt213*gtu31 + Gt223*gtu32) + Gt233*gtu33;
+      2*(Gt212*gtu21 + Gt213*gtu31 + Gt223*gtu32) + Gt233*gtu33;
     
     CCTK_REAL CCTK_ATTRIBUTE_UNUSED Xtn3 = Gt311*gtu11 + Gt322*gtu22 + 
-      2.*(Gt312*gtu21 + Gt313*gtu31 + Gt323*gtu32) + Gt333*gtu33;
+      2*(Gt312*gtu21 + Gt313*gtu31 + Gt323*gtu32) + Gt333*gtu33;
     
-    CCTK_REAL CCTK_ATTRIBUTE_UNUSED Rt11 = 3.*(Gt111*Gtlu111 + 
-      Gt112*Gtlu112 + Gt113*Gtlu113) + 2.*(Gt211*Gtlu121 + Gt212*Gtlu122 + 
+    CCTK_REAL CCTK_ATTRIBUTE_UNUSED Rt11 = 3*(Gt111*Gtlu111 + 
+      Gt112*Gtlu112 + Gt113*Gtlu113) + 2*(Gt211*Gtlu121 + Gt212*Gtlu122 + 
       Gt213*Gtlu123 + Gt311*Gtlu131 + Gt312*Gtlu132 + Gt313*Gtlu133) + 
       Gt211*Gtlu211 + Gt212*Gtlu212 + Gt213*Gtlu213 + Gt311*Gtlu311 + 
       Gt312*Gtlu312 + Gt313*Gtlu313 + gt11L*JacPDstandardNth1Xt1 + 
-      gt12L*JacPDstandardNth1Xt2 + gt13L*JacPDstandardNth1Xt3 - 
-      0.5*(gtu11*JacPDstandardNth11gt11 + gtu21*(JacPDstandardNth12gt11 + 
-      JacPDstandardNth21gt11) + gtu22*JacPDstandardNth22gt11 + 
-      gtu31*(JacPDstandardNth13gt11 + JacPDstandardNth31gt11) + 
-      gtu32*(JacPDstandardNth23gt11 + JacPDstandardNth32gt11) + 
+      gt12L*JacPDstandardNth1Xt2 + gt13L*JacPDstandardNth1Xt3 + 
+      0.5*(-(gtu11*JacPDstandardNth11gt11) - gtu21*(JacPDstandardNth12gt11 + 
+      JacPDstandardNth21gt11) - gtu22*JacPDstandardNth22gt11 + 
+      gtu31*(-JacPDstandardNth13gt11 - JacPDstandardNth31gt11) + 
+      gtu32*(-JacPDstandardNth23gt11 - JacPDstandardNth32gt11) - 
       gtu33*JacPDstandardNth33gt11) + Gtl111*Xtn1 + Gtl112*Xtn2 + 
       Gtl113*Xtn3;
     
-    CCTK_REAL CCTK_ATTRIBUTE_UNUSED Rt12 = 0.5*(4.*(Gt211*Gtlu221 + 
-      Gt212*Gtlu222 + Gt213*Gtlu223) + 2.*(Gt122*Gtlu112 + Gt123*Gtlu113 + 
-      (Gt111 + Gt212)*Gtlu121 + Gt222*Gtlu122 + (Gt113 + Gt223)*Gtlu123 + 
-      Gt322*Gtlu132 + Gt323*Gtlu133 + Gt111*Gtlu211 + Gt112*(Gtlu111 + 
-      Gtlu122 + Gtlu212) + Gt113*Gtlu213 + Gt311*(Gtlu231 + Gtlu321) + 
-      Gt312*(Gtlu131 + Gtlu232 + Gtlu322) + Gt313*(Gtlu233 + Gtlu323)) + 
-      gt22L*JacPDstandardNth1Xt2 + gt23L*JacPDstandardNth1Xt3 + 
-      gt11L*JacPDstandardNth2Xt1 + gt12L*(JacPDstandardNth1Xt1 + 
-      JacPDstandardNth2Xt2) + gt13L*JacPDstandardNth2Xt3 - 
-      1.*(gtu11*JacPDstandardNth11gt12 + gtu21*(JacPDstandardNth12gt12 + 
-      JacPDstandardNth21gt12) + gtu22*JacPDstandardNth22gt12 + 
-      gtu31*(JacPDstandardNth13gt12 + JacPDstandardNth31gt12) + 
-      gtu32*(JacPDstandardNth23gt12 + JacPDstandardNth32gt12) + 
-      gtu33*JacPDstandardNth33gt12) + (Gtl112 + Gtl211)*Xtn1 + (Gtl122 + 
-      Gtl212)*Xtn2 + (Gtl123 + Gtl213)*Xtn3);
-    
-    CCTK_REAL CCTK_ATTRIBUTE_UNUSED Rt13 = 0.5*(2.*(Gt123*Gtlu112 + 
-      Gt133*Gtlu113 + Gt223*Gtlu122 + Gt233*Gtlu123 + (Gt111 + Gt313)*Gtlu131 
-      + (Gt112 + Gt323)*Gtlu132 + Gt333*Gtlu133 + Gt111*Gtlu311 + 
-      Gt112*Gtlu312 + Gt113*(Gtlu111 + Gtlu133 + Gtlu313) + Gt211*(Gtlu231 + 
-      Gtlu321) + Gt212*(Gtlu232 + Gtlu322) + Gt213*(Gtlu121 + Gtlu233 + 
-      Gtlu323)) + 4.*(Gt311*Gtlu331 + Gt312*Gtlu332 + Gt313*Gtlu333) + 
-      gt23L*JacPDstandardNth1Xt2 + gt33L*JacPDstandardNth1Xt3 - 
-      1.*(gtu11*JacPDstandardNth11gt13 + gtu21*(JacPDstandardNth12gt13 + 
-      JacPDstandardNth21gt13) + gtu22*JacPDstandardNth22gt13 + 
-      gtu31*(JacPDstandardNth13gt13 + JacPDstandardNth31gt13) + 
-      gtu32*(JacPDstandardNth23gt13 + JacPDstandardNth32gt13) + 
-      gtu33*JacPDstandardNth33gt13) + gt11L*JacPDstandardNth3Xt1 + 
-      gt12L*JacPDstandardNth3Xt2 + gt13L*(JacPDstandardNth1Xt1 + 
-      JacPDstandardNth3Xt3) + (Gtl113 + Gtl311)*Xtn1 + (Gtl123 + Gtl312)*Xtn2 
-      + (Gtl133 + Gtl313)*Xtn3);
-    
-    CCTK_REAL CCTK_ATTRIBUTE_UNUSED Rt22 = Gt112*(Gtlu121 + 2.*Gtlu211) + 
-      Gt122*(Gtlu122 + 2.*Gtlu212) + Gt123*(Gtlu123 + 2.*Gtlu213) + 
-      3.*(Gt212*Gtlu221 + Gt222*Gtlu222 + Gt223*Gtlu223) + 2.*(Gt312*Gtlu231 
-      + Gt322*Gtlu232 + Gt323*Gtlu233) + Gt312*Gtlu321 + Gt322*Gtlu322 + 
+    CCTK_REAL CCTK_ATTRIBUTE_UNUSED Rt12 = 0.5*(4*(Gt211*Gtlu221 + 
+      Gt212*Gtlu222 + Gt213*Gtlu223) + 2*(Gt122*Gtlu112 + Gt123*Gtlu113 + 
+      Gt111*Gtlu121 + Gt212*Gtlu121 + Gt222*Gtlu122 + Gt113*Gtlu123 + 
+      Gt223*Gtlu123 + Gt312*Gtlu131 + Gt322*Gtlu132 + Gt323*Gtlu133 + 
+      Gt111*Gtlu211 + Gt112*(Gtlu111 + Gtlu122 + Gtlu212) + Gt113*Gtlu213 + 
+      Gt311*Gtlu231 + Gt312*Gtlu232 + Gt313*Gtlu233 + Gt311*Gtlu321 + 
+      Gt312*Gtlu322 + Gt313*Gtlu323) - gtu11*JacPDstandardNth11gt12 + 
+      gt12L*JacPDstandardNth1Xt1 + gt22L*JacPDstandardNth1Xt2 + 
+      gt23L*JacPDstandardNth1Xt3 + gtu21*(-JacPDstandardNth12gt12 - 
+      JacPDstandardNth21gt12) - gtu22*JacPDstandardNth22gt12 + 
+      gt11L*JacPDstandardNth2Xt1 + gt12L*JacPDstandardNth2Xt2 + 
+      gt13L*JacPDstandardNth2Xt3 + gtu31*(-JacPDstandardNth13gt12 - 
+      JacPDstandardNth31gt12) + gtu32*(-JacPDstandardNth23gt12 - 
+      JacPDstandardNth32gt12) - gtu33*JacPDstandardNth33gt12 + Gtl112*Xtn1 + 
+      Gtl211*Xtn1 + Gtl122*Xtn2 + Gtl212*Xtn2 + Gtl123*Xtn3 + Gtl213*Xtn3);
+    
+    CCTK_REAL CCTK_ATTRIBUTE_UNUSED Rt13 = 0.5*(2*(Gt123*Gtlu112 + 
+      Gt133*Gtlu113 + Gt213*Gtlu121 + Gt223*Gtlu122 + Gt233*Gtlu123 + 
+      Gt111*Gtlu131 + Gt313*Gtlu131 + Gt112*Gtlu132 + Gt323*Gtlu132 + 
+      Gt333*Gtlu133 + Gt211*Gtlu231 + Gt212*Gtlu232 + Gt213*Gtlu233 + 
+      Gt111*Gtlu311 + Gt112*Gtlu312 + Gt113*(Gtlu111 + Gtlu133 + Gtlu313) + 
+      Gt211*Gtlu321 + Gt212*Gtlu322 + Gt213*Gtlu323) + 4*(Gt311*Gtlu331 + 
+      Gt312*Gtlu332 + Gt313*Gtlu333) - gtu11*JacPDstandardNth11gt13 + 
+      gt13L*JacPDstandardNth1Xt1 + gt23L*JacPDstandardNth1Xt2 + 
+      gt33L*JacPDstandardNth1Xt3 + gtu21*(-JacPDstandardNth12gt13 - 
+      JacPDstandardNth21gt13) - gtu22*JacPDstandardNth22gt13 + 
+      gtu31*(-JacPDstandardNth13gt13 - JacPDstandardNth31gt13) + 
+      gtu32*(-JacPDstandardNth23gt13 - JacPDstandardNth32gt13) - 
+      gtu33*JacPDstandardNth33gt13 + gt11L*JacPDstandardNth3Xt1 + 
+      gt12L*JacPDstandardNth3Xt2 + gt13L*JacPDstandardNth3Xt3 + 
+      Gtl113*Xtn1 + Gtl311*Xtn1 + Gtl123*Xtn2 + Gtl312*Xtn2 + Gtl133*Xtn3 + 
+      Gtl313*Xtn3);
+    
+    CCTK_REAL CCTK_ATTRIBUTE_UNUSED Rt22 = Gt112*(Gtlu121 + 2*Gtlu211) + 
+      Gt122*(Gtlu122 + 2*Gtlu212) + Gt123*(Gtlu123 + 2*Gtlu213) + 
+      3*(Gt212*Gtlu221 + Gt222*Gtlu222 + Gt223*Gtlu223) + 2*(Gt312*Gtlu231 + 
+      Gt322*Gtlu232 + Gt323*Gtlu233) + Gt312*Gtlu321 + Gt322*Gtlu322 + 
       Gt323*Gtlu323 + gt12L*JacPDstandardNth2Xt1 + 
-      gt22L*JacPDstandardNth2Xt2 + gt23L*JacPDstandardNth2Xt3 - 
-      0.5*(gtu11*JacPDstandardNth11gt22 + gtu21*(JacPDstandardNth12gt22 + 
-      JacPDstandardNth21gt22) + gtu22*JacPDstandardNth22gt22 + 
-      gtu31*(JacPDstandardNth13gt22 + JacPDstandardNth31gt22) + 
-      gtu32*(JacPDstandardNth23gt22 + JacPDstandardNth32gt22) + 
+      gt22L*JacPDstandardNth2Xt2 + gt23L*JacPDstandardNth2Xt3 + 
+      0.5*(-(gtu11*JacPDstandardNth11gt22) - gtu21*(JacPDstandardNth12gt22 + 
+      JacPDstandardNth21gt22) - gtu22*JacPDstandardNth22gt22 + 
+      gtu31*(-JacPDstandardNth13gt22 - JacPDstandardNth31gt22) + 
+      gtu32*(-JacPDstandardNth23gt22 - JacPDstandardNth32gt22) - 
       gtu33*JacPDstandardNth33gt22) + Gtl212*Xtn1 + Gtl222*Xtn2 + 
       Gtl223*Xtn3;
     
-    CCTK_REAL CCTK_ATTRIBUTE_UNUSED Rt23 = 0.5*(2.*(Gt113*Gtlu211 + 
-      Gt133*Gtlu213 + Gt213*Gtlu221 + Gt233*Gtlu223 + (Gt212 + Gt313)*Gtlu231 
-      + (Gt222 + Gt323)*Gtlu232 + Gt333*Gtlu233 + Gt112*(Gtlu131 + Gtlu311) + 
-      Gt122*(Gtlu132 + Gtlu312) + Gt123*(Gtlu133 + Gtlu212 + Gtlu313) + 
-      Gt212*Gtlu321 + Gt222*Gtlu322 + Gt223*(Gtlu222 + Gtlu233 + Gtlu323)) + 
-      4.*(Gt312*Gtlu331 + Gt322*Gtlu332 + Gt323*Gtlu333) + 
-      gt13L*JacPDstandardNth2Xt1 + gt33L*JacPDstandardNth2Xt3 - 
-      1.*(gtu11*JacPDstandardNth11gt23 + gtu21*(JacPDstandardNth12gt23 + 
-      JacPDstandardNth21gt23) + gtu22*JacPDstandardNth22gt23 + 
-      gtu31*(JacPDstandardNth13gt23 + JacPDstandardNth31gt23) + 
-      gtu32*(JacPDstandardNth23gt23 + JacPDstandardNth32gt23) + 
-      gtu33*JacPDstandardNth33gt23) + gt12L*JacPDstandardNth3Xt1 + 
-      gt22L*JacPDstandardNth3Xt2 + gt23L*(JacPDstandardNth2Xt2 + 
-      JacPDstandardNth3Xt3) + (Gtl213 + Gtl312)*Xtn1 + (Gtl223 + Gtl322)*Xtn2 
-      + (Gtl233 + Gtl323)*Xtn3);
-    
-    CCTK_REAL CCTK_ATTRIBUTE_UNUSED Rt33 = Gt113*(Gtlu131 + 2.*Gtlu311) + 
-      Gt123*(Gtlu132 + 2.*Gtlu312) + Gt133*(Gtlu133 + 2.*Gtlu313) + 
-      Gt213*(Gtlu231 + 2.*Gtlu321) + Gt223*(Gtlu232 + 2.*Gtlu322) + 
-      Gt233*(Gtlu233 + 2.*Gtlu323) + 3.*(Gt313*Gtlu331 + Gt323*Gtlu332 + 
-      Gt333*Gtlu333) - 0.5*(gtu11*JacPDstandardNth11gt33 + 
-      gtu21*(JacPDstandardNth12gt33 + JacPDstandardNth21gt33) + 
-      gtu22*JacPDstandardNth22gt33 + gtu31*(JacPDstandardNth13gt33 + 
-      JacPDstandardNth31gt33) + gtu32*(JacPDstandardNth23gt33 + 
-      JacPDstandardNth32gt33) + gtu33*JacPDstandardNth33gt33) + 
+    CCTK_REAL CCTK_ATTRIBUTE_UNUSED Rt23 = 0.5*(2*(Gt123*Gtlu133 + 
+      Gt113*Gtlu211 + Gt123*Gtlu212 + Gt133*Gtlu213 + Gt213*Gtlu221 + 
+      Gt223*Gtlu222 + Gt233*Gtlu223 + Gt212*Gtlu231 + Gt313*Gtlu231 + 
+      Gt222*Gtlu232 + Gt323*Gtlu232 + Gt223*Gtlu233 + Gt333*Gtlu233 + 
+      Gt112*(Gtlu131 + Gtlu311) + Gt122*(Gtlu132 + Gtlu312) + Gt123*Gtlu313 + 
+      Gt212*Gtlu321 + Gt222*Gtlu322 + Gt223*Gtlu323) + 4*(Gt312*Gtlu331 + 
+      Gt322*Gtlu332 + Gt323*Gtlu333) - gtu11*JacPDstandardNth11gt23 + 
+      gtu21*(-JacPDstandardNth12gt23 - JacPDstandardNth21gt23) - 
+      gtu22*JacPDstandardNth22gt23 + gt13L*JacPDstandardNth2Xt1 + 
+      gt23L*JacPDstandardNth2Xt2 + gt33L*JacPDstandardNth2Xt3 + 
+      gtu31*(-JacPDstandardNth13gt23 - JacPDstandardNth31gt23) + 
+      gtu32*(-JacPDstandardNth23gt23 - JacPDstandardNth32gt23) - 
+      gtu33*JacPDstandardNth33gt23 + gt12L*JacPDstandardNth3Xt1 + 
+      gt22L*JacPDstandardNth3Xt2 + gt23L*JacPDstandardNth3Xt3 + 
+      Gtl213*Xtn1 + Gtl312*Xtn1 + Gtl223*Xtn2 + Gtl322*Xtn2 + Gtl233*Xtn3 + 
+      Gtl323*Xtn3);
+    
+    CCTK_REAL CCTK_ATTRIBUTE_UNUSED Rt33 = Gt113*(Gtlu131 + 2*Gtlu311) + 
+      Gt123*(Gtlu132 + 2*Gtlu312) + Gt133*(Gtlu133 + 2*Gtlu313) + 
+      Gt213*(Gtlu231 + 2*Gtlu321) + Gt223*(Gtlu232 + 2*Gtlu322) + 
+      Gt233*(Gtlu233 + 2*Gtlu323) + 3*(Gt313*Gtlu331 + Gt323*Gtlu332 + 
+      Gt333*Gtlu333) + 0.5*(-(gtu11*JacPDstandardNth11gt33) - 
+      gtu21*(JacPDstandardNth12gt33 + JacPDstandardNth21gt33) - 
+      gtu22*JacPDstandardNth22gt33 + gtu31*(-JacPDstandardNth13gt33 - 
+      JacPDstandardNth31gt33) + gtu32*(-JacPDstandardNth23gt33 - 
+      JacPDstandardNth32gt33) - gtu33*JacPDstandardNth33gt33) + 
       gt13L*JacPDstandardNth3Xt1 + gt23L*JacPDstandardNth3Xt2 + 
       gt33L*JacPDstandardNth3Xt3 + Gtl313*Xtn1 + Gtl323*Xtn2 + Gtl333*Xtn3;
     
     CCTK_REAL CCTK_ATTRIBUTE_UNUSED trRt = gtu11*Rt11 + gtu22*Rt22 + 
-      2.*(gtu21*Rt12 + gtu31*Rt13 + gtu32*Rt23) + gtu33*Rt33;
+      2*(gtu21*Rt12 + gtu31*Rt13 + gtu32*Rt23) + gtu33*Rt33;
     
     CCTK_REAL CCTK_ATTRIBUTE_UNUSED ephi = 
       IfThen(conformalMethod,INV(sqrt(phiL)),exp(phiL));
@@ -1495,17 +1518,17 @@ static void ML_ADMQuantities_Body(cGH const * restrict const cctkGH, int const d
       + At33L*gtu33;
     
     CCTK_REAL CCTK_ATTRIBUTE_UNUSED rho = INV(SQR(alphaL))*(eTttL - 
-      2.*(beta2L*eTtyL + beta3L*eTtzL) + 2.*(beta1L*(-1.*eTtxL + 
+      2*(beta2L*eTtyL + beta3L*eTtzL) + 2*(beta1L*(-eTtxL + 
       beta2L*eTxyL + beta3L*eTxzL) + beta2L*beta3L*eTyzL) + 
       eTxxL*SQR(beta1L) + eTyyL*SQR(beta2L) + eTzzL*SQR(beta3L));
     
-    CCTK_REAL CCTK_ATTRIBUTE_UNUSED S1 = (-1.*eTtxL + beta1L*eTxxL + 
+    CCTK_REAL CCTK_ATTRIBUTE_UNUSED S1 = (-eTtxL + beta1L*eTxxL + 
       beta2L*eTxyL + beta3L*eTxzL)*INV(alphaL);
     
-    CCTK_REAL CCTK_ATTRIBUTE_UNUSED S2 = (-1.*eTtyL + beta1L*eTxyL + 
+    CCTK_REAL CCTK_ATTRIBUTE_UNUSED S2 = (-eTtyL + beta1L*eTxyL + 
       beta2L*eTyyL + beta3L*eTyzL)*INV(alphaL);
     
-    CCTK_REAL CCTK_ATTRIBUTE_UNUSED S3 = (-1.*eTtzL + beta1L*eTxzL + 
+    CCTK_REAL CCTK_ATTRIBUTE_UNUSED S3 = (-eTtzL + beta1L*eTxzL + 
       beta2L*eTyzL + beta3L*eTzzL)*INV(alphaL);
     
     CCTK_REAL CCTK_ATTRIBUTE_UNUSED MadmL = 
@@ -1535,37 +1558,37 @@ static void ML_ADMQuantities_Body(cGH const * restrict const cctkGH, int const d
       Gtlu323*(Gt213*gtu31 + Gt223*gtu32 + Gt233*gtu33) + 
       Gtlu331*(Gt311*gtu31 + Gt312*gtu32 + Gt313*gtu33) + 
       Gtlu332*(Gt312*gtu31 + Gt322*gtu32 + Gt323*gtu33) + 
-      Gtlu333*(Gt313*gtu31 + Gt323*gtu32 + Gt333*gtu33) + (-1. + ephi)*trRt - 
-      1.*pow(ephi,5.)*(2.*(Atm12*Atm21 + Atm13*Atm31 + Atm23*Atm32) + 
-      50.26548245743669*rho - 0.666666666666666666666666666667*SQR(trKL) + 
-      SQR(Atm11) + SQR(Atm22) + SQR(Atm33)));
+      Gtlu333*(Gt313*gtu31 + Gt323*gtu32 + Gt333*gtu33) + (-1 + ephi)*trRt - 
+      pow(ephi,5)*(2*(Atm12*Atm21 + Atm13*Atm31 + Atm23*Atm32) + 16*Pi*rho - 
+      0.666666666666666666666666666667*SQR(trKL) + SQR(Atm11) + SQR(Atm22) 
+      + SQR(Atm33)));
     
-    CCTK_REAL CCTK_ATTRIBUTE_UNUSED Jadm1L = 0.0625*(2.*Atm23 - 2.*Atm32 + 
-      zL*(At11L*dgtu112 + At22L*dgtu222 + 2.*(At12L*dgtu212 + 
+    CCTK_REAL CCTK_ATTRIBUTE_UNUSED Jadm1L = 0.0625*(2*Atm23 - 2*Atm32 + 
+      zL*(At11L*dgtu112 + At22L*dgtu222 + 2*(At12L*dgtu212 + 
       At13L*dgtu312 + At23L*dgtu322) + At33L*dgtu332 - 
-      1.33333333333333333333333333333*JacPDstandardNth2trK - 
-      50.26548245743669*S2) + yL*(-1.*(At11L*dgtu113 + At22L*dgtu223 + 
-      2.*(At12L*dgtu213 + At13L*dgtu313 + At23L*dgtu323) + 
-      At33L*dgtu333) + 1.33333333333333333333333333333*JacPDstandardNth3trK 
-      + 50.26548245743669*S3))*INV(Pi)*pow(ephi,6.);
-    
-    CCTK_REAL CCTK_ATTRIBUTE_UNUSED Jadm2L = 0.0625*(-2.*Atm13 + 2.*Atm31 
-      + zL*(-1.*(At11L*dgtu111 + At22L*dgtu221 + 2.*(At12L*dgtu211 + 
-      At13L*dgtu311 + At23L*dgtu321) + At33L*dgtu331) + 
-      1.33333333333333333333333333333*JacPDstandardNth1trK + 
-      50.26548245743669*S1) + xL*(At11L*dgtu113 + At22L*dgtu223 + 
-      2.*(At12L*dgtu213 + At13L*dgtu313 + At23L*dgtu323) + 
-      At33L*dgtu333 - 1.33333333333333333333333333333*JacPDstandardNth3trK 
-      - 50.26548245743669*S3))*INV(Pi)*pow(ephi,6.);
-    
-    CCTK_REAL CCTK_ATTRIBUTE_UNUSED Jadm3L = 0.0625*(2.*Atm12 - 2.*Atm21 + 
-      yL*(At11L*dgtu111 + At22L*dgtu221 + 2.*(At12L*dgtu211 + 
+      1.33333333333333333333333333333*JacPDstandardNth2trK - 16*Pi*S2) + 
+      yL*(-(At11L*dgtu113) - 2*At12L*dgtu213 - At22L*dgtu223 - 
+      2*At13L*dgtu313 - 2*At23L*dgtu323 - At33L*dgtu333 + 
+      1.33333333333333333333333333333*JacPDstandardNth3trK + 
+      16*Pi*S3))*INV(Pi)*pow(ephi,6);
+    
+    CCTK_REAL CCTK_ATTRIBUTE_UNUSED Jadm2L = 0.0625*(-2*Atm13 + 2*Atm31 + 
+      zL*(-(At11L*dgtu111) - 2*At12L*dgtu211 - At22L*dgtu221 - 
+      2*At13L*dgtu311 - 2*At23L*dgtu321 - At33L*dgtu331 + 
+      1.33333333333333333333333333333*JacPDstandardNth1trK + 16*Pi*S1) + 
+      xL*(At11L*dgtu113 + At22L*dgtu223 + 2*(At12L*dgtu213 + 
+      At13L*dgtu313 + At23L*dgtu323) + At33L*dgtu333 - 
+      1.33333333333333333333333333333*JacPDstandardNth3trK - 
+      16*Pi*S3))*INV(Pi)*pow(ephi,6);
+    
+    CCTK_REAL CCTK_ATTRIBUTE_UNUSED Jadm3L = 0.0625*(2*Atm12 - 2*Atm21 + 
+      yL*(At11L*dgtu111 + At22L*dgtu221 + 2*(At12L*dgtu211 + 
       At13L*dgtu311 + At23L*dgtu321) + At33L*dgtu331 - 
-      1.33333333333333333333333333333*JacPDstandardNth1trK - 
-      50.26548245743669*S1) + xL*(-1.*(At11L*dgtu112 + At22L*dgtu222 + 
-      2.*(At12L*dgtu212 + At13L*dgtu312 + At23L*dgtu322) + 
-      At33L*dgtu332) + 1.33333333333333333333333333333*JacPDstandardNth2trK 
-      + 50.26548245743669*S2))*INV(Pi)*pow(ephi,6.);
+      1.33333333333333333333333333333*JacPDstandardNth1trK - 16*Pi*S1) + 
+      xL*(-(At11L*dgtu112) - 2*At12L*dgtu212 - At22L*dgtu222 - 
+      2*At13L*dgtu312 - 2*At23L*dgtu322 - At33L*dgtu332 + 
+      1.33333333333333333333333333333*JacPDstandardNth2trK + 
+      16*Pi*S2))*INV(Pi)*pow(ephi,6);
     
     /* Copy local copies back to grid functions */
     Jadm1[index] = Jadm1L;
@@ -1592,7 +1615,7 @@ extern "C" void ML_ADMQuantities(CCTK_ARGUMENTS)
     return;
   }
   
-  const char *const groups[] = {
+  const char* const groups[] = {
     "grid::coordinates",
     "ML_BSSN::ML_curv",
     "ML_BSSN::ML_Gamma",
diff --git a/ML_ADMQuantities/src/RegisterMoL.cc b/ML_ADMQuantities/src/RegisterMoL.cc
index 626dd92..05dfd39 100644
--- a/ML_ADMQuantities/src/RegisterMoL.cc
+++ b/ML_ADMQuantities/src/RegisterMoL.cc
@@ -9,7 +9,7 @@ extern "C" void ML_ADMQuantities_RegisterVars(CCTK_ARGUMENTS)
   DECLARE_CCTK_ARGUMENTS;
   DECLARE_CCTK_PARAMETERS;
   
-  CCTK_INT ierr CCTK_ATTRIBUTE_UNUSED  = 0;
+  CCTK_INT ierr CCTK_ATTRIBUTE_UNUSED = 0;
   
   /* Register all the evolved grid functions with MoL */
   
diff --git a/ML_ADMQuantities/src/Startup.cc b/ML_ADMQuantities/src/Startup.cc
index 4abd3a0..780503d 100644
--- a/ML_ADMQuantities/src/Startup.cc
+++ b/ML_ADMQuantities/src/Startup.cc
@@ -4,7 +4,7 @@
 
 extern "C" int ML_ADMQuantities_Startup(void)
 {
-  const char * banner CCTK_ATTRIBUTE_UNUSED  = "ML_ADMQuantities";
+  const char* banner CCTK_ATTRIBUTE_UNUSED = "ML_ADMQuantities";
   CCTK_RegisterBanner(banner);
   return 0;
 }