Change arguments of CactusBoundary`GetParameters to declaredGroups an…

…d groups from evolvedGFs and evolvedGroups This means the caller doesn't have to know about which groups are evolved. It changes the ordering of the parameters.
ianhinder · Sep 11, 2013 · cf0ebf3 · cf0ebf3
1 parent e180367
commit cf0ebf3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/Tools/CodeGen/CactusBoundary.m b/Tools/CodeGen/CactusBoundary.m
@@ -147,7 +147,12 @@
 };
 
 DefFn[
-  GetParameters[evolvedGFs_List, evolvedGroups_List] :=
+  GetParameters[declaredGroups_List, groups_List] :=
+  Module[
+    {evolvedGFs, evolvedGroups},
+    evolvedGroups = MoLEvolvedGroups[declaredGroups, groups];
+    evolvedGFs = variablesFromGroups[evolvedGroups, groups];
+
   Join[Map[createBoundTypeParam[#,"skip"] &, evolvedGFs],
        Map[createBoundTypeParam[#,"none"] &, Map[unqualifiedGroupName,evolvedGroups]],
 
@@ -158,7 +163,7 @@
        Map[createBoundLimitParam, Map[unqualifiedGroupName,evolvedGroups]],
 
        Map[createBoundScalarParam, evolvedGFs],
-       Map[createBoundScalarParam, Map[unqualifiedGroupName,evolvedGroups]]]];
+       Map[createBoundScalarParam, Map[unqualifiedGroupName,evolvedGroups]]]]];
 
 
 GetSources[evolvedGroups_, groups_, implementation_, thornName_] :=

diff --git a/Tools/CodeGen/Param.m b/Tools/CodeGen/Param.m
@@ -370,7 +370,7 @@
                     thornName, declaredGroups, groups,
                     evolutionTimelevels, defaultEvolutionTimelevels],
                   calculationParameterStructures[calcs],
-                  CactusBoundary`GetParameters[variablesFromGroups[evolvedGroups, groups], evolvedGroups]];
+                  CactusBoundary`GetParameters[declaredGroups, groups]];
 
     paramspec = {Implementations -> usedParameters[parameters, opts],
                  NewParameters   -> params};