Depth-Integrated Free-Surface Flow With Non-Hydrostatic Formulation