Fix event handling w/o early return (#424)

fixes #421 fixes #425 fixes #236
modelica · Jan 12, 2024 · 5a4f957 · 5a4f957
1 parent c7bec6f
commit 5a4f957
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/src/fmi3Functions.c b/src/fmi3Functions.c
@@ -1341,12 +1341,20 @@ fmi3Status fmi3DoStep(fmi3Instance instance,
 
     while (true) {
 
-        nextCommunicationPointReached = S->time + FIXED_SOLVER_STEP > nextCommunicationPoint;
+        const fmi3Float64 nextSolverStepTime = S->time + FIXED_SOLVER_STEP;
+        nextCommunicationPointReached = nextSolverStepTime > nextCommunicationPoint;
 
-        if (nextCommunicationPointReached) {
+        if (nextCommunicationPointReached || (*eventHandlingNeeded && S->earlyReturnAllowed)) {
             break;
         }
 
+#ifdef EVENT_UPDATE
+        if (*eventHandlingNeeded) {
+            eventUpdate(S);
+            *eventHandlingNeeded = fmi3False;
+        }
+#endif
+
         bool stateEvent, timeEvent;
 
         CALL(doFixedStep(S, &stateEvent, &timeEvent));