Rewrite phi_d_dd for scroll to handle area around discharge angle better

Signed-off-by: Ian Bell <ian.h.bell@gmail.com>