Calculation.m: Move CalculationEvolvedVars into MoL.m as EvolvedVaria…

…bles
ianhinder · Sep 9, 2013 · b5ceb9a · b5ceb9a
1 parent 589a4b3
commit b5ceb9a
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/Tools/CodeGen/Calculation.m b/Tools/CodeGen/Calculation.m
@@ -44,7 +44,6 @@
 VerifyCalculation;
 CalculationSymbols;
 VerifyNewCalculation;
-CalculationEvolvedVars;
 
 Begin["`Private`"];
 
@@ -468,14 +467,6 @@ pathalogical enough (e.g. {s1 -> s2, s2 -> s1} would not be
       VerifyListContent[lookup[calc, Equations], Rule," while checking the calculation called " <> ToString[calcName]],
       ThrowError["Invalid Calculation structure. Must contain Equations element: " <> ToString[calc]]]];
 
-CalculationEvolvedVars[calc_] :=
-  Module[{eqs, evolved, lhss},
-    VerifyNewCalculation[calc];
-    eqs = lookup[calc, Equations];
-    lhss = Map[First, eqs];
-    evolved = Cases[lhss, dot[v_] -> v];
-    Return[evolved]];
-
 End[];
 
 EndPackage[];
diff --git a/Tools/CodeGen/KrancThorn.m b/Tools/CodeGen/KrancThorn.m
@@ -337,7 +337,7 @@ Thorn generation (main entry point for non-tensorial thorns)
     VerifyList[calcs];
     Map[VerifyNewCalculation, calcs];
     allVars = variablesFromGroups[declaredGroups, groups];
-    evolvedVars = Apply[Join, Map[CalculationEvolvedVars, calcs]];
+    evolvedVars = Apply[Join, Map[EvolvedVariables, calcs]];
     evolvedVars = Intersection[allVars, evolvedVars];
     evolvedGroups = containingGroups[evolvedVars, groups];
     Return[evolvedGroups]];
@@ -350,7 +350,7 @@ Thorn generation (main entry point for non-tensorial thorns)
     Map[VerifyNewCalculation, calcs];
 
     allVars = variablesFromGroups[declaredGroups, groups];
-    evolvedVars = Apply[Join, Map[CalculationEvolvedVars, calcs]];
+    evolvedVars = Apply[Join, Map[EvolvedVariables, calcs]];
     evolvedGroups = containingGroups[evolvedVars, groups];
     nonevolvedGroups = Complement[declaredGroups, evolvedGroups];
 

diff --git a/Tools/CodeGen/MoL.m b/Tools/CodeGen/MoL.m
@@ -21,12 +21,13 @@
 BeginPackage[
   "MoL`",
   {"Errors`", "Helpers`", "Kranc`", "CodeGenKranc`", "MapLookup`", "CodeGenCactus`",
-   "CodeGen`", "CodeGenC`", "KrancGroups`"}];
+   "CodeGen`", "CodeGenC`", "KrancGroups`", "Calculation`"}];
 
 CreateKrancMoLRegister;
 CreateMoLBoundariesSource::usage = "";
 CreateMoLExcisionSource::usage = "";
 MoLReplaceDots;
+EvolvedVariables;
 
 Begin["`Private`"];
 
@@ -507,6 +508,14 @@
 DefFn[MoLReplaceDots[x_] := 
   x /. (dot[y_] :> Symbol[ToString[y] <> "rhs"])];
 
+EvolvedVariables[calc_] :=
+  Module[{eqs, evolved, lhss},
+    VerifyNewCalculation[calc];
+    eqs = GetEquations[calc];
+    lhss = Map[First, eqs];
+    evolved = Cases[lhss, dot[v_] -> v];
+    Return[evolved]];
+
 End[];
 
 EndPackage[];