Fixed time handling for model exchange (#1383) (#1483)

Co-authored-by: Lennart Ochel <lennart.ochel@outlook.com>

Author: arun3688

src/OMSimulatorLib/SystemSC.cpp

@@ -621,9 +621,6 @@ oms_status_enu_t oms::SystemSC::doStepEuler()
     logDebug("step_size: " + std::to_string(step_size) + " | " + std::to_string(time) + " -> " + std::to_string(event_time));
     for (size_t i = 0; i < fmus.size(); ++i)
     {
-      fmistatus = fmi2_setTime(fmus[i]->getFMU(), event_time);
-      if (fmi2OK != fmistatus) logError_FMUCall("fmi2_setTime", fmus[i]);
-
       if (0 == nStates[i])
         continue;
 
@@ -664,6 +661,21 @@ oms_status_enu_t oms::SystemSC::doStepEuler()
         time = event_time;
         step_size_adjustment = maximumStepSize;
 
+        // set time
+        for (const auto& component : getComponents())
+        {
+          switch (component.second->getType())
+          {
+            case oms_component_fmu:
+              if (fmi2OK != fmi2_setTime(dynamic_cast<ComponentFMUME*>(component.second)->getFMU(), time))
+                logError_FMUCall("fmi2_setTime", dynamic_cast<ComponentFMUME*>(component.second));
+              break;
+            case oms_component_table:
+              dynamic_cast<ComponentTable*>(component.second)->stepUntil(time);
+              break;
+          }
+        }
+
         for (size_t i = 0; i < fmus.size(); ++i)
         {
           fmistatus = fmi2_completedIntegratorStep(fmus[i]->getFMU(), fmi2True, &callEventUpdate[i], &terminateSimulation[i]);
@@ -699,6 +711,21 @@ oms_status_enu_t oms::SystemSC::doStepEuler()
         if (isTopLevelSystem())
           getModel().emit(time, false);
 
+        // set time
+        for (const auto& component : getComponents())
+        {
+          switch (component.second->getType())
+          {
+            case oms_component_fmu:
+              if (fmi2OK != fmi2_setTime(dynamic_cast<ComponentFMUME*>(component.second)->getFMU(), time))
+                logError_FMUCall("fmi2_setTime", dynamic_cast<ComponentFMUME*>(component.second));
+              break;
+            case oms_component_table:
+              dynamic_cast<ComponentTable*>(component.second)->stepUntil(time);
+              break;
+          }
+        }
+
         // Enter event mode and handle discrete state updates for each FMU
         for (size_t i = 0; i < fmus.size(); ++i)
         {
@@ -806,15 +833,27 @@ oms_status_enu_t oms::SystemSC::doStepCVODE()
       // set states
       status = fmus[i]->setContinuousStates(states[i]);
       if (oms_status_ok != status) return status;
-
-      // set time
-      fmistatus = fmi2_setTime(fmus[i]->getFMU(), time);
-      if (fmi2OK != fmistatus) logError_FMUCall("fmi2_setTime", fmus[i]);
     }
 
     if (flag == CV_ROOT_RETURN || time == tnext)
     {
-      //logInfo("event found!!! " + std::to_string(time));
+      logDebug("event found!!! " + std::to_string(time));
+
+      // set time
+      for (const auto& component : getComponents())
+      {
+        switch (component.second->getType())
+        {
+          case oms_component_fmu:
+            if (fmi2OK != fmi2_setTime(dynamic_cast<ComponentFMUME*>(component.second)->getFMU(), time))
+              logError_FMUCall("fmi2_setTime", dynamic_cast<ComponentFMUME*>(component.second));
+            break;
+          case oms_component_table:
+            dynamic_cast<ComponentTable*>(component.second)->stepUntil(time);
+            break;
+        }
+      }
+
       for (size_t i = 0; i < fmus.size(); ++i)
       {
         fmistatus = fmi2_completedIntegratorStep(fmus[i]->getFMU(), fmi2True, &callEventUpdate[i], &terminateSimulation[i]);
@@ -889,6 +928,22 @@ oms_status_enu_t oms::SystemSC::doStepCVODE()
     if (flag == CV_SUCCESS)
     {
       logDebug("CVode completed successfully at t = " + std::to_string(time));
+
+      // set time
+      for (const auto& component : getComponents())
+      {
+        switch (component.second->getType())
+        {
+          case oms_component_fmu:
+            if (fmi2OK != fmi2_setTime(dynamic_cast<ComponentFMUME*>(component.second)->getFMU(), time))
+              logError_FMUCall("fmi2_setTime", dynamic_cast<ComponentFMUME*>(component.second));
+            break;
+          case oms_component_table:
+            dynamic_cast<ComponentTable*>(component.second)->stepUntil(time);
+            break;
+        }
+      }
+
       for (size_t i = 0; i < fmus.size(); ++i)
       {
         fmistatus = fmi2_completedIntegratorStep(fmus[i]->getFMU(), fmi2True, &callEventUpdate[i], &terminateSimulation[i]);
@@ -945,26 +1000,6 @@ oms_status_enu_t oms::SystemSC::updateInputs(DirectedGraph& graph)
   oms_status_enu_t status;
   int loopNum = 0;
 
-  if (getModel().validState(oms_modelState_simulation))
-  {
-    // update time
-    for (const auto& component : getComponents())
-    {
-      switch (component.second->getType())
-      {
-        case oms_component_fmu:
-          if (fmi2OK != fmi2_setTime(dynamic_cast<ComponentFMUME*>(component.second)->getFMU(), time))
-            logError_FMUCall("fmi2_setTime", dynamic_cast<ComponentFMUME*>(component.second));
-          break;
-        case oms_component_table:
-          dynamic_cast<ComponentTable*>(component.second)->stepUntil(time);
-          break;
-        default:
-          break;
-      }
-    }
-  }
-
   // input := output
   const std::vector< scc_t >& sortedConnections = graph.getSortedConnections();
   updateAlgebraicLoops(sortedConnections, graph);