Skip to content

Commit

Permalink
Apply clang-format.
Browse files Browse the repository at this point in the history
  • Loading branch information
tanaya-mankad committed Jan 8, 2024
1 parent c6ad47f commit 00c9acc
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 44 deletions.
24 changes: 5 additions & 19 deletions src/EnergyPlus/Coils/CoilCoolingDX.cc
Original file line number Diff line number Diff line change
Expand Up @@ -551,7 +551,7 @@ void CoilCoolingDX::oneTimeInit(EnergyPlusData &state)
Constant::Units::None,
this->performance->OperatingMode,

OutputProcessor::SOVTimeStepType::System,
OutputProcessor::SOVTimeStepType::System,
OutputProcessor::SOVStoreType::Average,
this->name);
SetupOutputVariable(state,
Expand Down Expand Up @@ -673,13 +673,8 @@ void CoilCoolingDX::size(EnergyPlusData &state)
this->performance->size(state);
}

void CoilCoolingDX::simulate(EnergyPlusData &state,
int useAlternateMode,
int speedNum,
Real64 speedRatio,
int const fanOpMode,
bool const singleMode,
Real64 LoadSHR)
void CoilCoolingDX::simulate(
EnergyPlusData &state, int useAlternateMode, int speedNum, Real64 speedRatio, int const fanOpMode, bool const singleMode, Real64 LoadSHR)
{
if (this->myOneTimeInitFlag) {
this->oneTimeInit(state);
Expand Down Expand Up @@ -708,17 +703,8 @@ void CoilCoolingDX::simulate(EnergyPlusData &state,
// TODO: check the minOATcompressor and reset data/pass through data as needed
this->performance->OperatingMode = 0;
this->performance->ModeRatio = 0.0;
this->performance->simulate(state,
evapInletNode,
evapOutletNode,
useAlternateMode,
speedNum,
speedRatio,
fanOpMode,
condInletNode,
condOutletNode,
singleMode,
LoadSHR);
this->performance->simulate(
state, evapInletNode, evapOutletNode, useAlternateMode, speedNum, speedRatio, fanOpMode, condInletNode, condOutletNode, singleMode, LoadSHR);
CoilCoolingDX::passThroughNodeData(evapInletNode, evapOutletNode);

// calculate energy conversion factor
Expand Down
4 changes: 2 additions & 2 deletions src/EnergyPlus/Coils/CoilCoolingDXCurveFitOperatingMode.cc
Original file line number Diff line number Diff line change
Expand Up @@ -330,8 +330,8 @@ void CoilCoolingDXCurveFitOperatingMode::CalcOperatingMode(EnergyPlus::EnergyPlu
}

// If multispeed, evaluate high speed first using speedRatio as PLR
//Real64 plr1 = PLR;
//if (speedNum > 1) {
// Real64 plr1 = PLR;
// if (speedNum > 1) {
// plr1 = speedRatio;
//}

Expand Down
16 changes: 4 additions & 12 deletions src/EnergyPlus/UnitarySystem.cc
Original file line number Diff line number Diff line change
Expand Up @@ -12783,12 +12783,8 @@ namespace UnitarySystems {
bool const singleMode = (this->m_SingleMode == 1);
for (int speedNum = 1; speedNum <= this->m_NumOfSpeedCooling; speedNum++) {
this->m_CoolingSpeedNum = speedNum;
state.dataCoilCooingDX->coilCoolingDXs[this->m_CoolingCoilIndex].simulate(state,
OperationMode,
this->m_CoolingSpeedNum,
this->m_CoolingSpeedRatio,
this->m_FanOpMode,
singleMode);
state.dataCoilCooingDX->coilCoolingDXs[this->m_CoolingCoilIndex].simulate(
state, OperationMode, this->m_CoolingSpeedNum, this->m_CoolingSpeedRatio, this->m_FanOpMode, singleMode);
if (speedNum == this->m_NumOfSpeedCooling) {
FullLoadHumRatOut = state.dataLoopNodes->Node(OutletNode).HumRat;
}
Expand Down Expand Up @@ -13873,12 +13869,8 @@ namespace UnitarySystems {
PartLoadFrac = 1.0;
for (int speedNum = this->m_CoolingSpeedNum; speedNum <= this->m_NumOfSpeedCooling; speedNum++) {
this->m_CoolingSpeedNum = speedNum;
state.dataCoilCooingDX->coilCoolingDXs[this->m_CoolingCoilIndex].simulate(state,
OperationMode,
this->m_CoolingSpeedNum,
this->m_CoolingSpeedRatio,
this->m_FanOpMode,
singleMode);
state.dataCoilCooingDX->coilCoolingDXs[this->m_CoolingCoilIndex].simulate(
state, OperationMode, this->m_CoolingSpeedNum, this->m_CoolingSpeedRatio, this->m_FanOpMode, singleMode);
// Cooling: break if outlet humrat is lower than DesOutHumRat or approaches DesOutHumRat to within HumRatAcc from above
if ((state.dataLoopNodes->Node(OutletNode).HumRat - DesOutHumRat) < HumRatAcc) break;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -279,16 +279,7 @@ TEST_F(CoilCoolingDXTest, CoilCoolingDXCurveFitCrankcaseHeaterCurve)
auto &condInletNode = state->dataLoopNodes->Node(thisCoil.condInletNodeIndex);
auto &condOutletNode = state->dataLoopNodes->Node(thisCoil.condOutletNodeIndex);
Real64 LoadSHR = 0.0;
thisCoil.performance->simulate(*state,
evapInletNode,
evapOutletNode,
useAlternateMode,
speedNum,
speedRatio,
fanOpMode,
condInletNode,
condOutletNode,
singleMode,
LoadSHR);
thisCoil.performance->simulate(
*state, evapInletNode, evapOutletNode, useAlternateMode, speedNum, speedRatio, fanOpMode, condInletNode, condOutletNode, singleMode, LoadSHR);
EXPECT_EQ(thisCoil.performance->crankcaseHeaterPower, 120.0);
}

0 comments on commit 00c9acc

Please sign in to comment.