Skip to content

Commit

Permalink
fix problem in water heater
Browse files Browse the repository at this point in the history
sizing routines already tests for loopNum so need to remove calling
logic here
  • Loading branch information
EnergyArchmage committed Mar 17, 2015
1 parent 73f234f commit b7db966
Showing 1 changed file with 5 additions and 9 deletions.
14 changes: 5 additions & 9 deletions src/EnergyPlus/WaterThermalTanks.cc
Original file line number Diff line number Diff line change
Expand Up @@ -340,16 +340,12 @@ namespace WaterThermalTanks {
if ( present( LoopNum ) ) {
if ( ( ( WaterThermalTank( CompNum ).SourceSidePlantLoopNum == LoopNum ) && ( WaterThermalTank( CompNum ).SourceSidePlantLoopSide == LoopSideNum ) )
|| ( ( WaterThermalTank( CompNum ).UseSidePlantLoopNum == LoopNum ) && ( WaterThermalTank( CompNum ).UseSidePlantLoopSide == LoopSideNum ) ) ) {
// we know this is plant loop connected on at least one side, but only one should really call sizing,

if ( ( WaterThermalTank( CompNum ).UseSidePlantLoopNum == LoopNum ) ||
(WaterThermalTank( CompNum ).UseInletNode == 0 && ( WaterThermalTank( CompNum ).SourceSidePlantLoopNum == LoopNum ) )) {
// only call sizing routines from use side connection, unless there is none and are calling from source side loop
SizeTankForDemandSide( CompNum );
SizeDemandSidePlantConnections( CompNum );
SizeSupplySidePlantConnections( CompNum, LoopNum, LoopSideNum );
SizeTankForSupplySide( CompNum );
}
SizeTankForDemandSide( CompNum );
SizeDemandSidePlantConnections( CompNum );
SizeSupplySidePlantConnections( CompNum, LoopNum, LoopSideNum );
SizeTankForSupplySide( CompNum );


} else {
return;
Expand Down

7 comments on commit b7db966

@nrel-bot
Copy link

Choose a reason for hiding this comment

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

HVACSizingSim_CoincidentPlant (EnergyArchmage) - x86_64-MacOS-10.9-clang: Tests Failed

Build Badge Test 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.

HVACSizingSim_CoincidentPlant (EnergyArchmage) - i386-Windows-7-VisualStudio-12: Tests Failed

Build Badge Test 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.

HVACSizingSim_CoincidentPlant (EnergyArchmage) - Win64-Windows-7-VisualStudio-12: Tests Failed

Build Badge Test 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.

HVACSizingSim_CoincidentPlant (EnergyArchmage) - x86_64-Linux-Ubuntu-14.04-gcc-4.8: OK (0 of 0 tests passed)

Build Badge Test 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.

HVACSizingSim_CoincidentPlant (EnergyArchmage) - x86_64-Linux-Ubuntu-14.04-cppcheck-1.61: OK (0 of 0 tests passed)

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.

HVACSizingSim_CoincidentPlant (EnergyArchmage) - x86_64-Linux-Ubuntu-14.04-gcc-4.8-UnitTestsCoverage-Debug: Tests Failed

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.

HVACSizingSim_CoincidentPlant (EnergyArchmage) - x86_64-Linux-Ubuntu-14.04-gcc-4.8-IntegrationCoverage-Debug: Tests Failed

Build Badge Test Badge Coverage Badge

Please sign in to comment.