Fix simulation end Dates

Merged Frederik Rehbach requested to merge develop into master

Merge fix for the simulation end dates. This was causing a drop in the plots.

Merge request reports