Param.m: Move details of used MoL parameters into MoL.m

ianhinder · Sep 11, 2013 · 9484f64 · 9484f64
1 parent 21b0cb9
commit 9484f64
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/Tools/CodeGen/MoL.m b/Tools/CodeGen/MoL.m
@@ -36,6 +36,7 @@
 MoLUsedFunctions;
 MoLProcessGroups;
 MoLParameterStructures;
+MoLUsedParameters;
 
 Begin["`Private`"];
 
@@ -665,6 +666,16 @@
                           Description -> ""}},
        Steerable -> Recover}}]];
 
+DefFn[
+  MoLUsedParameters[] :=
+  { Name -> "MethodOfLines",
+    UsedParameters -> 
+    {
+      {Name -> "MoL_Num_Evolved_Vars",        Type -> "CCTK_INT"},
+      {Name -> "MoL_Num_ArrayEvolved_Vars",   Type -> "CCTK_INT"}
+      (* {Name -> "MoL_Num_Constrained_Vars", Type -> "CCTK_INT"} *)
+    }}];
+
 End[];
 
 EndPackage[];
diff --git a/Tools/CodeGen/Param.m b/Tools/CodeGen/Param.m
@@ -332,17 +332,6 @@
     implementationNames = Union[Map[implementationFromQualifiedName, allInherited],
                                 Map[implementationFromQualifiedName[lookup[#, Name]] &, allExtended]];
 
-    molImplementation =
-    {
-      Name -> "MethodOfLines",
-      UsedParameters -> 
-      {
-        {Name -> "MoL_Num_Evolved_Vars",        Type -> "CCTK_INT"},
-        {Name -> "MoL_Num_ArrayEvolved_Vars",   Type -> "CCTK_INT"}
-        (* {Name -> "MoL_Num_Constrained_Vars", Type -> "CCTK_INT"} *)
-      }
-    };
-
     userImplementations = Map[
       inheritParameters[
         #,
@@ -359,7 +348,7 @@
     userImplementations = If[userImplementations=={{}},{},userImplementations];
     userImplementations2 = If[userImplementations2=={{}},{},userImplementations2];
 
-    implementations = Join[userImplementations, userImplementations2, {genericfdStruct, molImplementation}];
+    implementations = Join[userImplementations, userImplementations2, {genericfdStruct, MoLUsedParameters[]}];
     params = Join[{verboseStruct}, realStructs, intStructs, keywordStructs,
                   MoLParameterStructures[thornName, evolvedGroups, evolvedODEGroups, groups,
                                          evolutionTimelevels, defaultEvolutionTimelevels],