Align fmi2DoStep() break condition with FMI 3.0

include/cosimulation.h

@@ -3,6 +3,8 @@
 
 #include "model.h"
 
+#define EPSILON (FIXED_SOLVER_STEP * 1e-6)
+
 void doFixedStep(ModelInstance *comp, bool* stateEvent, bool* timeEvent);
 
 #endif /* cosimulation_h */

include/model.h

@@ -202,7 +202,6 @@ void getEventIndicators(ModelInstance *comp, double z[], size_t nz);
 void eventUpdate(ModelInstance *comp);
 //void updateEventTime(ModelInstance *comp);
 
-double epsilon(double value);
 bool invalidNumber(ModelInstance *comp, const char *f, const char *arg, size_t actual, size_t expected);
 bool invalidState(ModelInstance *comp, const char *f, int statesExpected);
 bool nullPointer(ModelInstance* comp, const char *f, const char *arg, const void *p);

src/cosimulation.c

@@ -124,10 +124,6 @@ void reset(ModelInstance* comp) {
     comp->isDirtyValues = true;
 }
 
-double epsilon(double value) {
-    return (1.0 + fabs(value)) * DBL_EPSILON;
-}
-
 bool invalidNumber(ModelInstance *comp, const char *f, const char *arg, size_t actual, size_t expected) {
 
     if (actual != expected) {

src/fmi1Functions.c

@@ -323,7 +323,13 @@ fmiStatus fmiDoStep(fmiComponent c, fmiReal currentCommunicationPoint, fmiReal c
 
     ModelInstance* instance = (ModelInstance *)c;
 
-    while (instance->time + FIXED_SOLVER_STEP < currentCommunicationPoint + communicationStepSize + epsilon(instance->time)) {
+    const fmiReal nextCommunicationPoint = currentCommunicationPoint + communicationStepSize + EPSILON;
+
+    while (true) {
+
+        if (instance->time + FIXED_SOLVER_STEP > nextCommunicationPoint) {
+            break;  // next communcation point reached
+        }
 
         bool stateEvent, timeEvent;
 

src/fmi2Functions.c

@@ -641,7 +641,13 @@ fmi2Status fmi2DoStep(fmi2Component c, fmi2Real currentCommunicationPoint,
         return fmi2Error;
     }
 
-    while (S->time + FIXED_SOLVER_STEP < currentCommunicationPoint + communicationStepSize + epsilon(S->time)) {
+    const fmi2Real nextCommunicationPoint = currentCommunicationPoint + communicationStepSize + EPSILON;
+
+    while (true) {
+
+        if (S->time + FIXED_SOLVER_STEP > nextCommunicationPoint) {
+            break;  // next communcation point reached
+        }
 
         bool stateEvent, timeEvent;
 

src/fmi3Functions.c

@@ -1464,7 +1464,7 @@ fmi3Status fmi3DoStep(fmi3Instance instance,
         return fmi3Error;
     }
 
-    const fmi3Float64 nextCommunicationPoint = currentCommunicationPoint + communicationStepSize + epsilon(S->time);
+    const fmi3Float64 nextCommunicationPoint = currentCommunicationPoint + communicationStepSize + EPSILON;
 
     fmi3Boolean nextCommunicationPointReached;