Regenerate examples

5 files changed, 42 insertions, 42 deletions

diff --git a/Examples/WaveHost/schedule.ccl b/Examples/WaveHost/schedule.ccl
index d57c66f..b50b3de 100644
--- a/Examples/WaveHost/schedule.ccl
+++ b/Examples/WaveHost/schedule.ccl
@@ -57,10 +57,10 @@ schedule WaveHost_RegisterSymmetries in SymmetryRegister
 schedule initial_gaussian AT INITIAL
 {
   LANG: C
-  READS:    grid::coordinates
-  WRITES:   WaveHost::phi_g
-  WRITES:   WaveHost::pi_g
-  WRITES:   WaveHost::xCopy_g
+  READS:    grid::x
+  WRITES:   WaveHost::phi
+  WRITES:   WaveHost::pi
+  WRITES:   WaveHost::xCopy
 } "initial_gaussian"
 
 
@@ -69,10 +69,10 @@ if (fdOrder == 2)
   schedule calc_rhs_2 in MoL_CalcRHS
   {
     LANG: C
-    READS:    WaveHost::phi_g
-    READS:    WaveHost::pi_g
-    WRITES:   WaveHost::phi_grhs
-    WRITES:   WaveHost::pi_grhs
+    READS:    WaveHost::phi
+    READS:    WaveHost::pi
+    WRITES:   WaveHost::phirhs
+    WRITES:   WaveHost::pirhs
   } "calc_rhs_2"
 }
 
@@ -84,10 +84,10 @@ if (fdOrder == 2)
     LANG: C
     SYNC: phi_grhs
     SYNC: pi_grhs
-    READS:    WaveHost::phi_g
-    READS:    WaveHost::pi_g
-    WRITES:   WaveHost::phi_grhs
-    WRITES:   WaveHost::pi_grhs
+    READS:    WaveHost::phi
+    READS:    WaveHost::pi
+    WRITES:   WaveHost::phirhs
+    WRITES:   WaveHost::pirhs
   } "calc_rhs_2"
 }
 
@@ -97,10 +97,10 @@ if (fdOrder == 4)
   schedule calc_rhs_4 in MoL_CalcRHS
   {
     LANG: C
-    READS:    WaveHost::phi_g
-    READS:    WaveHost::pi_g
-    WRITES:   WaveHost::phi_grhs
-    WRITES:   WaveHost::pi_grhs
+    READS:    WaveHost::phi
+    READS:    WaveHost::pi
+    WRITES:   WaveHost::phirhs
+    WRITES:   WaveHost::pirhs
   } "calc_rhs_4"
 }
 
@@ -112,19 +112,19 @@ if (fdOrder == 4)
     LANG: C
     SYNC: phi_grhs
     SYNC: pi_grhs
-    READS:    WaveHost::phi_g
-    READS:    WaveHost::pi_g
-    WRITES:   WaveHost::phi_grhs
-    WRITES:   WaveHost::pi_grhs
+    READS:    WaveHost::phi
+    READS:    WaveHost::pi
+    WRITES:   WaveHost::phirhs
+    WRITES:   WaveHost::pirhs
   } "calc_rhs_4"
 }
 
 schedule calc_bound_rhs in MoL_RHSBoundaries
 {
   LANG: C
-  READS:    WaveHost::xCopy_g
-  WRITES:   WaveHost::phi_grhs
-  WRITES:   WaveHost::pi_grhs
+  READS:    WaveHost::xCopy
+  WRITES:   WaveHost::phirhs
+  WRITES:   WaveHost::pirhs
 } "calc_bound_rhs"
 
 schedule calc_bound_rhs at ANALYSIS
@@ -132,9 +132,9 @@ schedule calc_bound_rhs at ANALYSIS
   LANG: C
   SYNC: phi_grhs
   SYNC: pi_grhs
-  READS:    WaveHost::xCopy_g
-  WRITES:   WaveHost::phi_grhs
-  WRITES:   WaveHost::pi_grhs
+  READS:    WaveHost::xCopy
+  WRITES:   WaveHost::phirhs
+  WRITES:   WaveHost::pirhs
 } "calc_bound_rhs"
 
 schedule WaveHost_SelectBoundConds in MoL_PostStep
diff --git a/Examples/WaveHost/src/calc_bound_rhs.cc b/Examples/WaveHost/src/calc_bound_rhs.cc
index 0fe2b38..7c58500 100644
--- a/Examples/WaveHost/src/calc_bound_rhs.cc
+++ b/Examples/WaveHost/src/calc_bound_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)))
 
 extern "C" void calc_bound_rhs_SelectBCs(CCTK_ARGUMENTS)
 {
@@ -101,7 +101,7 @@ static void calc_bound_rhs_Body(cGH const * restrict const cctkGH, int const dir
   #pragma omp parallel
   CCTK_LOOP3(calc_bound_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;
     
diff --git a/Examples/WaveHost/src/calc_rhs_2.cc b/Examples/WaveHost/src/calc_rhs_2.cc
index d93a9be..0ac68e0 100644
--- a/Examples/WaveHost/src/calc_rhs_2.cc
+++ b/Examples/WaveHost/src/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 calc_rhs_2_SelectBCs(CCTK_ARGUMENTS)
 {
@@ -101,7 +101,7 @@ static void calc_rhs_2_Body(cGH const * restrict const cctkGH, int const dir, in
   #pragma omp parallel
   CCTK_LOOP3(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;
     
diff --git a/Examples/WaveHost/src/calc_rhs_4.cc b/Examples/WaveHost/src/calc_rhs_4.cc
index 2f91d7e..e4e607b 100644
--- a/Examples/WaveHost/src/calc_rhs_4.cc
+++ b/Examples/WaveHost/src/calc_rhs_4.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 calc_rhs_4_SelectBCs(CCTK_ARGUMENTS)
 {
@@ -101,7 +101,7 @@ static void calc_rhs_4_Body(cGH const * restrict const cctkGH, int const dir, in
   #pragma omp parallel
   CCTK_LOOP3(calc_rhs_4,
     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;
     
diff --git a/Examples/WaveHost/src/initial_gaussian.cc b/Examples/WaveHost/src/initial_gaussian.cc
index 99fd6d1..667c889 100644
--- a/Examples/WaveHost/src/initial_gaussian.cc
+++ b/Examples/WaveHost/src/initial_gaussian.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 initial_gaussian_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[])
 {
@@ -86,7 +86,7 @@ static void initial_gaussian_Body(cGH const * restrict const cctkGH, int const d
   #pragma omp parallel
   CCTK_LOOP3(initial_gaussian,
     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;