Merge branch 'cherry-pick-874146ba' into 'next'

Merge branch 'fix/restartAndEpisodes' into 'master'

Fix/restart and episodes

For me it would be more intuitive to first advance the time level and then do all the processing and file writing. However this is more complicated, therefore I shifted the restart stuff to the same level as the vtk output stuff.

See merge request !310

See merge request !321