diff options
| author | Ian Hinder <ian.hinder@aei.mpg.de> | 2013-09-09 18:33:20 +0200 |
|---|---|---|
| committer | Ian Hinder <ian.hinder@aei.mpg.de> | 2013-09-09 18:33:20 +0200 |
| commit | 492ae490d7b1063a548874910be163e169072764 (patch) | |
| tree | 0dd4bb3cb5b849d17bb642c7de2e8f1947bf55ca | |
| parent | 59fed20621d533b86617f40f85f374d0269cae70 (diff) | |
KrancThorn.m: Move RHS ODE group definitions into MoL.m
| -rw-r--r-- | Tools/CodeGen/KrancThorn.m | 3 | ||||
| -rw-r--r-- | Tools/CodeGen/MoL.m | 8 |
2 files changed, 9 insertions, 2 deletions
diff --git a/Tools/CodeGen/KrancThorn.m b/Tools/CodeGen/KrancThorn.m index a08eb43..33cf599 100644 --- a/Tools/CodeGen/KrancThorn.m +++ b/Tools/CodeGen/KrancThorn.m @@ -179,8 +179,7 @@ CreateKrancThorn[groupsOrig_, parentDirectory_, thornName_, opts:OptionsPattern[ rhsGroupDefinitions = MoLRHSGroupDefinitions[groups, evolvedGroups]; groups = Join[groups, rhsGroupDefinitions]; - evolvedODEGroupDefinitions = Map[groupFromName[#, groups] &, evolvedODEGroups]; - rhsODEGroupDefinitions = Map[EvolvedGroupToRHSGroup[#, evolvedODEGroupDefinitions] &, evolvedODEGroups]; + rhsODEGroupDefinitions = MoLRHSODEGroupDefinitions[groups, evolvedODEGroups]; groups = Join[groups, rhsODEGroupDefinitions]; (* Add the groups into the calcs *) diff --git a/Tools/CodeGen/MoL.m b/Tools/CodeGen/MoL.m index cada495..1fc829f 100644 --- a/Tools/CodeGen/MoL.m +++ b/Tools/CodeGen/MoL.m @@ -32,6 +32,7 @@ MoLEvolvedGroups; MoLNonevolvedGroups; EvolvedGroupToRHSGroup::usage = ""; MoLRHSGroupDefinitions; +MoLRHSODEGroupDefinitions; Begin["`Private`"]; @@ -570,6 +571,13 @@ DefFn[ evolvedGroupDefinitions = Map[groupFromName[#, groups] &, evolvedGroups]; Map[EvolvedGroupToRHSGroup[#, evolvedGroupDefinitions] &, evolvedGroups]]]; +DefFn[ + MoLRHSODEGroupDefinitions[groups_List, evolvedODEGroups_List] := + Module[ + {evolvedODEGroupDefinitions}, + evolvedODEGroupDefinitions = Map[groupFromName[#, groups] &, evolvedODEGroups]; + Map[EvolvedGroupToRHSGroup[#, evolvedODEGroupDefinitions] &, evolvedODEGroups]]]; + End[]; EndPackage[]; |