Efficient simulation of non-hydrostatic free-surface flow