aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Hinder <ian.hinder@aei.mpg.de>2013-09-12 22:02:08 +0200
committerIan Hinder <ian.hinder@aei.mpg.de>2013-09-12 22:02:08 +0200
commit3237af2566109f099ee78a7effb511a65dc18ae0 (patch)
treec24ee9793a1ea67e4901a4221a5006568f9bc4e5
parentc05f59d900a5477478a0cca12441953e4be3d2f8 (diff)
Change method used to determine which groups to create old-style boundary condition code for
This changes the ordering of code in Boundaries.cc.
-rw-r--r--Tools/CodeGen/CactusBoundary.m12
-rw-r--r--Tools/CodeGen/KrancThorn.m2
2 files changed, 10 insertions, 4 deletions
diff --git a/Tools/CodeGen/CactusBoundary.m b/Tools/CodeGen/CactusBoundary.m
index 127056b..f4d362d 100644
--- a/Tools/CodeGen/CactusBoundary.m
+++ b/Tools/CodeGen/CactusBoundary.m
@@ -166,12 +166,18 @@ DefFn[
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
index 701665e..a507e65 100644
--- a/Tools/CodeGen/KrancThorn.m
+++ b/Tools/CodeGen/KrancThorn.m
@@ -343,7 +343,7 @@ CreateKrancThorn[groupsOrig_, parentDirectory_, thornName_, opts:OptionsPattern[
sources = Join[
sources,
- CactusBoundary`GetSources[evolvedGroups, groups, implementation, thornName]];
+ CactusBoundary`GetSources[evolvedGroups, declaredGroups, groups, implementation, thornName]];
(* ------------------------------------------------------------------------
Add parameter check source file