Skip to content

Commit

Permalink
10065 Backed Out One Incorrent Mod
Browse files Browse the repository at this point in the history
After further review of the code and the concepts of minPLR and frac, I realized that this one change was not consistent with the concept and the change was a mistake on my part.  This backs out this change and corrects the unit test as well.  Now this is PR ready.
  • Loading branch information
RKStrand committed Jul 31, 2024
1 parent 3141020 commit 2c6c557
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/EnergyPlus/PlantCentralGSHP.cc
Original file line number Diff line number Diff line change
Expand Up @@ -2749,7 +2749,7 @@ void WrapperSpecs::calcPLRAndCyclingRatio(EnergyPlusData &state,
state.dataPlantCentralGSHP->ChillerPartLoadRatio = actualPartLoadRatio;

// Calculate the load due to false loading on chiller over and above water side load
state.dataPlantCentralGSHP->ChillerFalseLoadRate = (availChillerCap * minPartLoadRatio) - qEvaporator;
state.dataPlantCentralGSHP->ChillerFalseLoadRate = (availChillerCap * actualPartLoadRatio * frac) - qEvaporator;
if (state.dataPlantCentralGSHP->ChillerFalseLoadRate < HVAC::SmallLoad) {
state.dataPlantCentralGSHP->ChillerFalseLoadRate = 0.0;
}
Expand Down
2 changes: 1 addition & 1 deletion tst/EnergyPlus/unit/PlantCentralGSHP.unit.cc
Original file line number Diff line number Diff line change
Expand Up @@ -719,7 +719,7 @@ TEST_F(EnergyPlusFixture, Test_CentralHeatPumpSystem_calcPLRAndCyclingRatio)
frac = -1.0;
expPLR = 0.4;
expFrac = 0.5;
expFalseLoad = 10000.0;
expFalseLoad = 0.0;
state->dataPlantCentralGSHP->ChillerCyclingRatio = -1.0;
state->dataPlantCentralGSHP->ChillerPartLoadRatio = -1.0;
state->dataPlantCentralGSHP->ChillerFalseLoadRate = -1.0;
Expand Down

5 comments on commit 2c6c557

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

10065ChillerHeaterFix (RKStrand) - x86_64-Linux-Ubuntu-22.04-gcc-11.4: OK (3698 of 3700 tests passed, 0 test warnings)

Messages:\n

  • 2 tests had: EIO diffs.
  • 2 tests had: ESO big diffs.
  • 2 tests had: MTR big diffs.
  • 2 tests had: Table big diffs.
  • 2 tests had: Table string diffs.

Failures:\n

regression Test Summary

  • Passed: 809
  • Failed: 2

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.

10065ChillerHeaterFix (RKStrand) - Win64-Windows-10-VisualStudio-16: OK (2867 of 2867 tests passed, 0 test warnings)

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

10065ChillerHeaterFix (RKStrand) - x86_64-MacOS-10.18-clang-15.0.0: OK (3657 of 3659 tests passed, 0 test warnings)

Messages:\n

  • 2 tests had: EIO diffs.
  • 2 tests had: ESO big diffs.
  • 2 tests had: MTR big diffs.
  • 2 tests had: Table big diffs.
  • 2 tests had: Table string diffs.

Failures:\n

regression Test Summary

  • Passed: 789
  • Failed: 2

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.

10065ChillerHeaterFix (RKStrand) - x86_64-Linux-Ubuntu-22.04-gcc-11.4-IntegrationCoverage-Debug: OK (795 of 795 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.

10065ChillerHeaterFix (RKStrand) - x86_64-Linux-Ubuntu-22.04-gcc-11.4-UnitTestsCoverage-Debug: OK (2075 of 2075 tests passed, 0 test warnings)

Build Badge Test Badge Coverage Badge

Please sign in to comment.