Fix empty output basename when resuming a simulation
Fix switchting to checkpoint scenario when using an artificial scenario