diff options
| author | Ian Hinder <ian.hinder@aei.mpg.de> | 2013-09-11 17:05:28 +0200 |
|---|---|---|
| committer | Ian Hinder <ian.hinder@aei.mpg.de> | 2013-09-11 17:05:28 +0200 |
| commit | d03c1e0d8133666f9e21ea09c575a8ce5ea5278f (patch) | |
| tree | c45c583f95aaf31931d84b20a5da449d7f5114b3 /Tools | |
| parent | ec4399483cac51a8322265c6d1c6591bbde54f20 (diff) | |
Pass declared groups into parameter file generation functions
Diffstat (limited to 'Tools')
| -rw-r--r-- | Tools/CodeGen/KrancThorn.m | 3 | ||||
| -rw-r--r-- | Tools/CodeGen/MoL.m | 2 | ||||
| -rw-r--r-- | Tools/CodeGen/Param.m | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/Tools/CodeGen/KrancThorn.m b/Tools/CodeGen/KrancThorn.m index 543b6c0..44be2ba 100644 --- a/Tools/CodeGen/KrancThorn.m +++ b/Tools/CodeGen/KrancThorn.m @@ -228,7 +228,8 @@ CreateKrancThorn[groupsOrig_, parentDirectory_, thornName_, opts:OptionsPattern[ (* Construct the param file *) InfoMessage[Terse, "Creating param file"]; - param = CreateKrancParam[evolvedGroups, + param = CreateKrancParam[declaredGroups, + evolvedGroups, evolvedODEGroups, groups, thornName, diff --git a/Tools/CodeGen/MoL.m b/Tools/CodeGen/MoL.m index fd73932..ce656e3 100644 --- a/Tools/CodeGen/MoL.m +++ b/Tools/CodeGen/MoL.m @@ -616,7 +616,7 @@ DefFn[ groups2]]; DefFn[ - MoLParameterStructures[thornName_, evolvedGroups_, evolvedODEGroups_, groups_, evolutionTimelevels_, + MoLParameterStructures[thornName_, declaredGroups_, evolvedGroups_, evolvedODEGroups_, groups_, evolutionTimelevels_, defaultEvolutionTimelevels_] := Module[ {nEvolved, nevolvedODE}, diff --git a/Tools/CodeGen/Param.m b/Tools/CodeGen/Param.m index 2f2f796..57901d3 100644 --- a/Tools/CodeGen/Param.m +++ b/Tools/CodeGen/Param.m @@ -358,7 +358,7 @@ DefFn[ Options[CreateKrancParam] = ThornOptions; -CreateKrancParam[evolvedGroups_, evolvedODEGroups_, groups_, +CreateKrancParam[declaredGroups_, evolvedGroups_, evolvedODEGroups_, groups_, thornName_, parameters_, evolutionTimelevels_, defaultEvolutionTimelevels_, calcs_, opts:OptionsPattern[]] := Module[ @@ -367,7 +367,7 @@ CreateKrancParam[evolvedGroups_, evolvedODEGroups_, groups_, params = Join[commonParameterStructures[evolutionTimelevels], userParameterStructs[parameters], MoLParameterStructures[ - thornName, evolvedGroups, evolvedODEGroups, groups, + thornName, declaredGroups, evolvedGroups, evolvedODEGroups, groups, evolutionTimelevels, defaultEvolutionTimelevels], calculationParameterStructures[calcs], CactusBoundary`GetParameters[variablesFromGroups[evolvedGroups, groups], evolvedGroups]]; |