Title: Water Supply and Demand in an Energy Supply Model