Regenerate SimpleWaveCaKernel

ianhinder · Feb 2, 2012 · 6a9e48e · 6a9e48e
1 parent 60b0890
commit 6a9e48e
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 26 deletions.
diff --git a/Examples/SimpleWaveCaKernel/cakernel.ccl b/Examples/SimpleWaveCaKernel/cakernel.ccl
@@ -1,18 +1,18 @@
 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
+  CCTK_CUDA_KERNEL_VARIABLE  cached=no intent=out
   {
     phi
   }
   "phi"
 
-  CCTK_CUDA_KERNEL_VARIABLE  cached=yes intent=out
+  CCTK_CUDA_KERNEL_VARIABLE  cached=no intent=out
   {
     pi
   }
   "pi"
 
-  CCTK_CUDA_KERNEL_VARIABLE  cached=yes intent=in
+  CCTK_CUDA_KERNEL_VARIABLE  cached=no intent=in
   {
     x
   }
@@ -21,25 +21,25 @@ CCTK_CUDA_KERNEL initial_gaussian TYPE=gpu_cuda/3dblock STENCIL="0,0,0,0,0,0" TI
 
 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
+  CCTK_CUDA_KERNEL_VARIABLE  cached=no intent=in
   {
     phi
   }
   "phi"
 
-  CCTK_CUDA_KERNEL_VARIABLE  cached=yes intent=out
+  CCTK_CUDA_KERNEL_VARIABLE  cached=no intent=out
   {
     phirhs
   }
   "phirhs"
 
-  CCTK_CUDA_KERNEL_VARIABLE  cached=yes intent=in
+  CCTK_CUDA_KERNEL_VARIABLE  cached=no intent=in
   {
     pi
   }
   "pi"
 
-  CCTK_CUDA_KERNEL_VARIABLE  cached=yes intent=out
+  CCTK_CUDA_KERNEL_VARIABLE  cached=no intent=out
   {
     pirhs
   }
@@ -48,25 +48,25 @@ CCTK_CUDA_KERNEL calc_rhs TYPE=gpu_cuda/3dblock STENCIL="1,1,1,1,1,1" TILE="8,8,
 
 CCTK_CUDA_KERNEL rk1 TYPE=gpu_cuda/3dblock STENCIL="0,0,0,0,0,0" TILE="8,8,8" SHARECODE=yes
 {
-  CCTK_CUDA_KERNEL_VARIABLE  cached=yes intent=inout
+  CCTK_CUDA_KERNEL_VARIABLE  cached=no intent=inout
   {
     phi
   }
   "phi"
 
-  CCTK_CUDA_KERNEL_VARIABLE  cached=yes intent=in
+  CCTK_CUDA_KERNEL_VARIABLE  cached=no intent=in
   {
     phirhs
   }
   "phirhs"
 
-  CCTK_CUDA_KERNEL_VARIABLE  cached=yes intent=inout
+  CCTK_CUDA_KERNEL_VARIABLE  cached=no intent=inout
   {
     pi
   }
   "pi"
 
-  CCTK_CUDA_KERNEL_VARIABLE  cached=yes intent=in
+  CCTK_CUDA_KERNEL_VARIABLE  cached=no intent=in
   {
     pirhs
   }

diff --git a/Examples/SimpleWaveCaKernel/configuration.ccl b/Examples/SimpleWaveCaKernel/configuration.ccl
@@ -4,3 +4,4 @@ REQUIRES GenericFD
 OPTIONAL LoopControl
 {
 }
+REQUIRES CUDA
diff --git a/Examples/SimpleWaveCaKernel/interface.ccl b/Examples/SimpleWaveCaKernel/interface.ccl
@@ -50,3 +50,14 @@ CCTK_REAL pi_grhs type=GF timelevels=1 tags=''
 {
   pirhs
 } "pi_grhs"
+
+# These functions are provided by the CaKernel thorn
+
+CCTK_INT FUNCTION Device_RegisterMem(CCTK_POINTER IN cctkGH, CCTK_INT IN vi, CCTK_INT IN num_tls)
+REQUIRES FUNCTION Device_RegisterMem
+
+CCTK_INT FUNCTION Device_UnRegisterMem(CCTK_POINTER IN cctkGH, CCTK_INT IN vi)
+REQUIRES FUNCTION Device_UnRegisterMem
+
+CCTK_POINTER FUNCTION Device_GetVarI (CCTK_POINTER IN cctkGH, CCTK_INT IN vi, CCTK_INT IN num_tls)
+REQUIRES FUNCTION Device_GetVarI
diff --git a/Examples/SimpleWaveCaKernel/schedule.ccl b/Examples/SimpleWaveCaKernel/schedule.ccl
@@ -42,20 +42,33 @@ schedule SimpleWaveCaKernel_RegisterSymmetries in SymmetryRegister
 schedule CAKERNEL_Launch_initial_gaussian AT INITIAL
 {
   LANG: C
+  READS:    grid::coordinates
+  WRITES:   SimpleWaveCaKernel::phi_g
+  WRITES:   SimpleWaveCaKernel::pi_g
 } "initial_gaussian"
 
 schedule CAKERNEL_Launch_calc_rhs at EVOL
 {
   LANG: C
   SYNC: phi_grhs
   SYNC: pi_grhs
+  READS:    SimpleWaveCaKernel::phi_g
+  READS:    SimpleWaveCaKernel::pi_g
+  WRITES:   SimpleWaveCaKernel::phi_grhs
+  WRITES:   SimpleWaveCaKernel::pi_grhs
 } "calc_rhs"
 
 schedule CAKERNEL_Launch_rk1 at EVOL after calc_rhs
 {
   LANG: C
   SYNC: phi_g
   SYNC: pi_g
+  READS:    SimpleWaveCaKernel::phi_g
+  READS:    SimpleWaveCaKernel::phi_grhs
+  READS:    SimpleWaveCaKernel::pi_g
+  READS:    SimpleWaveCaKernel::pi_grhs
+  WRITES:   SimpleWaveCaKernel::phi_g
+  WRITES:   SimpleWaveCaKernel::pi_g
 } "rk1"
 
 schedule SimpleWaveCaKernel_SelectBoundConds in MoL_PostStep
@@ -72,17 +85,7 @@ schedule SimpleWaveCaKernel_CheckBoundaries at BASEGRID
   OPTIONS: meta
 } "check boundaries treatment"
 
-schedule CaKernel_CopyFromDev at ANALYSIS
-{
-  LANG: C
-} "Copy variables from devices"
-
 schedule group ApplyBCs as SimpleWaveCaKernel_ApplyBCs in MoL_PostStep after SimpleWaveCaKernel_SelectBoundConds
 {
   # no language specified
 } "Apply boundary conditions controlled by thorn Boundary"
-
-
-############################################################
-#CAKERNEL AUTO GENERATED PART. DO NOT EDIT BELOW THIS POINT#
-############################################################
diff --git a/Examples/SimpleWaveCaKernel/src/CaKernel__calc_rhs.code b/Examples/SimpleWaveCaKernel/src/CaKernel__calc_rhs.code
@@ -3,6 +3,7 @@
 #include "Differencing.h"
 #include "GenericFD.h"
 
+#undef KRANC_GFOFFSET3D
 #define KRANC_GFOFFSET3D(u,i,j,k) I3D(u,i,j,k)
 
 

diff --git a/Examples/SimpleWaveCaKernel/src/CaKernel__initial_gaussian.code b/Examples/SimpleWaveCaKernel/src/CaKernel__initial_gaussian.code
@@ -3,6 +3,7 @@
 #include "Differencing.h"
 #include "GenericFD.h"
 
+#undef KRANC_GFOFFSET3D
 #define KRANC_GFOFFSET3D(u,i,j,k) I3D(u,i,j,k)
 
 

diff --git a/Examples/SimpleWaveCaKernel/src/CaKernel__rk1.code b/Examples/SimpleWaveCaKernel/src/CaKernel__rk1.code
@@ -3,6 +3,7 @@
 #include "Differencing.h"
 #include "GenericFD.h"
 
+#undef KRANC_GFOFFSET3D
 #define KRANC_GFOFFSET3D(u,i,j,k) I3D(u,i,j,k)
 
 

diff --git a/Examples/SimpleWaveCaKernel/src/make.code.defn b/Examples/SimpleWaveCaKernel/src/make.code.defn
@@ -1,8 +1,3 @@
 # File produced by Kranc
 
 SRCS = Startup.cc RegisterMoL.cc RegisterSymmetries.cc Boundaries.cc 
-
-
-############################################################
-#CAKERNEL AUTO GENERATED PART. DO NOT EDIT BELOW THIS POINT#
-############################################################