Numerical solution of two-dimensional or axi-symmetric incompressible flow using the vorticity equations