Skip to content
This repository was archived by the owner on May 18, 2019. It is now read-only.

Commit 2264580

Browse files
Willi BraunOpenModelica-Hudson
authored andcommitted
remove jacobian var defines in cpp codegen
Belonging to [master]: - #1872 - OpenModelica/OpenModelica-testsuite#730
1 parent 24d5703 commit 2264580

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

Compiler/Template/CodegenCpp.tpl

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13038,7 +13038,8 @@ template variableDefinitionsJacobians(list<JacobianMatrix> JacobianMatrixes, Sim
1303813038
"Generates defines for jacobian vars."
1303913039
::=
1304013040
let analyticVars = (JacobianMatrixes |> JAC_MATRIX(columns=jacColumn, seedVars=vars, matrixName=name, jacobianIndex=jacIndex) =>
13041-
let varsDef = variableDefinitionsJacobians2(jacIndex, jacColumn, seedVars, name, simCode, &extraFuncs, &extraFuncsDecl, extraFuncsNamespace, &jacobianVarsInit, createDebugCode)
13041+
//let varsDef = variableDefinitionsJacobians2(jacIndex, jacColumn, seedVars, name, simCode, &extraFuncs, &extraFuncsDecl, extraFuncsNamespace, &jacobianVarsInit, createDebugCode)
13042+
let varsDef = ""
1304213043
<<
1304313044
<%varsDef%>
1304413045
>>
@@ -13082,7 +13083,7 @@ match simVar
1308213083
let &jacobianVarsInit += if createDebugCode then ', <%jacobianVar%>(_<%matrixName%><%typeName%>)<%\n%>'
1308313084
if createDebugCode then
1308413085
'double& <%jacobianVar%>;' else
13085-
'#define <%jacobianVar%> _<%matrixName%><%typeName%>'
13086+
'#define <%jacobianVar%> _<%matrixName%><%typeName%>'
1308613087
end match
1308713088
end jacobianVarDefine;
1308813089

Compiler/Template/CodegenCppCommon.tpl

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,14 +212,20 @@ template cref1(ComponentRef cr, SimCode simCode ,Text& extraFuncs,Text& extraFun
212212
end cref1;
213213

214214
template representationCref(ComponentRef inCref, SimCode simCode ,Text& extraFuncs,Text& extraFuncsDecl,Text extraFuncsNamespace, Context context, Text &varDecls, Text stateDerVectorName /*=__zDot*/, Boolean useFlatArrayNotation) ::=
215-
cref2simvar(inCref, simCode) |> var as SIMVAR(varKind=varKind, index=i) =>
215+
cref2simvar(inCref, simCode) |> var as SIMVAR(varKind=varKind, index=i, matrixName=matrixName) =>
216216
match varKind
217217
case STATE() then
218218
'__z[<%i%>]'
219219
case STATE_DER() then
220220
'__zDot[<%i%>]'
221221
case DAE_RESIDUAL_VAR() then
222222
'__daeResidual[<%i%>]'
223+
case JAC_VAR() then
224+
'_<%getOption(matrixName)%>jac_y(<%i%>)'
225+
case JAC_DIFF_VAR() then
226+
'_<%getOption(matrixName)%>jac_tmp(<%i%>)'
227+
case SEED_VAR() then
228+
'_<%getOption(matrixName)%>jac_x(<%i%>)'
223229
case VARIABLE() then
224230
match var
225231
case SIMVAR(index=-2) then

0 commit comments

Comments
 (0)