diff options
| -rw-r--r-- | Tools/CodeGen/KrancTensor.m | 1 | ||||
| -rw-r--r-- | Tools/CodeGen/KrancThorn.m | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/Tools/CodeGen/KrancTensor.m b/Tools/CodeGen/KrancTensor.m index ea56d38..d0157c9 100644 --- a/Tools/CodeGen/KrancTensor.m +++ b/Tools/CodeGen/KrancTensor.m @@ -55,6 +55,7 @@ CreateKrancThornTT[groups_, parentDirectory_, thornName_, opts___] := expDerivs = Flatten[Map[ExpandComponents,derivs],1]; expGroups = Map[makeGroupExplicit, groups]; options = Join[DeleteCases[{opts}, Calculations -> _], {Calculations -> expCalcs}]; + options = mapReplace[options, Shorthands, ExpandComponents[lookup[options,Shorthands,{}]]]; options = Join[DeleteCases[options, ConservationCalculations -> _], {ConservationCalculations -> expConsCalcs}]; options = Join[DeleteCases[options, PartialDerivatives -> _], {PartialDerivatives -> expDerivs}]; diff --git a/Tools/CodeGen/KrancThorn.m b/Tools/CodeGen/KrancThorn.m index 0a4003a..c4e6c93 100644 --- a/Tools/CodeGen/KrancThorn.m +++ b/Tools/CodeGen/KrancThorn.m @@ -103,6 +103,8 @@ CreateKrancThorn[groupsOrig_, parentDirectory_, thornName_, opts:OptionsPattern[ cktCheckNamedArgs[{opts}]; calcs = OptionValue[Calculations]; + calcs = Map[mapReplaceAdd[#, Shorthands, Join[lookup[#,Shorthands,{}],OptionValue[Shorthands]]] &, calcs]; + declaredGroups = OptionValue[DeclaredGroups]; odeGroups = OptionValue[ODEGroups]; implementation = |