Improved calculations of waterfalls and weir flows. (25th June 2022)