Move CalculationMacros to CodeGenCactus.m

ianhinder · Jan 27, 2012 · 2146cd5 · 2146cd5
1 parent 7cfe4ec
commit 2146cd5
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 15 deletions.
diff --git a/Tools/CodeGen/CodeGenCactus.m b/Tools/CodeGen/CodeGenCactus.m
@@ -79,7 +79,7 @@
 DataType::usage = "DataType[] returns a string for the grid function data type (e.g. CCTK_REAL)";
 SetDataType::usage = "SetDataType[type] sets a string for the grid function data type (e.g. CCTK_REAL)";
 CCLBlock;
-
+CalculationMacros;
 
 Begin["`Private`"];
 
@@ -701,6 +701,20 @@
    CBlock[contents],
    If[comment === "", "", Quote[comment]],"\n"}];
 
+CalculationMacros[vectorise_:False] :=
+  CommentedBlock["Define macros used in calculations",
+      Map[{"#define ", #, "\n"} &,
+         {"INITVALUE (42)",
+          "QAD(x) (SQR(SQR(x)))"} ~Join~
+          If[vectorise,
+           {"INV(x) (kdiv(ToReal(1.0),x))",
+            "SQR(x) (kmul(x,x))",
+            "CUB(x) (kmul(x,SQR(x)))"},
+           {"INV(x) ((1.0) / (x))",
+            "SQR(x) ((x) * (x))",
+            "CUB(x) ((x) * (x) * (x))"}]
+         ]];
+
 End[];
 
 EndPackage[];
diff --git a/Tools/CodeGen/Thorn.m b/Tools/CodeGen/Thorn.m
@@ -478,19 +478,6 @@
          optional LoopPreIncludes     -> {include file list},
 	          Equations           -> {{K11_rhs -> 2 A K11, ...}...}} *)
 
-calculationMacros[vectorise_] :=
-  CommentedBlock["Define macros used in calculations",
-      Map[{"#define ", #, "\n"} &,
-         {"INITVALUE (42)",
-          "QAD(x) (SQR(SQR(x)))"} ~Join~
-          If[vectorise,
-           {"INV(x) (kdiv(ToReal(1.0),x))",
-            "SQR(x) (kmul(x,x))",
-            "CUB(x) (kmul(x,SQR(x)))"},
-           {"INV(x) ((1.0) / (x))",
-            "SQR(x) ((x) * (x))",
-            "CUB(x) ((x) * (x) * (x))"}]
-         ]];
 
 (* Given a list of Calculation structures as defined above, create a
    CodeGen representation of a source file that defines a function for
@@ -524,7 +511,7 @@
                          {"cctk_Loop.h", "loopcontrol.h"},
                          If[OptionValue[UseOpenCL], {"OpenCLRunTime.h"}, {}],
                          If[OptionValue[UseVectors], {"vectors.h"}, {}]]],
-   calculationMacros[OptionValue[UseVectors]],
+   CalculationMacros[OptionValue[UseVectors]],
 
    (* For each function structure passed, create the function and
       insert it *)