New diagnostic framework makes integrated water storage a re