Changeset ef2fed95 in OpenModelica

Timestamp:

2019-01-10T13:05:18+01:00 (5 years ago)

Author:

hudson <openmodelica@…>

Branches:

Added-citation-metadata, maintenance/v1.14, maintenance/v1.15, maintenance/v1.16, maintenance/v1.17, maintenance/v1.18, maintenance/v1.19, maintenance/v1.20, maintenance/v1.21, maintenance/v1.22, maintenance/v1.23, master, omlib-staging

Children:

c68f4330

Parents:

2f4f72e

git-author:

Lennart Ochel <lennart.ochel@…> (01/10/19 13:05:18)

git-committer:

hudson <openmodelica@…> (01/10/19 13:05:18)

Message:

Fix more initialization issues with FMUs

Belonging to [master]:

• OpenModelica/OMCompiler#2859
• OpenModelica/OpenModelica-testsuite#1099

Location:

SimulationRuntime

Files:

• c/simulation/solver/initialization/initialization.c (modified) (3 diffs)
• fmi/export/fmi2/fmu2_model_interface.c (modified) (2 diffs)

SimulationRuntime/c/simulation/solver/initialization/initialization.c

@@ -606 +606 @@
   infoStreamPrint(LOG_INIT, 0, "### START INITIALIZATION ###");
 
-  setAllParamsToStart(data);
+  if (strcmp(pInitMethod, "fmi"))
+    setAllParamsToStart(data);
 
 #if !defined(OMC_MINIMAL_RUNTIME)
@@ -622 +623 @@
 #endif
   /* set up all variables with their start-values */
-  setAllVarsToStart(data);
+  if (strcmp(pInitMethod, "fmi"))
+    setAllVarsToStart(data);
 
   if(!(pInitFile && strcmp(pInitFile, ""))) {
@@ -634 +636 @@
 
   /* if there are user-specified options, use them! */
-  if (pInitMethod && strcmp(pInitMethod, "")) {
+  if (pInitMethod && (strcmp(pInitMethod, "") && strcmp(pInitMethod, "fmi"))) {
     initMethod = IIM_UNKNOWN;
 

SimulationRuntime/fmi/export/fmi2/fmu2_model_interface.c

@@ -563 +563 @@
 fmi2Status fmi2EnterInitializationMode(fmi2Component c)
 {
+  ModelInstance *comp = (ModelInstance *)c;
+
+  if (invalidState(comp, "fmi2EnterInitializationMode", modelInstantiated, ~0))
+    return fmi2Error;
+  FILTERED_LOG(comp, fmi2OK, LOG_FMI2_CALL, "fmi2EnterInitializationMode...")
+
+  setZCtol(comp->tolerance); /* set zero-crossing tolerance */
+  setStartValues(comp);
+  copyStartValuestoInitValues(comp->fmuData);
+  comp->state = modelInitializationMode;
+
+  return fmi2OK;
+}
+
+fmi2Status fmi2ExitInitializationMode(fmi2Component c)
+{
   fmi2Status res = fmi2Error;
   ModelInstance *comp = (ModelInstance *)c;
@@ -571 +587 @@
 
   threadData->currentErrorStage = ERROR_SIMULATION;
-  if (invalidState(comp, "fmi2EnterInitializationMode", modelInstantiated, ~0))
-    return fmi2Error;
+  if (invalidState(comp, "fmi2ExitInitializationMode", modelInitializationMode, ~0))
+    return fmi2Error;
+  FILTERED_LOG(comp, fmi2OK, LOG_FMI2_CALL, "fmi2ExitInitializationMode...")
 
   setThreadData(comp);
-
-  FILTERED_LOG(comp, fmi2OK, LOG_FMI2_CALL, "fmi2EnterInitializationMode...")
-  /* set zero-crossing tolerance */
-  setZCtol(comp->tolerance);
-
-  setStartValues(comp);
-  copyStartValuestoInitValues(comp->fmuData);
+  comp->fmuData->callback->updateBoundParameters(comp->fmuData, comp->threadData);
+  comp->fmuData->callback->updateBoundVariableAttributes(comp->fmuData, comp->threadData);
 
   /* try */
   MMC_TRY_INTERNAL(simulationJumpBuffer)
-    threadData->mmc_jumper = threadData->simulationJumpBuffer;
-
-    if (initialization(comp->fmuData, comp->threadData, "", "", 0.0)) {
-      comp->state = modelError;
-      FILTERED_LOG(comp, fmi2Error, LOG_FMI2_CALL, "fmi2EnterInitializationMode: failed")
+  threadData->mmc_jumper = threadData->simulationJumpBuffer;
+
+  if (initialization(comp->fmuData, comp->threadData, "fmi", "", 0.0))
+  {
+    comp->state = modelError;
+    FILTERED_LOG(comp, fmi2Error, LOG_FMI2_CALL, "fmi2EnterInitializationMode: failed")
+  }
+  else
+  {
+    /* TODO: Simulation stop time is needed to calculate the sample events beforehand. */
+    initSample(comp->fmuData, comp->threadData, comp->fmuData->localData[0]->timeValue, 100 /*should be stopTime*/);
+#if !defined(OMC_NDELAY_EXPRESSIONS) || OMC_NDELAY_EXPRESSIONS>0
+    initDelay(comp->fmuData, comp->fmuData->localData[0]->timeValue);
+#endif
+    /* overwrite old values due to an event */
+    overwriteOldSimulationData(comp->fmuData);
+
+    comp->eventInfo.terminateSimulation = fmi2False;
+    comp->eventInfo.valuesOfContinuousStatesChanged = fmi2True;
+
+    /* get next event time (sample calls) */
+    nextSampleEvent = 0;
+    nextSampleEvent = getNextSampleTimeFMU(comp->fmuData);
+    if (nextSampleEvent == -1)
+    {
+      comp->eventInfo.nextEventTimeDefined = fmi2False;
     }
     else
     {
-      /*TODO: Simulation stop time is need to calculate in before hand all sample events
-                  We shouldn't generate them all in beforehand */
-      initSample(comp->fmuData, comp->threadData, comp->fmuData->localData[0]->timeValue, 100 /*should be stopTime*/);
-#if !defined(OMC_NDELAY_EXPRESSIONS) || OMC_NDELAY_EXPRESSIONS>0
-      initDelay(comp->fmuData, comp->fmuData->localData[0]->timeValue);
-#endif
-      /* due to an event overwrite old values */
-      overwriteOldSimulationData(comp->fmuData);
-
-      comp->eventInfo.terminateSimulation = fmi2False;
-      comp->eventInfo.valuesOfContinuousStatesChanged = fmi2True;
-
-      /* Get next event time (sample calls)*/
-      nextSampleEvent = 0;
-      nextSampleEvent = getNextSampleTimeFMU(comp->fmuData);
-      if (nextSampleEvent == -1) {
-        comp->eventInfo.nextEventTimeDefined = fmi2False;
-      } else {
-        comp->eventInfo.nextEventTimeDefined = fmi2True;
-        comp->eventInfo.nextEventTime = nextSampleEvent;
-        fmi2EventUpdate(comp, &(comp->eventInfo));
-      }
-      comp->state = modelInitializationMode;
-      FILTERED_LOG(comp, fmi2OK, LOG_FMI2_CALL, "fmi2EnterInitializationMode: succeed")
-      res = fmi2OK;
-    }
-    done = 1;
+      comp->eventInfo.nextEventTimeDefined = fmi2True;
+      comp->eventInfo.nextEventTime = nextSampleEvent;
+      fmi2EventUpdate(comp, &(comp->eventInfo));
+    }
+    FILTERED_LOG(comp, fmi2OK, LOG_FMI2_CALL, "fmi2EnterInitializationMode: succeed")
+    res = fmi2OK;
+  }
+  done = 1;
   /* catch */
   MMC_CATCH_INTERNAL(simulationJumpBuffer)
   threadData->mmc_jumper = old_jmp;
 
-  if (!done) {
+  if (!done)
+  {
     FILTERED_LOG(comp, fmi2Error, LOG_FMI2_CALL, "fmi2EnterInitializationMode: terminated by an assertion.")
   }
-  resetThreadData(comp);
-  return res;
-}
-
-fmi2Status fmi2ExitInitializationMode(fmi2Component c)
-{
-  ModelInstance *comp = (ModelInstance *)c;
-  if (invalidState(comp, "fmi2ExitInitializationMode", modelInitializationMode, ~0))
-    return fmi2Error;
-  FILTERED_LOG(comp, fmi2OK, LOG_FMI2_CALL, "fmi2ExitInitializationMode...")
-
-  setThreadData(comp);
-  comp->fmuData->callback->updateBoundParameters(comp->fmuData, comp->threadData);
-  comp->fmuData->callback->updateBoundVariableAttributes(comp->fmuData, comp->threadData);
+
   comp->state = modelEventMode;
   resetThreadData(comp);
 
   FILTERED_LOG(comp, fmi2OK, LOG_FMI2_CALL, "fmi2ExitInitializationMode: succeed")
-  return fmi2OK;
+  return res;
 }