- fix events in fmi 2.0

- added more tests for fmi 2.0 git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@22860 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Oct 22, 2014 · 231155d · 231155d
1 parent e4bb763
commit 231155d
Showing 1 changed file with 1 addition and 15 deletions.
diff --git a/SimulationRuntime/fmi/export/fmi2/fmu2_model_interface.c b/SimulationRuntime/fmi/export/fmi2/fmu2_model_interface.c
@@ -726,21 +726,7 @@ fmi2Status fmi2NewDiscreteStates(fmi2Component c, fmi2EventInfo* eventInfo) {
   eventInfo->nextEventTimeDefined = fmi2False;
   eventInfo->nextEventTime = 0;
 
-  /* Get next event time (sample calls)*/
-
-  nextSampleEvent = getNextSampleTimeFMU(comp->fmuData);
-  if (nextSampleEvent == -1) {
-    eventInfo->nextEventTimeDefined = fmi2False;
-  } else {
-    eventInfo->nextEventTimeDefined = fmi2True;
-    eventInfo->nextEventTime = nextSampleEvent;
-    returnValue = fmi2EventUpdate(comp, eventInfo);
-  }
-
-  // set the state
-  if (eventInfo->newDiscreteStatesNeeded) {
-    comp->state = modelContinuousTimeMode;
-  }
+  returnValue = fmi2EventUpdate(comp, eventInfo);
 
   return returnValue;
 }