From 769667acb6c0faa9b8c9db7a43c0908d583bed1a Mon Sep 17 00:00:00 2001
From: Lixing Gu <gu@fsec.ucf.edu>
Date: Tue, 23 Feb 2016 10:49:53 -0500
Subject: [PATCH] Solved remaining conflicts in
 UnitarySystem_MultispeedDXCoilHeatRecoveryHandling

---
 tst/EnergyPlus/unit/HVACUnitarySystem.unit.cc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tst/EnergyPlus/unit/HVACUnitarySystem.unit.cc b/tst/EnergyPlus/unit/HVACUnitarySystem.unit.cc
index fd5a4433e81..a383e422a71 100644
--- a/tst/EnergyPlus/unit/HVACUnitarySystem.unit.cc
+++ b/tst/EnergyPlus/unit/HVACUnitarySystem.unit.cc
@@ -3779,6 +3779,7 @@ TEST_F( EnergyPlusFixture, UnitarySystem_MultispeedDXCoilHeatRecoveryHandling )
 		"  MultiSpeed Performance,  !- Name",
 		"  4,                       !- Number of Speeds for Heating",
 		"  3,                       !- Number of Speeds for Cooling",
+		"  No,                      !- Single Mode Operation",
 		"  autosize,                !- Heating Speed 1 Supply Air Flow Ratio",
 		"  autosize,                !- Cooling Speed 1 Supply Air Flow Ratio",
 		"  autosize,                !- Heating Speed 2 Supply Air Flow Ratio",
@@ -4520,6 +4521,7 @@ TEST_F( EnergyPlusFixture, UnitarySystem_MultispeedDXCoilHeatRecoveryHandling )
 	ASSERT_FALSE( process_idf( idf_objects ) ); // read idf objects
 
 	SimulationManager::GetProjectData( );
+	createFacilityElectricPowerServiceObject( );
 
 	DataGlobals::BeginSimFlag = true;
 	DataGlobals::DoingSizing = true;