Fix reference-bug in FMUSimulator simulateStep to update currentTime

refs #7649

Change-Id: Id1c98fd334a9a633e5ccf676f99bf19b7ba3af75

diff --git a/org.simantics.fmil.core/native/FMUSimulator/src/fmu_control.cpp b/org.simantics.fmil.core/native/FMUSimulator/src/fmu_control.cpp
index 310e9066fa7bdb0137ed280ff2c2b5f47a56a6e3..80c66ce57495134b3ad88665250ccf550ca79557 100644 (file)
--- a/org.simantics.fmil.core/native/FMUSimulator/src/fmu_control.cpp
+++ b/org.simantics.fmil.core/native/FMUSimulator/src/fmu_control.cpp
@@ -480,7 +480,7 @@ JNIEXPORT jint JNICALL Java_org_simantics_fmil_core_FMIL_instantiateSimulation_1
          int returnValue;
          const char *error = "";
 
-         FMI1 fmi = fmus[id];
+         FMI1 &fmi = fmus[id];
          if (fmi.version == 1) {
                returnValue = FMI1_CS_INSTANTIATE(fmi.fmu, "", &error);
          } else if (fmi.version == 2) {
@@ -719,7 +719,7 @@ JNIEXPORT jint JNICALL Java_org_simantics_fmil_core_FMIL_simulateStep_1
          int returnValue;
          const char *error = "";
 
-         FMI1 fmi = fmus[id];
+         FMI1 &fmi = fmus[id];
          if (fmi.version == 1) {
                  returnValue = FMI1_CS_STEP(fmi.fmu, fmi.currentTime, fmi.timeStep, &error);
          } else if (fmi.version == 2) {

diff --git a/org.simantics.fmil.win32/libraries/Debug/FMUSimulator.dll b/org.simantics.fmil.win32/libraries/Debug/FMUSimulator.dll
index 5e6f109ca1dff82d43244d8476b95be2c69b904b..5682053cfcfb786edb7622d9867079119521f296 100644 (file)
Binary files a/org.simantics.fmil.win32/libraries/Debug/FMUSimulator.dll and b/org.simantics.fmil.win32/libraries/Debug/FMUSimulator.dll differ

diff --git a/org.simantics.fmil.win32/libraries/FMUSimulator.dll b/org.simantics.fmil.win32/libraries/FMUSimulator.dll
index 2907f2ab825e5bb07204107e8231be4ebf888b08..fd14ee682242200c9f9e5e42cab3fb0a0aad96f9 100644 (file)
Binary files a/org.simantics.fmil.win32/libraries/FMUSimulator.dll and b/org.simantics.fmil.win32/libraries/FMUSimulator.dll differ

diff --git a/org.simantics.fmil.win64/libraries/Debug/FMUSimulator.dll b/org.simantics.fmil.win64/libraries/Debug/FMUSimulator.dll
index e142ebedb5885f35e3a5f4fca0972e4747fe5978..6ff899070a9d253a580ea2f201a5f261fc39aa43 100644 (file)
Binary files a/org.simantics.fmil.win64/libraries/Debug/FMUSimulator.dll and b/org.simantics.fmil.win64/libraries/Debug/FMUSimulator.dll differ

diff --git a/org.simantics.fmil.win64/libraries/FMUSimulator.dll b/org.simantics.fmil.win64/libraries/FMUSimulator.dll
index d0922ca5a6b9cbef63a1ade5f392844873b5ec5e..53f0749f239569499f4685209b41b39b4fe42c5c 100644 (file)
Binary files a/org.simantics.fmil.win64/libraries/FMUSimulator.dll and b/org.simantics.fmil.win64/libraries/FMUSimulator.dll differ