Better logic for what to do when we set stop_time or max_step.
Better logic for what to do when we set stop_time or max_step.

BoxLib-Codes/wdmerger,BoxLib-Codes/wdmerger,BoxLib-Codes/wdmerger,BoxLib-Codes/wdmerger