Skip to content

Commit

Permalink
Revert change to EIRfPLR definition
Browse files Browse the repository at this point in the history
  • Loading branch information
@rraustad
rraustad committed Aug 23, 2023
1 parent eaadc29 commit 5b89364
Show file tree
Hide file tree
Showing 7 changed files with 25 additions and 21 deletions.
4 changes: 2 additions & 2 deletions ...src/simulation-models-encyclopedic-reference-002/air-system-compound-component-groups.tex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2887,13 +2887,13 @@ \subsubsection{Final Calculation of Load and Energy, Power and Electricity, and
EIRFPLR = {f(PLR_{operating})}
\end{equation}
\begin{equation}
Power = \frac{\dot{Q}_{avail}}{COP_{ref}} \times EIRFT \times EIRFPLR \times Multipler_{heating,\; power} \times CyclingRatio
Power = \frac{\dot{Q}_{load}}{COP_{ref}} \times EIRFT \times EIRFPLR \times Multipler_{heating,\; power} \times CyclingRatio
\end{equation}
\begin{equation}
Energy = Power \times TimeStepInSeconds
\end{equation}
\begin{equation}
{\dot{Q}_{source} = (\dot{Q}_{avail} \pm Power) \times PLR_{operating}}
{\dot{Q}_{source} = (\dot{Q}_{load} \pm Power) \times CyclingRatio}
\end{equation}
\begin{equation}
T{out,\;source} = T_{in,\;source} \pm \frac{\dot{Q}_{source}}{\dot{m}_{source} \times C_{p,\;source}}
Expand Down
2 changes: 1 addition & 1 deletion src/EnergyPlus/PlantLoopHeatPumpEIR.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -567,7 +567,7 @@ void EIRPlantLoopHeatPump::doPhysics(EnergyPlusData &state, Real64 currentLoad)
}

this->powerUsage =
(availableCapacity / this->referenceCOP) * eirModifierFuncPLR * eirModifierFuncTemp * InputPowerMultiplier * this->cyclingRatio;
(this->loadSideHeatTransfer / this->referenceCOP) * eirModifierFuncPLR * eirModifierFuncTemp * InputPowerMultiplier * this->cyclingRatio;
this->powerEnergy = this->powerUsage * reportingInterval;

// energy balance on heat pump
Expand Down
8 changes: 4 additions & 4 deletions testfiles/PlantLoopHeatPump_EIR_AirSource.idf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -313,8 +313,8 @@

Curve:Quadratic,
EIRCurveFuncPLR, !- Name
0.0, !- Coefficient1 Constant
1.0, !- Coefficient2 x
1.0, !- Coefficient1 Constant
0.0, !- Coefficient2 x
0.0, !- Coefficient3 x**2
0.0, !- Minimum Value of x
1.0; !- Maximum Value of x
Expand Down Expand Up @@ -472,8 +472,8 @@

Curve:Quadratic,
EIRCurveFuncPLR2, !- Name
0.0, !- Coefficient1 Constant
1.0, !- Coefficient2 x
1.0, !- Coefficient1 Constant
0.0, !- Coefficient2 x
0.0, !- Coefficient3 x**2
0.0, !- Minimum Value of x
1.0; !- Maximum Value of x
Expand Down
12 changes: 7 additions & 5 deletions testfiles/PlantLoopHeatPump_EIR_Large-Office-2-AWHP-DedHR-AuxBoiler-Pri-Sec-HW.idf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,9 @@

ConvergenceLimits,
2, !- Minimum System Timestep {minutes}
25; !- Maximum HVAC Iterations
25, !- Maximum HVAC Iterations
4, !- Minimum Plant Iterations
12; !- Maximum Plant Iterations

ShadowCalculation,
PolygonClipping,
Expand Down Expand Up @@ -10300,8 +10302,8 @@ Curve:Biquadratic,

Curve:Quadratic,
EIRCurveFuncPLR, !- Name
0.0, !- Coefficient1 Constant
1.0, !- Coefficient2 x
1.0, !- Coefficient1 Constant
0.0, !- Coefficient2 x
0.0, !- Coefficient3 x**2
0.0, !- Minimum Value of x
1.0; !- Maximum Value of x
Expand Down Expand Up @@ -10662,8 +10664,8 @@ Curve:Biquadratic,

Curve:Quadratic,
EIRCurveFuncPLR2, !- Name
0.0, !- Coefficient1 Constant
1.0, !- Coefficient2 x
1.0, !- Coefficient1 Constant
0.0, !- Coefficient2 x
0.0, !- Coefficient3 x**2
0.0, !- Minimum Value of x
1.0; !- Maximum Value of x
Expand Down
8 changes: 5 additions & 3 deletions testfiles/PlantLoopHeatPump_EIR_LargeOffice-2-AWHP-AuxBoiler-Pri-Sec-4PipeBeam.idf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,9 @@

ConvergenceLimits,
2, !- Minimum System Timestep {minutes}
25; !- Maximum HVAC Iterations
25, !- Maximum HVAC Iterations
4, !- Minimum Plant Iterations
12; !- Maximum Plant Iterations

ShadowCalculation,
PolygonClipping, !- Shading Calculation Method
Expand Down Expand Up @@ -8645,8 +8647,8 @@ Curve:Biquadratic,

Curve:Quadratic,
EIRCurveFuncPLR, !- Name
0.0, !- Coefficient1 Constant
1.0, !- Coefficient2 x
1.0, !- Coefficient1 Constant
0.0, !- Coefficient2 x
0.0, !- Coefficient3 x**2
0.0, !- Minimum Value of x
1.0; !- Maximum Value of x
Expand Down
8 changes: 4 additions & 4 deletions testfiles/PlantLoopHeatPump_EIR_WaterSource.idf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -313,8 +313,8 @@

Curve:Quadratic,
EIRCurveFuncPLR, !- Name
0.0, !- Coefficient1 Constant
1.0, !- Coefficient2 x
1.0, !- Coefficient1 Constant
0.0, !- Coefficient2 x
0.0, !- Coefficient3 x**2
0.0, !- Minimum Value of x
1.0; !- Maximum Value of x
Expand Down Expand Up @@ -472,8 +472,8 @@

Curve:Quadratic,
EIRCurveFuncPLR2, !- Name
0.0, !- Coefficient1 Constant
1.0, !- Coefficient2 x
1.0, !- Coefficient1 Constant
0.0, !- Coefficient2 x
0.0, !- Coefficient3 x**2
0.0, !- Minimum Value of x
1.0; !- Maximum Value of x
Expand Down
4 changes: 2 additions & 2 deletions tst/EnergyPlus/unit/PlantLoopHeatPumpEIR.unit.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2810,10 +2810,10 @@ TEST_F(EnergyPlusFixture, Test_DoPhysics)
" Dimensionless;",
"Curve:Quadratic,",
" EIRCurveFuncPLR,",
" 0.0,",
" 1.0,",
" 0.0,",
" 0.0,",
" 0.0,",
" 1.0;"});

ASSERT_TRUE(process_idf(idf_objects));
Expand Down Expand Up @@ -3237,10 +3237,10 @@ TEST_F(EnergyPlusFixture, Test_Curve_Negative_Energy)
" Dimensionless;",
"Curve:Quadratic,",
" EIRCurveFuncPLR,",
" 0.0,",
" 1.0,",
" 0.0,",
" 0.0,",
" 0.0,",
" 1.0;"
"Curve:Quadratic,",
" badEIRCurveFuncPLR,",
Expand Down

4 comments on commit 5b89364

@nrel-bot
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

NFP-Chiller-Plant-Support-for-Carbon-Initiatives (rraustad) - Win64-Windows-10-VisualStudio-16: OK (2691 of 2691 tests passed, 0 test warnings)

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.

NFP-Chiller-Plant-Support-for-Carbon-Initiatives (rraustad) - x86_64-Linux-Ubuntu-22.04-gcc-11.4: OK (3512 of 3513 tests passed, 2 test warnings)

Messages:\n

  • 2 tests had: AUD diffs.
  • 2 tests had: RDD diffs.
  • 1 test had: ESO small diffs.
  • 1 test had: Table big diffs.

Failures:\n

regression Test Summary

  • Passed: 799
  • Failed: 1

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

NFP-Chiller-Plant-Support-for-Carbon-Initiatives (rraustad) - x86_64-Linux-Ubuntu-22.04-gcc-11.4-UnitTestsCoverage-Debug: OK (1910 of 1910 tests passed, 0 test warnings)

Build Badge Test Badge Coverage Badge

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

NFP-Chiller-Plant-Support-for-Carbon-Initiatives (rraustad) - x86_64-Linux-Ubuntu-22.04-gcc-11.4-IntegrationCoverage-Debug: OK (784 of 784 tests passed, 0 test warnings)

Build Badge Test Badge Coverage Badge

Please sign in to comment.