update the discrete system after a sample event

OpenModelica · Sep 27, 2018 · 1d52b90 · 1d52b90
1 parent 91ff2aa
commit 1d52b90
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Compiler/SimCode/SimCodeUtil.mo b/Compiler/SimCode/SimCodeUtil.mo
@@ -1500,9 +1500,7 @@ algorithm
   outAllEquations := inEq::inAllEquations;
 
   outOdeEquations := if bdynamic and not skipDiscrete then inEq::inOdeEquations else inOdeEquations;
-  // FIXME: actually discrete equtaions should be also skipable in the algebraic equations
-  //        but currently the event handling with sample operator fail if they are skipped
-  outAlgebraicEquations := if not bdynamic then inEq::inAlgebraicEquations else inAlgebraicEquations;
+  outAlgebraicEquations := if not bdynamic and not skipDiscrete then inEq::inAlgebraicEquations else inAlgebraicEquations;
   outEquationsforZeroCrossings := if bzceqns and not skipDiscrete then inEq::inEquationsforZeroCrossings else inEquationsforZeroCrossings;
 end addEquationsToLists;
 
@@ -1563,7 +1561,7 @@ algorithm
       String message;
 
     // case used for then inline solver, if "not createAlgebraicEquations = true"
-    case _ guard not (createAlgebraicEquations or bdynamic) or skip and not createAlgebraicEquations
+    case _ guard ((not bdynamic) or skip) and not createAlgebraicEquations
     then (uniqueEqIndex, odeEquations, algebraicEquations, allEquations, equationsforZeroCrossings,
             tempvars, eqSccMapping, eqBackendSimCodeMapping, backendMapping, sccIndex);
 

diff --git a/SimulationRuntime/c/simulation/solver/events.c b/SimulationRuntime/c/simulation/solver/events.c
@@ -278,6 +278,8 @@ void handleEvents(DATA* data, threadData_t *threadData, LIST* eventLst, double *
     debugStreamPrint(LOG_EVENTS, 0, "next sample-event at t = %g", data->simulationInfo->nextSampleEvent);
 
     solverInfo->sampleEvents++;
+    /* update the whole system */
+    updateDiscreteSystem(data, threadData);
   }
 
   TRACE_POP