diff options
| author | Ian Hinder <ian.hinder@aei.mpg.de> | 2013-09-10 17:12:04 +0200 |
|---|---|---|
| committer | Ian Hinder <ian.hinder@aei.mpg.de> | 2013-09-10 17:12:04 +0200 |
| commit | ab37589937f9481d2346a77d6a71f488ed8b3d4f (patch) | |
| tree | bf8c7328799f2f24f63a0bcec2dfe18bb642a124 | |
| parent | 5a98f93751cfbe54fab50a5c0392437c7bbeb0c1 (diff) | |
Pass declared groups into CreateInterface from CreateKrancThorn
| -rw-r--r-- | Tools/CodeGen/Interface.m | 2 | ||||
| -rw-r--r-- | Tools/CodeGen/KrancThorn.m | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/Tools/CodeGen/Interface.m b/Tools/CodeGen/Interface.m index c30381a..b432355 100644 --- a/Tools/CodeGen/Interface.m +++ b/Tools/CodeGen/Interface.m @@ -111,7 +111,7 @@ rhsODEGroupInterfaceStructure[group_, timelevels_] := Options[CreateKrancInterface] = ThornOptions; CreateKrancInterface[nonevolvedGroups_, evolvedGroups_, rhsGroups_, - nonevolvedODEGroups_, evolvedODEGroups_, rhsODEGroups_, groups_, + nonevolvedODEGroups_, evolvedODEGroups_, rhsODEGroups_, declaredGroups_, groups_, implementation_, inheritedImplementations_, includeFiles_, opts:OptionsPattern[]] := diff --git a/Tools/CodeGen/KrancThorn.m b/Tools/CodeGen/KrancThorn.m index 08ef44f..8b6ed15 100644 --- a/Tools/CodeGen/KrancThorn.m +++ b/Tools/CodeGen/KrancThorn.m @@ -203,6 +203,8 @@ CreateKrancThorn[groupsOrig_, parentDirectory_, thornName_, opts:OptionsPattern[ rhsGroups = Map[groupName, rhsGroupDefinitions]; rhsODEGroups = Map[groupName, rhsODEGroupDefinitions]; + declaredGroups = Join[declaredGroups, rhsGroups, odeGroups, rhsODEGroups]; + calcs = Map[Append[#, ODEGroups -> Join[odeGroups, rhsODEGroups]] &, calcs]; (* Construct a source file for each calculation *) @@ -223,7 +225,7 @@ CreateKrancThorn[groupsOrig_, parentDirectory_, thornName_, opts:OptionsPattern[ InfoMessage[Terse, "Creating interface file"]; interface = CreateKrancInterface[nonevolvedGroups, evolvedGroups, rhsGroups, nonevolvedODEGroups, evolvedODEGroups, - rhsODEGroups, groups, + rhsODEGroups, declaredGroups, groups, implementation, inheritedImplementations, includeFiles, opts]; (* Construct the param file *) |