Skip to content

Commit

Permalink
fix botched merge
Browse files Browse the repository at this point in the history
  • Loading branch information
mitchute committed Jan 28, 2020
1 parent 5a5fe6b commit 9540691
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/EnergyPlus/ChillerElectricEIR.cc
Original file line number Diff line number Diff line change
Expand Up @@ -2170,7 +2170,7 @@ namespace ChillerElectricEIR {
if (this->HeatRecActive) this->calcHeatRecovery(this->QCondenser, this->CondMassFlowRate, condInletTemp, this->QHeatRecovered);

if (CondMassFlowRate > 0.0) {
Cp = Psychrometrics::PsyCpAirFnWTdb(Node(CondInletNode).HumRat, CondInletTemp);
Cp = Psychrometrics::PsyCpAirFnW(DataLoopNode::Node(this->CondInletNodeNum).HumRat);
CondOutletTemp = CondInletTemp + QCondenser / CondMassFlowRate / Cp;
} else {
this->CondOutletTemp = condInletTemp;
Expand Down

7 comments on commit 9540691

@nrel-bot-2c
Copy link

Choose a reason for hiding this comment

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

168168673_Issue7476 (mitchute) - x86_64-Linux-Ubuntu-18.04-cppcheck: OK (0 of 0 tests passed, 0 test warnings)

Build Badge

@nrel-bot-2c
Copy link

Choose a reason for hiding this comment

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

168168673_Issue7476 (mitchute) - x86_64-Linux-Ubuntu-18.04-custom_check: OK (11 of 11 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.

168168673_Issue7476 (mitchute) - x86_64-Linux-Ubuntu-18.04-gcc-7.4: OK (2635 of 2659 tests passed, 618 test warnings)

Messages:\n

  • 534 tests had: EIO diffs.
  • 610 tests had: ESO small diffs.
  • 415 tests had: Table small diffs.
  • 471 tests had: MTR small diffs.
  • 5 tests had: EDD diffs.
  • 14 tests had: ESO big diffs.
  • 8 tests had: MTR big diffs.
  • 20 tests had: Table big diffs.
  • 20 tests had: ERR diffs.
  • 12 tests had: SSZ small diffs.
  • 44 tests had: ZSZ small diffs.
  • 2 tests had: JSON big diffs.

Failures:\n

regression Test Summary

  • Passed: 669
  • Failed: 24

Build Badge Test Badge

@nrel-bot-2c
Copy link

Choose a reason for hiding this comment

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

168168673_Issue7476 (mitchute) - x86_64-Linux-Ubuntu-18.04-gcc-7.4-UnitTestsCoverage-Debug: OK (1271 of 1271 tests passed, 0 test warnings)

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

168168673_Issue7476 (mitchute) - x86_64-Linux-Ubuntu-18.04-gcc-7.4-IntegrationCoverage-Debug: OK (677 of 678 tests passed, 0 test warnings)

Failures:\n

integration Test Summary

  • Passed: 677
  • Timeout: 1

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

168168673_Issue7476 (mitchute) - x86_64-MacOS-10.13-clang: OK (2595 of 2619 tests passed, 614 test warnings)

Messages:\n

  • 524 tests had: EIO diffs.
  • 5 tests had: EDD diffs.
  • 604 tests had: ESO small diffs.
  • 472 tests had: MTR small diffs.
  • 407 tests had: Table small diffs.
  • 17 tests had: ESO big diffs.
  • 8 tests had: MTR big diffs.
  • 19 tests had: Table big diffs.
  • 31 tests had: ZSZ small diffs.
  • 13 tests had: ERR diffs.
  • 9 tests had: SSZ small diffs.
  • 2 tests had: JSON big diffs.
  • 2 tests had: AUD diffs.

Failures:\n

regression Test Summary

  • Passed: 649
  • Failed: 24

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.

168168673_Issue7476 (mitchute) - Win64-Windows-10-VisualStudio-16: OK (2592 of 2619 tests passed, 614 test warnings)

Messages:\n

  • 524 tests had: EIO diffs.
  • 608 tests had: ESO small diffs.
  • 401 tests had: Table small diffs.
  • 470 tests had: MTR small diffs.
  • 5 tests had: EDD diffs.
  • 16 tests had: ESO big diffs.
  • 9 tests had: MTR big diffs.
  • 23 tests had: Table big diffs.
  • 42 tests had: ZSZ small diffs.
  • 15 tests had: ERR diffs.
  • 14 tests had: SSZ small diffs.
  • 2 tests had: SSZ big diffs.
  • 2 tests had: JSON big diffs.

Failures:\n

regression Test Summary

  • Passed: 646
  • Failed: 27

Build Badge Test Badge

Please sign in to comment.