Added subcritical and supercritical flow and support for bathymetry