Regenerate SimpleWaveCaKernel

6 files changed, 31 insertions, 22 deletions

diff --git a/Examples/SimpleWaveCaKernel/cakernel.ccl b/Examples/SimpleWaveCaKernel/cakernel.ccl
index b68af03..81db8b6 100644
--- a/Examples/SimpleWaveCaKernel/cakernel.ccl
+++ b/Examples/SimpleWaveCaKernel/cakernel.ccl
@@ -1,4 +1,4 @@
-CCTK_CUDA_KERNEL initial_sine TYPE=gpu_cuda/3dblock STENCIL="0,0,0,0,0,0" TILE="8,8,8" SHARECODE=yes
+CCTK_CUDA_KERNEL initial_gaussian TYPE=gpu_cuda/3dblock STENCIL="0,0,0,0,0,0" TILE="8,8,8" SHARECODE=yes
 {
   CCTK_CUDA_KERNEL_VARIABLE  cached=yes intent=out
   {
@@ -19,7 +19,7 @@ CCTK_CUDA_KERNEL initial_sine TYPE=gpu_cuda/3dblock STENCIL="0,0,0,0,0,0" TILE="
   "x"
 }
 
-CCTK_CUDA_KERNEL calc_rhs TYPE=gpu_cuda/3dblock STENCIL="0,0,0,0,0,0" TILE="8,8,8" SHARECODE=yes
+CCTK_CUDA_KERNEL calc_rhs TYPE=gpu_cuda/3dblock STENCIL="1,1,1,1,1,1" TILE="8,8,8" SHARECODE=yes
 {
   CCTK_CUDA_KERNEL_VARIABLE  cached=yes intent=in
   {
diff --git a/Examples/SimpleWaveCaKernel/param.ccl b/Examples/SimpleWaveCaKernel/param.ccl
index 3b9211b..ecb8b5e 100644
--- a/Examples/SimpleWaveCaKernel/param.ccl
+++ b/Examples/SimpleWaveCaKernel/param.ccl
@@ -47,7 +47,7 @@ CCTK_INT other_timelevels "Number of active timelevels for non-evolved grid func
 } 1
 
 restricted:
-CCTK_INT initial_sine_calc_every "initial_sine_calc_every" STEERABLE=ALWAYS
+CCTK_INT initial_gaussian_calc_every "initial_gaussian_calc_every" STEERABLE=ALWAYS
 {
   *:* :: ""
 } 1
@@ -65,7 +65,7 @@ CCTK_INT rk1_calc_every "rk1_calc_every" STEERABLE=ALWAYS
 } 1
 
 restricted:
-CCTK_INT initial_sine_calc_offset "initial_sine_calc_offset" STEERABLE=ALWAYS
+CCTK_INT initial_gaussian_calc_offset "initial_gaussian_calc_offset" STEERABLE=ALWAYS
 {
   *:* :: ""
 } 0
diff --git a/Examples/SimpleWaveCaKernel/schedule.ccl b/Examples/SimpleWaveCaKernel/schedule.ccl
index 3b4b30e..4af3bff 100644
--- a/Examples/SimpleWaveCaKernel/schedule.ccl
+++ b/Examples/SimpleWaveCaKernel/schedule.ccl
@@ -39,14 +39,16 @@ schedule SimpleWaveCaKernel_RegisterSymmetries in SymmetryRegister
   OPTIONS: meta
 } "register symmetries"
 
-schedule CAKERNEL_Launch_initial_sine AT INITIAL
+schedule CAKERNEL_Launch_initial_gaussian AT INITIAL
 {
   LANG: C
-} "initial_sine"
+} "initial_gaussian"
 
 schedule CAKERNEL_Launch_calc_rhs at EVOL
 {
   LANG: C
+  SYNC: phi_grhs
+  SYNC: pi_grhs
 } "calc_rhs"
 
 schedule CAKERNEL_Launch_rk1 at EVOL after calc_rhs
diff --git a/Examples/SimpleWaveCaKernel/src/CaKernel__calc_rhs.code b/Examples/SimpleWaveCaKernel/src/CaKernel__calc_rhs.code
index 35ba87e..40d5b56 100644
--- a/Examples/SimpleWaveCaKernel/src/CaKernel__calc_rhs.code
+++ b/Examples/SimpleWaveCaKernel/src/CaKernel__calc_rhs.code
@@ -1,8 +1,11 @@
+#undef KRANC_DIFF_FUNCTIONS
 #define KRANC_C
-
 #include "Differencing.h"
 #include "GenericFD.h"
 
+#define KRANC_GFOFFSET3D(u,i,j,k) I3D(u,i,j,k)
+
+
 /* Define macros used in calculations */
 #define INITVALUE (42)
 #define QAD(x) (SQR(SQR(x)))
@@ -10,8 +13,6 @@
 #define SQR(x) ((x) * (x))
 #define CUB(x) ((x) * (x) * (x))
 
-#define CCTK_GFINDEX3D(u,i,j,k) I3D(u,i,j,k)
-
 CAKERNEL_calc_rhs_Begin
   
   /* Include user-supplied include files */
@@ -60,11 +61,15 @@ CAKERNEL_calc_rhs_Begin
     /* Include user supplied include files */
     
     /* Precompute derivatives */
+    CCTK_REAL const PDstandard2nd11phi = PDstandard2nd11(phi);
+    CCTK_REAL const PDstandard2nd22phi = PDstandard2nd22(phi);
+    CCTK_REAL const PDstandard2nd33phi = PDstandard2nd33(phi);
     
     /* Calculate temporaries and grid functions */
     CCTK_REAL phirhsL = piL;
     
-    CCTK_REAL pirhsL = phiL;
+    CCTK_REAL pirhsL = PDstandard2nd11phi + PDstandard2nd22phi + 
+      PDstandard2nd33phi;
     
     /* Copy local copies back to grid functions */
     I3D(phirhs,0,0,0) = phirhsL;
diff --git a/Examples/SimpleWaveCaKernel/src/CaKernel__initial_sine.code b/Examples/SimpleWaveCaKernel/src/CaKernel__initial_gaussian.code
index e030f4f..e4b571b 100644
--- a/Examples/SimpleWaveCaKernel/src/CaKernel__initial_sine.code
+++ b/Examples/SimpleWaveCaKernel/src/CaKernel__initial_gaussian.code
@@ -1,8 +1,11 @@
+#undef KRANC_DIFF_FUNCTIONS
 #define KRANC_C
-
 #include "Differencing.h"
 #include "GenericFD.h"
 
+#define KRANC_GFOFFSET3D(u,i,j,k) I3D(u,i,j,k)
+
+
 /* Define macros used in calculations */
 #define INITVALUE (42)
 #define QAD(x) (SQR(SQR(x)))
@@ -10,9 +13,7 @@
 #define SQR(x) ((x) * (x))
 #define CUB(x) ((x) * (x) * (x))
 
-#define CCTK_GFINDEX3D(u,i,j,k) I3D(u,i,j,k)
-
-CAKERNEL_initial_sine_Begin
+CAKERNEL_initial_gaussian_Begin
   
   /* Include user-supplied include files */
   
@@ -49,7 +50,7 @@ CAKERNEL_initial_sine_Begin
   /* Calculate temporaries and arrays functions */
   
   /* Copy local copies back to grid functions */
-  CAKERNEL_initial_sine_Computations_Begin
+  CAKERNEL_initial_gaussian_Computations_Begin
     
     /* Assign local copies of grid functions */
     
@@ -61,14 +62,14 @@ CAKERNEL_initial_sine_Begin
     /* Precompute derivatives */
     
     /* Calculate temporaries and grid functions */
-    CCTK_REAL phiL = Sin(2*Pi*(xL - t));
+    CCTK_REAL phiL = exp(-100.*SQR(xL + t));
     
-    CCTK_REAL piL = -2*Pi*Cos(2*Pi*(xL - t));
+    CCTK_REAL piL = -200.*(xL + t)*exp(-100.*SQR(xL + t));
     
     /* Copy local copies back to grid functions */
     I3D(phi,0,0,0) = phiL;
     I3D(pi,0,0,0) = piL;
     
-  CAKERNEL_initial_sine_Computations_End
+  CAKERNEL_initial_gaussian_Computations_End
   
-CAKERNEL_initial_sine_End
+CAKERNEL_initial_gaussian_End
diff --git a/Examples/SimpleWaveCaKernel/src/CaKernel__rk1.code b/Examples/SimpleWaveCaKernel/src/CaKernel__rk1.code
index 03c5376..3a7e9f3 100644
--- a/Examples/SimpleWaveCaKernel/src/CaKernel__rk1.code
+++ b/Examples/SimpleWaveCaKernel/src/CaKernel__rk1.code
@@ -1,8 +1,11 @@
+#undef KRANC_DIFF_FUNCTIONS
 #define KRANC_C
-
 #include "Differencing.h"
 #include "GenericFD.h"
 
+#define KRANC_GFOFFSET3D(u,i,j,k) I3D(u,i,j,k)
+
+
 /* Define macros used in calculations */
 #define INITVALUE (42)
 #define QAD(x) (SQR(SQR(x)))
@@ -10,8 +13,6 @@
 #define SQR(x) ((x) * (x))
 #define CUB(x) ((x) * (x) * (x))
 
-#define CCTK_GFINDEX3D(u,i,j,k) I3D(u,i,j,k)
-
 CAKERNEL_rk1_Begin
   
   /* Include user-supplied include files */