Fix small bug in segregated solver parameters

Was assigning the superlu solver for phi1 solve to phi parameters.

Also rearranged code a little
Only renormalise explicit steps when requested

In particular don't renormalise explicit predictor steps unless the
implicit method is renormalised as that could cause problems.