Water Source Summary incorrect values

Issue overview

When implementing rain collection in the model, reported value of Water Supplied by Utility appears to be greater than the total end use water although no overflow occurred.

example output:

I think that in OutputReportTabular.cc variable gatherMains should be gatherMains=gatherMains + StorageChange since gatherMains is actually taking into account all the water that the different water equipments were supplied with including gray and rain water as indicated in the e+ Input Output Reference :

1.54.1.2.10 Water Use Equipment Mains Water Volume [m3]
The total volume of water (hot+cold) supplied to the equipment and consumed down the drain, in
units of cubic meters (m3). This output is also added to a meter with Resource Type = MainsWater, End
Use Key = WaterSystems, and Group Key = Plant. The sub-categories may be entered as any type (e.g.,
Laundry, Dish Washing, etc. defined in WaterUse:Equipment object input for End-Use Subcategory) with
General being the default sub-category (ref. Output Meter)

Start in OutputReportTabular.cc and trace how gatherMains contributes to the Water Source Summary during rain collection. Compare that calculation with the Water Use Equipment Mains Water Volume definition in the cited EnergyPlus Input Output Reference. Done means the reported Water Supplied by Utility value matches the actual mains contribution when gray or rain water is also used and no overflow occurs.