remove jacobian var defines in cpp codegen

Belonging to [master]: - OpenModelica/OMCompiler#1872 - OpenModelica/OpenModelica-testsuite#730
OpenModelica · Oct 11, 2017 · 2264580 · 2264580
1 parent 24d5703
commit 2264580
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/Compiler/Template/CodegenCpp.tpl b/Compiler/Template/CodegenCpp.tpl
@@ -13038,7 +13038,8 @@ template variableDefinitionsJacobians(list<JacobianMatrix> JacobianMatrixes, Sim
  "Generates defines for jacobian vars."
 ::=
   let analyticVars = (JacobianMatrixes |> JAC_MATRIX(columns=jacColumn, seedVars=vars, matrixName=name, jacobianIndex=jacIndex)  =>
-    let varsDef = variableDefinitionsJacobians2(jacIndex, jacColumn, seedVars, name, simCode, &extraFuncs, &extraFuncsDecl, extraFuncsNamespace, &jacobianVarsInit, createDebugCode)
+    //let varsDef = variableDefinitionsJacobians2(jacIndex, jacColumn, seedVars, name, simCode, &extraFuncs, &extraFuncsDecl, extraFuncsNamespace, &jacobianVarsInit, createDebugCode)
+    let varsDef = ""
     <<
     <%varsDef%>
     >>
@@ -13082,7 +13083,7 @@ match simVar
     let &jacobianVarsInit += if createDebugCode then ', <%jacobianVar%>(_<%matrixName%><%typeName%>)<%\n%>'
     if createDebugCode then
        'double& <%jacobianVar%>;' else
-      '#define <%jacobianVar%> _<%matrixName%><%typeName%>'
+       '#define <%jacobianVar%> _<%matrixName%><%typeName%>'
   end match
 end jacobianVarDefine;
 

diff --git a/Compiler/Template/CodegenCppCommon.tpl b/Compiler/Template/CodegenCppCommon.tpl
@@ -212,14 +212,20 @@ template cref1(ComponentRef cr, SimCode simCode ,Text& extraFuncs,Text& extraFun
 end cref1;
 
 template representationCref(ComponentRef inCref, SimCode simCode ,Text& extraFuncs,Text& extraFuncsDecl,Text extraFuncsNamespace, Context context, Text &varDecls, Text stateDerVectorName /*=__zDot*/, Boolean useFlatArrayNotation) ::=
-  cref2simvar(inCref, simCode) |> var as SIMVAR(varKind=varKind, index=i) =>
+  cref2simvar(inCref, simCode) |> var as SIMVAR(varKind=varKind, index=i, matrixName=matrixName) =>
   match varKind
     case STATE() then
       '__z[<%i%>]'
     case STATE_DER() then
       '__zDot[<%i%>]'
     case DAE_RESIDUAL_VAR() then
       '__daeResidual[<%i%>]'
+    case JAC_VAR() then
+      '_<%getOption(matrixName)%>jac_y(<%i%>)'
+    case JAC_DIFF_VAR() then
+      '_<%getOption(matrixName)%>jac_tmp(<%i%>)'
+    case SEED_VAR() then
+      '_<%getOption(matrixName)%>jac_x(<%i%>)'
     case VARIABLE() then
       match var
         case SIMVAR(index=-2) then