CaKernel.m: Handle parameters in cakernel.ccl file

ianhinder · Jan 31, 2012 · 155fa59 · 155fa59
1 parent cd80a54
commit 155fa59
Showing 1 changed file with 12 additions and 5 deletions.
diff --git a/Tools/CodeGen/CaKernel.m b/Tools/CodeGen/CaKernel.m
@@ -33,24 +33,31 @@
   variableBlock[var_, intent_String] :=
   CCLBlock["CCTK_CUDA_KERNEL_VARIABLE", "", {"cached" -> "yes", "intent" -> intent}, {var,"\n"}, ToString[var]]];
 
+DefFn[
+  parameterBlock[par_] :=
+  CCLBlock["CCTK_CUDA_KERNEL_PARAMETER", "", {}, {par,"\n"}, ToString[par]]];
+
 DefFn[
   variableBlocks[calc_] :=
   Module[
-    {in,out,all,inOnly,outOnly,inOut},
-    in = InputGridFunctions[calc];
+    {in,out,all,inOnly,outOnly,inOut,params},
+
+    params = GetCalculationParameters[calc];
+    in = Join[InputGridFunctions[calc]];
     out = OutputGridFunctions[calc];
     all = Union[in,out];
 
-    inOnly = Complement[in, out];
+    inOnly = Join[Complement[in, out]];
     outOnly = Complement[out, in];
     inOut = Intersection[in,out];
 
     Riffle[
       Map[variableBlock[#, Which[MemberQ[inOnly, #], "in",
                                  MemberQ[outOnly, #], "out",
                                  MemberQ[inOut, #], "inout",
-                                 True,ThrowError["Unable to determine use of variable "<>ToString[#]]]] &, all],
-          "\n"]]];
+                                 True,ThrowError["Unable to determine use of variable "<>ToString[#]]]] &, all]~Join~
+      Map[parameterBlock, params],
+      "\n"]]];
 
 DefFn[
   kernelCCLBlock[calc_] :=