Skip to content
Merged
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
9 changes: 1 addition & 8 deletions src/fmpy/simulation.py
Original file line number Diff line number Diff line change
Expand Up @@ -1124,8 +1124,6 @@ def simulateME(model_description, fmu, start_time, stop_time, solver_name, step_

if input_event or time_event or state_event or step_event:

reset_solver = False

if record_events:
recorder.sample(time, force=True)

Expand Down Expand Up @@ -1165,8 +1163,6 @@ def simulateME(model_description, fmu, start_time, stop_time, solver_name, step_
next_event_time_defined,
next_event_time) = fmu.newDiscreteStates()

reset_solver |= nominals_of_continuous_states_changed or values_of_continuous_states_changed

if terminate_simulation:
break

Expand All @@ -1189,15 +1185,12 @@ def simulateME(model_description, fmu, start_time, stop_time, solver_name, step_
next_event_time_defined,
next_event_time) = fmu.updateDiscreteStates()

reset_solver |= nominals_of_continuous_states_changed or values_of_continuous_states_changed

if terminate_simulation:
break

fmu.enterContinuousTimeMode()

if reset_solver:
solver.reset(time)
solver.reset(time)

if step_finished is not None and not step_finished(time, recorder):
break
Expand Down
Loading