Add setupExperiment feature, refs eclipse-sumo#6533

fidodido2503 · Aug 28, 2020 · 07491a7 · 07491a7
1 parent 8699210
commit 07491a7
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 2 deletions.
diff --git a/src/fmi/fmi2Functions.c b/src/fmi/fmi2Functions.c
@@ -121,5 +121,19 @@ fmi2SetDebugLogging(fmi2Component c, fmi2Boolean loggingOn, size_t nCategories,
         comp->logErrors = false;
     }
 
+    return fmi2OK;
+}
+
+fmi2Status 
+fmi2SetupExperiment(fmi2Component c, fmi2Boolean toleranceDefined, fmi2Real tolerance,
+					fmi2Real startTime, fmi2Boolean stopTimeDefined, fmi2Real stopTime) {
+
+    // ignore arguments: toleranceDefined, tolerance
+    ModelInstance *comp = (ModelInstance *)c;
+
+	// Store the start and stop times of the experiment
+    comp->startTime = startTime;
+	comp->stopTime = stopTime;
+
     return fmi2OK;
 }
diff --git a/src/fmi/fmi2main.c b/src/fmi/fmi2main.c
@@ -26,7 +26,8 @@
 #include "fmi2main.h"
 
 
-void logError(ModelInstance *comp, const char *message, ...) {
+void 
+logError(ModelInstance *comp, const char *message, ...) {
     if (!comp->logErrors) return;
 
     va_list args;
@@ -35,7 +36,8 @@ void logError(ModelInstance *comp, const char *message, ...) {
     va_end(args); 
 }
 
-static void logMessage(ModelInstance *comp, int status, const char *category, const char *message, va_list args) {
+void 
+logMessage(ModelInstance *comp, int status, const char *category, const char *message, va_list args) {
     va_list args1;
     size_t len = 0;
     char *buf = "";

diff --git a/src/fmi/fmi2main.h b/src/fmi/fmi2main.h
@@ -47,6 +47,9 @@ typedef struct {
    	allocateMemoryType allocateMemory;
    	freeMemoryType freeMemory;
 
+    double startTime;
+    double stopTime;
+
     bool logEvents;
     bool logErrors;
 } ModelInstance;