Skip to content

Commit

Permalink
[DAEMode] update at event update again all equations
Browse files Browse the repository at this point in the history
 - for now evaluate at event update all equations, since
   the dependency evaluation breaks a lot of models.

Belonging to [master]:
  - OpenModelica/OMCompiler#2355
  • Loading branch information
Willi Braun authored and OpenModelica-Hudson committed Apr 11, 2018
1 parent 2245862 commit e6bd883
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions Compiler/BackEnd/BackendDAEUtil.mo
Expand Up @@ -1554,9 +1554,12 @@ algorithm
markedEqns := markStateEquationsWork(indicesAlgebraic, adjMatrix, assigndVar, markedEqns);
eqns := setMarkedEqnsEvalStage(eqns, markedEqns, BackendEquation.setEvalStageAlgebraic);

markedEqns := arrayCreate(BackendEquation.getNumberOfEquations(eqns), 0);
markedEqns := markStateEquationsWork(indicesDiscrete, adjMatrix, assigndVar, markedEqns);
markedEqns := markStateEquationsWork(indicesDiscrete, adjMatrixT, assigndVar, markedEqns);
/* For now avoid this and evaluate all the event update breaks right now
quite a lot models.
*/
markedEqns := arrayCreate(BackendEquation.getNumberOfEquations(eqns), 1);
//markedEqns := markStateEquationsWork(indicesDiscrete, adjMatrix, assigndVar, markedEqns);
//markedEqns := markStateEquationsWork(indicesDiscrete, adjMatrixT, assigndVar, markedEqns);
eqns := setMarkedEqnsEvalStage(eqns, markedEqns, BackendEquation.setEvalStageDiscrete);
else
/* in case something goes wrong above mark all equation to be evaluated always */
Expand Down

0 comments on commit e6bd883

Please sign in to comment.