Reduce common template code from assignDerArray to assignJacArray

See failing tests cppruntime/solveTest and cppruntime/RefArrayDim2

Belonging to [master]:
  - #2230

Author: rfranke

Compiler/Template/CodegenCpp.tpl

@@ -10977,6 +10977,36 @@ case eqn as SES_ARRAY_CALL_ASSIGN(lhs=lhs as CREF(__)) then
     >>
 end equationArrayCallAssign;
 
+template assignDerArray(Context context, String arr, Exp lhs_ecr, SimCode simCode, Text& extraFuncs, Text& extraFuncsDecl, Text extraFuncsNamespace, Text stateDerVectorName /*=__zDot*/, Boolean useFlatArrayNotation)
+ "Assign array considering special treatment of states and Jacobian vars"
+::=
+match lhs_ecr
+case CREF(componentRef=c, ty=ty as DAE.T_ARRAY(ty=elty, dims=dims)) then
+  let &varDeclsCref = buffer "" /*BUFD*/
+  let lhsStr = cref1(c, simCode, &extraFuncs, &extraFuncsDecl, extraFuncsNamespace, context, varDeclsCref, stateDerVectorName, useFlatArrayNotation)
+  match cref2simvar(c, simCode)
+  case SIMVAR(varKind=varKind) then
+    match varKind
+    case STATE()
+    case STATE_DER() then
+      //STATE vars are flat vectors
+      <<
+      /*assign to <%cref(c,useFlatArrayNotation)%>*/
+      memcpy(&<%lhsStr%>, <%arr%>.getData(), <%arr%>.getNumElems()*sizeof(double));
+      >>
+    case JAC_VAR()
+    case JAC_DIFF_VAR()
+    case SEED_VAR() then
+      <<
+      <%assignJacArray(lhsStr, arr, ty)%>
+      >>
+    else
+      <<
+      /*default array assign*/
+      <%lhsStr%>.assign(<%arr%>);
+      >>
+end assignDerArray;
+
 template equationWhen(SimEqSystem eq, Context context, Text &varDecls, SimCode simCode, Text& extraFuncs, Text& extraFuncsDecl,
                       Text extraFuncsNamespace, Text stateDerVectorName /*=__zDot*/, Boolean useFlatArrayNotation)
  "Generates a when equation."

Compiler/Template/CodegenCppCommon.tpl

@@ -2744,50 +2744,44 @@ template encloseInParantheses(String expStr)
 if intEq(stringGet(expStr, 1), stringGet("(", 1)) then '<%expStr%>' else '(<%expStr%>)'
 end encloseInParantheses;
 
-template assignDerArray(Context context, String arr, Exp lhs_ecr, SimCode simCode, Text& extraFuncs, Text& extraFuncsDecl, Text extraFuncsNamespace, Text stateDerVectorName /*=__zDot*/, Boolean useFlatArrayNotation)
- "Assign array considering special treatment of states and Jacobian vars"
+template assignJacArray(String lhsStr, String rhsStr, DAE.Type ty)
+ "Assign array to JAC/DIFF/SEED vars that are flat vectors with row major odering"
 ::=
-match lhs_ecr
-case CREF(componentRef=c, ty=ty as DAE.T_ARRAY(ty=elty, dims=dims)) then
-  let &varDeclsCref = buffer "" /*BUFD*/
-  let lhsStr = cref1(c, simCode, &extraFuncs, &extraFuncsDecl, extraFuncsNamespace, context, varDeclsCref, stateDerVectorName, useFlatArrayNotation)
-  match cref2simvar(c, simCode)
+  match ty
+  case DAE.T_ARRAY(ty=elty, dims=dims) then
+    let dimstr = listDimsFlat(dims, elty)
+    let arrayWrapper = 'tmp<%System.tmpTick()%>'
+    <<
+    /*assign through wrapper array*/
+    StatArrayDim<%nDimsFlat(dims, elty, 0)%><<%expTypeShort(elty)%>, <%dimstr%>, true> <%arrayWrapper%>(&<%lhsStr%>);
+    assignRowMajorData(<%rhsStr%>.getData(), <%arrayWrapper%>);
+    >>
+end assignJacArray;
+
+template writeLhsCref(Exp exp, String rhsStr, Context context, Text &preExp, Text &varDecls, SimCode simCode,
+                      Text& extraFuncs,Text& extraFuncsDecl,Text extraFuncsNamespace, Text stateDerVectorName, Boolean useFlatArrayNotation)
+ "Generates code for writing a returnStructur to var."
+::=
+match exp
+case ecr as CREF(componentRef=WILD(__)) then
+  ''
+case ecr as CREF(componentRef=cr, ty=ty as DAE.T_ARRAY()) then
+  let lhsStr = scalarLhsCref(exp, context, &preExp /*BUFC*/, &varDecls /*BUFD*/,simCode, &extraFuncs, &extraFuncsDecl, extraFuncsNamespace, stateDerVectorName, useFlatArrayNotation)
+  match cref2simvar(cr, simCode)
   case SIMVAR(varKind=varKind) then
     match varKind
-    case STATE()
-    case STATE_DER() then
-      //STATE vars are flat vectors
-      <<
-      /*assign to <%cref(c,useFlatArrayNotation)%>*/
-      memcpy(&<%lhsStr%>, <%arr%>.getData(), <%arr%>.getNumElems()*sizeof(double));
-      >>
     case JAC_VAR()
     case JAC_DIFF_VAR()
     case SEED_VAR() then
-      //JAC/DIFF/SEED vars are flat vectors with row major odering
-      let dimstr = listDimsFlat(dims, elty)
-      let arrayWrapper = 'tmp<%System.tmpTick()%>'
       <<
-      /*assign through wrapper array*/
-      StatArrayDim<%nDimsFlat(dims, elty, 0)%><<%expTypeShort(elty)%>, <%dimstr%>, true> <%arrayWrapper%>(&<%lhsStr%>);
-      assignRowMajorData(<%arr%>.getData(), <%arrayWrapper%>);
+      <%assignJacArray(lhsStr, rhsStr, ty)%>
       >>
     else
       <<
-      /*default array assign*/
-      <%lhsStr%>.assign(<%arr%>);
+      <%lhsStr%>.assign(<%rhsStr%>);
       >>
-end assignDerArray;
-
-template writeLhsCref(Exp exp, String rhsStr, Context context, Text &preExp, Text &varDecls, SimCode simCode,
-                      Text& extraFuncs,Text& extraFuncsDecl,Text extraFuncsNamespace, Text stateDerVectorName, Boolean useFlatArrayNotation)
- "Generates code for writing a returnStructur to var."
-::=
-match exp
-case ecr as CREF(componentRef=WILD(__)) then
-  ''
-case ecr as CREF(ty= t as DAE.T_ARRAY(__)) then
-  '<%assignDerArray(context, rhsStr, exp, simCode,  &extraFuncs, &extraFuncsDecl, extraFuncsNamespace, stateDerVectorName, useFlatArrayNotation)%>'
+    end match
+  end match
 case UNARY(exp = e as CREF(ty= t as DAE.T_ARRAY(__))) then
   let lhsStr = scalarLhsCref(e, context, &preExp /*BUFC*/, &varDecls /*BUFD*/,simCode , &extraFuncs , &extraFuncsDecl,  extraFuncsNamespace, stateDerVectorName, useFlatArrayNotation)
   match context