-
Notifications
You must be signed in to change notification settings - Fork 396
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix #10665 - HeatPump:AirToWater:FuelFired:Heating was not using Outside air temperatures to evaluate curves #10682
Merged
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
3cfd96a
Add a (failing) unit test for #10665
jmarrec 041f5db
Fix #10665 - HeatPump:AirToWater:FuelFired:Heating was not using Outs…
jmarrec 5a14785
Merge remote-tracking branch 'remotes/origin/develop' into 10665_GAHP…
mjwitte afef936
Fix GAHP unit test
mjwitte File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2549,6 +2549,7 @@ void EIRFuelFiredHeatPump::doPhysics(EnergyPlusData &state, Real64 currentLoad) | |
// will not shut down the branch | ||
auto &thisInletNode = state.dataLoopNodes->Node(this->loadSideNodes.inlet); | ||
auto &thisOutletNode = state.dataLoopNodes->Node(this->loadSideNodes.outlet); | ||
auto &thisSourceSideInletNode = state.dataLoopNodes->Node(this->sourceSideNodes.inlet); // OA Intake node | ||
auto &sim_component = DataPlant::CompData::getPlantComponent(state, this->loadSidePlantLoc); | ||
if ((this->EIRHPType == DataPlant::PlantEquipmentType::HeatPumpFuelFiredHeating && currentLoad <= 0.0)) { | ||
if (sim_component.FlowCtrl == DataBranchAirLoopPlant::ControlType::SeriesActive) this->loadSideMassFlowRate = thisInletNode.MassFlowRate; | ||
|
@@ -2720,10 +2721,10 @@ void EIRFuelFiredHeatPump::doPhysics(EnergyPlusData &state, Real64 currentLoad) | |
// Determine which air variable to use for GAHP: | ||
// Source (air) side variable to use | ||
// auto &thisloadsideinletnode = state.dataLoopNodes->Node(this->loadSideNodes.inlet); | ||
Real64 oaTempforCurve = thisInletNode.Temp; // state.dataLoopNodes->Node(this->loadSideNodes.inlet).Temp; | ||
Real64 oaTempforCurve = this->sourceSideInletTemp; // state.dataLoopNodes->Node(this->loadSideNodes.inlet).Temp; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Fix one, for OA Drybulb |
||
if (this->oaTempCurveInputVar == OATempCurveVar::WetBulb) { | ||
oaTempforCurve = | ||
Psychrometrics::PsyTwbFnTdbWPb(state, thisInletNode.Temp, thisInletNode.HumRat, thisInletNode.Press, "PLFFHPEIR::doPhysics()"); | ||
oaTempforCurve = Psychrometrics::PsyTwbFnTdbWPb( | ||
state, thisSourceSideInletNode.Temp, thisSourceSideInletNode.HumRat, thisSourceSideInletNode.Press, "PLFFHPEIR::doPhysics()"); | ||
Comment on lines
+2726
to
+2727
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Fix 2, If Wetbulb, evaluate it |
||
} | ||
|
||
// Load (water) side temperature variable | ||
|
@@ -2733,10 +2734,7 @@ void EIRFuelFiredHeatPump::doPhysics(EnergyPlusData &state, Real64 currentLoad) | |
} | ||
|
||
// evaluate capacity modifier curve and determine load side heat transfer | ||
Real64 capacityModifierFuncTemp = | ||
// CurveManager::CurveValue(state, this->capFuncTempCurveIndex, loadSideOutletSetpointTemp, this->sourceSideInletTemp); | ||
// CurveManager::CurveValue(state, this->capFuncTempCurveIndex, loadSideOutletSetpointTemp, oaTempforCurve); | ||
Curve::CurveValue(state, this->capFuncTempCurveIndex, waterTempforCurve, oaTempforCurve); | ||
Real64 capacityModifierFuncTemp = Curve::CurveValue(state, this->capFuncTempCurveIndex, waterTempforCurve, oaTempforCurve); | ||
|
||
if (capacityModifierFuncTemp < 0.0) { | ||
if (this->capModFTErrorIndex == 0) { | ||
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Take a ref