Skip to content

Commit 39ea7a9

Browse files
author
Yueyue Zhou
committed
apply format
1 parent 0f9e7f5 commit 39ea7a9

3 files changed

Lines changed: 47 additions & 45 deletions

File tree

‎src/EnergyPlus/VariableSpeedCoils.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6402,7 +6402,7 @@ namespace VariableSpeedCoils {
64026402
state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).WaterMassFlowRate = 0.0;
64036403
state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).OutletWaterTemp = 0.0;
64046404
state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).OutletWaterEnthalpy = 0.0;
6405-
state.dataHeatBal->HeatReclaimVS_Coil(DXCoilNum).AvailCapacity = state.dataVariableSpeedCoils->QSource;
6405+
state.dataHeatBal->HeatReclaimVS_Coil(DXCoilNum).AvailCapacity = state.dataVariableSpeedCoils->QSource;
64066406
state.dataVariableSpeedCoils->QSource -= state.dataHeatBal->HeatReclaimVS_Coil(DXCoilNum).WaterHeatingDesuperheaterReclaimedHeatTotal;
64076407
} else {
64086408
state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).WaterMassFlowRate = state.dataVariableSpeedCoils->SourceSideMassFlowRate;

‎src/EnergyPlus/WaterThermalTanks.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8444,7 +8444,7 @@ void WaterThermalTankData::CalcDesuperheaterWaterHeater(EnergyPlusData &state, b
84448444
AverageWasteHeat = state.dataHeatBal->HeatReclaimDXCoil(SourceID).AvailCapacity -
84458445
state.dataHeatBal->HeatReclaimDXCoil(SourceID).HVACDesuperheaterReclaimedHeatTotal;
84468446
DesupHtr.DXSysPLR = state.dataDXCoils->DXCoil(SourceID).PartLoadRatio;
8447-
} else if (DesupHtr.ReclaimHeatingSource == ReclaimHeatObjectType::DXVariableCooling ||
8447+
} else if (DesupHtr.ReclaimHeatingSource == ReclaimHeatObjectType::DXVariableCooling ||
84488448
DesupHtr.ReclaimHeatingSource == ReclaimHeatObjectType::AirWaterHeatPumpVSEQ) {
84498449
AverageWasteHeat = state.dataHeatBal->HeatReclaimVS_Coil(SourceID).AvailCapacity -
84508450
state.dataHeatBal->HeatReclaimVS_Coil(SourceID).HVACDesuperheaterReclaimedHeatTotal;

‎tst/EnergyPlus/unit/WaterThermalTanks.unit.cc‎

Lines changed: 45 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -3356,18 +3356,18 @@ TEST_F(EnergyPlusFixture, Desuperheater_WAHP_VSEQ_Coil_Test)
33563356
" 2, !- Maximum Value of x {BasedOnField A2}",
33573357
" 0, !- Minimum Curve Output {BasedOnField A3}",
33583358
" 2; !- Maximum Curve Output {BasedOnField A3}",
3359-
3360-
"Curve:Biquadratic,",
3361-
" WasteHeat-FT1, !-Name",
3362-
" 1, !- Coefficient1 Constant",
3363-
" 0, !- Coefficient2 x",
3364-
" 0, !- Coefficient3 x**2",
3365-
" 0, !- Coefficient4 y",
3366-
" 0, !- Coefficient5 y**2",
3367-
" 0, !- Coefficient6 x*y",
3368-
" 0, !- Minimum Value of x {BasedOnField A2}",
3369-
" 1, !- Maximum Value of x {BasedOnField A2}",
3370-
" 0, !- Minimum Value of y {BasedOnField A3}",
3359+
3360+
"Curve:Biquadratic,",
3361+
" WasteHeat-FT1, !-Name",
3362+
" 1, !- Coefficient1 Constant",
3363+
" 0, !- Coefficient2 x",
3364+
" 0, !- Coefficient3 x**2",
3365+
" 0, !- Coefficient4 y",
3366+
" 0, !- Coefficient5 y**2",
3367+
" 0, !- Coefficient6 x*y",
3368+
" 0, !- Minimum Value of x {BasedOnField A2}",
3369+
" 1, !- Maximum Value of x {BasedOnField A2}",
3370+
" 0, !- Minimum Value of y {BasedOnField A3}",
33713371
" 1; !- Maximum Value of y {BasedOnField A3}",
33723372

33733373
" Curve:Biquadratic,",
@@ -3392,7 +3392,7 @@ TEST_F(EnergyPlusFixture, Desuperheater_WAHP_VSEQ_Coil_Test)
33923392
" 2, !- Maximum Value of x {BasedOnField A2}",
33933393
" 0, !- Minimum Curve Output {BasedOnField A3}",
33943394
" 2; !- Maximum Curve Output {BasedOnField A3}",
3395-
3395+
33963396
"Curve:Quadratic,",
33973397
" Cool-Cap-fWF2, !- Name",
33983398
" 0.815, !- Coefficient1 Constant",
@@ -3425,7 +3425,7 @@ TEST_F(EnergyPlusFixture, Desuperheater_WAHP_VSEQ_Coil_Test)
34253425
" 2, !- Maximum Value of x {BasedOnField A2}",
34263426
" 0, !- Minimum Curve Output {BasedOnField A3}",
34273427
" 2; !- Maximum Curve Output {BasedOnField A3}",
3428-
3428+
34293429
"Curve:Quadratic,",
34303430
" Cool-EIR-fWF2, !- Name",
34313431
" 1.5872, !- Coefficient1 Constant",
@@ -3436,17 +3436,17 @@ TEST_F(EnergyPlusFixture, Desuperheater_WAHP_VSEQ_Coil_Test)
34363436
" 0, !- Minimum Curve Output {BasedOnField A3}",
34373437
" 2; !- Maximum Curve Output {BasedOnField A3}",
34383438

3439-
"Curve:Biquadratic,",
3440-
" WasteHeat-FT2, !- Name",
3441-
" 1, !- Coefficient1 Constant",
3442-
" 0, !- Coefficient2 x",
3439+
"Curve:Biquadratic,",
3440+
" WasteHeat-FT2, !- Name",
3441+
" 1, !- Coefficient1 Constant",
3442+
" 0, !- Coefficient2 x",
34433443
" 0, !- Coefficient3 x**2",
34443444
" 0, !- Coefficient4 y",
3445-
" 0, !- Coefficient5 y**2",
3446-
" 0, !- Coefficient6 x*y",
3445+
" 0, !- Coefficient5 y**2",
3446+
" 0, !- Coefficient6 x*y",
34473447
" 0, !- Minimum Value of x {BasedOnField A2}",
34483448
" 1, !- Maximum Value of x {BasedOnField A2}",
3449-
" 0, !- Minimum Value of y {BasedOnField A3}",
3449+
" 0, !- Minimum Value of y {BasedOnField A3}",
34503450
" 1; !- Maximum Value of y {BasedOnField A3}",
34513451
});
34523452

@@ -3495,8 +3495,7 @@ TEST_F(EnergyPlusFixture, Desuperheater_WAHP_VSEQ_Coil_Test)
34953495
state->dataVariableSpeedCoils->VarSpeedCoil(1).MSRatedWaterVolFlowRate(1) * 1000.0;
34963496
state->dataVariableSpeedCoils->VarSpeedCoil(1).MSRatedWaterMassFlowRate(2) =
34973497
state->dataVariableSpeedCoils->VarSpeedCoil(1).MSRatedWaterVolFlowRate(2) * 1000.0;
3498-
state->dataVariableSpeedCoils->VarSpeedCoil(1).DesignAirMassFlowRate =
3499-
state->dataVariableSpeedCoils->VarSpeedCoil(1).MSRatedAirMassFlowRate(2);
3498+
state->dataVariableSpeedCoils->VarSpeedCoil(1).DesignAirMassFlowRate = state->dataVariableSpeedCoils->VarSpeedCoil(1).MSRatedAirMassFlowRate(2);
35003499
state->dataVariableSpeedCoils->VarSpeedCoil(1).DesignWaterMassFlowRate =
35013500
state->dataVariableSpeedCoils->VarSpeedCoil(1).MSRatedWaterMassFlowRate(2);
35023501
state->dataVariableSpeedCoils->VarSpeedCoil(1).AirMassFlowRate = state->dataVariableSpeedCoils->VarSpeedCoil(1).MSRatedAirMassFlowRate(2);
@@ -3512,34 +3511,37 @@ TEST_F(EnergyPlusFixture, Desuperheater_WAHP_VSEQ_Coil_Test)
35123511
state->dataVariableSpeedCoils->VarSpeedCoil(1).InletWaterEnthalpy = 27.0 * Cp;
35133512
state->dataVariableSpeedCoils->VarSpeedCoil(1).plantLoc.loopNum = PlantLoopNum;
35143513
state->dataPlnt->PlantLoop.allocate(PlantLoopNum);
3515-
3514+
35163515
state->dataPlnt->PlantLoop(PlantLoopNum).glycol = Fluid::GetWater(*state);
35173516
state->dataPlnt->PlantLoop(PlantLoopNum).FluidName = "WATER";
35183517
state->dataLoopNodes->Node(5).MassFlowRate = state->dataVariableSpeedCoils->VarSpeedCoil(1).MSRatedAirMassFlowRate(2);
3519-
state->dataVariableSpeedCoils->VarSpeedCoil(1).MSRatedCBF(1) = DXCoils::CalcCBF(*state,
3520-
state->dataVariableSpeedCoils->VarSpeedCoil(1).VarSpeedCoilType,
3521-
state->dataVariableSpeedCoils->VarSpeedCoil(1).Name,
3522-
26.6667,
3523-
0.0111847,
3524-
state->dataVariableSpeedCoils->VarSpeedCoil(1).MSRatedTotCap(1),
3525-
state->dataVariableSpeedCoils->VarSpeedCoil(1).MSRatedAirVolFlowRate(1),
3526-
state->dataVariableSpeedCoils->VarSpeedCoil(1).MSRatedSHR(1),
3527-
true);
3528-
state->dataVariableSpeedCoils->VarSpeedCoil(1).MSRatedCBF(2) = DXCoils::CalcCBF(*state,
3529-
state->dataVariableSpeedCoils->VarSpeedCoil(1).VarSpeedCoilType,
3530-
state->dataVariableSpeedCoils->VarSpeedCoil(1).Name,
3531-
26.6667,
3532-
0.0111847,
3533-
state->dataVariableSpeedCoils->VarSpeedCoil(1).MSRatedTotCap(2),
3534-
state->dataVariableSpeedCoils->VarSpeedCoil(1).MSRatedAirVolFlowRate(2),
3535-
state->dataVariableSpeedCoils->VarSpeedCoil(1).MSRatedSHR(2),
3536-
true);
3518+
state->dataVariableSpeedCoils->VarSpeedCoil(1).MSRatedCBF(1) =
3519+
DXCoils::CalcCBF(*state,
3520+
state->dataVariableSpeedCoils->VarSpeedCoil(1).VarSpeedCoilType,
3521+
state->dataVariableSpeedCoils->VarSpeedCoil(1).Name,
3522+
26.6667,
3523+
0.0111847,
3524+
state->dataVariableSpeedCoils->VarSpeedCoil(1).MSRatedTotCap(1),
3525+
state->dataVariableSpeedCoils->VarSpeedCoil(1).MSRatedAirVolFlowRate(1),
3526+
state->dataVariableSpeedCoils->VarSpeedCoil(1).MSRatedSHR(1),
3527+
true);
3528+
state->dataVariableSpeedCoils->VarSpeedCoil(1).MSRatedCBF(2) =
3529+
DXCoils::CalcCBF(*state,
3530+
state->dataVariableSpeedCoils->VarSpeedCoil(1).VarSpeedCoilType,
3531+
state->dataVariableSpeedCoils->VarSpeedCoil(1).Name,
3532+
26.6667,
3533+
0.0111847,
3534+
state->dataVariableSpeedCoils->VarSpeedCoil(1).MSRatedTotCap(2),
3535+
state->dataVariableSpeedCoils->VarSpeedCoil(1).MSRatedAirVolFlowRate(2),
3536+
state->dataVariableSpeedCoils->VarSpeedCoil(1).MSRatedSHR(2),
3537+
true);
35373538

35383539
// Calculate multispeed DX cooling coils
35393540
VariableSpeedCoils::CalcVarSpeedCoilCooling(*state, DXNum, HVAC::FanOp::Cycling, 1000.0, 100.0, HVAC::CompressorOp::On, 1.0, 1.0, 1.0, 2);
35403541

35413542
// Source available heat successfully passed to DataHeatBalance::HeatReclaimVS_Coil data struct
3542-
EXPECT_EQ(state->dataHeatBal->HeatReclaimVS_Coil(DXNum).AvailCapacity, state->dataVariableSpeedCoils->VarSpeedCoil(DXNum).QLoadTotal + state->dataVariableSpeedCoils->Winput);
3543+
EXPECT_EQ(state->dataHeatBal->HeatReclaimVS_Coil(DXNum).AvailCapacity,
3544+
state->dataVariableSpeedCoils->VarSpeedCoil(DXNum).QLoadTotal + state->dataVariableSpeedCoils->Winput);
35433545

35443546
// Now move to the water thermal tank calculation
35453547
WaterThermalTanks::WaterThermalTankData &Tank = state->dataWaterThermalTanks->WaterThermalTank(TankNum);

0 commit comments

Comments
 (0)