Don't emit rhs of events if --emitEvents=true (#1093)

Author: lochel

src/OMSimulatorLib/Model.cpp

@@ -968,7 +968,7 @@ oms_status_enu_t oms::Model::initialize()
   clock.reset();
   clock.tic();
 
-  lastEmit = startTime;
+  lastEmit = startTime - 1.0;
 
   if (!resultFilename.empty())
   {
@@ -1173,6 +1173,10 @@ oms_status_enu_t oms::Model::emit(double time, bool force, bool* emitted)
   if (!force && time <= lastEmit)
     return oms_status_ok;
 
+  // Skip rhs of events if --emitEvents=true
+  if (!Flags::EmitEvents() && lastEmit == time)
+    return oms_status_ok;
+
   if (system)
     if (oms_status_ok != system->updateSignals(*resultFile))
       return oms_status_error;

src/OMSimulatorLib/SystemSC.cpp

@@ -522,7 +522,7 @@ oms_status_enu_t oms::SystemSC::doStep()
       logDebug("Event detected in FMU \"" + std::string(fmus[i]->getFullCref()) + "\" at time=" + std::to_string(time));
 
       // emit the left limit of the event (if it hasn't already been emitted)
-      if (Flags::EmitEvents() && isTopLevelSystem())
+      if (isTopLevelSystem())
         getModel().emit(time, false);
 
       fmistatus = fmi2_import_enter_event_mode(fmus[i]->getFMU());
@@ -555,7 +555,7 @@ oms_status_enu_t oms::SystemSC::doStep()
 
       // emit the right limit of the event
       updateInputs(eventGraph);
-      if (Flags::EmitEvents() && isTopLevelSystem())
+      if (isTopLevelSystem())
         getModel().emit(time, true);
 
       // restart event iteration from the beginning