A comprehensive and well tested energy balance for water supply systems. Issue 8 (14th September 2017)