Regenerate SimpleWaveCaKernel

7 files changed, 24 insertions, 51 deletions

diff --git a/Examples/SimpleWaveCaKernel/cakernel.ccl b/Examples/SimpleWaveCaKernel/cakernel.ccl
index b564871..b68af03 100644
--- a/Examples/SimpleWaveCaKernel/cakernel.ccl
+++ b/Examples/SimpleWaveCaKernel/cakernel.ccl
@@ -11,6 +11,12 @@ CCTK_CUDA_KERNEL initial_sine TYPE=gpu_cuda/3dblock STENCIL="0,0,0,0,0,0" TILE="
     pi
   }
   "pi"
+  
+  CCTK_CUDA_KERNEL_VARIABLE  cached=yes intent=in
+  {
+    x
+  }
+  "x"
 }
 
 CCTK_CUDA_KERNEL calc_rhs TYPE=gpu_cuda/3dblock STENCIL="0,0,0,0,0,0" TILE="8,8,8" SHARECODE=yes
@@ -54,7 +60,7 @@ CCTK_CUDA_KERNEL rk1 TYPE=gpu_cuda/3dblock STENCIL="0,0,0,0,0,0" TILE="8,8,8" SH
   }
   "phirhs"
   
-  CCTK_CUDA_KERNEL_VARIABLE  cached=yes intent=in
+  CCTK_CUDA_KERNEL_VARIABLE  cached=yes intent=inout
   {
     pi
   }
diff --git a/Examples/SimpleWaveCaKernel/interface.ccl b/Examples/SimpleWaveCaKernel/interface.ccl
index c65ef50..64d1b09 100644
--- a/Examples/SimpleWaveCaKernel/interface.ccl
+++ b/Examples/SimpleWaveCaKernel/interface.ccl
@@ -28,25 +28,25 @@ CCTK_INT FUNCTION Boundary_SelectVarForBC(CCTK_POINTER_TO_CONST IN GH, CCTK_INT
 USES FUNCTION Boundary_SelectVarForBC
 
 public:
-CCTK_REAL phi_g type=GF timelevels=3 tags=''
+CCTK_REAL phi_g type=GF timelevels=1 tags=''
 {
   phi
 } "phi_g"
 
 public:
-CCTK_REAL pi_g type=GF timelevels=3 tags=''
+CCTK_REAL pi_g type=GF timelevels=1 tags=''
 {
   pi
 } "pi_g"
 
 public:
-CCTK_REAL phi_grhs type=GF timelevels=3 tags=''
+CCTK_REAL phi_grhs type=GF timelevels=1 tags=''
 {
   phirhs
 } "phi_grhs"
 
 public:
-CCTK_REAL pi_grhs type=GF timelevels=3 tags=''
+CCTK_REAL pi_grhs type=GF timelevels=1 tags=''
 {
   pirhs
 } "pi_grhs"
diff --git a/Examples/SimpleWaveCaKernel/param.ccl b/Examples/SimpleWaveCaKernel/param.ccl
index 60327e0..3b9211b 100644
--- a/Examples/SimpleWaveCaKernel/param.ccl
+++ b/Examples/SimpleWaveCaKernel/param.ccl
@@ -31,19 +31,19 @@ CCTK_INT SimpleWaveCaKernel_MaxNumArrayEvolvedVars "Number of Array evolved vari
 restricted:
 CCTK_INT timelevels "Number of active timelevels" STEERABLE=RECOVER
 {
-  0:3 :: ""
-} 3
+  0:1 :: ""
+} 1
 
 restricted:
 CCTK_INT rhs_timelevels "Number of active RHS timelevels" STEERABLE=RECOVER
 {
-  0:3 :: ""
+  0:1 :: ""
 } 1
 
 restricted:
 CCTK_INT other_timelevels "Number of active timelevels for non-evolved grid functions" STEERABLE=RECOVER
 {
-  0:3 :: ""
+  0:1 :: ""
 } 1
 
 restricted:
diff --git a/Examples/SimpleWaveCaKernel/schedule.ccl b/Examples/SimpleWaveCaKernel/schedule.ccl
index 75a99ef..3b4b30e 100644
--- a/Examples/SimpleWaveCaKernel/schedule.ccl
+++ b/Examples/SimpleWaveCaKernel/schedule.ccl
@@ -5,53 +5,21 @@ if (timelevels == 1)
 {
   STORAGE: phi_g[1]
 }
-if (timelevels == 2)
-{
-  STORAGE: phi_g[2]
-}
-if (timelevels == 3)
-{
-  STORAGE: phi_g[3]
-}
 
 if (timelevels == 1)
 {
   STORAGE: pi_g[1]
 }
-if (timelevels == 2)
-{
-  STORAGE: pi_g[2]
-}
-if (timelevels == 3)
-{
-  STORAGE: pi_g[3]
-}
 
 if (rhs_timelevels == 1)
 {
   STORAGE: phi_grhs[1]
 }
-if (rhs_timelevels == 2)
-{
-  STORAGE: phi_grhs[2]
-}
-if (rhs_timelevels == 3)
-{
-  STORAGE: phi_grhs[3]
-}
 
 if (rhs_timelevels == 1)
 {
   STORAGE: pi_grhs[1]
 }
-if (rhs_timelevels == 2)
-{
-  STORAGE: pi_grhs[2]
-}
-if (rhs_timelevels == 3)
-{
-  STORAGE: pi_grhs[3]
-}
 
 schedule SimpleWaveCaKernel_Startup at STARTUP
 {
@@ -79,14 +47,13 @@ schedule CAKERNEL_Launch_initial_sine AT INITIAL
 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
 {
   LANG: C
   SYNC: phi_g
+  SYNC: pi_g
 } "rk1"
 
 schedule SimpleWaveCaKernel_SelectBoundConds in MoL_PostStep
diff --git a/Examples/SimpleWaveCaKernel/src/CaKernel__calc_rhs.code b/Examples/SimpleWaveCaKernel/src/CaKernel__calc_rhs.code
index ba4ab79..35ba87e 100644
--- a/Examples/SimpleWaveCaKernel/src/CaKernel__calc_rhs.code
+++ b/Examples/SimpleWaveCaKernel/src/CaKernel__calc_rhs.code
@@ -60,15 +60,11 @@ CAKERNEL_calc_rhs_Begin
     /* Include user supplied include files */
     
     /* Precompute derivatives */
-    CCTK_REAL const PDstandard2nd11phi = PDstandard2nd11(&phi[index]);
-    CCTK_REAL const PDstandard2nd22phi = PDstandard2nd22(&phi[index]);
-    CCTK_REAL const PDstandard2nd33phi = PDstandard2nd33(&phi[index]);
     
     /* Calculate temporaries and grid functions */
     CCTK_REAL phirhsL = piL;
     
-    CCTK_REAL pirhsL = PDstandard2nd11phi + PDstandard2nd22phi + 
-      PDstandard2nd33phi;
+    CCTK_REAL pirhsL = phiL;
     
     /* 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_sine.code
index c781408..e030f4f 100644
--- a/Examples/SimpleWaveCaKernel/src/CaKernel__initial_sine.code
+++ b/Examples/SimpleWaveCaKernel/src/CaKernel__initial_sine.code
@@ -53,6 +53,7 @@ CAKERNEL_initial_sine_Begin
     
     /* Assign local copies of grid functions */
     
+    CCTK_REAL xL = I3D(x,0,0,0);
     
     
     /* Include user supplied include files */
@@ -60,9 +61,9 @@ CAKERNEL_initial_sine_Begin
     /* Precompute derivatives */
     
     /* Calculate temporaries and grid functions */
-    CCTK_REAL phiL = 0;
+    CCTK_REAL phiL = Sin(2*Pi*(xL - t));
     
-    CCTK_REAL piL = 0;
+    CCTK_REAL piL = -2*Pi*Cos(2*Pi*(xL - t));
     
     /* Copy local copies back to grid functions */
     I3D(phi,0,0,0) = phiL;
diff --git a/Examples/SimpleWaveCaKernel/src/CaKernel__rk1.code b/Examples/SimpleWaveCaKernel/src/CaKernel__rk1.code
index 95d8220..03c5376 100644
--- a/Examples/SimpleWaveCaKernel/src/CaKernel__rk1.code
+++ b/Examples/SimpleWaveCaKernel/src/CaKernel__rk1.code
@@ -64,10 +64,13 @@ CAKERNEL_rk1_Begin
     /* Precompute derivatives */
     
     /* Calculate temporaries and grid functions */
-    phiL = Rule(phiL + phirhsL*piL*dt,piL + pirhsL*dt);
+    phiL = phiL + phirhsL*dt;
+    
+    piL = piL + pirhsL*dt;
     
     /* Copy local copies back to grid functions */
     I3D(phi,0,0,0) = phiL;
+    I3D(pi,0,0,0) = piL;
     
   CAKERNEL_rk1_Computations_End