Skip to content

Commit e1a595a

Browse files
committed
Mixed generates usable code for Adevs backend. Need better test cases.
git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@13935 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
1 parent d6c1fa4 commit e1a595a

File tree

1 file changed

+2
-26
lines changed

1 file changed

+2
-26
lines changed

Compiler/Template/CodegenAdevs.tpl

Lines changed: 2 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1027,7 +1027,7 @@ case SES_LINEAR(__) then
10271027
long int* <%pname%> = newLintArray(<%size%>);
10281028
for (int i = 0; i < <%size%>; i++)
10291029
{
1030-
for (int j = 0; j <%size%>; j++)
1030+
for (int j = 0; j < <%size%>; j++)
10311031
{
10321032
<%aname%>[i][j] = 0.0;
10331033
}
@@ -1062,41 +1062,17 @@ template equationMixed(SimEqSystem eq, Context context, Text &varDecls /*BUFP*/)
10621062
match eq
10631063
case SES_MIXED(__) then
10641064
let contEqs = equation_(cont, context, &varDecls /*BUFD*/)
1065-
let numDiscVarsStr = listLength(discVars)
1066-
/*
1067-
let valuesLenStr = listLength(values)
1068-
*/
10691065
let &preDisc = buffer "" /*BUFD*/
10701066
let discLoc2 = (discEqs |> SES_SIMPLE_ASSIGN(__) hasindex i0 =>
10711067
let expPart = daeExp(exp, context, &preDisc /*BUFC*/, &varDecls /*BUFD*/)
10721068
<<
10731069
<%cref(cref)%> = <%expPart%>;
1074-
discrete_loc2[<%i0%>] = <%cref(cref)%>;
10751070
>>
10761071
;separator="\n")
10771072
<<
1078-
<%/*
1079-
#ifdef _OMC_MEASURE_TIME
1080-
SIM_PROF_TICK_EQ(SIM_PROF_EQ_<%index%>);
1081-
#endif
1082-
mixed_equation_system(<%numDiscVarsStr%>);
1083-
modelica_boolean values[<%valuesLenStr%>] = {<%values ;separator=", "%>};
1084-
int value_dims[<%numDiscVarsStr%>] = {<%value_dims ;separator=", "%>};
1085-
<%discVars |> SIMVAR(__) hasindex i0 => 'discrete_loc[<%i0%>] = <%cref(name)%>;' ;separator="\n"%>
1086-
{
1087-
<%contEqs%>
1088-
}
10891073
<%preDisc%>
10901074
<%discLoc2%>
1091-
{
1092-
modelica_boolean *loc_ptrs[<%numDiscVarsStr%>] = {<%discVars |> SIMVAR(__) => '(modelica_boolean*)&<%cref(name)%>' ;separator=", "%>};
1093-
check_discrete_values(<%numDiscVarsStr%>, <%valuesLenStr%>);
1094-
}
1095-
mixed_equation_system_end(<%numDiscVarsStr%>);
1096-
#ifdef _OMC_MEASURE_TIME
1097-
SIM_PROF_ACC_EQ(SIM_PROF_EQ_<%index%>);
1098-
#endif<%\n%>
1099-
*/%>
1075+
<%contEqs%>
11001076
>>
11011077
end equationMixed;
11021078

0 commit comments

Comments
 (0)