Accounting for uniformly distributed pipe demand in WDN analysis: Enhanced GGA