Change method used to determine which groups to create old-style boun…

…dary condition code for This changes the ordering of code in Boundaries.cc.
ianhinder · Sep 12, 2013 · 3237af2 · 3237af2
1 parent c05f59d
commit 3237af2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/Tools/CodeGen/CactusBoundary.m b/Tools/CodeGen/CactusBoundary.m
@@ -166,12 +166,18 @@
        Map[createBoundScalarParam, Map[unqualifiedGroupName,evolvedGroups]]]]];
 
 
-GetSources[evolvedGroups_, groups_, implementation_, thornName_] :=
+GetSources[evolvedGroups_, declaredGroups_, groups_, implementation_, thornName_] :=
   Module[{boundarySpec, evolvedGFs},
-    evolvedGFs = variablesFromGroups[evolvedGroups, groups];
+    evolvedGroups2 = MoLEvolvedGroups[declaredGroups, groups];
+
+    If[Union@evolvedGroups2 =!= Union[evolvedGroups],
+       Print["Group mismatch"];
+       Quit[1]];
+
+    evolvedGFs = variablesFromGroups[evolvedGroups2, groups];
     boundarySpec = 
     {
-      Groups -> evolvedGroups, 
+      Groups -> evolvedGroups2, 
       EvolvedGFs -> Map[qualifyGFName[#, groups, implementation] &, evolvedGFs],
       BaseImplementation -> implementation, 
       ThornName -> thornName,

diff --git a/Tools/CodeGen/KrancThorn.m b/Tools/CodeGen/KrancThorn.m
@@ -343,7 +343,7 @@ Thorn generation (main entry point for non-tensorial thorns)
 
     sources = Join[
       sources,
-      CactusBoundary`GetSources[evolvedGroups, groups, implementation, thornName]];
+      CactusBoundary`GetSources[evolvedGroups, declaredGroups, groups, implementation, thornName]];
 
     (* ------------------------------------------------------------------------ 
        Add parameter check source file