Fixed convergence for curved domains.  Pressure and saturation boundary conditions need to be Dirichlet everywhere; any Neumann conditions will not in general respect the forced solution.