fix in Idas solver for event handling, added reinit before Idas call.

fix in cpp template in event iteration if discrete  variable has changed.

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@14012 f25d12d1-65f4-0310-ae8a-bbce733d8d8e

Author: niklwors

Compiler/Template/CodegenCpp.tpl

@@ -3462,13 +3462,13 @@ case SIMCODE(modelInfo = MODELINFO(vars = vars as SIMVARS(__)))
      
       <%{
        (vars.algVars |> SIMVAR(__) =>
-        '_event_handling.save(<%cref(name)%>,"<%cref(name)%>");'
+        '_event_handling.saveDiscreteVar(<%cref(name)%>,"<%cref(name)%>");'
       ;separator="\n"),
       (vars.intAlgVars |> SIMVAR(__) =>
-       '_event_handling.save(<%cref(name)%>,"<%cref(name)%>");'
+       '_event_handling.saveDiscreteVar(<%cref(name)%>,"<%cref(name)%>");'
       ;separator="\n"),
       (vars.boolAlgVars |> SIMVAR(__) =>
-        '_event_handling.save(<%cref(name)%>,"<%cref(name)%>");'
+        '_event_handling.saveDiscreteVar(<%cref(name)%>,"<%cref(name)%>");'
       ;separator="\n")}
      ;separator="\n"%>
      
@@ -6330,8 +6330,6 @@ template handleSystemEvents2(Integer index1, Exp relation, Text &varDecls /*BUFP
     if(events[<%zerocrossingIndex%>])
     {
       checkConditions(<%zerocrossingIndex%>,false);
-      _event_handling.addEvent(<%zerocrossingIndex%>);
-      handleEvent(<%zerocrossingIndex%>);
     }
    >>
  end handleSystemEvents2;
@@ -6621,7 +6619,7 @@ template checkForDiscreteEvents(list<ComponentRef> discreteModelVars,SimCode sim
 ::=
 
   let changediscreteVars = (discreteModelVars |> var => match var case CREF_QUAL(__) case CREF_IDENT(__) then
-       'if (_event_handling.change(<%cref(var)%>,"<%cref(var)%>")) {  restart=true; }'
+       'if (_event_handling.changeDiscreteVar(<%cref(var)%>,"<%cref(var)%>")) {  restart=true; }'
        ;separator="\n")
   match simCode
   case SIMCODE(modelInfo = MODELINFO(__)) then