Use the index from the correct set

Earlier, we did go through all variables in all equation systems in
order to find the indexes of initialization variables in the current
equation system. Now we check which variables in the current equation
system are initialization variables (and return the current index).

Compiler/BackEnd/BackendVariable.mo

@@ -2939,6 +2939,42 @@ algorithm
   end try;
 end traversingVarIndexFinder;
 
+public function getVarIndexFromVariablesIndexInFirstSet
+  input BackendDAE.Variables inVariables;
+  input BackendDAE.Variables inVariables2;
+  output list<Integer> v_lst;
+protected
+  array<list<Integer>> a;
+algorithm
+  (a,_) := traverseBackendDAEVars(inVariables,
+    function traversingVarIndexInFirstSetFinder(inVars = inVariables2), (arrayCreate(1,{}),arrayCreate(1,1)));
+  v_lst := listReverse(a[1]);
+end getVarIndexFromVariablesIndexInFirstSet;
+
+protected function traversingVarIndexInFirstSetFinder
+"author: Frenkel TUD 2010-11"
+  input BackendDAE.Var inVar;
+  input BackendDAE.Variables inVars;
+  input tuple<array<list<Integer>>,array<Integer>> inIndices;
+  output BackendDAE.Var outVar = inVar;
+  output tuple<array<list<Integer>>,array<Integer>> outIndices;
+protected
+  DAE.ComponentRef cr;
+  list<Integer> indices1,indices2;
+  array<list<Integer>> l;
+  array<Integer> i;
+algorithm
+  (l,i) := inIndices;
+  outIndices := inIndices;
+  try
+    cr := varCref(inVar);
+    getVar(cr, inVars);
+    l[1] := i[1]::l[1];
+  else
+  end try;
+  i[1] := i[1]+1;
+end traversingVarIndexInFirstSetFinder;
+
 public function mergeVariables
   "Merges two sets of Variables, where the variables of the first set takes
    precedence over the second set."

Compiler/BackEnd/Initialization.mo

@@ -1220,11 +1220,11 @@ algorithm
     (m_, _, _, mapIncRowEqn) := BackendDAEUtil.incidenceMatrixScalar(syst, BackendDAE.SOLVABLE(), SOME(funcs));
     //BackendDump.dumpEqSystem(syst, "fixInitialSystem");
     //BackendDump.dumpVariables(initVars, "selected initialization variables");
+    //BackendDump.dumpVariables(inEqSystem.orderedVars, "vars in the system");
     //BackendDump.dumpIncidenceMatrix(m_);
 
     // get state-index list
-    stateIndices := BackendVariable.getVarIndexFromVariables(inEqSystem.orderedVars, initVars);
-    //print("{" + stringDelimitList(List.map(stateIndices, intString), ",") + "}\n");
+    stateIndices := BackendVariable.getVarIndexFromVariablesIndexInFirstSet(inEqSystem.orderedVars, initVars);
 
     // get initial equation-index list
     //(initEqs, _) := List.extractOnTrue(BackendEquation.equationList(inEqSystem.orderedEqs), BackendEquation.isInitialEquation);