Check isfinite() and fix includes

modelica · Sep 26, 2024 · 72cc1e1 · 72cc1e1
1 parent fa78248
commit 72cc1e1
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 8 deletions.
diff --git a/fmusim/FMI1CSSimulation.c b/fmusim/FMI1CSSimulation.c
@@ -1,11 +1,11 @@
+#include "FMIUtil.h"
 #include "FMI1.h"
 #include "FMI1CSSimulation.h"
 
 #define FMI_PATH_MAX 4096
 
 #define CALL(f) do { status = f; if (status > FMIOK) goto TERMINATE; } while (0)
 
-
 FMIStatus FMI1CSSimulate(const FMISimulationSettings* s) {
 
     FMIStatus status = FMIOK;

diff --git a/fmusim/FMI1MESimulation.c b/fmusim/FMI1MESimulation.c
@@ -1,13 +1,12 @@
 #include <stdlib.h>
 #include <math.h>
 
+#include "FMIUtil.h"
 #include "FMI1.h"
 #include "FMI1MESimulation.h"
 
-
 #define CALL(f) do { status = f; if (status > FMIOK) goto TERMINATE; } while (0)
 
-
 FMIStatus FMI1MESimulate(const FMISimulationSettings* s) {
 
     FMIStatus status = FMIOK;
@@ -57,10 +56,6 @@ FMIStatus FMI1MESimulate(const FMISimulationSettings* s) {
     // initialize
     CALL(FMI1Initialize(S, s->tolerance > 0, s->tolerance, &eventInfo));
 
-    if (!eventInfo.upcomingTimeEvent) {
-        eventInfo.nextEventTime = INFINITY;
-    }
-
     const FMISolverParameters solverFunctions = {
         .modelInstance = S,
         .input = s->input,

diff --git a/fmusim/FMI2CSSimulation.c b/fmusim/FMI2CSSimulation.c
@@ -2,7 +2,6 @@
 #include "FMI2.h"
 #include "FMI2CSSimulation.h"
 
-
 #define FMI_PATH_MAX 4096
 
 #define CALL(f) do { status = f; if (status > FMIOK) goto TERMINATE; } while (0)

diff --git a/fmusim/FMIUtil.c b/fmusim/FMIUtil.c
@@ -738,6 +738,10 @@ FMIStatus FMIDuplicateBuffer(const void* source, void** destination, size_t size
 
 bool FMIIsClose(double a, double b) {
 
+    if (!isfinite(a) || !isfinite(b)) {
+        return false;
+    }
+
     if (fabs(a - b) <= EPSILON) {
         return true;
     }