Change arguments of CactusBoundary`GetParameters to declaredGroups and 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.

2 files changed, 8 insertions, 3 deletions

diff --git a/Tools/CodeGen/CactusBoundary.m b/Tools/CodeGen/CactusBoundary.m
index ba4a0f4..2a580be 100644
--- a/Tools/CodeGen/CactusBoundary.m
+++ b/Tools/CodeGen/CactusBoundary.m
@@ -147,7 +147,12 @@ createBoundScalarParam[groupOrGF_] := {
 };
 
 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 @@ DefFn[
        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
index b21bff1..ac12942 100644
--- a/Tools/CodeGen/Param.m
+++ b/Tools/CodeGen/Param.m
@@ -370,7 +370,7 @@ CreateKrancParam[declaredGroups_, evolvedGroups_, evolvedODEGroups_, groups_,
                     thornName, declaredGroups, groups,
                     evolutionTimelevels, defaultEvolutionTimelevels],
                   calculationParameterStructures[calcs],
-                  CactusBoundary`GetParameters[variablesFromGroups[evolvedGroups, groups], evolvedGroups]];
+                  CactusBoundary`GetParameters[declaredGroups, groups]];
 
     paramspec = {Implementations -> usedParameters[parameters, opts],
                  NewParameters   -> params};