Skip to content

Commit b4f9e4c

Browse files
committed
Fix formatting.
1 parent 43dfa02 commit b4f9e4c

File tree

2 files changed

+5
-21
lines changed

2 files changed

+5
-21
lines changed

src/EnergyPlus/DXCoils.cc

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -13799,10 +13799,8 @@ void CalcMultiSpeedDXCoilHeating(EnergyPlusData &state,
1379913799
// Calculate defrost adjustment factors depending on defrost control type
1380013800
if (thisDXCoil.DefrostControl == StandardRatings::HPdefrostControl::Timed) {
1380113801
FractionalDefrostTime = thisDXCoil.DefrostTime;
13802-
if (FractionalDefrostTime > 0.0) {
13803-
HeatingCapacityMultiplier = 0.909 - 107.33 * OutdoorCoildw;
13804-
InputPowerMultiplier = 0.90 - 36.45 * OutdoorCoildw;
13805-
}
13802+
HeatingCapacityMultiplier = 0.909 - 107.33 * OutdoorCoildw;
13803+
InputPowerMultiplier = 0.90 - 36.45 * OutdoorCoildw;
1380613804
} else { // else defrost control is on-demand
1380713805
FractionalDefrostTime = 1.0 / (1.0 + 0.01446 / OutdoorCoildw);
1380813806
HeatingCapacityMultiplier = 0.875 * (1.0 - FractionalDefrostTime);
@@ -13827,12 +13825,6 @@ void CalcMultiSpeedDXCoilHeating(EnergyPlusData &state,
1382713825
}
1382813826
}
1382913827

13830-
// Make no adjustment if there is no defrost power available
13831-
if (thisDXCoil.DefrostPower == 0.0) {
13832-
HeatingCapacityMultiplier = 1.0;
13833-
InputPowerMultiplier = 1.0;
13834-
}
13835-
1383613828
TotCapLSAdj = TotCapLS * HeatingCapacityMultiplier;
1383713829
TotCapHSAdj = TotCapHS * HeatingCapacityMultiplier;
1383813830

@@ -14019,10 +14011,8 @@ void CalcMultiSpeedDXCoilHeating(EnergyPlusData &state,
1401914011
// Calculate defrost adjustment factors depending on defrost control type
1402014012
if (thisDXCoil.DefrostControl == StandardRatings::HPdefrostControl::Timed) {
1402114013
FractionalDefrostTime = thisDXCoil.DefrostTime;
14022-
if (FractionalDefrostTime > 0.0) {
14023-
HeatingCapacityMultiplier = 0.909 - 107.33 * OutdoorCoildw;
14024-
InputPowerMultiplier = 0.90 - 36.45 * OutdoorCoildw;
14025-
}
14014+
HeatingCapacityMultiplier = 0.909 - 107.33 * OutdoorCoildw;
14015+
InputPowerMultiplier = 0.90 - 36.45 * OutdoorCoildw;
1402614016
} else { // else defrost control is on-demand
1402714017
FractionalDefrostTime = 1.0 / (1.0 + 0.01446 / OutdoorCoildw);
1402814018
HeatingCapacityMultiplier = 0.875 * (1.0 - FractionalDefrostTime);
@@ -14043,12 +14033,6 @@ void CalcMultiSpeedDXCoilHeating(EnergyPlusData &state,
1404314033
}
1404414034
}
1404514035

14046-
// Make no adjustment if there is no defrost power available
14047-
if (thisDXCoil.DefrostPower == 0.0) {
14048-
HeatingCapacityMultiplier = 1.0;
14049-
InputPowerMultiplier = 1.0;
14050-
}
14051-
1405214036
// Modify total heating capacity based on defrost heating capacity multiplier
1405314037
TotCapAdj = TotCap * HeatingCapacityMultiplier;
1405414038

src/EnergyPlus/HVACVariableRefrigerantFlow.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -914,7 +914,7 @@ void CalcVRFCondenser(EnergyPlusData &state, int const VRFCond)
914914

915915
vrf.DefrostPower = DefrostEIRTempModFac * (vrf.HeatingCapacity / 1.01667) * FractionalDefrostTime;
916916

917-
} else { // Defrost strategy is resistive
917+
} else { // Defrost strategy is resistive
918918
vrf.DefrostPower = vrf.DefrostCapacity * FractionalDefrostTime;
919919
}
920920
}

0 commit comments

Comments
 (0)