Interface.m: Move MoL aliased function declarations into MoL.m

2 files changed, 21 insertions, 18 deletions

diff --git a/Tools/CodeGen/Interface.m b/Tools/CodeGen/Interface.m
index 353e629..6bd36cf 100644
--- a/Tools/CodeGen/Interface.m
+++ b/Tools/CodeGen/Interface.m
@@ -20,7 +20,7 @@
 
 BeginPackage["Interface`", {"Thorn`", "KrancGroups`", "MapLookup`", "Errors`",
                             "Helpers`", "Kranc`", "CaKernel`", "OpenCL`",
-                            "CodeGenInterface`"}];
+                            "CodeGenInterface`", "MoL`"}];
 
 CreateKrancInterface;
 
@@ -130,21 +130,6 @@ CreateKrancInterface[nonevolvedGroups_, evolvedGroups_, rhsGroups_,
     VerifyStringList[inheritedImplementations, "InheritedImplementations"];
     VerifyStringList[includeFiles, "IncludeFiles"];
     (* These are the aliased functions that are USED by this thorn from other thorns *)
-    registerEvolved = 
-    {
-      Name      -> "MoLRegisterEvolved",
-      Type      -> "CCTK_INT",
-      ArgString -> "CCTK_INT IN EvolvedIndex, CCTK_INT IN RHSIndex"
-    };
-
-    (*
-    registerConstrained = 
-    {
-      Name      -> "MoLRegisterConstrained",
-      Type      -> "CCTK_INT",
-      ArgString -> "CCTK_INT IN ConstrainedIndex"
-    };
-    *)
 
     diffCoeff = 
     {
@@ -201,8 +186,7 @@ CreateKrancInterface[nonevolvedGroups_, evolvedGroups_, rhsGroups_,
            If[OptionValue[UseVectors], {"vectors.h"}, {}]],
       groupStructures,
       UsesFunctions ->
-        Join[{registerEvolved, (*registerConstrained,*)
-                diffCoeff, getMap}, 
+        Join[MoLUsedFunctions[], {diffCoeff, getMap}, 
              CactusBoundary`GetUsedFunctions[]]],
    {If[OptionValue[UseCaKernel], CaKernelInterfaceCLL[], {}]}];
 
diff --git a/Tools/CodeGen/MoL.m b/Tools/CodeGen/MoL.m
index 1fc829f..83b91fd 100644
--- a/Tools/CodeGen/MoL.m
+++ b/Tools/CodeGen/MoL.m
@@ -33,6 +33,7 @@ MoLNonevolvedGroups;
 EvolvedGroupToRHSGroup::usage = "";
 MoLRHSGroupDefinitions;
 MoLRHSODEGroupDefinitions;
+MoLUsedFunctions;
 
 Begin["`Private`"];
 
@@ -578,6 +579,24 @@ DefFn[
     evolvedODEGroupDefinitions = Map[groupFromName[#, groups] &, evolvedODEGroups];
     Map[EvolvedGroupToRHSGroup[#, evolvedODEGroupDefinitions] &, evolvedODEGroups]]];
 
+DefFn[
+  MoLUsedFunctions[] :=
+  {
+    {
+      Name      -> "MoLRegisterEvolved",
+      Type      -> "CCTK_INT",
+      ArgString -> "CCTK_INT IN EvolvedIndex, CCTK_INT IN RHSIndex"
+    }
+
+    (*
+    {
+      Name      -> "MoLRegisterConstrained",
+      Type      -> "CCTK_INT",
+      ArgString -> "CCTK_INT IN ConstrainedIndex"
+    };
+    *)
+  }];
+
 End[];
 
 EndPackage[];