Merge branch 'electric_panel' of github.com:NREL/OpenStudio-HPXML int…

…o electric_panel

workflow/tests/base_results/results_simulations_panel.csv

@@ -57,7 +57,7 @@ base-bldgtype-mf-unit-shared-mechvent-preconditioning.xml,920.0,3115.0,5500.0,57
 base-bldgtype-mf-unit-shared-mechvent.xml,920.0,3115.0,5500.0,5760.0,1200.0,12000.0,0.0,0.0,0.0,0.0,0.0,0.0,2700.0,559.0,18933.6,79.0,71.0,2983.4,12.4,137.6,13.0,13.0,0.0
 base-bldgtype-mf-unit-shared-pv-battery.xml,920.0,3115.0,5500.0,5760.0,1200.0,12000.0,0.0,0.0,0.0,0.0,0.0,0.0,2700.0,559.0,18933.6,79.0,71.0,2613.5,10.9,139.1,13.0,13.0,0.0
 base-bldgtype-mf-unit-shared-pv.xml,920.0,3115.0,5500.0,5760.0,1200.0,12000.0,0.0,0.0,0.0,0.0,0.0,0.0,2700.0,559.0,18933.6,79.0,71.0,2610.9,10.9,139.1,13.0,13.0,0.0
-base-bldgtype-mf-unit-shared-water-heater-heat-pump.xml,920.0,3115.0,1410.0,5760.0,1200.0,12000.0,0.0,0.0,0.0,0.0,0.0,0.0,2700.0,559.0,17297.6,72.0,78.0,2009.2,8.4,141.6,13.0,13.0,0.0
+base-bldgtype-mf-unit-shared-water-heater-heat-pump.xml,920.0,3115.0,0.0,5760.0,1200.0,12000.0,0.0,0.0,0.0,0.0,0.0,0.0,2700.0,559.0,16733.6,70.0,80.0,2009.2,8.4,141.6,11.0,11.0,0.0
 base-bldgtype-mf-unit-shared-water-heater-recirc-beds-0.xml,920.0,3115.0,0.0,5760.0,1200.0,12000.0,0.0,0.0,0.0,0.0,0.0,0.0,2700.0,559.0,16733.6,70.0,80.0,1834.5,7.6,142.4,11.0,11.0,0.0
 base-bldgtype-mf-unit-shared-water-heater-recirc-scheduled.xml,920.0,3115.0,0.0,5760.0,1200.0,12000.0,0.0,0.0,0.0,0.0,0.0,0.0,2700.0,559.0,16733.6,70.0,80.0,2069.0,8.6,141.4,11.0,11.0,0.0
 base-bldgtype-mf-unit-shared-water-heater-recirc.xml,920.0,3115.0,0.0,5760.0,1200.0,12000.0,0.0,0.0,0.0,0.0,0.0,0.0,2700.0,559.0,16733.6,70.0,80.0,2069.0,8.6,141.4,11.0,11.0,0.0