For fire flow analyses, there should be additional constraint options that allow the results of a specified residual node to be output for each fire flow node (including pressure and residual pressure). This would allow for direct comparison of hydrant flow tests in the field when testing with a flow hydrant and a residual hydrant, allowing for faster water model calibration.