HX Bypass and General OA Controller Cleanup

Issue overview

The original user test file for #6886 is somewhat problematic in that it asks the OA controller to do things that just don't add up. The fix implemented in #6861 gets the right answer for better formed models, but it goes to max iterations with this particular file. The OA controller should be able to come up with a stable answer for this case. It could as simple as forcing LockoutWithHeating in for some combinations of inputs, or adding more logic to make an HX bypass decision and stick with it rather than flipping back and forth.

More generally, the OA Controller logic has become hard to follow again, and could use some refactoring, and possibly reordering as well as eliminating similar variables that are sometimes a fraction of design flow vs current system flow.

Details

Some additional details for this issue (if relevant):

• Platform (Operating system, version)
• Version of EnergyPlus (if using an intermediate build, include SHA)
• Unmethours link or helpdesk ticket number

Checklist

Add to this list or remove from it as applicable. This is a simple templated set of guidelines.

• Defect file added (list location of defect file here)
• Ticket added to Pivotal for defect (development team task)
• Pull request created (the pull request will have additional tasks related to reviewing changes that fix this defect)

Begin with the original user test file from #6886 and the OA Controller logic, reproducing the case where the controller reaches maximum iterations. A complete change should produce a stable answer for that case and make the controller logic easier to follow, including the requested cleanup of similar flow variables and decision logic.