Incompressibility and axisymmetry : a modified mixed and penalty formulation