Handle indices for input and extra parameters

FlexibleSUSY · Dec 7, 2016 · 0d6eb35 · 0d6eb35
1 parent 7cb4424
commit 0d6eb35
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/meta/Parameters.m b/meta/Parameters.m
@@ -421,11 +421,17 @@
 
 IsInputParameter[parameter_] := MemberQ[GetInputParameters[], parameter];
 
+IsInputParameter[parameter_[indices__] /; And @@ (IsIndex /@ {indices})] :=
+    IsInputParameter[parameter];
+
 IsOutputParameter[lst_List] := And @@ (IsOutputParameter /@ lst);
 IsOutputParameter[sym_]     := MemberQ[GetOutputParameters[],sym];
 
 IsExtraParameter[parameter_] := MemberQ[GetExtraParameters[], parameter];
 
+IsExtraParameter[parameter_[indices__] /; And @@ (IsIndex /@ {indices})] :=
+    IsExtraParameter[parameter];
+
 IsRealParameter[Re[sym_]] := True;
 IsRealParameter[Im[sym_]] := True;
 IsRealParameter[FlexibleSUSY`M[_]] := True;
@@ -642,6 +648,9 @@
            RuleDelayed @@ Rule[parameter[i_,j_,k_,l_], parameter[i-1,j-1,k-1,l-1]]
           ];
 
+CreateIndexReplacementRule[parameter_ /; (IsInputParameter[parameter] || IsExtraParameter[parameter])] :=
+    CreateIndexReplacementRule[{parameter, GetType[parameter]}];
+
 CreateIndexReplacementRule[parameter_] :=
     Module[{i,j,k,l, dim, rule},
            dim = SARAH`getDimParameters[parameter];
@@ -1106,8 +1115,8 @@
     IncreaseIndexLiterals[expr, 1];
 
 IncreaseIndexLiterals[expr_, num_Integer] :=
-    IncreaseIndexLiterals[expr, num, Join[GetInputParameters[], allModelParameters,
-                                          allOutputParameters]];
+    IncreaseIndexLiterals[expr, num, Join[GetInputParameters[], GetExtraParameters[],
+                                          allModelParameters, allOutputParameters]];
 
 IncreaseIndexLiterals[expr_, num_Integer, heads_List] :=
     Module[{indexedSymbols, rules, decrExpr, allHeads},