Regenerate examples

8 files changed, 107 insertions, 106 deletions

diff --git a/Examples/SimpleWaveOpenCL/interface.ccl b/Examples/SimpleWaveOpenCL/interface.ccl
index 2c987ce..3484dcf 100644
--- a/Examples/SimpleWaveOpenCL/interface.ccl
+++ b/Examples/SimpleWaveOpenCL/interface.ccl
@@ -36,7 +36,7 @@ CCTK_REAL evolved_group type=GF timelevels=3 tags=''
 } "evolved_group"
 
 public:
-CCTK_REAL evolved_grouprhs type=GF timelevels=3 tags=''
+CCTK_REAL evolved_grouprhs type=GF timelevels=3 tags='Prolongation="None"'
 {
   phirhs,
   pirhs
diff --git a/Examples/SimpleWaveOpenCL/schedule.ccl b/Examples/SimpleWaveOpenCL/schedule.ccl
index ec20325..40ee42f 100644
--- a/Examples/SimpleWaveOpenCL/schedule.ccl
+++ b/Examples/SimpleWaveOpenCL/schedule.ccl
@@ -43,19 +43,19 @@ schedule initial_sine AT INITIAL
 {
   LANG: C
   TAGS: Device=1
-  READS:    grid::x
-  WRITES:   SimpleWaveOpenCL::phi
-  WRITES:   SimpleWaveOpenCL::pi
+  READS:    grid::x(Everywhere)
+  WRITES:   SimpleWaveOpenCL::phi(Everywhere)
+  WRITES:   SimpleWaveOpenCL::pi(Everywhere)
 } "initial_sine"
 
 schedule calc_rhs in MoL_CalcRHS
 {
   LANG: C
   TAGS: Device=1
-  READS:    SimpleWaveOpenCL::phi
-  READS:    SimpleWaveOpenCL::pi
-  WRITES:   SimpleWaveOpenCL::phirhs
-  WRITES:   SimpleWaveOpenCL::pirhs
+  READS:    SimpleWaveOpenCL::phi(Everywhere)
+  READS:    SimpleWaveOpenCL::pi(Everywhere)
+  WRITES:   SimpleWaveOpenCL::phirhs(Interior)
+  WRITES:   SimpleWaveOpenCL::pirhs(Interior)
 } "calc_rhs"
 
 schedule SimpleWaveOpenCL_SelectBoundConds in MoL_PostStep
@@ -79,5 +79,4 @@ schedule SimpleWaveOpenCL_RegisterVars in MoL_Register
 
 schedule group ApplyBCs as SimpleWaveOpenCL_ApplyBCs in MoL_PostStep after SimpleWaveOpenCL_SelectBoundConds
 {
-  # no language specified
 } "Apply boundary conditions controlled by thorn Boundary"
diff --git a/Examples/SimpleWaveOpenCL/src/Boundaries.cc b/Examples/SimpleWaveOpenCL/src/Boundaries.cc
index fc19996..6cec1b7 100644
--- a/Examples/SimpleWaveOpenCL/src/Boundaries.cc
+++ b/Examples/SimpleWaveOpenCL/src/Boundaries.cc
@@ -30,7 +30,7 @@ extern "C" void SimpleWaveOpenCL_SelectBoundConds(CCTK_ARGUMENTS)
   DECLARE_CCTK_ARGUMENTS;
   DECLARE_CCTK_PARAMETERS;
   
-  CCTK_INT ierr = 0;
+  CCTK_INT ierr CCTK_ATTRIBUTE_UNUSED  = 0;
   
   if (CCTK_EQUALS(evolved_group_bound, "none"  ) ||
       CCTK_EQUALS(evolved_group_bound, "static") ||
@@ -68,7 +68,7 @@ extern "C" void SimpleWaveOpenCL_SelectBoundConds(CCTK_ARGUMENTS)
   if (CCTK_EQUALS(evolved_group_bound, "radiative"))
   {
    /* select radiation boundary condition */
-    static CCTK_INT handle_evolved_group_bound = -1;
+    static CCTK_INT handle_evolved_group_bound CCTK_ATTRIBUTE_UNUSED  = -1;
     if (handle_evolved_group_bound < 0) handle_evolved_group_bound = Util_TableCreate(UTIL_TABLE_FLAGS_CASE_INSENSITIVE);
     if (handle_evolved_group_bound < 0) CCTK_WARN(0, "could not create table!");
     if (Util_TableSetReal(handle_evolved_group_bound , evolved_group_bound_limit, "LIMIT") < 0)
@@ -87,7 +87,7 @@ extern "C" void SimpleWaveOpenCL_SelectBoundConds(CCTK_ARGUMENTS)
   if (CCTK_EQUALS(phi_bound, "radiative"))
   {
    /* select radiation boundary condition */
-    static CCTK_INT handle_phi_bound = -1;
+    static CCTK_INT handle_phi_bound CCTK_ATTRIBUTE_UNUSED  = -1;
     if (handle_phi_bound < 0) handle_phi_bound = Util_TableCreate(UTIL_TABLE_FLAGS_CASE_INSENSITIVE);
     if (handle_phi_bound < 0) CCTK_WARN(0, "could not create table!");
     if (Util_TableSetReal(handle_phi_bound , phi_bound_limit, "LIMIT") < 0)
@@ -106,7 +106,7 @@ extern "C" void SimpleWaveOpenCL_SelectBoundConds(CCTK_ARGUMENTS)
   if (CCTK_EQUALS(pi_bound, "radiative"))
   {
    /* select radiation boundary condition */
-    static CCTK_INT handle_pi_bound = -1;
+    static CCTK_INT handle_pi_bound CCTK_ATTRIBUTE_UNUSED  = -1;
     if (handle_pi_bound < 0) handle_pi_bound = Util_TableCreate(UTIL_TABLE_FLAGS_CASE_INSENSITIVE);
     if (handle_pi_bound < 0) CCTK_WARN(0, "could not create table!");
     if (Util_TableSetReal(handle_pi_bound , pi_bound_limit, "LIMIT") < 0)
@@ -125,7 +125,7 @@ extern "C" void SimpleWaveOpenCL_SelectBoundConds(CCTK_ARGUMENTS)
   if (CCTK_EQUALS(evolved_group_bound, "scalar"))
   {
    /* select scalar boundary condition */
-    static CCTK_INT handle_evolved_group_bound = -1;
+    static CCTK_INT handle_evolved_group_bound CCTK_ATTRIBUTE_UNUSED  = -1;
     if (handle_evolved_group_bound < 0) handle_evolved_group_bound = Util_TableCreate(UTIL_TABLE_FLAGS_CASE_INSENSITIVE);
     if (handle_evolved_group_bound < 0) CCTK_WARN(0, "could not create table!");
     if (Util_TableSetReal(handle_evolved_group_bound ,evolved_group_bound_scalar, "SCALAR") < 0)
@@ -142,7 +142,7 @@ extern "C" void SimpleWaveOpenCL_SelectBoundConds(CCTK_ARGUMENTS)
   if (CCTK_EQUALS(phi_bound, "scalar"))
   {
    /* select scalar boundary condition */
-    static CCTK_INT handle_phi_bound = -1;
+    static CCTK_INT handle_phi_bound CCTK_ATTRIBUTE_UNUSED  = -1;
     if (handle_phi_bound < 0) handle_phi_bound = Util_TableCreate(UTIL_TABLE_FLAGS_CASE_INSENSITIVE);
     if (handle_phi_bound < 0) CCTK_WARN(0, "could not create table!");
     if (Util_TableSetReal(handle_phi_bound ,phi_bound_scalar, "SCALAR") < 0)
@@ -159,7 +159,7 @@ extern "C" void SimpleWaveOpenCL_SelectBoundConds(CCTK_ARGUMENTS)
   if (CCTK_EQUALS(pi_bound, "scalar"))
   {
    /* select scalar boundary condition */
-    static CCTK_INT handle_pi_bound = -1;
+    static CCTK_INT handle_pi_bound CCTK_ATTRIBUTE_UNUSED  = -1;
     if (handle_pi_bound < 0) handle_pi_bound = Util_TableCreate(UTIL_TABLE_FLAGS_CASE_INSENSITIVE);
     if (handle_pi_bound < 0) CCTK_WARN(0, "could not create table!");
     if (Util_TableSetReal(handle_pi_bound ,pi_bound_scalar, "SCALAR") < 0)
diff --git a/Examples/SimpleWaveOpenCL/src/Differencing.h b/Examples/SimpleWaveOpenCL/src/Differencing.h
index 7d48129..cc4f473 100644
--- a/Examples/SimpleWaveOpenCL/src/Differencing.h
+++ b/Examples/SimpleWaveOpenCL/src/Differencing.h
@@ -1,73 +1,73 @@
 static char const *const differencing =
 "#ifndef KRANC_DIFF_FUNCTIONS\n"
-"#  define PDstandard2nd1(u) ((-KRANC_GFOFFSET3D(u,-1,0,0) + KRANC_GFOFFSET3D(u,1,0,0))*p1o2dx)\n"
+"#  define PDstandard2nd1(u) ((-1.*KRANC_GFOFFSET3D(u,-1,0,0) + KRANC_GFOFFSET3D(u,1,0,0))*p1o2dx)\n"
 "#else\n"
 "#  define PDstandard2nd1(u) (PDstandard2nd1_impl(u,p1o2dx,cdj,cdk))\n"
 "static CCTK_REAL PDstandard2nd1_impl(CCTK_REAL const* restrict const u, CCTK_REAL const p1o2dx, ptrdiff_t const cdj, ptrdiff_t const cdk) CCTK_ATTRIBUTE_NOINLINE CCTK_ATTRIBUTE_UNUSED;\n"
 "static CCTK_REAL PDstandard2nd1_impl(CCTK_REAL const* restrict const u, CCTK_REAL const p1o2dx, ptrdiff_t const cdj, ptrdiff_t const cdk)\n"
 "{\n"
-"  ptrdiff_t const cdi=sizeof(CCTK_REAL);\n"
-"  return (-KRANC_GFOFFSET3D(u,-1,0,0) + KRANC_GFOFFSET3D(u,1,0,0))*p1o2dx;\n"
+"  ptrdiff_t const cdi CCTK_ATTRIBUTE_UNUSED = sizeof(CCTK_REAL);\n"
+"  return (-1.*KRANC_GFOFFSET3D(u,-1,0,0) + KRANC_GFOFFSET3D(u,1,0,0))*p1o2dx;\n"
 "}\n"
 "#endif\n"
 "\n"
 "#ifndef KRANC_DIFF_FUNCTIONS\n"
-"#  define PDstandard2nd2(u) ((-KRANC_GFOFFSET3D(u,0,-1,0) + KRANC_GFOFFSET3D(u,0,1,0))*p1o2dy)\n"
+"#  define PDstandard2nd2(u) ((-1.*KRANC_GFOFFSET3D(u,0,-1,0) + KRANC_GFOFFSET3D(u,0,1,0))*p1o2dy)\n"
 "#else\n"
 "#  define PDstandard2nd2(u) (PDstandard2nd2_impl(u,p1o2dy,cdj,cdk))\n"
 "static CCTK_REAL PDstandard2nd2_impl(CCTK_REAL const* restrict const u, CCTK_REAL const p1o2dy, ptrdiff_t const cdj, ptrdiff_t const cdk) CCTK_ATTRIBUTE_NOINLINE CCTK_ATTRIBUTE_UNUSED;\n"
 "static CCTK_REAL PDstandard2nd2_impl(CCTK_REAL const* restrict const u, CCTK_REAL const p1o2dy, ptrdiff_t const cdj, ptrdiff_t const cdk)\n"
 "{\n"
-"  ptrdiff_t const cdi=sizeof(CCTK_REAL);\n"
-"  return (-KRANC_GFOFFSET3D(u,0,-1,0) + KRANC_GFOFFSET3D(u,0,1,0))*p1o2dy;\n"
+"  ptrdiff_t const cdi CCTK_ATTRIBUTE_UNUSED = sizeof(CCTK_REAL);\n"
+"  return (-1.*KRANC_GFOFFSET3D(u,0,-1,0) + KRANC_GFOFFSET3D(u,0,1,0))*p1o2dy;\n"
 "}\n"
 "#endif\n"
 "\n"
 "#ifndef KRANC_DIFF_FUNCTIONS\n"
-"#  define PDstandard2nd3(u) ((-KRANC_GFOFFSET3D(u,0,0,-1) + KRANC_GFOFFSET3D(u,0,0,1))*p1o2dz)\n"
+"#  define PDstandard2nd3(u) ((-1.*KRANC_GFOFFSET3D(u,0,0,-1) + KRANC_GFOFFSET3D(u,0,0,1))*p1o2dz)\n"
 "#else\n"
 "#  define PDstandard2nd3(u) (PDstandard2nd3_impl(u,p1o2dz,cdj,cdk))\n"
 "static CCTK_REAL PDstandard2nd3_impl(CCTK_REAL const* restrict const u, CCTK_REAL const p1o2dz, ptrdiff_t const cdj, ptrdiff_t const cdk) CCTK_ATTRIBUTE_NOINLINE CCTK_ATTRIBUTE_UNUSED;\n"
 "static CCTK_REAL PDstandard2nd3_impl(CCTK_REAL const* restrict const u, CCTK_REAL const p1o2dz, ptrdiff_t const cdj, ptrdiff_t const cdk)\n"
 "{\n"
-"  ptrdiff_t const cdi=sizeof(CCTK_REAL);\n"
-"  return (-KRANC_GFOFFSET3D(u,0,0,-1) + KRANC_GFOFFSET3D(u,0,0,1))*p1o2dz;\n"
+"  ptrdiff_t const cdi CCTK_ATTRIBUTE_UNUSED = sizeof(CCTK_REAL);\n"
+"  return (-1.*KRANC_GFOFFSET3D(u,0,0,-1) + KRANC_GFOFFSET3D(u,0,0,1))*p1o2dz;\n"
 "}\n"
 "#endif\n"
 "\n"
 "#ifndef KRANC_DIFF_FUNCTIONS\n"
-"#  define PDstandard2nd11(u) ((-2*KRANC_GFOFFSET3D(u,0,0,0) + KRANC_GFOFFSET3D(u,-1,0,0) + KRANC_GFOFFSET3D(u,1,0,0))*p1odx2)\n"
+"#  define PDstandard2nd11(u) ((-2.*KRANC_GFOFFSET3D(u,0,0,0) + KRANC_GFOFFSET3D(u,-1,0,0) + KRANC_GFOFFSET3D(u,1,0,0))*p1odx2)\n"
 "#else\n"
 "#  define PDstandard2nd11(u) (PDstandard2nd11_impl(u,p1odx2,cdj,cdk))\n"
 "static CCTK_REAL PDstandard2nd11_impl(CCTK_REAL const* restrict const u, CCTK_REAL const p1odx2, ptrdiff_t const cdj, ptrdiff_t const cdk) CCTK_ATTRIBUTE_NOINLINE CCTK_ATTRIBUTE_UNUSED;\n"
 "static CCTK_REAL PDstandard2nd11_impl(CCTK_REAL const* restrict const u, CCTK_REAL const p1odx2, ptrdiff_t const cdj, ptrdiff_t const cdk)\n"
 "{\n"
-"  ptrdiff_t const cdi=sizeof(CCTK_REAL);\n"
-"  return (-2*KRANC_GFOFFSET3D(u,0,0,0) + KRANC_GFOFFSET3D(u,-1,0,0) + KRANC_GFOFFSET3D(u,1,0,0))*p1odx2;\n"
+"  ptrdiff_t const cdi CCTK_ATTRIBUTE_UNUSED = sizeof(CCTK_REAL);\n"
+"  return (-2.*KRANC_GFOFFSET3D(u,0,0,0) + KRANC_GFOFFSET3D(u,-1,0,0) + KRANC_GFOFFSET3D(u,1,0,0))*p1odx2;\n"
 "}\n"
 "#endif\n"
 "\n"
 "#ifndef KRANC_DIFF_FUNCTIONS\n"
-"#  define PDstandard2nd22(u) ((-2*KRANC_GFOFFSET3D(u,0,0,0) + KRANC_GFOFFSET3D(u,0,-1,0) + KRANC_GFOFFSET3D(u,0,1,0))*p1ody2)\n"
+"#  define PDstandard2nd22(u) ((-2.*KRANC_GFOFFSET3D(u,0,0,0) + KRANC_GFOFFSET3D(u,0,-1,0) + KRANC_GFOFFSET3D(u,0,1,0))*p1ody2)\n"
 "#else\n"
 "#  define PDstandard2nd22(u) (PDstandard2nd22_impl(u,p1ody2,cdj,cdk))\n"
 "static CCTK_REAL PDstandard2nd22_impl(CCTK_REAL const* restrict const u, CCTK_REAL const p1ody2, ptrdiff_t const cdj, ptrdiff_t const cdk) CCTK_ATTRIBUTE_NOINLINE CCTK_ATTRIBUTE_UNUSED;\n"
 "static CCTK_REAL PDstandard2nd22_impl(CCTK_REAL const* restrict const u, CCTK_REAL const p1ody2, ptrdiff_t const cdj, ptrdiff_t const cdk)\n"
 "{\n"
-"  ptrdiff_t const cdi=sizeof(CCTK_REAL);\n"
-"  return (-2*KRANC_GFOFFSET3D(u,0,0,0) + KRANC_GFOFFSET3D(u,0,-1,0) + KRANC_GFOFFSET3D(u,0,1,0))*p1ody2;\n"
+"  ptrdiff_t const cdi CCTK_ATTRIBUTE_UNUSED = sizeof(CCTK_REAL);\n"
+"  return (-2.*KRANC_GFOFFSET3D(u,0,0,0) + KRANC_GFOFFSET3D(u,0,-1,0) + KRANC_GFOFFSET3D(u,0,1,0))*p1ody2;\n"
 "}\n"
 "#endif\n"
 "\n"
 "#ifndef KRANC_DIFF_FUNCTIONS\n"
-"#  define PDstandard2nd33(u) ((-2*KRANC_GFOFFSET3D(u,0,0,0) + KRANC_GFOFFSET3D(u,0,0,-1) + KRANC_GFOFFSET3D(u,0,0,1))*p1odz2)\n"
+"#  define PDstandard2nd33(u) ((-2.*KRANC_GFOFFSET3D(u,0,0,0) + KRANC_GFOFFSET3D(u,0,0,-1) + KRANC_GFOFFSET3D(u,0,0,1))*p1odz2)\n"
 "#else\n"
 "#  define PDstandard2nd33(u) (PDstandard2nd33_impl(u,p1odz2,cdj,cdk))\n"
 "static CCTK_REAL PDstandard2nd33_impl(CCTK_REAL const* restrict const u, CCTK_REAL const p1odz2, ptrdiff_t const cdj, ptrdiff_t const cdk) CCTK_ATTRIBUTE_NOINLINE CCTK_ATTRIBUTE_UNUSED;\n"
 "static CCTK_REAL PDstandard2nd33_impl(CCTK_REAL const* restrict const u, CCTK_REAL const p1odz2, ptrdiff_t const cdj, ptrdiff_t const cdk)\n"
 "{\n"
-"  ptrdiff_t const cdi=sizeof(CCTK_REAL);\n"
-"  return (-2*KRANC_GFOFFSET3D(u,0,0,0) + KRANC_GFOFFSET3D(u,0,0,-1) + KRANC_GFOFFSET3D(u,0,0,1))*p1odz2;\n"
+"  ptrdiff_t const cdi CCTK_ATTRIBUTE_UNUSED = sizeof(CCTK_REAL);\n"
+"  return (-2.*KRANC_GFOFFSET3D(u,0,0,0) + KRANC_GFOFFSET3D(u,0,0,-1) + KRANC_GFOFFSET3D(u,0,0,1))*p1odz2;\n"
 "}\n"
 "#endif\n"
 "\n"
diff --git a/Examples/SimpleWaveOpenCL/src/RegisterMoL.cc b/Examples/SimpleWaveOpenCL/src/RegisterMoL.cc
index 7ad8024..d9d2704 100644
--- a/Examples/SimpleWaveOpenCL/src/RegisterMoL.cc
+++ b/Examples/SimpleWaveOpenCL/src/RegisterMoL.cc
@@ -9,7 +9,7 @@ extern "C" void SimpleWaveOpenCL_RegisterVars(CCTK_ARGUMENTS)
   DECLARE_CCTK_ARGUMENTS;
   DECLARE_CCTK_PARAMETERS;
   
-  CCTK_INT ierr = 0;
+  CCTK_INT ierr CCTK_ATTRIBUTE_UNUSED  = 0;
   
   /* Register all the evolved grid functions with MoL */
   ierr += MoLRegisterEvolved(CCTK_VarIndex("SimpleWaveOpenCL::phi"),  CCTK_VarIndex("SimpleWaveOpenCL::phirhs"));
diff --git a/Examples/SimpleWaveOpenCL/src/Startup.cc b/Examples/SimpleWaveOpenCL/src/Startup.cc
index 10e5dbf..842e8fd 100644
--- a/Examples/SimpleWaveOpenCL/src/Startup.cc
+++ b/Examples/SimpleWaveOpenCL/src/Startup.cc
@@ -4,7 +4,7 @@
 
 extern "C" int SimpleWaveOpenCL_Startup(void)
 {
-  const char * banner = "SimpleWaveOpenCL";
+  const char * banner CCTK_ATTRIBUTE_UNUSED  = "SimpleWaveOpenCL";
   CCTK_RegisterBanner(banner);
   return 0;
 }
diff --git a/Examples/SimpleWaveOpenCL/src/calc_rhs.cc b/Examples/SimpleWaveOpenCL/src/calc_rhs.cc
index 0344c0d..b06c19d 100644
--- a/Examples/SimpleWaveOpenCL/src/calc_rhs.cc
+++ b/Examples/SimpleWaveOpenCL/src/calc_rhs.cc
@@ -28,7 +28,7 @@ extern "C" void calc_rhs_SelectBCs(CCTK_ARGUMENTS)
   DECLARE_CCTK_ARGUMENTS;
   DECLARE_CCTK_PARAMETERS;
   
-  CCTK_INT ierr = 0;
+  CCTK_INT ierr CCTK_ATTRIBUTE_UNUSED  = 0;
   ierr = Boundary_SelectGroupForBC(cctkGH, CCTK_ALL_FACES, GenericFD_GetBoundaryWidth(cctkGH), -1 /* no table */, "SimpleWaveOpenCL::evolved_grouprhs","flat");
   if (ierr < 0)
     CCTK_WARN(1, "Failed to register flat BC for SimpleWaveOpenCL::evolved_grouprhs.");
@@ -45,36 +45,36 @@ static void calc_rhs_Body(cGH const * restrict const cctkGH, int const dir, int
   "/* Include user-supplied include files */\n"
   "\n"
   "/* Initialise finite differencing variables */\n"
-  "ptrdiff_t const di = 1;\n"
-  "ptrdiff_t const dj = CCTK_GFINDEX3D(cctkGH,0,1,0) - CCTK_GFINDEX3D(cctkGH,0,0,0);\n"
-  "ptrdiff_t const dk = CCTK_GFINDEX3D(cctkGH,0,0,1) - CCTK_GFINDEX3D(cctkGH,0,0,0);\n"
-  "ptrdiff_t const cdi = sizeof(CCTK_REAL) * di;\n"
-  "ptrdiff_t const cdj = sizeof(CCTK_REAL) * dj;\n"
-  "ptrdiff_t const cdk = sizeof(CCTK_REAL) * dk;\n"
-  "CCTK_REAL const dx = ToReal(CCTK_DELTA_SPACE(0));\n"
-  "CCTK_REAL const dy = ToReal(CCTK_DELTA_SPACE(1));\n"
-  "CCTK_REAL const dz = ToReal(CCTK_DELTA_SPACE(2));\n"
-  "CCTK_REAL const dt = ToReal(CCTK_DELTA_TIME);\n"
-  "CCTK_REAL const t = ToReal(cctk_time);\n"
-  "CCTK_REAL const dxi = INV(dx);\n"
-  "CCTK_REAL const dyi = INV(dy);\n"
-  "CCTK_REAL const dzi = INV(dz);\n"
-  "CCTK_REAL const khalf = 0.5;\n"
-  "CCTK_REAL const kthird = 1/3.0;\n"
-  "CCTK_REAL const ktwothird = 2.0/3.0;\n"
-  "CCTK_REAL const kfourthird = 4.0/3.0;\n"
-  "CCTK_REAL const keightthird = 8.0/3.0;\n"
-  "CCTK_REAL const hdxi = 0.5 * dxi;\n"
-  "CCTK_REAL const hdyi = 0.5 * dyi;\n"
-  "CCTK_REAL const hdzi = 0.5 * dzi;\n"
+  "ptrdiff_t /*const*/ di CCTK_ATTRIBUTE_UNUSED  = 1;\n"
+  "ptrdiff_t /*const*/ dj CCTK_ATTRIBUTE_UNUSED  = CCTK_GFINDEX3D(cctkGH,0,1,0) - CCTK_GFINDEX3D(cctkGH,0,0,0);\n"
+  "ptrdiff_t /*const*/ dk CCTK_ATTRIBUTE_UNUSED  = CCTK_GFINDEX3D(cctkGH,0,0,1) - CCTK_GFINDEX3D(cctkGH,0,0,0);\n"
+  "ptrdiff_t /*const*/ cdi CCTK_ATTRIBUTE_UNUSED  = sizeof(CCTK_REAL) * di;\n"
+  "ptrdiff_t /*const*/ cdj CCTK_ATTRIBUTE_UNUSED  = sizeof(CCTK_REAL) * dj;\n"
+  "ptrdiff_t /*const*/ cdk CCTK_ATTRIBUTE_UNUSED  = sizeof(CCTK_REAL) * dk;\n"
+  "CCTK_REAL /*const*/ dx CCTK_ATTRIBUTE_UNUSED  = ToReal(CCTK_DELTA_SPACE(0));\n"
+  "CCTK_REAL /*const*/ dy CCTK_ATTRIBUTE_UNUSED  = ToReal(CCTK_DELTA_SPACE(1));\n"
+  "CCTK_REAL /*const*/ dz CCTK_ATTRIBUTE_UNUSED  = ToReal(CCTK_DELTA_SPACE(2));\n"
+  "CCTK_REAL /*const*/ dt CCTK_ATTRIBUTE_UNUSED  = ToReal(CCTK_DELTA_TIME);\n"
+  "CCTK_REAL /*const*/ t CCTK_ATTRIBUTE_UNUSED  = ToReal(cctk_time);\n"
+  "CCTK_REAL /*const*/ dxi CCTK_ATTRIBUTE_UNUSED  = INV(dx);\n"
+  "CCTK_REAL /*const*/ dyi CCTK_ATTRIBUTE_UNUSED  = INV(dy);\n"
+  "CCTK_REAL /*const*/ dzi CCTK_ATTRIBUTE_UNUSED  = INV(dz);\n"
+  "CCTK_REAL /*const*/ khalf CCTK_ATTRIBUTE_UNUSED  = 0.5;\n"
+  "CCTK_REAL /*const*/ kthird CCTK_ATTRIBUTE_UNUSED  = 1/3.0;\n"
+  "CCTK_REAL /*const*/ ktwothird CCTK_ATTRIBUTE_UNUSED  = 2.0/3.0;\n"
+  "CCTK_REAL /*const*/ kfourthird CCTK_ATTRIBUTE_UNUSED  = 4.0/3.0;\n"
+  "CCTK_REAL /*const*/ keightthird CCTK_ATTRIBUTE_UNUSED  = 8.0/3.0;\n"
+  "CCTK_REAL /*const*/ hdxi CCTK_ATTRIBUTE_UNUSED  = 0.5 * dxi;\n"
+  "CCTK_REAL /*const*/ hdyi CCTK_ATTRIBUTE_UNUSED  = 0.5 * dyi;\n"
+  "CCTK_REAL /*const*/ hdzi CCTK_ATTRIBUTE_UNUSED  = 0.5 * dzi;\n"
   "\n"
   "/* Initialize predefined quantities */\n"
-  "CCTK_REAL const p1o2dx = 0.5*INV(dx);\n"
-  "CCTK_REAL const p1o2dy = 0.5*INV(dy);\n"
-  "CCTK_REAL const p1o2dz = 0.5*INV(dz);\n"
-  "CCTK_REAL const p1odx2 = INV(SQR(dx));\n"
-  "CCTK_REAL const p1ody2 = INV(SQR(dy));\n"
-  "CCTK_REAL const p1odz2 = INV(SQR(dz));\n"
+  "CCTK_REAL /*const*/ p1o2dx CCTK_ATTRIBUTE_UNUSED  = 0.5*INV(dx);\n"
+  "CCTK_REAL /*const*/ p1o2dy CCTK_ATTRIBUTE_UNUSED  = 0.5*INV(dy);\n"
+  "CCTK_REAL /*const*/ p1o2dz CCTK_ATTRIBUTE_UNUSED  = 0.5*INV(dz);\n"
+  "CCTK_REAL /*const*/ p1odx2 CCTK_ATTRIBUTE_UNUSED  = INV(SQR(dx));\n"
+  "CCTK_REAL /*const*/ p1ody2 CCTK_ATTRIBUTE_UNUSED  = INV(SQR(dy));\n"
+  "CCTK_REAL /*const*/ p1odz2 CCTK_ATTRIBUTE_UNUSED  = INV(SQR(dz));\n"
   "\n"
   "/* Assign local copies of arrays functions */\n"
   "\n"
@@ -90,26 +90,26 @@ static void calc_rhs_Body(cGH const * restrict const cctkGH, int const dir, int
   "  i,j,k, imin[0],imin[1],imin[2], imax[0],imax[1],imax[2],\n"
   "  cctk_ash[0],cctk_ash[1],cctk_ash[2])\n"
   "{\n"
-  "  ptrdiff_t const index = di*i + dj*j + dk*k;\n"
+  "  ptrdiff_t /*const*/ index CCTK_ATTRIBUTE_UNUSED  = di*i + dj*j + dk*k;\n"
   "  \n"
   "  /* Assign local copies of grid functions */\n"
   "  \n"
-  "  CCTK_REAL phiL = phi[index];\n"
-  "  CCTK_REAL piL = pi[index];\n"
+  "  CCTK_REAL phiL CCTK_ATTRIBUTE_UNUSED = phi[index];\n"
+  "  CCTK_REAL piL CCTK_ATTRIBUTE_UNUSED = pi[index];\n"
   "  \n"
   "  \n"
   "  /* Include user supplied include files */\n"
   "  \n"
   "  /* Precompute derivatives */\n"
-  "  CCTK_REAL const PDstandard2nd11phi = PDstandard2nd11(&phi[index]);\n"
-  "  CCTK_REAL const PDstandard2nd22phi = PDstandard2nd22(&phi[index]);\n"
-  "  CCTK_REAL const PDstandard2nd33phi = PDstandard2nd33(&phi[index]);\n"
+  "  CCTK_REAL /*const*/ PDstandard2nd11phi CCTK_ATTRIBUTE_UNUSED  = PDstandard2nd11(&phi[index]);\n"
+  "  CCTK_REAL /*const*/ PDstandard2nd22phi CCTK_ATTRIBUTE_UNUSED  = PDstandard2nd22(&phi[index]);\n"
+  "  CCTK_REAL /*const*/ PDstandard2nd33phi CCTK_ATTRIBUTE_UNUSED  = PDstandard2nd33(&phi[index]);\n"
   "  \n"
   "  /* Calculate temporaries and grid functions */\n"
-  "  CCTK_REAL phirhsL = piL;\n"
+  "  CCTK_REAL CCTK_ATTRIBUTE_UNUSED phirhsL = piL;\n"
   "  \n"
-  "  CCTK_REAL pirhsL = PDstandard2nd11phi + PDstandard2nd22phi + \n"
-  "    PDstandard2nd33phi;\n"
+  "  CCTK_REAL CCTK_ATTRIBUTE_UNUSED pirhsL = PDstandard2nd11phi + \n"
+  "    PDstandard2nd22phi + PDstandard2nd33phi;\n"
   "  \n"
   "  /* Copy local copies back to grid functions */\n"
   "  vec_store_partial_prepare(i,lc_imin,lc_imax);\n"
diff --git a/Examples/SimpleWaveOpenCL/src/initial_sine.cc b/Examples/SimpleWaveOpenCL/src/initial_sine.cc
index b29c7b5..0ef88ad 100644
--- a/Examples/SimpleWaveOpenCL/src/initial_sine.cc
+++ b/Examples/SimpleWaveOpenCL/src/initial_sine.cc
@@ -33,36 +33,36 @@ static void initial_sine_Body(cGH const * restrict const cctkGH, int const dir,
   "/* Include user-supplied include files */\n"
   "\n"
   "/* Initialise finite differencing variables */\n"
-  "ptrdiff_t const di = 1;\n"
-  "ptrdiff_t const dj = CCTK_GFINDEX3D(cctkGH,0,1,0) - CCTK_GFINDEX3D(cctkGH,0,0,0);\n"
-  "ptrdiff_t const dk = CCTK_GFINDEX3D(cctkGH,0,0,1) - CCTK_GFINDEX3D(cctkGH,0,0,0);\n"
-  "ptrdiff_t const cdi = sizeof(CCTK_REAL) * di;\n"
-  "ptrdiff_t const cdj = sizeof(CCTK_REAL) * dj;\n"
-  "ptrdiff_t const cdk = sizeof(CCTK_REAL) * dk;\n"
-  "CCTK_REAL const dx = ToReal(CCTK_DELTA_SPACE(0));\n"
-  "CCTK_REAL const dy = ToReal(CCTK_DELTA_SPACE(1));\n"
-  "CCTK_REAL const dz = ToReal(CCTK_DELTA_SPACE(2));\n"
-  "CCTK_REAL const dt = ToReal(CCTK_DELTA_TIME);\n"
-  "CCTK_REAL const t = ToReal(cctk_time);\n"
-  "CCTK_REAL const dxi = INV(dx);\n"
-  "CCTK_REAL const dyi = INV(dy);\n"
-  "CCTK_REAL const dzi = INV(dz);\n"
-  "CCTK_REAL const khalf = 0.5;\n"
-  "CCTK_REAL const kthird = 1/3.0;\n"
-  "CCTK_REAL const ktwothird = 2.0/3.0;\n"
-  "CCTK_REAL const kfourthird = 4.0/3.0;\n"
-  "CCTK_REAL const keightthird = 8.0/3.0;\n"
-  "CCTK_REAL const hdxi = 0.5 * dxi;\n"
-  "CCTK_REAL const hdyi = 0.5 * dyi;\n"
-  "CCTK_REAL const hdzi = 0.5 * dzi;\n"
+  "ptrdiff_t /*const*/ di CCTK_ATTRIBUTE_UNUSED  = 1;\n"
+  "ptrdiff_t /*const*/ dj CCTK_ATTRIBUTE_UNUSED  = CCTK_GFINDEX3D(cctkGH,0,1,0) - CCTK_GFINDEX3D(cctkGH,0,0,0);\n"
+  "ptrdiff_t /*const*/ dk CCTK_ATTRIBUTE_UNUSED  = CCTK_GFINDEX3D(cctkGH,0,0,1) - CCTK_GFINDEX3D(cctkGH,0,0,0);\n"
+  "ptrdiff_t /*const*/ cdi CCTK_ATTRIBUTE_UNUSED  = sizeof(CCTK_REAL) * di;\n"
+  "ptrdiff_t /*const*/ cdj CCTK_ATTRIBUTE_UNUSED  = sizeof(CCTK_REAL) * dj;\n"
+  "ptrdiff_t /*const*/ cdk CCTK_ATTRIBUTE_UNUSED  = sizeof(CCTK_REAL) * dk;\n"
+  "CCTK_REAL /*const*/ dx CCTK_ATTRIBUTE_UNUSED  = ToReal(CCTK_DELTA_SPACE(0));\n"
+  "CCTK_REAL /*const*/ dy CCTK_ATTRIBUTE_UNUSED  = ToReal(CCTK_DELTA_SPACE(1));\n"
+  "CCTK_REAL /*const*/ dz CCTK_ATTRIBUTE_UNUSED  = ToReal(CCTK_DELTA_SPACE(2));\n"
+  "CCTK_REAL /*const*/ dt CCTK_ATTRIBUTE_UNUSED  = ToReal(CCTK_DELTA_TIME);\n"
+  "CCTK_REAL /*const*/ t CCTK_ATTRIBUTE_UNUSED  = ToReal(cctk_time);\n"
+  "CCTK_REAL /*const*/ dxi CCTK_ATTRIBUTE_UNUSED  = INV(dx);\n"
+  "CCTK_REAL /*const*/ dyi CCTK_ATTRIBUTE_UNUSED  = INV(dy);\n"
+  "CCTK_REAL /*const*/ dzi CCTK_ATTRIBUTE_UNUSED  = INV(dz);\n"
+  "CCTK_REAL /*const*/ khalf CCTK_ATTRIBUTE_UNUSED  = 0.5;\n"
+  "CCTK_REAL /*const*/ kthird CCTK_ATTRIBUTE_UNUSED  = 1/3.0;\n"
+  "CCTK_REAL /*const*/ ktwothird CCTK_ATTRIBUTE_UNUSED  = 2.0/3.0;\n"
+  "CCTK_REAL /*const*/ kfourthird CCTK_ATTRIBUTE_UNUSED  = 4.0/3.0;\n"
+  "CCTK_REAL /*const*/ keightthird CCTK_ATTRIBUTE_UNUSED  = 8.0/3.0;\n"
+  "CCTK_REAL /*const*/ hdxi CCTK_ATTRIBUTE_UNUSED  = 0.5 * dxi;\n"
+  "CCTK_REAL /*const*/ hdyi CCTK_ATTRIBUTE_UNUSED  = 0.5 * dyi;\n"
+  "CCTK_REAL /*const*/ hdzi CCTK_ATTRIBUTE_UNUSED  = 0.5 * dzi;\n"
   "\n"
   "/* Initialize predefined quantities */\n"
-  "CCTK_REAL const p1o2dx = 0.5*INV(dx);\n"
-  "CCTK_REAL const p1o2dy = 0.5*INV(dy);\n"
-  "CCTK_REAL const p1o2dz = 0.5*INV(dz);\n"
-  "CCTK_REAL const p1odx2 = INV(SQR(dx));\n"
-  "CCTK_REAL const p1ody2 = INV(SQR(dy));\n"
-  "CCTK_REAL const p1odz2 = INV(SQR(dz));\n"
+  "CCTK_REAL /*const*/ p1o2dx CCTK_ATTRIBUTE_UNUSED  = 0.5*INV(dx);\n"
+  "CCTK_REAL /*const*/ p1o2dy CCTK_ATTRIBUTE_UNUSED  = 0.5*INV(dy);\n"
+  "CCTK_REAL /*const*/ p1o2dz CCTK_ATTRIBUTE_UNUSED  = 0.5*INV(dz);\n"
+  "CCTK_REAL /*const*/ p1odx2 CCTK_ATTRIBUTE_UNUSED  = INV(SQR(dx));\n"
+  "CCTK_REAL /*const*/ p1ody2 CCTK_ATTRIBUTE_UNUSED  = INV(SQR(dy));\n"
+  "CCTK_REAL /*const*/ p1odz2 CCTK_ATTRIBUTE_UNUSED  = INV(SQR(dz));\n"
   "\n"
   "/* Assign local copies of arrays functions */\n"
   "\n"
@@ -78,11 +78,11 @@ static void initial_sine_Body(cGH const * restrict const cctkGH, int const dir,
   "  i,j,k, imin[0],imin[1],imin[2], imax[0],imax[1],imax[2],\n"
   "  cctk_ash[0],cctk_ash[1],cctk_ash[2])\n"
   "{\n"
-  "  ptrdiff_t const index = di*i + dj*j + dk*k;\n"
+  "  ptrdiff_t /*const*/ index CCTK_ATTRIBUTE_UNUSED  = di*i + dj*j + dk*k;\n"
   "  \n"
   "  /* Assign local copies of grid functions */\n"
   "  \n"
-  "  CCTK_REAL xL = x[index];\n"
+  "  CCTK_REAL xL CCTK_ATTRIBUTE_UNUSED = x[index];\n"
   "  \n"
   "  \n"
   "  /* Include user supplied include files */\n"
@@ -90,9 +90,11 @@ static void initial_sine_Body(cGH const * restrict const cctkGH, int const dir,
   "  /* Precompute derivatives */\n"
   "  \n"
   "  /* Calculate temporaries and grid functions */\n"
-  "  CCTK_REAL phiL = sin(2*Pi*(xL - t));\n"
+  "  CCTK_REAL CCTK_ATTRIBUTE_UNUSED phiL = sin(6.283185307179586*(xL - \n"
+  "    1.*t));\n"
   "  \n"
-  "  CCTK_REAL piL = -2*Pi*cos(2*Pi*(xL - t));\n"
+  "  CCTK_REAL CCTK_ATTRIBUTE_UNUSED piL = \n"
+  "    -6.283185307179586*cos(6.283185307179586*(xL - 1.*t));\n"
   "  \n"
   "  /* Copy local copies back to grid functions */\n"
   "  vec_store_partial_prepare(i,lc_imin,lc_imax);\n"