An issue, filed as RW-7231, was identified and fixed for a Diversion object using the Diversion Pump Energy category and Energy Equation and Cost user method. In this method, the computation for Energy Consumption was off by a factor of 3600 due to using seconds instead of hours. The resulting Total Energy Cost was also incorrect.

The following flow user units were added, representing gallons per minute:

• GPM
• gpm
• gal/min

All three have the same conversion factor.

The following issues were addressed:

7227:	The reservoir Predictor-Corrector Salt method failed if Storage and Inflows were zero.
7228:	A crash occurred when opening a model after opening the Initialization Rules set editor.
7230:	In addition to the RiverSMART issue described below, the following RiverWare issues were fixed as part of this bug: The distributed MRM controller assumed that RDF files had a suffix of ".rdf". The distributed MRM controller was incorrectly detecting and quoting white space in file paths.
7231:	Diversion Energy Consumption was incorrect. See the note above.
7232:	Running a simulation deleted Series Slot Notes when the series slot had no input values.
7233:	A crash could occur when running a model with the Note Manager open.

The following issues were addressed:

7230:

Using Iterative MRM in RiverSMART, an internal error was issued when trying to combine RDF files.