minor changes to advectVelocity() and project() functions
resolve merge conflict