Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add event check and update for ME2 #109

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/pyfmi/fmi_algorithm_drivers.py
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,9 @@ def __init__(self,
event_info = self.model.get_event_info()
if event_info.upcomingTimeEvent and event_info.nextEventTime == model.time:
self.model.event_update()

elif isinstance(self.model, fmi.FMUModelME2):
self.model.event_update()
Copy link
Contributor

@jschueller jschueller Jun 10, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what about the event_info condition ? I guess its there to avoid updating at each timestep
I see fmi2 also has event_info but upcomingTimeEvent is named nextEventTimeDefined

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @jschueller! And really sorry for my delay here. But after some further testing compiling my test fmu (from #72) as an ME1 instead of ME2, it seems the if condition in Line 352 is also insufficient to detect an event. I'm finding that event_info.upcomingTimeEvent always returns false and event_info.nextEventTime always returns 0.0. Similarly, if applied to ME2, event_info.nextEventTimeDefined always returns false and event_info.nextEventTime always returns 0.0. Therefore, in order to get my expected performance, the self.model.event_update() needs to be called as I suggest, without the ifcondition on event_info, in both the ME1 and ME2 cases. I'm still not sure if I'm missing something here though.


if abs(start_time - model.time) > 1e-14:
logging.warning('The simulation start time (%f) and the current time in the model (%f) is different. Is the simulation start time correctly set?'%(start_time, model.time))

Expand Down