Skip to content

Commit 31375e7

Browse files
authored
Merge c894587 into ec7398a
2 parents ec7398a + c894587 commit 31375e7

File tree

6 files changed

+31
-7
lines changed

6 files changed

+31
-7
lines changed

src/EnergyPlus/ChillerAbsorption.cc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1728,6 +1728,7 @@ void BLASTAbsorberSpecs::calculate(EnergyPlusData &state, Real64 &MyLoad, bool R
17281728
this->CondOutletTemp = state.dataLoopNodes->Node(this->CondInletNodeNum).Temp;
17291729
this->CondMassFlowRate = 0.0;
17301730
this->QCondenser = 0.0;
1731+
MyLoad = 0.0;
17311732
return;
17321733
// V7 plant upgrade, no longer fatal here anymore, set some things and return
17331734
}

src/EnergyPlus/ChillerElectricASHRAE205.cc

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1337,7 +1337,12 @@ void ASHRAE205ChillerSpecs::calculate(EnergyPlusData &state, Real64 &MyLoad, boo
13371337
PlantUtilities::PullCompInterconnectTrigger(
13381338
state, this->CWPlantLoc, this->CondMassFlowIndex, this->CDPlantLoc, DataPlant::CriteriaType::MassFlowRate, this->CondMassFlowRate);
13391339

1340-
if (this->CondMassFlowRate < DataBranchAirLoopPlant::MassFlowTolerance) return;
1340+
if (this->CondMassFlowRate < DataBranchAirLoopPlant::MassFlowTolerance) {
1341+
MyLoad = 0.0;
1342+
this->Power = standbyPower;
1343+
this->AmbientZoneGain = standbyPower;
1344+
return;
1345+
}
13411346
}
13421347
Real64 EvapOutletTempSetPoint(0.0); // Evaporator outlet temperature setpoint [C]
13431348
switch (state.dataPlnt->PlantLoop(PlantLoopNum).LoopDemandCalcScheme) {

src/EnergyPlus/ChillerElectricEIR.cc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1962,6 +1962,8 @@ void ElectricEIRChillerSpecs::calculate(EnergyPlusData &state, Real64 &MyLoad, b
19621962
state, this->CWPlantLoc, this->CondMassFlowIndex, this->CDPlantLoc, DataPlant::CriteriaType::MassFlowRate, this->CondMassFlowRate);
19631963

19641964
if (this->CondMassFlowRate < DataBranchAirLoopPlant::MassFlowTolerance) {
1965+
// Shut chiller off if there is no condenser water flow
1966+
MyLoad = 0.0;
19651967
if (this->EvapMassFlowRate < DataBranchAirLoopPlant::MassFlowTolerance) {
19661968
// Use PlantUtilities::SetComponentFlowRate to decide actual flow
19671969
PlantUtilities::SetComponentFlowRate(

src/EnergyPlus/ChillerIndirectAbsorption.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1604,7 +1604,7 @@ void IndirectAbsorberSpecs::sizeChiller(EnergyPlusData &state)
16041604
}
16051605
}
16061606

1607-
void IndirectAbsorberSpecs::calculate(EnergyPlusData &state, Real64 const MyLoad, bool const RunFlag)
1607+
void IndirectAbsorberSpecs::calculate(EnergyPlusData &state, Real64 MyLoad, bool const RunFlag)
16081608
{
16091609
// SUBROUTINE INFORMATION:
16101610
// AUTHOR R. Raustad (FSEC)
@@ -1999,6 +1999,7 @@ void IndirectAbsorberSpecs::calculate(EnergyPlusData &state, Real64 const MyLoad
19991999
this->CondOutletTemp = CondInletTemp;
20002000
this->CondMassFlowRate = 0.0;
20012001
this->QCondenser = 0.0;
2002+
MyLoad = 0.0;
20022003
return;
20032004
// V7 plant upgrade, no longer fatal here anymore... set some things and return
20042005
}

src/EnergyPlus/ChillerReformulatedEIR.cc

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2147,7 +2147,10 @@ void ReformulatedEIRChillerSpecs::calculate(EnergyPlusData &state, Real64 &MyLoa
21472147
PlantUtilities::PullCompInterconnectTrigger(
21482148
state, this->CWPlantLoc, this->CondMassFlowIndex, this->CDPlantLoc, DataPlant::CriteriaType::MassFlowRate, this->CondMassFlowRate);
21492149

2150-
if (this->CondMassFlowRate < DataBranchAirLoopPlant::MassFlowTolerance) return;
2150+
if (this->CondMassFlowRate < DataBranchAirLoopPlant::MassFlowTolerance) {
2151+
MyLoad = 0.0;
2152+
return;
2153+
}
21512154
}
21522155
Real64 FRAC = 1.0;
21532156
Real64 EvapOutletTempSetPoint(0.0); // Evaporator outlet temperature setpoint [C]

src/EnergyPlus/PlantChillers.cc

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1468,7 +1468,10 @@ namespace PlantChillers {
14681468
PlantUtilities::SetComponentFlowRate(state, this->CondMassFlowRate, this->CondInletNodeNum, this->CondOutletNodeNum, this->CDPlantLoc);
14691469
PlantUtilities::PullCompInterconnectTrigger(
14701470
state, this->CWPlantLoc, this->CondMassFlowIndex, this->CDPlantLoc, DataPlant::CriteriaType::MassFlowRate, this->CondMassFlowRate);
1471-
if (this->CondMassFlowRate < DataBranchAirLoopPlant::MassFlowTolerance) return;
1471+
if (this->CondMassFlowRate < DataBranchAirLoopPlant::MassFlowTolerance) {
1472+
MyLoad = 0.0;
1473+
return;
1474+
}
14721475
}
14731476

14741477
// LOAD LOCAL VARIABLES FROM DATA STRUCTURE (for code readability)
@@ -3593,7 +3596,10 @@ namespace PlantChillers {
35933596
PlantUtilities::SetComponentFlowRate(state, this->CondMassFlowRate, this->CondInletNodeNum, this->CondOutletNodeNum, this->CDPlantLoc);
35943597
PlantUtilities::PullCompInterconnectTrigger(
35953598
state, this->CWPlantLoc, this->CondMassFlowIndex, this->CDPlantLoc, DataPlant::CriteriaType::MassFlowRate, this->CondMassFlowRate);
3596-
if (this->CondMassFlowRate < DataBranchAirLoopPlant::MassFlowTolerance) return;
3599+
if (this->CondMassFlowRate < DataBranchAirLoopPlant::MassFlowTolerance) {
3600+
MyLoad = 0.0;
3601+
return;
3602+
}
35973603
}
35983604

35993605
// LOAD LOCAL VARIABLES FROM DATA STRUCTURE (for code readability)
@@ -5605,7 +5611,10 @@ namespace PlantChillers {
56055611
PlantUtilities::PullCompInterconnectTrigger(
56065612
state, this->CWPlantLoc, this->CondMassFlowIndex, this->CDPlantLoc, DataPlant::CriteriaType::MassFlowRate, this->CondMassFlowRate);
56075613

5608-
if (this->CondMassFlowRate < DataBranchAirLoopPlant::MassFlowTolerance) return;
5614+
if (this->CondMassFlowRate < DataBranchAirLoopPlant::MassFlowTolerance) {
5615+
MyLoad = 0.0;
5616+
return;
5617+
}
56095618
}
56105619

56115620
// LOAD LOCAL VARIABLES FROM DATA STRUCTURE (for code readability)
@@ -7313,7 +7322,10 @@ namespace PlantChillers {
73137322
PlantUtilities::PullCompInterconnectTrigger(
73147323
state, this->CWPlantLoc, this->CondMassFlowIndex, this->CDPlantLoc, DataPlant::CriteriaType::MassFlowRate, this->CondMassFlowRate);
73157324

7316-
if (this->CondMassFlowRate < DataBranchAirLoopPlant::MassFlowTolerance) return;
7325+
if (this->CondMassFlowRate < DataBranchAirLoopPlant::MassFlowTolerance) {
7326+
MyLoad = 0.0;
7327+
return;
7328+
}
73177329
}
73187330

73197331
// If FlowLock is True, the new resolved mdot is used to update Power, QEvap, Qcond, and

0 commit comments

Comments
 (0)