Gerris Flow Solver with some patches