Skip to content

Commit

Permalink
Fix pysch related build error
Browse files Browse the repository at this point in the history
  • Loading branch information
@Myoldmopar
Myoldmopar committed Feb 13, 2020
1 parent a4f0574 commit 2a38371
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions src/EnergyPlus/HVACVariableRefrigerantFlow.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8148,7 +8148,7 @@ namespace HVACVariableRefrigerantFlow {
Real64 mDot = DataLoopNode::Node(this->SuppHeatCoilAirInletNode).MassFlowRate;
Real64 Tin = DataLoopNode::Node(this->SuppHeatCoilAirInletNode).Temp;
Real64 Win = DataLoopNode::Node(this->SuppHeatCoilAirInletNode).HumRat;
Real64 CpAirIn = Psychrometrics::PsyCpAirFnWTdb(Win, Tin);
Real64 CpAirIn = Psychrometrics::PsyCpAirFnW(Win);
SuppHeatCoilLoad = mDot * CpAirIn * (this->suppTempSetPoint - Tin);
this->SuppHeatingCoilLoad = SuppHeatCoilLoad;
if (this->DesignSuppHeatingCapacity > 0.0) {
Expand Down Expand Up @@ -9062,7 +9062,7 @@ namespace HVACVariableRefrigerantFlow {
VRFTU(TUIndex).heatSPActive = false;

if ((heatCoilTempSetPoint - coilInletTemp - heatfanDeltaT) > DataHVACGlobals::SmallTempDiff) { // heating
Real64 CpAirIn = Psychrometrics::PsyCpAirFnWTdb(coilInletHumRat, coilInletTemp);
Real64 CpAirIn = Psychrometrics::PsyCpAirFnW(coilInletHumRat);
ZoneLoad = coilInletMassFlow * CpAirIn * (heatCoilTempSetPoint - coilInletTemp - heatfanDeltaT);
VRFTU(TUIndex).heatSPActive = true;
VRFTU(TUIndex).heatLoadToSP = ZoneLoad;
Expand All @@ -9071,7 +9071,7 @@ namespace HVACVariableRefrigerantFlow {
MinDeltaT(VRFCond) = min(MinDeltaT(VRFCond), -1.0);
VRFTU(TUIndex).coilTempSetPoint = heatCoilTempSetPoint - heatfanDeltaT;
} else if ((coilInletTemp - coolCoilTempSetPoint - coolfanDeltaT) > DataHVACGlobals::SmallTempDiff) { // cooling
Real64 CpAirIn = Psychrometrics::PsyCpAirFnWTdb(coilInletHumRat, coilInletTemp);
Real64 CpAirIn = Psychrometrics::PsyCpAirFnW(coilInletHumRat);
ZoneLoad = coilInletMassFlow * CpAirIn * (coolCoilTempSetPoint - coilInletTemp - coolfanDeltaT);
VRFTU(TUIndex).coolSPActive = true;
VRFTU(TUIndex).coolLoadToSP = ZoneLoad;
Expand Down Expand Up @@ -11301,7 +11301,7 @@ namespace HVACVariableRefrigerantFlow {
Real64 mDot = DataLoopNode::Node(this->SuppHeatCoilAirInletNode).MassFlowRate;
Real64 Tin = DataLoopNode::Node(this->SuppHeatCoilAirInletNode).Temp;
Real64 Win = DataLoopNode::Node(this->SuppHeatCoilAirInletNode).HumRat;
Real64 CpAirIn = Psychrometrics::PsyCpAirFnWTdb(Win, Tin);
Real64 CpAirIn = Psychrometrics::PsyCpAirFnW(Win);
SuppHeatCoilLoad = mDot * CpAirIn * (this->suppTempSetPoint - Tin);
this->SuppHeatingCoilLoad = SuppHeatCoilLoad;
if (this->DesignSuppHeatingCapacity > 0.0) {
Expand Down

7 comments on commit 2a38371

@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.

develop (Myoldmopar) - x86_64-MacOS-10.13-clang: OK (1961 of 1961 tests passed, 0 test warnings)

Build Badge Test Badge

@nrel-bot-2b
Copy link

Choose a reason for hiding this comment

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

develop (Myoldmopar) - x86_64-Linux-Ubuntu-18.04-gcc-7.4: OK (1981 of 1981 tests passed, 0 test warnings)

Build Badge Test Badge

@nrel-bot-2b
Copy link

Choose a reason for hiding this comment

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

develop (Myoldmopar) - x86_64-Linux-Ubuntu-18.04-cppcheck: OK (0 of 0 tests passed, 0 test warnings)

Build Badge

@nrel-bot-2b
Copy link

Choose a reason for hiding this comment

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

develop (Myoldmopar) - x86_64-Linux-Ubuntu-18.04-custom_check: OK (10 of 11 tests passed, 0 test warnings)

Failures:\n

Test Summary

  • Passed: 10
  • : 1

Build Badge

@nrel-bot-2b
Copy link

Choose a reason for hiding this comment

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

develop (Myoldmopar) - x86_64-Linux-Ubuntu-18.04-gcc-7.4-UnitTestsCoverage-Debug: OK (1284 of 1284 tests passed, 0 test warnings)

Build Badge Test Badge Coverage Badge

@rraustad
Copy link
Contributor

Choose a reason for hiding this comment

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

Perfect, only clang-format warnings. Thank you @Myoldmopar

@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.

develop (Myoldmopar) - x86_64-Linux-Ubuntu-18.04-gcc-7.4-IntegrationCoverage-Debug: OK (679 of 680 tests passed, 0 test warnings)

Failures:\n

integration Test Summary

  • Passed: 679
  • Timeout: 1

Build Badge Test Badge Coverage Badge

Please sign in to comment.