Regenerate examples

18 files changed, 533 insertions, 167 deletions

diff --git a/Examples/EulerAuto/schedule.ccl b/Examples/EulerAuto/schedule.ccl
index 2911d7b..1b1eeda 100644
--- a/Examples/EulerAuto/schedule.ccl
+++ b/Examples/EulerAuto/schedule.ccl
@@ -175,12 +175,6 @@ schedule EulerAuto_Startup at STARTUP
   OPTIONS: meta
 } "create banner"
 
-schedule EulerAuto_RegisterVars in MoL_Register
-{
-  LANG: C
-  OPTIONS: meta
-} "Register Variables for MoL"
-
 schedule EulerAuto_RegisterSymmetries in SymmetryRegister
 {
   LANG: C
@@ -193,22 +187,53 @@ if (CCTK_EQUALS(initial_data, "shock"))
   schedule eulerauto_initial_shock at CCTK_INITIAL as eulerauto_initial
   {
     LANG: C
+    READS:    grid::x
+    WRITES:   EulerAuto::p
+    WRITES:   EulerAuto::rho
+    WRITES:   EulerAuto::v1
+    WRITES:   EulerAuto::v2
+    WRITES:   EulerAuto::v3
   } "eulerauto_initial_shock"
 }
 
 schedule eulerauto_cons_calc_zero_rhs in MoL_CalcRHS
 {
   LANG: C
+  WRITES:   EulerAuto::Denrhs
+  WRITES:   EulerAuto::Enrhs
+  WRITES:   EulerAuto::S1rhs
+  WRITES:   EulerAuto::S2rhs
+  WRITES:   EulerAuto::S3rhs
 } "eulerauto_cons_calc_zero_rhs"
 
 schedule eulerauto_cons_calc_conserved at POSTINITIAL
 {
   LANG: C
+  READS:    EulerAuto::p
+  READS:    EulerAuto::rho
+  READS:    EulerAuto::v1
+  READS:    EulerAuto::v2
+  READS:    EulerAuto::v3
+  WRITES:   EulerAuto::Den
+  WRITES:   EulerAuto::En
+  WRITES:   EulerAuto::S1
+  WRITES:   EulerAuto::S2
+  WRITES:   EulerAuto::S3
 } "eulerauto_cons_calc_conserved"
 
 schedule eulerauto_cons_calc_primitives in MoL_PostStep after EulerAuto_ApplyBCs
 {
   LANG: C
+  READS:    EulerAuto::Den
+  READS:    EulerAuto::En
+  READS:    EulerAuto::S1
+  READS:    EulerAuto::S2
+  READS:    EulerAuto::S3
+  WRITES:   EulerAuto::p
+  WRITES:   EulerAuto::rho
+  WRITES:   EulerAuto::v1
+  WRITES:   EulerAuto::v2
+  WRITES:   EulerAuto::v3
 } "eulerauto_cons_calc_primitives"
 
 schedule group eulerauto_cons_calc_reconstruct_1_group in MoL_CalcRHS after eulerauto_cons_calc_zero_rhs
@@ -219,6 +244,21 @@ schedule group eulerauto_cons_calc_reconstruct_1_group in MoL_CalcRHS after eule
 schedule eulerauto_cons_calc_reconstruct_1 in eulerauto_cons_calc_reconstruct_1_group
 {
   LANG: C
+  READS:    EulerAuto::p
+  READS:    EulerAuto::rho
+  READS:    EulerAuto::v1
+  READS:    EulerAuto::v2
+  READS:    EulerAuto::v3
+  WRITES:   EulerAuto::pLeft
+  WRITES:   EulerAuto::pRight
+  WRITES:   EulerAuto::rhoLeft
+  WRITES:   EulerAuto::rhoRight
+  WRITES:   EulerAuto::v1Left
+  WRITES:   EulerAuto::v1Right
+  WRITES:   EulerAuto::v2Left
+  WRITES:   EulerAuto::v2Right
+  WRITES:   EulerAuto::v3Left
+  WRITES:   EulerAuto::v3Right
 } "eulerauto_cons_calc_reconstruct_1"
 
 schedule eulerauto_cons_calc_reconstruct_1_SelectBCs in eulerauto_cons_calc_reconstruct_1_bc_group
@@ -250,6 +290,26 @@ schedule group eulerauto_cons_calc_reconstruct_1_bc_group in MoL_PseudoEvolution
 schedule eulerauto_cons_calc_intercell_conserved_1 in MoL_CalcRHS after eulerauto_cons_calc_reconstruct_1
 {
   LANG: C
+  READS:    EulerAuto::pLeft
+  READS:    EulerAuto::pRight
+  READS:    EulerAuto::rhoLeft
+  READS:    EulerAuto::rhoRight
+  READS:    EulerAuto::v1Left
+  READS:    EulerAuto::v1Right
+  READS:    EulerAuto::v2Left
+  READS:    EulerAuto::v2Right
+  READS:    EulerAuto::v3Left
+  READS:    EulerAuto::v3Right
+  WRITES:   EulerAuto::DenLeft
+  WRITES:   EulerAuto::DenRight
+  WRITES:   EulerAuto::EnLeft
+  WRITES:   EulerAuto::EnRight
+  WRITES:   EulerAuto::S1Left
+  WRITES:   EulerAuto::S1Right
+  WRITES:   EulerAuto::S2Left
+  WRITES:   EulerAuto::S2Right
+  WRITES:   EulerAuto::S3Left
+  WRITES:   EulerAuto::S3Right
 } "eulerauto_cons_calc_intercell_conserved_1"
 
 schedule group eulerauto_cons_calc_flux_1_group in MoL_CalcRHS after eulerauto_cons_calc_intercell_conserved_1
@@ -260,6 +320,31 @@ schedule group eulerauto_cons_calc_flux_1_group in MoL_CalcRHS after eulerauto_c
 schedule eulerauto_cons_calc_flux_1 in eulerauto_cons_calc_flux_1_group
 {
   LANG: C
+  READS:    EulerAuto::DenLeft
+  READS:    EulerAuto::DenRight
+  READS:    EulerAuto::EnLeft
+  READS:    EulerAuto::EnRight
+  READS:    EulerAuto::pLeft
+  READS:    EulerAuto::pRight
+  READS:    EulerAuto::rhoLeft
+  READS:    EulerAuto::rhoRight
+  READS:    EulerAuto::S1Left
+  READS:    EulerAuto::S1Right
+  READS:    EulerAuto::S2Left
+  READS:    EulerAuto::S2Right
+  READS:    EulerAuto::S3Left
+  READS:    EulerAuto::S3Right
+  READS:    EulerAuto::v1Left
+  READS:    EulerAuto::v1Right
+  READS:    EulerAuto::v2Left
+  READS:    EulerAuto::v2Right
+  READS:    EulerAuto::v3Left
+  READS:    EulerAuto::v3Right
+  WRITES:   EulerAuto::DenFlux
+  WRITES:   EulerAuto::EnFlux
+  WRITES:   EulerAuto::S1Flux
+  WRITES:   EulerAuto::S2Flux
+  WRITES:   EulerAuto::S3Flux
 } "eulerauto_cons_calc_flux_1"
 
 schedule eulerauto_cons_calc_flux_1_SelectBCs in eulerauto_cons_calc_flux_1_bc_group
@@ -291,6 +376,21 @@ schedule group eulerauto_cons_calc_flux_1_bc_group in MoL_PseudoEvolutionBoundar
 schedule eulerauto_cons_calc_rhs_1 in MoL_CalcRHS after eulerauto_cons_calc_flux_1
 {
   LANG: C
+  READS:    EulerAuto::DenFlux
+  READS:    EulerAuto::Denrhs
+  READS:    EulerAuto::EnFlux
+  READS:    EulerAuto::Enrhs
+  READS:    EulerAuto::S1Flux
+  READS:    EulerAuto::S1rhs
+  READS:    EulerAuto::S2Flux
+  READS:    EulerAuto::S2rhs
+  READS:    EulerAuto::S3Flux
+  READS:    EulerAuto::S3rhs
+  WRITES:   EulerAuto::Denrhs
+  WRITES:   EulerAuto::Enrhs
+  WRITES:   EulerAuto::S1rhs
+  WRITES:   EulerAuto::S2rhs
+  WRITES:   EulerAuto::S3rhs
 } "eulerauto_cons_calc_rhs_1"
 
 schedule group eulerauto_cons_calc_reconstruct_2_group in MoL_CalcRHS after eulerauto_cons_calc_rhs_1
@@ -301,6 +401,21 @@ schedule group eulerauto_cons_calc_reconstruct_2_group in MoL_CalcRHS after eule
 schedule eulerauto_cons_calc_reconstruct_2 in eulerauto_cons_calc_reconstruct_2_group
 {
   LANG: C
+  READS:    EulerAuto::p
+  READS:    EulerAuto::rho
+  READS:    EulerAuto::v1
+  READS:    EulerAuto::v2
+  READS:    EulerAuto::v3
+  WRITES:   EulerAuto::pLeft
+  WRITES:   EulerAuto::pRight
+  WRITES:   EulerAuto::rhoLeft
+  WRITES:   EulerAuto::rhoRight
+  WRITES:   EulerAuto::v1Left
+  WRITES:   EulerAuto::v1Right
+  WRITES:   EulerAuto::v2Left
+  WRITES:   EulerAuto::v2Right
+  WRITES:   EulerAuto::v3Left
+  WRITES:   EulerAuto::v3Right
 } "eulerauto_cons_calc_reconstruct_2"
 
 schedule eulerauto_cons_calc_reconstruct_2_SelectBCs in eulerauto_cons_calc_reconstruct_2_bc_group
@@ -332,6 +447,26 @@ schedule group eulerauto_cons_calc_reconstruct_2_bc_group in MoL_PseudoEvolution
 schedule eulerauto_cons_calc_intercell_conserved_2 in MoL_CalcRHS after eulerauto_cons_calc_reconstruct_2
 {
   LANG: C
+  READS:    EulerAuto::pLeft
+  READS:    EulerAuto::pRight
+  READS:    EulerAuto::rhoLeft
+  READS:    EulerAuto::rhoRight
+  READS:    EulerAuto::v1Left
+  READS:    EulerAuto::v1Right
+  READS:    EulerAuto::v2Left
+  READS:    EulerAuto::v2Right
+  READS:    EulerAuto::v3Left
+  READS:    EulerAuto::v3Right
+  WRITES:   EulerAuto::DenLeft
+  WRITES:   EulerAuto::DenRight
+  WRITES:   EulerAuto::EnLeft
+  WRITES:   EulerAuto::EnRight
+  WRITES:   EulerAuto::S1Left
+  WRITES:   EulerAuto::S1Right
+  WRITES:   EulerAuto::S2Left
+  WRITES:   EulerAuto::S2Right
+  WRITES:   EulerAuto::S3Left
+  WRITES:   EulerAuto::S3Right
 } "eulerauto_cons_calc_intercell_conserved_2"
 
 schedule group eulerauto_cons_calc_flux_2_group in MoL_CalcRHS after eulerauto_cons_calc_intercell_conserved_2
@@ -342,6 +477,31 @@ schedule group eulerauto_cons_calc_flux_2_group in MoL_CalcRHS after eulerauto_c
 schedule eulerauto_cons_calc_flux_2 in eulerauto_cons_calc_flux_2_group
 {
   LANG: C
+  READS:    EulerAuto::DenLeft
+  READS:    EulerAuto::DenRight
+  READS:    EulerAuto::EnLeft
+  READS:    EulerAuto::EnRight
+  READS:    EulerAuto::pLeft
+  READS:    EulerAuto::pRight
+  READS:    EulerAuto::rhoLeft
+  READS:    EulerAuto::rhoRight
+  READS:    EulerAuto::S1Left
+  READS:    EulerAuto::S1Right
+  READS:    EulerAuto::S2Left
+  READS:    EulerAuto::S2Right
+  READS:    EulerAuto::S3Left
+  READS:    EulerAuto::S3Right
+  READS:    EulerAuto::v1Left
+  READS:    EulerAuto::v1Right
+  READS:    EulerAuto::v2Left
+  READS:    EulerAuto::v2Right
+  READS:    EulerAuto::v3Left
+  READS:    EulerAuto::v3Right
+  WRITES:   EulerAuto::DenFlux
+  WRITES:   EulerAuto::EnFlux
+  WRITES:   EulerAuto::S1Flux
+  WRITES:   EulerAuto::S2Flux
+  WRITES:   EulerAuto::S3Flux
 } "eulerauto_cons_calc_flux_2"
 
 schedule eulerauto_cons_calc_flux_2_SelectBCs in eulerauto_cons_calc_flux_2_bc_group
@@ -373,6 +533,21 @@ schedule group eulerauto_cons_calc_flux_2_bc_group in MoL_PseudoEvolutionBoundar
 schedule eulerauto_cons_calc_rhs_2 in MoL_CalcRHS after eulerauto_cons_calc_flux_2
 {
   LANG: C
+  READS:    EulerAuto::DenFlux
+  READS:    EulerAuto::Denrhs
+  READS:    EulerAuto::EnFlux
+  READS:    EulerAuto::Enrhs
+  READS:    EulerAuto::S1Flux
+  READS:    EulerAuto::S1rhs
+  READS:    EulerAuto::S2Flux
+  READS:    EulerAuto::S2rhs
+  READS:    EulerAuto::S3Flux
+  READS:    EulerAuto::S3rhs
+  WRITES:   EulerAuto::Denrhs
+  WRITES:   EulerAuto::Enrhs
+  WRITES:   EulerAuto::S1rhs
+  WRITES:   EulerAuto::S2rhs
+  WRITES:   EulerAuto::S3rhs
 } "eulerauto_cons_calc_rhs_2"
 
 schedule group eulerauto_cons_calc_reconstruct_3_group in MoL_CalcRHS after eulerauto_cons_calc_rhs_2
@@ -383,6 +558,21 @@ schedule group eulerauto_cons_calc_reconstruct_3_group in MoL_CalcRHS after eule
 schedule eulerauto_cons_calc_reconstruct_3 in eulerauto_cons_calc_reconstruct_3_group
 {
   LANG: C
+  READS:    EulerAuto::p
+  READS:    EulerAuto::rho
+  READS:    EulerAuto::v1
+  READS:    EulerAuto::v2
+  READS:    EulerAuto::v3
+  WRITES:   EulerAuto::pLeft
+  WRITES:   EulerAuto::pRight
+  WRITES:   EulerAuto::rhoLeft
+  WRITES:   EulerAuto::rhoRight
+  WRITES:   EulerAuto::v1Left
+  WRITES:   EulerAuto::v1Right
+  WRITES:   EulerAuto::v2Left
+  WRITES:   EulerAuto::v2Right
+  WRITES:   EulerAuto::v3Left
+  WRITES:   EulerAuto::v3Right
 } "eulerauto_cons_calc_reconstruct_3"
 
 schedule eulerauto_cons_calc_reconstruct_3_SelectBCs in eulerauto_cons_calc_reconstruct_3_bc_group
@@ -414,6 +604,26 @@ schedule group eulerauto_cons_calc_reconstruct_3_bc_group in MoL_PseudoEvolution
 schedule eulerauto_cons_calc_intercell_conserved_3 in MoL_CalcRHS after eulerauto_cons_calc_reconstruct_3
 {
   LANG: C
+  READS:    EulerAuto::pLeft
+  READS:    EulerAuto::pRight
+  READS:    EulerAuto::rhoLeft
+  READS:    EulerAuto::rhoRight
+  READS:    EulerAuto::v1Left
+  READS:    EulerAuto::v1Right
+  READS:    EulerAuto::v2Left
+  READS:    EulerAuto::v2Right
+  READS:    EulerAuto::v3Left
+  READS:    EulerAuto::v3Right
+  WRITES:   EulerAuto::DenLeft
+  WRITES:   EulerAuto::DenRight
+  WRITES:   EulerAuto::EnLeft
+  WRITES:   EulerAuto::EnRight
+  WRITES:   EulerAuto::S1Left
+  WRITES:   EulerAuto::S1Right
+  WRITES:   EulerAuto::S2Left
+  WRITES:   EulerAuto::S2Right
+  WRITES:   EulerAuto::S3Left
+  WRITES:   EulerAuto::S3Right
 } "eulerauto_cons_calc_intercell_conserved_3"
 
 schedule group eulerauto_cons_calc_flux_3_group in MoL_CalcRHS after eulerauto_cons_calc_intercell_conserved_3
@@ -424,6 +634,31 @@ schedule group eulerauto_cons_calc_flux_3_group in MoL_CalcRHS after eulerauto_c
 schedule eulerauto_cons_calc_flux_3 in eulerauto_cons_calc_flux_3_group
 {
   LANG: C
+  READS:    EulerAuto::DenLeft
+  READS:    EulerAuto::DenRight
+  READS:    EulerAuto::EnLeft
+  READS:    EulerAuto::EnRight
+  READS:    EulerAuto::pLeft
+  READS:    EulerAuto::pRight
+  READS:    EulerAuto::rhoLeft
+  READS:    EulerAuto::rhoRight
+  READS:    EulerAuto::S1Left
+  READS:    EulerAuto::S1Right
+  READS:    EulerAuto::S2Left
+  READS:    EulerAuto::S2Right
+  READS:    EulerAuto::S3Left
+  READS:    EulerAuto::S3Right
+  READS:    EulerAuto::v1Left
+  READS:    EulerAuto::v1Right
+  READS:    EulerAuto::v2Left
+  READS:    EulerAuto::v2Right
+  READS:    EulerAuto::v3Left
+  READS:    EulerAuto::v3Right
+  WRITES:   EulerAuto::DenFlux
+  WRITES:   EulerAuto::EnFlux
+  WRITES:   EulerAuto::S1Flux
+  WRITES:   EulerAuto::S2Flux
+  WRITES:   EulerAuto::S3Flux
 } "eulerauto_cons_calc_flux_3"
 
 schedule eulerauto_cons_calc_flux_3_SelectBCs in eulerauto_cons_calc_flux_3_bc_group
@@ -455,6 +690,21 @@ schedule group eulerauto_cons_calc_flux_3_bc_group in MoL_PseudoEvolutionBoundar
 schedule eulerauto_cons_calc_rhs_3 in MoL_CalcRHS after eulerauto_cons_calc_flux_3
 {
   LANG: C
+  READS:    EulerAuto::DenFlux
+  READS:    EulerAuto::Denrhs
+  READS:    EulerAuto::EnFlux
+  READS:    EulerAuto::Enrhs
+  READS:    EulerAuto::S1Flux
+  READS:    EulerAuto::S1rhs
+  READS:    EulerAuto::S2Flux
+  READS:    EulerAuto::S2rhs
+  READS:    EulerAuto::S3Flux
+  READS:    EulerAuto::S3rhs
+  WRITES:   EulerAuto::Denrhs
+  WRITES:   EulerAuto::Enrhs
+  WRITES:   EulerAuto::S1rhs
+  WRITES:   EulerAuto::S2rhs
+  WRITES:   EulerAuto::S3rhs
 } "eulerauto_cons_calc_rhs_3"
 
 schedule EulerAuto_SelectBoundConds in MoL_PostStep
@@ -472,6 +722,12 @@ schedule EulerAuto_CheckBoundaries at BASEGRID
   OPTIONS: meta
 } "check boundaries treatment"
 
+schedule EulerAuto_RegisterVars in MoL_Register
+{
+  LANG: C
+  OPTIONS: meta
+} "Register Variables for MoL"
+
 schedule group ApplyBCs as EulerAuto_ApplyBCs in MoL_PostStep after EulerAuto_SelectBoundConds
 {
   # no language specified
diff --git a/Examples/EulerAuto/src/eulerauto_cons_calc_conserved.cc b/Examples/EulerAuto/src/eulerauto_cons_calc_conserved.cc
index b41803a..9696876 100644
--- a/Examples/EulerAuto/src/eulerauto_cons_calc_conserved.cc
+++ b/Examples/EulerAuto/src/eulerauto_cons_calc_conserved.cc
@@ -17,10 +17,10 @@
 
 /* Define macros used in calculations */
 #define INITVALUE (42)
-#define QAD(x) (SQR(SQR(x)))
-#define INV(x) ((1.0) / (x))
+#define INV(x) ((CCTK_REAL)1.0 / (x))
 #define SQR(x) ((x) * (x))
-#define CUB(x) ((x) * (x) * (x))
+#define CUB(x) ((x) * SQR(x))
+#define QAD(x) (SQR(SQR(x)))
 
 static void eulerauto_cons_calc_conserved_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[])
 {
@@ -28,8 +28,6 @@ static void eulerauto_cons_calc_conserved_Body(cGH const * restrict const cctkGH
   DECLARE_CCTK_PARAMETERS;
   
   
-  /* Declare finite differencing variables */
-  
   /* Include user-supplied include files */
   
   /* Initialise finite differencing variables */
@@ -72,9 +70,9 @@ static void eulerauto_cons_calc_conserved_Body(cGH const * restrict const cctkGH
   
   /* Loop over the grid points */
   #pragma omp parallel
-  CCTK_LOOP3 (eulerauto_cons_calc_conserved,
+  CCTK_LOOP3(eulerauto_cons_calc_conserved,
     i,j,k, imin[0],imin[1],imin[2], imax[0],imax[1],imax[2],
-    cctk_lsh[0],cctk_lsh[1],cctk_lsh[2])
+    cctk_ash[0],cctk_ash[1],cctk_ash[2])
   {
     ptrdiff_t const index = di*i + dj*j + dk*k;
     
@@ -110,7 +108,7 @@ static void eulerauto_cons_calc_conserved_Body(cGH const * restrict const cctkGH
     S2[index] = S2L;
     S3[index] = S3L;
   }
-  CCTK_ENDLOOP3 (eulerauto_cons_calc_conserved);
+  CCTK_ENDLOOP3(eulerauto_cons_calc_conserved);
 }
 
 extern "C" void eulerauto_cons_calc_conserved(CCTK_ARGUMENTS)
@@ -129,11 +127,17 @@ extern "C" void eulerauto_cons_calc_conserved(CCTK_ARGUMENTS)
     return;
   }
   
-  const char *groups[] = {"EulerAuto::Den_group","EulerAuto::En_group","EulerAuto::p_group","EulerAuto::rho_group","EulerAuto::S_group","EulerAuto::v_group"};
+  const char *const groups[] = {
+    "EulerAuto::Den_group",
+    "EulerAuto::En_group",
+    "EulerAuto::p_group",
+    "EulerAuto::rho_group",
+    "EulerAuto::S_group",
+    "EulerAuto::v_group"};
   GenericFD_AssertGroupStorage(cctkGH, "eulerauto_cons_calc_conserved", 6, groups);
   
   
-  GenericFD_LoopOverEverything(cctkGH, &eulerauto_cons_calc_conserved_Body);
+  GenericFD_LoopOverEverything(cctkGH, eulerauto_cons_calc_conserved_Body);
   
   if (verbose > 1)
   {
diff --git a/Examples/EulerAuto/src/eulerauto_cons_calc_flux_1.cc b/Examples/EulerAuto/src/eulerauto_cons_calc_flux_1.cc
index 02eec61..01c2e08 100644
--- a/Examples/EulerAuto/src/eulerauto_cons_calc_flux_1.cc
+++ b/Examples/EulerAuto/src/eulerauto_cons_calc_flux_1.cc
@@ -17,10 +17,10 @@
 
 /* Define macros used in calculations */
 #define INITVALUE (42)
-#define QAD(x) (SQR(SQR(x)))
-#define INV(x) ((1.0) / (x))
+#define INV(x) ((CCTK_REAL)1.0 / (x))
 #define SQR(x) ((x) * (x))
-#define CUB(x) ((x) * (x) * (x))
+#define CUB(x) ((x) * SQR(x))
+#define QAD(x) (SQR(SQR(x)))
 
 extern "C" void eulerauto_cons_calc_flux_1_SelectBCs(CCTK_ARGUMENTS)
 {
@@ -52,8 +52,6 @@ static void eulerauto_cons_calc_flux_1_Body(cGH const * restrict const cctkGH, i
   DECLARE_CCTK_PARAMETERS;
   
   
-  /* Declare finite differencing variables */
-  
   /* Include user-supplied include files */
   
   /* Initialise finite differencing variables */
@@ -96,9 +94,9 @@ static void eulerauto_cons_calc_flux_1_Body(cGH const * restrict const cctkGH, i
   
   /* Loop over the grid points */
   #pragma omp parallel
-  CCTK_LOOP3 (eulerauto_cons_calc_flux_1,
+  CCTK_LOOP3(eulerauto_cons_calc_flux_1,
     i,j,k, imin[0],imin[1],imin[2], imax[0],imax[1],imax[2],
-    cctk_lsh[0],cctk_lsh[1],cctk_lsh[2])
+    cctk_ash[0],cctk_ash[1],cctk_ash[2])
   {
     ptrdiff_t const index = di*i + dj*j + dk*k;
     
@@ -187,7 +185,7 @@ static void eulerauto_cons_calc_flux_1_Body(cGH const * restrict const cctkGH, i
     S2Flux[index] = S2FluxL;
     S3Flux[index] = S3FluxL;
   }
-  CCTK_ENDLOOP3 (eulerauto_cons_calc_flux_1);
+  CCTK_ENDLOOP3(eulerauto_cons_calc_flux_1);
 }
 
 extern "C" void eulerauto_cons_calc_flux_1(CCTK_ARGUMENTS)
@@ -206,12 +204,27 @@ extern "C" void eulerauto_cons_calc_flux_1(CCTK_ARGUMENTS)
     return;
   }
   
-  const char *groups[] = {"EulerAuto::Den_flux_group","EulerAuto::Den_lr_group","EulerAuto::En_flux_group","EulerAuto::En_lr_group","EulerAuto::p_lr_group","EulerAuto::rho_lr_group","EulerAuto::S1_flux_group","EulerAuto::S1_lr_group","EulerAuto::S2_flux_group","EulerAuto::S2_lr_group","EulerAuto::S3_flux_group","EulerAuto::S3_lr_group","EulerAuto::v1_lr_group","EulerAuto::v2_lr_group","EulerAuto::v3_lr_group"};
+  const char *const groups[] = {
+    "EulerAuto::Den_flux_group",
+    "EulerAuto::Den_lr_group",
+    "EulerAuto::En_flux_group",
+    "EulerAuto::En_lr_group",
+    "EulerAuto::p_lr_group",
+    "EulerAuto::rho_lr_group",
+    "EulerAuto::S1_flux_group",
+    "EulerAuto::S1_lr_group",
+    "EulerAuto::S2_flux_group",
+    "EulerAuto::S2_lr_group",
+    "EulerAuto::S3_flux_group",
+    "EulerAuto::S3_lr_group",
+    "EulerAuto::v1_lr_group",
+    "EulerAuto::v2_lr_group",
+    "EulerAuto::v3_lr_group"};
   GenericFD_AssertGroupStorage(cctkGH, "eulerauto_cons_calc_flux_1", 15, groups);
   
   GenericFD_EnsureStencilFits(cctkGH, "eulerauto_cons_calc_flux_1", 1, 1, 1);
   
-  GenericFD_LoopOverInterior(cctkGH, &eulerauto_cons_calc_flux_1_Body);
+  GenericFD_LoopOverInterior(cctkGH, eulerauto_cons_calc_flux_1_Body);
   
   if (verbose > 1)
   {
diff --git a/Examples/EulerAuto/src/eulerauto_cons_calc_flux_2.cc b/Examples/EulerAuto/src/eulerauto_cons_calc_flux_2.cc
index eb6fac5..8ad72ef 100644
--- a/Examples/EulerAuto/src/eulerauto_cons_calc_flux_2.cc
+++ b/Examples/EulerAuto/src/eulerauto_cons_calc_flux_2.cc
@@ -17,10 +17,10 @@
 
 /* Define macros used in calculations */
 #define INITVALUE (42)
-#define QAD(x) (SQR(SQR(x)))
-#define INV(x) ((1.0) / (x))
+#define INV(x) ((CCTK_REAL)1.0 / (x))
 #define SQR(x) ((x) * (x))
-#define CUB(x) ((x) * (x) * (x))
+#define CUB(x) ((x) * SQR(x))
+#define QAD(x) (SQR(SQR(x)))
 
 extern "C" void eulerauto_cons_calc_flux_2_SelectBCs(CCTK_ARGUMENTS)
 {
@@ -52,8 +52,6 @@ static void eulerauto_cons_calc_flux_2_Body(cGH const * restrict const cctkGH, i
   DECLARE_CCTK_PARAMETERS;
   
   
-  /* Declare finite differencing variables */
-  
   /* Include user-supplied include files */
   
   /* Initialise finite differencing variables */
@@ -96,9 +94,9 @@ static void eulerauto_cons_calc_flux_2_Body(cGH const * restrict const cctkGH, i
   
   /* Loop over the grid points */
   #pragma omp parallel
-  CCTK_LOOP3 (eulerauto_cons_calc_flux_2,
+  CCTK_LOOP3(eulerauto_cons_calc_flux_2,
     i,j,k, imin[0],imin[1],imin[2], imax[0],imax[1],imax[2],
-    cctk_lsh[0],cctk_lsh[1],cctk_lsh[2])
+    cctk_ash[0],cctk_ash[1],cctk_ash[2])
   {
     ptrdiff_t const index = di*i + dj*j + dk*k;
     
@@ -187,7 +185,7 @@ static void eulerauto_cons_calc_flux_2_Body(cGH const * restrict const cctkGH, i
     S2Flux[index] = S2FluxL;
     S3Flux[index] = S3FluxL;
   }
-  CCTK_ENDLOOP3 (eulerauto_cons_calc_flux_2);
+  CCTK_ENDLOOP3(eulerauto_cons_calc_flux_2);
 }
 
 extern "C" void eulerauto_cons_calc_flux_2(CCTK_ARGUMENTS)
@@ -206,12 +204,27 @@ extern "C" void eulerauto_cons_calc_flux_2(CCTK_ARGUMENTS)
     return;
   }
   
-  const char *groups[] = {"EulerAuto::Den_flux_group","EulerAuto::Den_lr_group","EulerAuto::En_flux_group","EulerAuto::En_lr_group","EulerAuto::p_lr_group","EulerAuto::rho_lr_group","EulerAuto::S1_flux_group","EulerAuto::S1_lr_group","EulerAuto::S2_flux_group","EulerAuto::S2_lr_group","EulerAuto::S3_flux_group","EulerAuto::S3_lr_group","EulerAuto::v1_lr_group","EulerAuto::v2_lr_group","EulerAuto::v3_lr_group"};
+  const char *const groups[] = {
+    "EulerAuto::Den_flux_group",
+    "EulerAuto::Den_lr_group",
+    "EulerAuto::En_flux_group",
+    "EulerAuto::En_lr_group",
+    "EulerAuto::p_lr_group",
+    "EulerAuto::rho_lr_group",
+    "EulerAuto::S1_flux_group",
+    "EulerAuto::S1_lr_group",
+    "EulerAuto::S2_flux_group",
+    "EulerAuto::S2_lr_group",
+    "EulerAuto::S3_flux_group",
+    "EulerAuto::S3_lr_group",
+    "EulerAuto::v1_lr_group",
+    "EulerAuto::v2_lr_group",
+    "EulerAuto::v3_lr_group"};
   GenericFD_AssertGroupStorage(cctkGH, "eulerauto_cons_calc_flux_2", 15, groups);
   
   GenericFD_EnsureStencilFits(cctkGH, "eulerauto_cons_calc_flux_2", 1, 1, 1);
   
-  GenericFD_LoopOverInterior(cctkGH, &eulerauto_cons_calc_flux_2_Body);
+  GenericFD_LoopOverInterior(cctkGH, eulerauto_cons_calc_flux_2_Body);
   
   if (verbose > 1)
   {
diff --git a/Examples/EulerAuto/src/eulerauto_cons_calc_flux_3.cc b/Examples/EulerAuto/src/eulerauto_cons_calc_flux_3.cc
index 140cd47..752fec3 100644
--- a/Examples/EulerAuto/src/eulerauto_cons_calc_flux_3.cc
+++ b/Examples/EulerAuto/src/eulerauto_cons_calc_flux_3.cc
@@ -17,10 +17,10 @@
 
 /* Define macros used in calculations */
 #define INITVALUE (42)
-#define QAD(x) (SQR(SQR(x)))
-#define INV(x) ((1.0) / (x))
+#define INV(x) ((CCTK_REAL)1.0 / (x))
 #define SQR(x) ((x) * (x))
-#define CUB(x) ((x) * (x) * (x))
+#define CUB(x) ((x) * SQR(x))
+#define QAD(x) (SQR(SQR(x)))
 
 extern "C" void eulerauto_cons_calc_flux_3_SelectBCs(CCTK_ARGUMENTS)
 {
@@ -52,8 +52,6 @@ static void eulerauto_cons_calc_flux_3_Body(cGH const * restrict const cctkGH, i
   DECLARE_CCTK_PARAMETERS;
   
   
-  /* Declare finite differencing variables */
-  
   /* Include user-supplied include files */
   
   /* Initialise finite differencing variables */
@@ -96,9 +94,9 @@ static void eulerauto_cons_calc_flux_3_Body(cGH const * restrict const cctkGH, i
   
   /* Loop over the grid points */
   #pragma omp parallel
-  CCTK_LOOP3 (eulerauto_cons_calc_flux_3,
+  CCTK_LOOP3(eulerauto_cons_calc_flux_3,
     i,j,k, imin[0],imin[1],imin[2], imax[0],imax[1],imax[2],
-    cctk_lsh[0],cctk_lsh[1],cctk_lsh[2])
+    cctk_ash[0],cctk_ash[1],cctk_ash[2])
   {
     ptrdiff_t const index = di*i + dj*j + dk*k;
     
@@ -187,7 +185,7 @@ static void eulerauto_cons_calc_flux_3_Body(cGH const * restrict const cctkGH, i
     S2Flux[index] = S2FluxL;
     S3Flux[index] = S3FluxL;
   }
-  CCTK_ENDLOOP3 (eulerauto_cons_calc_flux_3);
+  CCTK_ENDLOOP3(eulerauto_cons_calc_flux_3);
 }
 
 extern "C" void eulerauto_cons_calc_flux_3(CCTK_ARGUMENTS)
@@ -206,12 +204,27 @@ extern "C" void eulerauto_cons_calc_flux_3(CCTK_ARGUMENTS)
     return;
   }
   
-  const char *groups[] = {"EulerAuto::Den_flux_group","EulerAuto::Den_lr_group","EulerAuto::En_flux_group","EulerAuto::En_lr_group","EulerAuto::p_lr_group","EulerAuto::rho_lr_group","EulerAuto::S1_flux_group","EulerAuto::S1_lr_group","EulerAuto::S2_flux_group","EulerAuto::S2_lr_group","EulerAuto::S3_flux_group","EulerAuto::S3_lr_group","EulerAuto::v1_lr_group","EulerAuto::v2_lr_group","EulerAuto::v3_lr_group"};
+  const char *const groups[] = {
+    "EulerAuto::Den_flux_group",
+    "EulerAuto::Den_lr_group",
+    "EulerAuto::En_flux_group",
+    "EulerAuto::En_lr_group",
+    "EulerAuto::p_lr_group",
+    "EulerAuto::rho_lr_group",
+    "EulerAuto::S1_flux_group",
+    "EulerAuto::S1_lr_group",
+    "EulerAuto::S2_flux_group",
+    "EulerAuto::S2_lr_group",
+    "EulerAuto::S3_flux_group",
+    "EulerAuto::S3_lr_group",
+    "EulerAuto::v1_lr_group",
+    "EulerAuto::v2_lr_group",
+    "EulerAuto::v3_lr_group"};
   GenericFD_AssertGroupStorage(cctkGH, "eulerauto_cons_calc_flux_3", 15, groups);
   
   GenericFD_EnsureStencilFits(cctkGH, "eulerauto_cons_calc_flux_3", 1, 1, 1);
   
-  GenericFD_LoopOverInterior(cctkGH, &eulerauto_cons_calc_flux_3_Body);
+  GenericFD_LoopOverInterior(cctkGH, eulerauto_cons_calc_flux_3_Body);
   
   if (verbose > 1)
   {
diff --git a/Examples/EulerAuto/src/eulerauto_cons_calc_intercell_conserved_1.cc b/Examples/EulerAuto/src/eulerauto_cons_calc_intercell_conserved_1.cc
index fdcd6f7..6f22748 100644
--- a/Examples/EulerAuto/src/eulerauto_cons_calc_intercell_conserved_1.cc
+++ b/Examples/EulerAuto/src/eulerauto_cons_calc_intercell_conserved_1.cc
@@ -17,10 +17,10 @@
 
 /* Define macros used in calculations */
 #define INITVALUE (42)
-#define QAD(x) (SQR(SQR(x)))
-#define INV(x) ((1.0) / (x))
+#define INV(x) ((CCTK_REAL)1.0 / (x))
 #define SQR(x) ((x) * (x))
-#define CUB(x) ((x) * (x) * (x))
+#define CUB(x) ((x) * SQR(x))
+#define QAD(x) (SQR(SQR(x)))
 
 static void eulerauto_cons_calc_intercell_conserved_1_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[])
 {
@@ -28,8 +28,6 @@ static void eulerauto_cons_calc_intercell_conserved_1_Body(cGH const * restrict
   DECLARE_CCTK_PARAMETERS;
   
   
-  /* Declare finite differencing variables */
-  
   /* Include user-supplied include files */
   
   /* Initialise finite differencing variables */
@@ -72,9 +70,9 @@ static void eulerauto_cons_calc_intercell_conserved_1_Body(cGH const * restrict
   
   /* Loop over the grid points */
   #pragma omp parallel
-  CCTK_LOOP3 (eulerauto_cons_calc_intercell_conserved_1,
+  CCTK_LOOP3(eulerauto_cons_calc_intercell_conserved_1,
     i,j,k, imin[0],imin[1],imin[2], imax[0],imax[1],imax[2],
-    cctk_lsh[0],cctk_lsh[1],cctk_lsh[2])
+    cctk_ash[0],cctk_ash[1],cctk_ash[2])
   {
     ptrdiff_t const index = di*i + dj*j + dk*k;
     
@@ -133,7 +131,7 @@ static void eulerauto_cons_calc_intercell_conserved_1_Body(cGH const * restrict
     S3Left[index] = S3LeftL;
     S3Right[index] = S3RightL;
   }
-  CCTK_ENDLOOP3 (eulerauto_cons_calc_intercell_conserved_1);
+  CCTK_ENDLOOP3(eulerauto_cons_calc_intercell_conserved_1);
 }
 
 extern "C" void eulerauto_cons_calc_intercell_conserved_1(CCTK_ARGUMENTS)
@@ -152,11 +150,21 @@ extern "C" void eulerauto_cons_calc_intercell_conserved_1(CCTK_ARGUMENTS)
     return;
   }
   
-  const char *groups[] = {"EulerAuto::Den_lr_group","EulerAuto::En_lr_group","EulerAuto::p_lr_group","EulerAuto::rho_lr_group","EulerAuto::S1_lr_group","EulerAuto::S2_lr_group","EulerAuto::S3_lr_group","EulerAuto::v1_lr_group","EulerAuto::v2_lr_group","EulerAuto::v3_lr_group"};
+  const char *const groups[] = {
+    "EulerAuto::Den_lr_group",
+    "EulerAuto::En_lr_group",
+    "EulerAuto::p_lr_group",
+    "EulerAuto::rho_lr_group",
+    "EulerAuto::S1_lr_group",
+    "EulerAuto::S2_lr_group",
+    "EulerAuto::S3_lr_group",
+    "EulerAuto::v1_lr_group",
+    "EulerAuto::v2_lr_group",
+    "EulerAuto::v3_lr_group"};
   GenericFD_AssertGroupStorage(cctkGH, "eulerauto_cons_calc_intercell_conserved_1", 10, groups);
   
   
-  GenericFD_LoopOverEverything(cctkGH, &eulerauto_cons_calc_intercell_conserved_1_Body);
+  GenericFD_LoopOverEverything(cctkGH, eulerauto_cons_calc_intercell_conserved_1_Body);
   
   if (verbose > 1)
   {
diff --git a/Examples/EulerAuto/src/eulerauto_cons_calc_intercell_conserved_2.cc b/Examples/EulerAuto/src/eulerauto_cons_calc_intercell_conserved_2.cc
index 9a8709d..3d9488e 100644
--- a/Examples/EulerAuto/src/eulerauto_cons_calc_intercell_conserved_2.cc
+++ b/Examples/EulerAuto/src/eulerauto_cons_calc_intercell_conserved_2.cc
@@ -17,10 +17,10 @@
 
 /* Define macros used in calculations */
 #define INITVALUE (42)
-#define QAD(x) (SQR(SQR(x)))
-#define INV(x) ((1.0) / (x))
+#define INV(x) ((CCTK_REAL)1.0 / (x))
 #define SQR(x) ((x) * (x))
-#define CUB(x) ((x) * (x) * (x))
+#define CUB(x) ((x) * SQR(x))
+#define QAD(x) (SQR(SQR(x)))
 
 static void eulerauto_cons_calc_intercell_conserved_2_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[])
 {
@@ -28,8 +28,6 @@ static void eulerauto_cons_calc_intercell_conserved_2_Body(cGH const * restrict
   DECLARE_CCTK_PARAMETERS;
   
   
-  /* Declare finite differencing variables */
-  
   /* Include user-supplied include files */
   
   /* Initialise finite differencing variables */
@@ -72,9 +70,9 @@ static void eulerauto_cons_calc_intercell_conserved_2_Body(cGH const * restrict
   
   /* Loop over the grid points */
   #pragma omp parallel
-  CCTK_LOOP3 (eulerauto_cons_calc_intercell_conserved_2,
+  CCTK_LOOP3(eulerauto_cons_calc_intercell_conserved_2,
     i,j,k, imin[0],imin[1],imin[2], imax[0],imax[1],imax[2],
-    cctk_lsh[0],cctk_lsh[1],cctk_lsh[2])
+    cctk_ash[0],cctk_ash[1],cctk_ash[2])
   {
     ptrdiff_t const index = di*i + dj*j + dk*k;
     
@@ -133,7 +131,7 @@ static void eulerauto_cons_calc_intercell_conserved_2_Body(cGH const * restrict
     S3Left[index] = S3LeftL;
     S3Right[index] = S3RightL;
   }
-  CCTK_ENDLOOP3 (eulerauto_cons_calc_intercell_conserved_2);
+  CCTK_ENDLOOP3(eulerauto_cons_calc_intercell_conserved_2);
 }
 
 extern "C" void eulerauto_cons_calc_intercell_conserved_2(CCTK_ARGUMENTS)
@@ -152,11 +150,21 @@ extern "C" void eulerauto_cons_calc_intercell_conserved_2(CCTK_ARGUMENTS)
     return;
   }
   
-  const char *groups[] = {"EulerAuto::Den_lr_group","EulerAuto::En_lr_group","EulerAuto::p_lr_group","EulerAuto::rho_lr_group","EulerAuto::S1_lr_group","EulerAuto::S2_lr_group","EulerAuto::S3_lr_group","EulerAuto::v1_lr_group","EulerAuto::v2_lr_group","EulerAuto::v3_lr_group"};
+  const char *const groups[] = {
+    "EulerAuto::Den_lr_group",
+    "EulerAuto::En_lr_group",
+    "EulerAuto::p_lr_group",
+    "EulerAuto::rho_lr_group",
+    "EulerAuto::S1_lr_group",
+    "EulerAuto::S2_lr_group",
+    "EulerAuto::S3_lr_group",
+    "EulerAuto::v1_lr_group",
+    "EulerAuto::v2_lr_group",
+    "EulerAuto::v3_lr_group"};
   GenericFD_AssertGroupStorage(cctkGH, "eulerauto_cons_calc_intercell_conserved_2", 10, groups);
   
   
-  GenericFD_LoopOverEverything(cctkGH, &eulerauto_cons_calc_intercell_conserved_2_Body);
+  GenericFD_LoopOverEverything(cctkGH, eulerauto_cons_calc_intercell_conserved_2_Body);
   
   if (verbose > 1)
   {
diff --git a/Examples/EulerAuto/src/eulerauto_cons_calc_intercell_conserved_3.cc b/Examples/EulerAuto/src/eulerauto_cons_calc_intercell_conserved_3.cc
index 2c4f3a1..096f13c 100644
--- a/Examples/EulerAuto/src/eulerauto_cons_calc_intercell_conserved_3.cc
+++ b/Examples/EulerAuto/src/eulerauto_cons_calc_intercell_conserved_3.cc
@@ -17,10 +17,10 @@
 
 /* Define macros used in calculations */
 #define INITVALUE (42)
-#define QAD(x) (SQR(SQR(x)))
-#define INV(x) ((1.0) / (x))
+#define INV(x) ((CCTK_REAL)1.0 / (x))
 #define SQR(x) ((x) * (x))
-#define CUB(x) ((x) * (x) * (x))
+#define CUB(x) ((x) * SQR(x))
+#define QAD(x) (SQR(SQR(x)))
 
 static void eulerauto_cons_calc_intercell_conserved_3_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[])
 {
@@ -28,8 +28,6 @@ static void eulerauto_cons_calc_intercell_conserved_3_Body(cGH const * restrict
   DECLARE_CCTK_PARAMETERS;
   
   
-  /* Declare finite differencing variables */
-  
   /* Include user-supplied include files */
   
   /* Initialise finite differencing variables */
@@ -72,9 +70,9 @@ static void eulerauto_cons_calc_intercell_conserved_3_Body(cGH const * restrict
   
   /* Loop over the grid points */
   #pragma omp parallel
-  CCTK_LOOP3 (eulerauto_cons_calc_intercell_conserved_3,
+  CCTK_LOOP3(eulerauto_cons_calc_intercell_conserved_3,
     i,j,k, imin[0],imin[1],imin[2], imax[0],imax[1],imax[2],
-    cctk_lsh[0],cctk_lsh[1],cctk_lsh[2])
+    cctk_ash[0],cctk_ash[1],cctk_ash[2])
   {
     ptrdiff_t const index = di*i + dj*j + dk*k;
     
@@ -133,7 +131,7 @@ static void eulerauto_cons_calc_intercell_conserved_3_Body(cGH const * restrict
     S3Left[index] = S3LeftL;
     S3Right[index] = S3RightL;
   }
-  CCTK_ENDLOOP3 (eulerauto_cons_calc_intercell_conserved_3);
+  CCTK_ENDLOOP3(eulerauto_cons_calc_intercell_conserved_3);
 }
 
 extern "C" void eulerauto_cons_calc_intercell_conserved_3(CCTK_ARGUMENTS)
@@ -152,11 +150,21 @@ extern "C" void eulerauto_cons_calc_intercell_conserved_3(CCTK_ARGUMENTS)
     return;
   }
   
-  const char *groups[] = {"EulerAuto::Den_lr_group","EulerAuto::En_lr_group","EulerAuto::p_lr_group","EulerAuto::rho_lr_group","EulerAuto::S1_lr_group","EulerAuto::S2_lr_group","EulerAuto::S3_lr_group","EulerAuto::v1_lr_group","EulerAuto::v2_lr_group","EulerAuto::v3_lr_group"};
+  const char *const groups[] = {
+    "EulerAuto::Den_lr_group",
+    "EulerAuto::En_lr_group",
+    "EulerAuto::p_lr_group",
+    "EulerAuto::rho_lr_group",
+    "EulerAuto::S1_lr_group",
+    "EulerAuto::S2_lr_group",
+    "EulerAuto::S3_lr_group",
+    "EulerAuto::v1_lr_group",
+    "EulerAuto::v2_lr_group",
+    "EulerAuto::v3_lr_group"};
   GenericFD_AssertGroupStorage(cctkGH, "eulerauto_cons_calc_intercell_conserved_3", 10, groups);
   
   
-  GenericFD_LoopOverEverything(cctkGH, &eulerauto_cons_calc_intercell_conserved_3_Body);
+  GenericFD_LoopOverEverything(cctkGH, eulerauto_cons_calc_intercell_conserved_3_Body);
   
   if (verbose > 1)
   {
diff --git a/Examples/EulerAuto/src/eulerauto_cons_calc_primitives.cc b/Examples/EulerAuto/src/eulerauto_cons_calc_primitives.cc
index 1b16069..b2cafeb 100644
--- a/Examples/EulerAuto/src/eulerauto_cons_calc_primitives.cc
+++ b/Examples/EulerAuto/src/eulerauto_cons_calc_primitives.cc
@@ -17,10 +17,10 @@
 
 /* Define macros used in calculations */
 #define INITVALUE (42)
-#define QAD(x) (SQR(SQR(x)))
-#define INV(x) ((1.0) / (x))
+#define INV(x) ((CCTK_REAL)1.0 / (x))
 #define SQR(x) ((x) * (x))
-#define CUB(x) ((x) * (x) * (x))
+#define CUB(x) ((x) * SQR(x))
+#define QAD(x) (SQR(SQR(x)))
 
 static void eulerauto_cons_calc_primitives_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[])
 {
@@ -28,8 +28,6 @@ static void eulerauto_cons_calc_primitives_Body(cGH const * restrict const cctkG
   DECLARE_CCTK_PARAMETERS;
   
   
-  /* Declare finite differencing variables */
-  
   /* Include user-supplied include files */
   
   /* Initialise finite differencing variables */
@@ -72,9 +70,9 @@ static void eulerauto_cons_calc_primitives_Body(cGH const * restrict const cctkG
   
   /* Loop over the grid points */
   #pragma omp parallel
-  CCTK_LOOP3 (eulerauto_cons_calc_primitives,
+  CCTK_LOOP3(eulerauto_cons_calc_primitives,
     i,j,k, imin[0],imin[1],imin[2], imax[0],imax[1],imax[2],
-    cctk_lsh[0],cctk_lsh[1],cctk_lsh[2])
+    cctk_ash[0],cctk_ash[1],cctk_ash[2])
   {
     ptrdiff_t const index = di*i + dj*j + dk*k;
     
@@ -110,7 +108,7 @@ static void eulerauto_cons_calc_primitives_Body(cGH const * restrict const cctkG
     v2[index] = v2L;
     v3[index] = v3L;
   }
-  CCTK_ENDLOOP3 (eulerauto_cons_calc_primitives);
+  CCTK_ENDLOOP3(eulerauto_cons_calc_primitives);
 }
 
 extern "C" void eulerauto_cons_calc_primitives(CCTK_ARGUMENTS)
@@ -129,11 +127,17 @@ extern "C" void eulerauto_cons_calc_primitives(CCTK_ARGUMENTS)
     return;
   }
   
-  const char *groups[] = {"EulerAuto::Den_group","EulerAuto::En_group","EulerAuto::p_group","EulerAuto::rho_group","EulerAuto::S_group","EulerAuto::v_group"};
+  const char *const groups[] = {
+    "EulerAuto::Den_group",
+    "EulerAuto::En_group",
+    "EulerAuto::p_group",
+    "EulerAuto::rho_group",
+    "EulerAuto::S_group",
+    "EulerAuto::v_group"};
   GenericFD_AssertGroupStorage(cctkGH, "eulerauto_cons_calc_primitives", 6, groups);
   
   
-  GenericFD_LoopOverEverything(cctkGH, &eulerauto_cons_calc_primitives_Body);
+  GenericFD_LoopOverEverything(cctkGH, eulerauto_cons_calc_primitives_Body);
   
   if (verbose > 1)
   {
diff --git a/Examples/EulerAuto/src/eulerauto_cons_calc_reconstruct_1.cc b/Examples/EulerAuto/src/eulerauto_cons_calc_reconstruct_1.cc
index be96c9f..f0dbe5f 100644
--- a/Examples/EulerAuto/src/eulerauto_cons_calc_reconstruct_1.cc
+++ b/Examples/EulerAuto/src/eulerauto_cons_calc_reconstruct_1.cc
@@ -17,10 +17,10 @@
 
 /* Define macros used in calculations */
 #define INITVALUE (42)
-#define QAD(x) (SQR(SQR(x)))
-#define INV(x) ((1.0) / (x))
+#define INV(x) ((CCTK_REAL)1.0 / (x))
 #define SQR(x) ((x) * (x))
-#define CUB(x) ((x) * (x) * (x))
+#define CUB(x) ((x) * SQR(x))
+#define QAD(x) (SQR(SQR(x)))
 
 extern "C" void eulerauto_cons_calc_reconstruct_1_SelectBCs(CCTK_ARGUMENTS)
 {
@@ -52,8 +52,6 @@ static void eulerauto_cons_calc_reconstruct_1_Body(cGH const * restrict const cc
   DECLARE_CCTK_PARAMETERS;
   
   
-  /* Declare finite differencing variables */
-  
   /* Include user-supplied include files */
   
   /* Initialise finite differencing variables */
@@ -96,9 +94,9 @@ static void eulerauto_cons_calc_reconstruct_1_Body(cGH const * restrict const cc
   
   /* Loop over the grid points */
   #pragma omp parallel
-  CCTK_LOOP3 (eulerauto_cons_calc_reconstruct_1,
+  CCTK_LOOP3(eulerauto_cons_calc_reconstruct_1,
     i,j,k, imin[0],imin[1],imin[2], imax[0],imax[1],imax[2],
-    cctk_lsh[0],cctk_lsh[1],cctk_lsh[2])
+    cctk_ash[0],cctk_ash[1],cctk_ash[2])
   {
     ptrdiff_t const index = di*i + dj*j + dk*k;
     
@@ -188,7 +186,7 @@ static void eulerauto_cons_calc_reconstruct_1_Body(cGH const * restrict const cc
     v3Left[index] = v3LeftL;
     v3Right[index] = v3RightL;
   }
-  CCTK_ENDLOOP3 (eulerauto_cons_calc_reconstruct_1);
+  CCTK_ENDLOOP3(eulerauto_cons_calc_reconstruct_1);
 }
 
 extern "C" void eulerauto_cons_calc_reconstruct_1(CCTK_ARGUMENTS)
@@ -207,12 +205,20 @@ extern "C" void eulerauto_cons_calc_reconstruct_1(CCTK_ARGUMENTS)
     return;
   }
   
-  const char *groups[] = {"EulerAuto::p_group","EulerAuto::p_lr_group","EulerAuto::rho_group","EulerAuto::rho_lr_group","EulerAuto::v1_lr_group","EulerAuto::v2_lr_group","EulerAuto::v3_lr_group","EulerAuto::v_group"};
+  const char *const groups[] = {
+    "EulerAuto::p_group",
+    "EulerAuto::p_lr_group",
+    "EulerAuto::rho_group",
+    "EulerAuto::rho_lr_group",
+    "EulerAuto::v1_lr_group",
+    "EulerAuto::v2_lr_group",
+    "EulerAuto::v3_lr_group",
+    "EulerAuto::v_group"};
   GenericFD_AssertGroupStorage(cctkGH, "eulerauto_cons_calc_reconstruct_1", 8, groups);
   
   GenericFD_EnsureStencilFits(cctkGH, "eulerauto_cons_calc_reconstruct_1", 1, 1, 1);
   
-  GenericFD_LoopOverInterior(cctkGH, &eulerauto_cons_calc_reconstruct_1_Body);
+  GenericFD_LoopOverInterior(cctkGH, eulerauto_cons_calc_reconstruct_1_Body);
   
   if (verbose > 1)
   {
diff --git a/Examples/EulerAuto/src/eulerauto_cons_calc_reconstruct_2.cc b/Examples/EulerAuto/src/eulerauto_cons_calc_reconstruct_2.cc
index 34b7f55..f47b0d7 100644
--- a/Examples/EulerAuto/src/eulerauto_cons_calc_reconstruct_2.cc
+++ b/Examples/EulerAuto/src/eulerauto_cons_calc_reconstruct_2.cc
@@ -17,10 +17,10 @@
 
 /* Define macros used in calculations */
 #define INITVALUE (42)
-#define QAD(x) (SQR(SQR(x)))
-#define INV(x) ((1.0) / (x))
+#define INV(x) ((CCTK_REAL)1.0 / (x))
 #define SQR(x) ((x) * (x))
-#define CUB(x) ((x) * (x) * (x))
+#define CUB(x) ((x) * SQR(x))
+#define QAD(x) (SQR(SQR(x)))
 
 extern "C" void eulerauto_cons_calc_reconstruct_2_SelectBCs(CCTK_ARGUMENTS)
 {
@@ -52,8 +52,6 @@ static void eulerauto_cons_calc_reconstruct_2_Body(cGH const * restrict const cc
   DECLARE_CCTK_PARAMETERS;
   
   
-  /* Declare finite differencing variables */
-  
   /* Include user-supplied include files */
   
   /* Initialise finite differencing variables */
@@ -96,9 +94,9 @@ static void eulerauto_cons_calc_reconstruct_2_Body(cGH const * restrict const cc
   
   /* Loop over the grid points */
   #pragma omp parallel
-  CCTK_LOOP3 (eulerauto_cons_calc_reconstruct_2,
+  CCTK_LOOP3(eulerauto_cons_calc_reconstruct_2,
     i,j,k, imin[0],imin[1],imin[2], imax[0],imax[1],imax[2],
-    cctk_lsh[0],cctk_lsh[1],cctk_lsh[2])
+    cctk_ash[0],cctk_ash[1],cctk_ash[2])
   {
     ptrdiff_t const index = di*i + dj*j + dk*k;
     
@@ -188,7 +186,7 @@ static void eulerauto_cons_calc_reconstruct_2_Body(cGH const * restrict const cc
     v3Left[index] = v3LeftL;
     v3Right[index] = v3RightL;
   }
-  CCTK_ENDLOOP3 (eulerauto_cons_calc_reconstruct_2);
+  CCTK_ENDLOOP3(eulerauto_cons_calc_reconstruct_2);
 }
 
 extern "C" void eulerauto_cons_calc_reconstruct_2(CCTK_ARGUMENTS)
@@ -207,12 +205,20 @@ extern "C" void eulerauto_cons_calc_reconstruct_2(CCTK_ARGUMENTS)
     return;
   }
   
-  const char *groups[] = {"EulerAuto::p_group","EulerAuto::p_lr_group","EulerAuto::rho_group","EulerAuto::rho_lr_group","EulerAuto::v1_lr_group","EulerAuto::v2_lr_group","EulerAuto::v3_lr_group","EulerAuto::v_group"};
+  const char *const groups[] = {
+    "EulerAuto::p_group",
+    "EulerAuto::p_lr_group",
+    "EulerAuto::rho_group",
+    "EulerAuto::rho_lr_group",
+    "EulerAuto::v1_lr_group",
+    "EulerAuto::v2_lr_group",
+    "EulerAuto::v3_lr_group",
+    "EulerAuto::v_group"};
   GenericFD_AssertGroupStorage(cctkGH, "eulerauto_cons_calc_reconstruct_2", 8, groups);
   
   GenericFD_EnsureStencilFits(cctkGH, "eulerauto_cons_calc_reconstruct_2", 1, 1, 1);
   
-  GenericFD_LoopOverInterior(cctkGH, &eulerauto_cons_calc_reconstruct_2_Body);
+  GenericFD_LoopOverInterior(cctkGH, eulerauto_cons_calc_reconstruct_2_Body);
   
   if (verbose > 1)
   {
diff --git a/Examples/EulerAuto/src/eulerauto_cons_calc_reconstruct_3.cc b/Examples/EulerAuto/src/eulerauto_cons_calc_reconstruct_3.cc
index 5481fba..3075063 100644
--- a/Examples/EulerAuto/src/eulerauto_cons_calc_reconstruct_3.cc
+++ b/Examples/EulerAuto/src/eulerauto_cons_calc_reconstruct_3.cc
@@ -17,10 +17,10 @@
 
 /* Define macros used in calculations */
 #define INITVALUE (42)
-#define QAD(x) (SQR(SQR(x)))
-#define INV(x) ((1.0) / (x))
+#define INV(x) ((CCTK_REAL)1.0 / (x))
 #define SQR(x) ((x) * (x))
-#define CUB(x) ((x) * (x) * (x))
+#define CUB(x) ((x) * SQR(x))
+#define QAD(x) (SQR(SQR(x)))
 
 extern "C" void eulerauto_cons_calc_reconstruct_3_SelectBCs(CCTK_ARGUMENTS)
 {
@@ -52,8 +52,6 @@ static void eulerauto_cons_calc_reconstruct_3_Body(cGH const * restrict const cc
   DECLARE_CCTK_PARAMETERS;
   
   
-  /* Declare finite differencing variables */
-  
   /* Include user-supplied include files */
   
   /* Initialise finite differencing variables */
@@ -96,9 +94,9 @@ static void eulerauto_cons_calc_reconstruct_3_Body(cGH const * restrict const cc
   
   /* Loop over the grid points */
   #pragma omp parallel
-  CCTK_LOOP3 (eulerauto_cons_calc_reconstruct_3,
+  CCTK_LOOP3(eulerauto_cons_calc_reconstruct_3,
     i,j,k, imin[0],imin[1],imin[2], imax[0],imax[1],imax[2],
-    cctk_lsh[0],cctk_lsh[1],cctk_lsh[2])
+    cctk_ash[0],cctk_ash[1],cctk_ash[2])
   {
     ptrdiff_t const index = di*i + dj*j + dk*k;
     
@@ -188,7 +186,7 @@ static void eulerauto_cons_calc_reconstruct_3_Body(cGH const * restrict const cc
     v3Left[index] = v3LeftL;
     v3Right[index] = v3RightL;
   }
-  CCTK_ENDLOOP3 (eulerauto_cons_calc_reconstruct_3);
+  CCTK_ENDLOOP3(eulerauto_cons_calc_reconstruct_3);
 }
 
 extern "C" void eulerauto_cons_calc_reconstruct_3(CCTK_ARGUMENTS)
@@ -207,12 +205,20 @@ extern "C" void eulerauto_cons_calc_reconstruct_3(CCTK_ARGUMENTS)
     return;
   }
   
-  const char *groups[] = {"EulerAuto::p_group","EulerAuto::p_lr_group","EulerAuto::rho_group","EulerAuto::rho_lr_group","EulerAuto::v1_lr_group","EulerAuto::v2_lr_group","EulerAuto::v3_lr_group","EulerAuto::v_group"};
+  const char *const groups[] = {
+    "EulerAuto::p_group",
+    "EulerAuto::p_lr_group",
+    "EulerAuto::rho_group",
+    "EulerAuto::rho_lr_group",
+    "EulerAuto::v1_lr_group",
+    "EulerAuto::v2_lr_group",
+    "EulerAuto::v3_lr_group",
+    "EulerAuto::v_group"};
   GenericFD_AssertGroupStorage(cctkGH, "eulerauto_cons_calc_reconstruct_3", 8, groups);
   
   GenericFD_EnsureStencilFits(cctkGH, "eulerauto_cons_calc_reconstruct_3", 1, 1, 1);
   
-  GenericFD_LoopOverInterior(cctkGH, &eulerauto_cons_calc_reconstruct_3_Body);
+  GenericFD_LoopOverInterior(cctkGH, eulerauto_cons_calc_reconstruct_3_Body);
   
   if (verbose > 1)
   {
diff --git a/Examples/EulerAuto/src/eulerauto_cons_calc_rhs_1.cc b/Examples/EulerAuto/src/eulerauto_cons_calc_rhs_1.cc
index 5f38d60..5f1e9ed 100644
--- a/Examples/EulerAuto/src/eulerauto_cons_calc_rhs_1.cc
+++ b/Examples/EulerAuto/src/eulerauto_cons_calc_rhs_1.cc
@@ -17,10 +17,10 @@
 
 /* Define macros used in calculations */
 #define INITVALUE (42)
-#define QAD(x) (SQR(SQR(x)))
-#define INV(x) ((1.0) / (x))
+#define INV(x) ((CCTK_REAL)1.0 / (x))
 #define SQR(x) ((x) * (x))
-#define CUB(x) ((x) * (x) * (x))
+#define CUB(x) ((x) * SQR(x))
+#define QAD(x) (SQR(SQR(x)))
 
 extern "C" void eulerauto_cons_calc_rhs_1_SelectBCs(CCTK_ARGUMENTS)
 {
@@ -46,8 +46,6 @@ static void eulerauto_cons_calc_rhs_1_Body(cGH const * restrict const cctkGH, in
   DECLARE_CCTK_PARAMETERS;
   
   
-  /* Declare finite differencing variables */
-  
   /* Include user-supplied include files */
   
   /* Initialise finite differencing variables */
@@ -90,9 +88,9 @@ static void eulerauto_cons_calc_rhs_1_Body(cGH const * restrict const cctkGH, in
   
   /* Loop over the grid points */
   #pragma omp parallel
-  CCTK_LOOP3 (eulerauto_cons_calc_rhs_1,
+  CCTK_LOOP3(eulerauto_cons_calc_rhs_1,
     i,j,k, imin[0],imin[1],imin[2], imax[0],imax[1],imax[2],
-    cctk_lsh[0],cctk_lsh[1],cctk_lsh[2])
+    cctk_ash[0],cctk_ash[1],cctk_ash[2])
   {
     ptrdiff_t const index = di*i + dj*j + dk*k;
     
@@ -137,7 +135,7 @@ static void eulerauto_cons_calc_rhs_1_Body(cGH const * restrict const cctkGH, in
     S2rhs[index] = S2rhsL;
     S3rhs[index] = S3rhsL;
   }
-  CCTK_ENDLOOP3 (eulerauto_cons_calc_rhs_1);
+  CCTK_ENDLOOP3(eulerauto_cons_calc_rhs_1);
 }
 
 extern "C" void eulerauto_cons_calc_rhs_1(CCTK_ARGUMENTS)
@@ -156,12 +154,20 @@ extern "C" void eulerauto_cons_calc_rhs_1(CCTK_ARGUMENTS)
     return;
   }
   
-  const char *groups[] = {"EulerAuto::Den_flux_group","EulerAuto::Den_grouprhs","EulerAuto::En_flux_group","EulerAuto::En_grouprhs","EulerAuto::S1_flux_group","EulerAuto::S2_flux_group","EulerAuto::S3_flux_group","EulerAuto::S_grouprhs"};
+  const char *const groups[] = {
+    "EulerAuto::Den_flux_group",
+    "EulerAuto::Den_grouprhs",
+    "EulerAuto::En_flux_group",
+    "EulerAuto::En_grouprhs",
+    "EulerAuto::S1_flux_group",
+    "EulerAuto::S2_flux_group",
+    "EulerAuto::S3_flux_group",
+    "EulerAuto::S_grouprhs"};
   GenericFD_AssertGroupStorage(cctkGH, "eulerauto_cons_calc_rhs_1", 8, groups);
   
   GenericFD_EnsureStencilFits(cctkGH, "eulerauto_cons_calc_rhs_1", 1, 1, 1);
   
-  GenericFD_LoopOverInterior(cctkGH, &eulerauto_cons_calc_rhs_1_Body);
+  GenericFD_LoopOverInterior(cctkGH, eulerauto_cons_calc_rhs_1_Body);
   
   if (verbose > 1)
   {
diff --git a/Examples/EulerAuto/src/eulerauto_cons_calc_rhs_2.cc b/Examples/EulerAuto/src/eulerauto_cons_calc_rhs_2.cc
index c4859bc..796a85b 100644
--- a/Examples/EulerAuto/src/eulerauto_cons_calc_rhs_2.cc
+++ b/Examples/EulerAuto/src/eulerauto_cons_calc_rhs_2.cc
@@ -17,10 +17,10 @@
 
 /* Define macros used in calculations */
 #define INITVALUE (42)
-#define QAD(x) (SQR(SQR(x)))
-#define INV(x) ((1.0) / (x))
+#define INV(x) ((CCTK_REAL)1.0 / (x))
 #define SQR(x) ((x) * (x))
-#define CUB(x) ((x) * (x) * (x))
+#define CUB(x) ((x) * SQR(x))
+#define QAD(x) (SQR(SQR(x)))
 
 extern "C" void eulerauto_cons_calc_rhs_2_SelectBCs(CCTK_ARGUMENTS)
 {
@@ -46,8 +46,6 @@ static void eulerauto_cons_calc_rhs_2_Body(cGH const * restrict const cctkGH, in
   DECLARE_CCTK_PARAMETERS;
   
   
-  /* Declare finite differencing variables */
-  
   /* Include user-supplied include files */
   
   /* Initialise finite differencing variables */
@@ -90,9 +88,9 @@ static void eulerauto_cons_calc_rhs_2_Body(cGH const * restrict const cctkGH, in
   
   /* Loop over the grid points */
   #pragma omp parallel
-  CCTK_LOOP3 (eulerauto_cons_calc_rhs_2,
+  CCTK_LOOP3(eulerauto_cons_calc_rhs_2,
     i,j,k, imin[0],imin[1],imin[2], imax[0],imax[1],imax[2],
-    cctk_lsh[0],cctk_lsh[1],cctk_lsh[2])
+    cctk_ash[0],cctk_ash[1],cctk_ash[2])
   {
     ptrdiff_t const index = di*i + dj*j + dk*k;
     
@@ -137,7 +135,7 @@ static void eulerauto_cons_calc_rhs_2_Body(cGH const * restrict const cctkGH, in
     S2rhs[index] = S2rhsL;
     S3rhs[index] = S3rhsL;
   }
-  CCTK_ENDLOOP3 (eulerauto_cons_calc_rhs_2);
+  CCTK_ENDLOOP3(eulerauto_cons_calc_rhs_2);
 }
 
 extern "C" void eulerauto_cons_calc_rhs_2(CCTK_ARGUMENTS)
@@ -156,12 +154,20 @@ extern "C" void eulerauto_cons_calc_rhs_2(CCTK_ARGUMENTS)
     return;
   }
   
-  const char *groups[] = {"EulerAuto::Den_flux_group","EulerAuto::Den_grouprhs","EulerAuto::En_flux_group","EulerAuto::En_grouprhs","EulerAuto::S1_flux_group","EulerAuto::S2_flux_group","EulerAuto::S3_flux_group","EulerAuto::S_grouprhs"};
+  const char *const groups[] = {
+    "EulerAuto::Den_flux_group",
+    "EulerAuto::Den_grouprhs",
+    "EulerAuto::En_flux_group",
+    "EulerAuto::En_grouprhs",
+    "EulerAuto::S1_flux_group",
+    "EulerAuto::S2_flux_group",
+    "EulerAuto::S3_flux_group",
+    "EulerAuto::S_grouprhs"};
   GenericFD_AssertGroupStorage(cctkGH, "eulerauto_cons_calc_rhs_2", 8, groups);
   
   GenericFD_EnsureStencilFits(cctkGH, "eulerauto_cons_calc_rhs_2", 1, 1, 1);
   
-  GenericFD_LoopOverInterior(cctkGH, &eulerauto_cons_calc_rhs_2_Body);
+  GenericFD_LoopOverInterior(cctkGH, eulerauto_cons_calc_rhs_2_Body);
   
   if (verbose > 1)
   {
diff --git a/Examples/EulerAuto/src/eulerauto_cons_calc_rhs_3.cc b/Examples/EulerAuto/src/eulerauto_cons_calc_rhs_3.cc
index 0ce65f6..3aca46c 100644
--- a/Examples/EulerAuto/src/eulerauto_cons_calc_rhs_3.cc
+++ b/Examples/EulerAuto/src/eulerauto_cons_calc_rhs_3.cc
@@ -17,10 +17,10 @@
 
 /* Define macros used in calculations */
 #define INITVALUE (42)
-#define QAD(x) (SQR(SQR(x)))
-#define INV(x) ((1.0) / (x))
+#define INV(x) ((CCTK_REAL)1.0 / (x))
 #define SQR(x) ((x) * (x))
-#define CUB(x) ((x) * (x) * (x))
+#define CUB(x) ((x) * SQR(x))
+#define QAD(x) (SQR(SQR(x)))
 
 extern "C" void eulerauto_cons_calc_rhs_3_SelectBCs(CCTK_ARGUMENTS)
 {
@@ -46,8 +46,6 @@ static void eulerauto_cons_calc_rhs_3_Body(cGH const * restrict const cctkGH, in
   DECLARE_CCTK_PARAMETERS;
   
   
-  /* Declare finite differencing variables */
-  
   /* Include user-supplied include files */
   
   /* Initialise finite differencing variables */
@@ -90,9 +88,9 @@ static void eulerauto_cons_calc_rhs_3_Body(cGH const * restrict const cctkGH, in
   
   /* Loop over the grid points */
   #pragma omp parallel
-  CCTK_LOOP3 (eulerauto_cons_calc_rhs_3,
+  CCTK_LOOP3(eulerauto_cons_calc_rhs_3,
     i,j,k, imin[0],imin[1],imin[2], imax[0],imax[1],imax[2],
-    cctk_lsh[0],cctk_lsh[1],cctk_lsh[2])
+    cctk_ash[0],cctk_ash[1],cctk_ash[2])
   {
     ptrdiff_t const index = di*i + dj*j + dk*k;
     
@@ -137,7 +135,7 @@ static void eulerauto_cons_calc_rhs_3_Body(cGH const * restrict const cctkGH, in
     S2rhs[index] = S2rhsL;
     S3rhs[index] = S3rhsL;
   }
-  CCTK_ENDLOOP3 (eulerauto_cons_calc_rhs_3);
+  CCTK_ENDLOOP3(eulerauto_cons_calc_rhs_3);
 }
 
 extern "C" void eulerauto_cons_calc_rhs_3(CCTK_ARGUMENTS)
@@ -156,12 +154,20 @@ extern "C" void eulerauto_cons_calc_rhs_3(CCTK_ARGUMENTS)
     return;
   }
   
-  const char *groups[] = {"EulerAuto::Den_flux_group","EulerAuto::Den_grouprhs","EulerAuto::En_flux_group","EulerAuto::En_grouprhs","EulerAuto::S1_flux_group","EulerAuto::S2_flux_group","EulerAuto::S3_flux_group","EulerAuto::S_grouprhs"};
+  const char *const groups[] = {
+    "EulerAuto::Den_flux_group",
+    "EulerAuto::Den_grouprhs",
+    "EulerAuto::En_flux_group",
+    "EulerAuto::En_grouprhs",
+    "EulerAuto::S1_flux_group",
+    "EulerAuto::S2_flux_group",
+    "EulerAuto::S3_flux_group",
+    "EulerAuto::S_grouprhs"};
   GenericFD_AssertGroupStorage(cctkGH, "eulerauto_cons_calc_rhs_3", 8, groups);
   
   GenericFD_EnsureStencilFits(cctkGH, "eulerauto_cons_calc_rhs_3", 1, 1, 1);
   
-  GenericFD_LoopOverInterior(cctkGH, &eulerauto_cons_calc_rhs_3_Body);
+  GenericFD_LoopOverInterior(cctkGH, eulerauto_cons_calc_rhs_3_Body);
   
   if (verbose > 1)
   {
diff --git a/Examples/EulerAuto/src/eulerauto_cons_calc_zero_rhs.cc b/Examples/EulerAuto/src/eulerauto_cons_calc_zero_rhs.cc
index 5418435..267d6c6 100644
--- a/Examples/EulerAuto/src/eulerauto_cons_calc_zero_rhs.cc
+++ b/Examples/EulerAuto/src/eulerauto_cons_calc_zero_rhs.cc
@@ -17,10 +17,10 @@
 
 /* Define macros used in calculations */
 #define INITVALUE (42)
-#define QAD(x) (SQR(SQR(x)))
-#define INV(x) ((1.0) / (x))
+#define INV(x) ((CCTK_REAL)1.0 / (x))
 #define SQR(x) ((x) * (x))
-#define CUB(x) ((x) * (x) * (x))
+#define CUB(x) ((x) * SQR(x))
+#define QAD(x) (SQR(SQR(x)))
 
 static void eulerauto_cons_calc_zero_rhs_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[])
 {
@@ -28,8 +28,6 @@ static void eulerauto_cons_calc_zero_rhs_Body(cGH const * restrict const cctkGH,
   DECLARE_CCTK_PARAMETERS;
   
   
-  /* Declare finite differencing variables */
-  
   /* Include user-supplied include files */
   
   /* Initialise finite differencing variables */
@@ -72,9 +70,9 @@ static void eulerauto_cons_calc_zero_rhs_Body(cGH const * restrict const cctkGH,
   
   /* Loop over the grid points */
   #pragma omp parallel
-  CCTK_LOOP3 (eulerauto_cons_calc_zero_rhs,
+  CCTK_LOOP3(eulerauto_cons_calc_zero_rhs,
     i,j,k, imin[0],imin[1],imin[2], imax[0],imax[1],imax[2],
-    cctk_lsh[0],cctk_lsh[1],cctk_lsh[2])
+    cctk_ash[0],cctk_ash[1],cctk_ash[2])
   {
     ptrdiff_t const index = di*i + dj*j + dk*k;
     
@@ -124,7 +122,7 @@ static void eulerauto_cons_calc_zero_rhs_Body(cGH const * restrict const cctkGH,
     S2rhs[index] = S2rhsL;
     S3rhs[index] = S3rhsL;
   }
-  CCTK_ENDLOOP3 (eulerauto_cons_calc_zero_rhs);
+  CCTK_ENDLOOP3(eulerauto_cons_calc_zero_rhs);
 }
 
 extern "C" void eulerauto_cons_calc_zero_rhs(CCTK_ARGUMENTS)
@@ -143,11 +141,14 @@ extern "C" void eulerauto_cons_calc_zero_rhs(CCTK_ARGUMENTS)
     return;
   }
   
-  const char *groups[] = {"EulerAuto::Den_grouprhs","EulerAuto::En_grouprhs","EulerAuto::S_grouprhs"};
+  const char *const groups[] = {
+    "EulerAuto::Den_grouprhs",
+    "EulerAuto::En_grouprhs",
+    "EulerAuto::S_grouprhs"};
   GenericFD_AssertGroupStorage(cctkGH, "eulerauto_cons_calc_zero_rhs", 3, groups);
   
   
-  GenericFD_LoopOverEverything(cctkGH, &eulerauto_cons_calc_zero_rhs_Body);
+  GenericFD_LoopOverEverything(cctkGH, eulerauto_cons_calc_zero_rhs_Body);
   
   if (verbose > 1)
   {
diff --git a/Examples/EulerAuto/src/eulerauto_initial_shock.cc b/Examples/EulerAuto/src/eulerauto_initial_shock.cc
index ea1b342..3becd2f 100644
--- a/Examples/EulerAuto/src/eulerauto_initial_shock.cc
+++ b/Examples/EulerAuto/src/eulerauto_initial_shock.cc
@@ -17,10 +17,10 @@
 
 /* Define macros used in calculations */
 #define INITVALUE (42)
-#define QAD(x) (SQR(SQR(x)))
-#define INV(x) ((1.0) / (x))
+#define INV(x) ((CCTK_REAL)1.0 / (x))
 #define SQR(x) ((x) * (x))
-#define CUB(x) ((x) * (x) * (x))
+#define CUB(x) ((x) * SQR(x))
+#define QAD(x) (SQR(SQR(x)))
 
 static void eulerauto_initial_shock_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[])
 {
@@ -28,8 +28,6 @@ static void eulerauto_initial_shock_Body(cGH const * restrict const cctkGH, int
   DECLARE_CCTK_PARAMETERS;
   
   
-  /* Declare finite differencing variables */
-  
   /* Include user-supplied include files */
   
   /* Initialise finite differencing variables */
@@ -72,9 +70,9 @@ static void eulerauto_initial_shock_Body(cGH const * restrict const cctkGH, int
   
   /* Loop over the grid points */
   #pragma omp parallel
-  CCTK_LOOP3 (eulerauto_initial_shock,
+  CCTK_LOOP3(eulerauto_initial_shock,
     i,j,k, imin[0],imin[1],imin[2], imax[0],imax[1],imax[2],
-    cctk_lsh[0],cctk_lsh[1],cctk_lsh[2])
+    cctk_ash[0],cctk_ash[1],cctk_ash[2])
   {
     ptrdiff_t const index = di*i + dj*j + dk*k;
     
@@ -108,7 +106,7 @@ static void eulerauto_initial_shock_Body(cGH const * restrict const cctkGH, int
     v2[index] = v2L;
     v3[index] = v3L;
   }
-  CCTK_ENDLOOP3 (eulerauto_initial_shock);
+  CCTK_ENDLOOP3(eulerauto_initial_shock);
 }
 
 extern "C" void eulerauto_initial_shock(CCTK_ARGUMENTS)
@@ -127,11 +125,15 @@ extern "C" void eulerauto_initial_shock(CCTK_ARGUMENTS)
     return;
   }
   
-  const char *groups[] = {"grid::coordinates","EulerAuto::p_group","EulerAuto::rho_group","EulerAuto::v_group"};
+  const char *const groups[] = {
+    "grid::coordinates",
+    "EulerAuto::p_group",
+    "EulerAuto::rho_group",
+    "EulerAuto::v_group"};
   GenericFD_AssertGroupStorage(cctkGH, "eulerauto_initial_shock", 4, groups);
   
   
-  GenericFD_LoopOverEverything(cctkGH, &eulerauto_initial_shock_Body);
+  GenericFD_LoopOverEverything(cctkGH, eulerauto_initial_shock_Body);
   
   if (verbose > 1)
   {
diff --git a/Examples/EulerAuto/src/make.code.defn b/Examples/EulerAuto/src/make.code.defn
index 0e17ddb..c79c855 100644
--- a/Examples/EulerAuto/src/make.code.defn
+++ b/Examples/EulerAuto/src/make.code.defn
@@ -1,3 +1,3 @@
 # File produced by Kranc
 
-SRCS = Startup.cc RegisterMoL.cc RegisterSymmetries.cc eulerauto_initial_shock.cc eulerauto_cons_calc_zero_rhs.cc eulerauto_cons_calc_conserved.cc eulerauto_cons_calc_primitives.cc eulerauto_cons_calc_reconstruct_1.cc eulerauto_cons_calc_intercell_conserved_1.cc eulerauto_cons_calc_flux_1.cc eulerauto_cons_calc_rhs_1.cc eulerauto_cons_calc_reconstruct_2.cc eulerauto_cons_calc_intercell_conserved_2.cc eulerauto_cons_calc_flux_2.cc eulerauto_cons_calc_rhs_2.cc eulerauto_cons_calc_reconstruct_3.cc eulerauto_cons_calc_intercell_conserved_3.cc eulerauto_cons_calc_flux_3.cc eulerauto_cons_calc_rhs_3.cc Boundaries.cc 
+SRCS = Startup.cc RegisterSymmetries.cc RegisterMoL.cc eulerauto_initial_shock.cc eulerauto_cons_calc_zero_rhs.cc eulerauto_cons_calc_conserved.cc eulerauto_cons_calc_primitives.cc eulerauto_cons_calc_reconstruct_1.cc eulerauto_cons_calc_intercell_conserved_1.cc eulerauto_cons_calc_flux_1.cc eulerauto_cons_calc_rhs_1.cc eulerauto_cons_calc_reconstruct_2.cc eulerauto_cons_calc_intercell_conserved_2.cc eulerauto_cons_calc_flux_2.cc eulerauto_cons_calc_rhs_2.cc eulerauto_cons_calc_reconstruct_3.cc eulerauto_cons_calc_intercell_conserved_3.cc eulerauto_cons_calc_flux_3.cc eulerauto_cons_calc_rhs_3.cc Boundaries.cc