Skip to content

Commit

Permalink
Solved remaining conflicts in UnitarySystem_MultispeedDXCoilHeatRecov…
Browse files Browse the repository at this point in the history
…eryHandling
  • Loading branch information
lgu1234 committed Feb 23, 2016
1 parent 3e4e41a commit 769667a
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions tst/EnergyPlus/unit/HVACUnitarySystem.unit.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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;
Expand Down

8 comments on commit 769667a

@nrel-bot-2
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

113107773-Improve-waste-heat-function-handling-of-AirloopHVACUnitarySystem-#5222 (lgu1234) - x86_64-Linux-Ubuntu-14.04-cppcheck-1.61: OK (0 of 0 tests passed, 0 test warnings)

Build Badge

@nrel-bot-3
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

113107773-Improve-waste-heat-function-handling-of-AirloopHVACUnitarySystem-#5222 (lgu1234) - x86_64-MacOS-10.9-clang: OK (2114 of 2114 tests passed, 0 test warnings)

Build Badge Test Badge

@nrel-bot-2
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

113107773-Improve-waste-heat-function-handling-of-AirloopHVACUnitarySystem-#5222 (lgu1234) - x86_64-Linux-Ubuntu-14.04-gcc-4.8: OK (2152 of 2152 tests passed, 0 test warnings)

Build Badge Test Badge

@nrel-bot-2
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

113107773-Improve-waste-heat-function-handling-of-AirloopHVACUnitarySystem-#5222 (lgu1234) - x86_64-Linux-Ubuntu-14.04-gcc-4.8-UnitTestsCoverage-Debug: OK (1006 of 1006 tests passed, 0 test warnings)

Build Badge Test Badge Coverage Badge

@nrel-bot-2
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

113107773-Improve-waste-heat-function-handling-of-AirloopHVACUnitarySystem-#5222 (lgu1234) - x86_64-Linux-Ubuntu-14.04-custom_check: OK (0 of 0 tests passed, 0 test warnings)

Build Badge

@nrel-bot
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

113107773-Improve-waste-heat-function-handling-of-AirloopHVACUnitarySystem-#5222 (lgu1234) - i386-Windows-7-VisualStudio-12: OK (2119 of 2120 tests passed, 0 test warnings)

Build Badge Test Badge

@nrel-bot-2
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

113107773-Improve-waste-heat-function-handling-of-AirloopHVACUnitarySystem-#5222 (lgu1234) - x86_64-Linux-Ubuntu-14.04-gcc-4.8-IntegrationCoverage-Debug: OK (1564 of 1564 tests passed, 0 test warnings)

Build Badge Test Badge Coverage Badge

@nrel-bot
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

113107773-Improve-waste-heat-function-handling-of-AirloopHVACUnitarySystem-#5222 (lgu1234) - Win64-Windows-7-VisualStudio-12: OK (2120 of 2120 tests passed, 0 test warnings)

Build Badge Test Badge

Please sign in to comment.