re-instate drainage tests - change invading_phase to phase and remove defending_phase. Leave trapping tests commented out
re-instate drainage tests - change invading_phase to phase and remove defending_phase. Leave trapping tests commented out

PMEAL/OpenPNM,TomTranter/OpenPNM