Free surface incompressible flow with surface tension and contact angle