Skip to content
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.

Sign up for GitHub

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 wshp array bounds error and sizing #10735

Merged
merged 7 commits into from
Nov 8, 2024
Merged

Fix wshp array bounds error and sizing #10735

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
433593a
Avoid wshp array bounds
mjwitte Sep 13, 2024
5289b30
Protect companion coil for heating coil in sizing
rraustad Sep 19, 2024
9d3f048
Merge branch 'develop' of https://github.com/NREL/EnergyPlus into 984…
rraustad Sep 19, 2024
ef29015
Use hard-sized capacity
rraustad Sep 19, 2024
76d1800
Revert and correct water flow rate, not surprised of no unit test fai…
rraustad Sep 20, 2024
6e1066c
Merge branch 'develop' of https://github.com/NREL/EnergyPlus into 984…
rraustad Sep 20, 2024
672c1d4
Merge remote-tracking branch 'remotes/origin/develop' into 9849wshpAr…
mjwitte Nov 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions src/EnergyPlus/UnitarySystem.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3153,7 +3153,7 @@ namespace UnitarySystems {
state.dataSize->DataFractionUsedForSizing = 1.0;
SizingMethod = HVAC::AutoCalculateSizing;
this->m_DesignHeatingCapacity = DataSizing::AutoSize;
if (this->m_CoolingCoilType_Num == HVAC::Coil_CoolingWaterToAirHPSimple)
if (this->m_CoolingCoilType_Num == HVAC::Coil_CoolingWaterToAirHPSimple) {
// adjusted cooling coil capacity
WaterToAirHeatPumpSimple::SimWatertoAirHPSimple(state,
blankString,
Expand All @@ -3164,9 +3164,10 @@ namespace UnitarySystems {
HVAC::CompressorOp::Off,
0.0,
FirstHVACIteration);
state.dataSize->DataConstantUsedForSizing = WaterToAirHeatPumpSimple::GetCoilCapacity(
state, HVAC::cAllCoilTypes(this->m_CoolingCoilType_Num), this->m_CoolingCoilName, ErrFound);
EqSizing.DesCoolingLoad = state.dataSize->DataConstantUsedForSizing;
state.dataSize->DataConstantUsedForSizing = WaterToAirHeatPumpSimple::GetCoilCapacity(
state, HVAC::cAllCoilTypes(this->m_CoolingCoilType_Num), this->m_CoolingCoilName, ErrFound);
EqSizing.DesCoolingLoad = state.dataSize->DataConstantUsedForSizing;
}
Copy link
Contributor

Choose a reason for hiding this comment

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

I just wrapped all this in 1 IF block. Still not sure if the code at the end of this block is needed.

Copy link
Contributor

Choose a reason for hiding this comment

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

The next step is to remove this IF block. There is no reason to call the cooling coil to report the UnitarySystem heating capacity. That's a cover up.

state.dataSize->DataFractionUsedForSizing = 1.0;
this->m_DesignCoolingCapacity = DataSizing::AutoSize;
// airflow sizing with multispeed fan
Expand Down
163 changes: 84 additions & 79 deletions src/EnergyPlus/WaterToAirHeatPumpSimple.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2580,86 +2580,92 @@ namespace WaterToAirHeatPumpSimple {

// determine adjusted cooling and heating coil capacity
simpleWatertoAirHP.RatedCapHeatAtRatedCdts = RatedCapHeatDes * RatedHeatCapTempModFac;
Copy link
Contributor

Choose a reason for hiding this comment

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

I believe what the code below is trying to do is to size a HP, so the coils would need to be the same size. In this case that's not necessary but an actual HP would need to be tested to make sure it works. I guess it does work since all WSHPs apparently size correctly, or do they?

auto &companionCoolingCoil(state.dataWaterToAirHeatPumpSimple->SimpleWatertoAirHP(simpleWatertoAirHP.CompanionCoolingCoilNum));
if (companionCoolingCoil.WAHPPlantType == DataPlant::PlantEquipmentType::CoilWAHPCoolingEquationFit &&
companionCoolingCoil.RatedCapCoolTotal == DataSizing::AutoSize) {
// case 1: companion coil is also of EquationFit type and is being autosized
RatedCapCoolTotalDes = state.dataSize->DXCoolCap;
RatedTotCapTempModFac = companionCoolingCoil.RatedCapCoolAtRatedCdts / RatedCapCoolTotalDes;
RatedCapCoolHeatDD =
simpleWatertoAirHP.RatedCapHeatAtRatedCdts / simpleWatertoAirHP.RatioRatedHeatRatedTotCoolCap / RatedTotCapTempModFac;
RatedCoolPowerTempModFac = companionCoolingCoil.RatedPowerCoolAtRatedCdts / companionCoolingCoil.RatedPowerCool;
if (RatedCapCoolHeatDD > RatedCapCoolTotalDes) {
// total cooling capacity
RatedCapCoolTotalDes = RatedCapCoolHeatDD;
// adjust for system air flow -- capacity is based on heating design day calcs
// adjust by ratio of system to heating air flow rate and temperature delta across the coil at these different airflow
if (HeatingAirVolFlowRateDes > 0) {
RatedCapCoolTotalDes *= (RatedAirVolFlowRateDes / HeatingAirVolFlowRateDes) * HeatdTratio;
if (simpleWatertoAirHP.CompanionCoolingCoilNum > 0) {
auto &companionCoolingCoil(state.dataWaterToAirHeatPumpSimple->SimpleWatertoAirHP(simpleWatertoAirHP.CompanionCoolingCoilNum));
if (companionCoolingCoil.WAHPPlantType == DataPlant::PlantEquipmentType::CoilWAHPCoolingEquationFit &&
companionCoolingCoil.RatedCapCoolTotal == DataSizing::AutoSize) {
// case 1: companion coil is also of EquationFit type and is being autosized
RatedCapCoolTotalDes = state.dataSize->DXCoolCap;
RatedTotCapTempModFac = companionCoolingCoil.RatedCapCoolAtRatedCdts / RatedCapCoolTotalDes;
RatedCapCoolHeatDD =
simpleWatertoAirHP.RatedCapHeatAtRatedCdts / simpleWatertoAirHP.RatioRatedHeatRatedTotCoolCap / RatedTotCapTempModFac;
RatedCoolPowerTempModFac = companionCoolingCoil.RatedPowerCoolAtRatedCdts / companionCoolingCoil.RatedPowerCool;
if (RatedCapCoolHeatDD > RatedCapCoolTotalDes) {
// total cooling capacity
RatedCapCoolTotalDes = RatedCapCoolHeatDD;
// adjust for system air flow -- capacity is based on heating design day calcs
// adjust by ratio of system to heating air flow rate and temperature delta across the coil at these different airflow
if (HeatingAirVolFlowRateDes > 0) {
RatedCapCoolTotalDes *= (RatedAirVolFlowRateDes / HeatingAirVolFlowRateDes) * HeatdTratio;
}
// calculate ajustment factor over previous capacity for sensible capacity adjustment
Real64 CapCoolAdjFac = RatedCapCoolTotalDes / state.dataSize->DXCoolCap;
// update cooling coil rated capacity after adjustments based on heating coil size
state.dataSize->DXCoolCap = RatedCapCoolTotalDes;
// sensible cooling capacity
RatedCapCoolSensDes = companionCoolingCoil.RatedCapCoolSens * CapCoolAdjFac; // Assume that SHR stays the same
companionCoolingCoil.RatedCapCoolSensDesAtRatedCdts *= CapCoolAdjFac;
companionCoolingCoil.RatedCapCoolSens = RatedCapCoolSensDes;
// update Water-to-Air Heat Pumps output reports
OutputReportPredefined::PreDefTableEntry(state,
state.dataOutRptPredefined->pdchWAHPRatedSensCapAtRatedCdts,
companionCoolingCoil.Name,
companionCoolingCoil.RatedCapCoolSensDesAtRatedCdts);
OutputReportPredefined::PreDefTableEntry(
state, state.dataOutRptPredefined->pdchWAHPDD, companionCoolingCoil.Name, "Heating");
OutputReportPredefined::PreDefTableEntry(
state, state.dataOutRptPredefined->pdchWAHPDD, simpleWatertoAirHP.Name, "Heating");
// update Cooling Coils output reports
OutputReportPredefined::PreDefTableEntry(state,
state.dataOutRptPredefined->pdchCoolCoilLatCap,
companionCoolingCoil.Name,
RatedCapCoolTotalDes - RatedCapCoolSensDes);
OutputReportPredefined::PreDefTableEntry(state,
state.dataOutRptPredefined->pdchCoolCoilSHR,
companionCoolingCoil.Name,
RatedCapCoolSensDes / RatedCapCoolTotalDes);
OutputReportPredefined::PreDefTableEntry(
state, state.dataOutRptPredefined->pdchCoolCoilSensCap, companionCoolingCoil.Name, RatedCapCoolSensDes);
} else {
OutputReportPredefined::PreDefTableEntry(
state, state.dataOutRptPredefined->pdchWAHPDD, companionCoolingCoil.Name, "Cooling");
OutputReportPredefined::PreDefTableEntry(
state, state.dataOutRptPredefined->pdchWAHPDD, simpleWatertoAirHP.Name, "Cooling");
}
// calculate ajustment factor over previous capacity for sensible capacity adjustment
Real64 CapCoolAdjFac = RatedCapCoolTotalDes / state.dataSize->DXCoolCap;
// update cooling coil rated capacity after adjustments based on heating coil size
state.dataSize->DXCoolCap = RatedCapCoolTotalDes;
// sensible cooling capacity
RatedCapCoolSensDes = companionCoolingCoil.RatedCapCoolSens * CapCoolAdjFac; // Assume that SHR stays the same
companionCoolingCoil.RatedCapCoolSensDesAtRatedCdts *= CapCoolAdjFac;
companionCoolingCoil.RatedCapCoolSens = RatedCapCoolSensDes;
RatedCapHeatDes =
RatedCapCoolTotalDes * RatedTotCapTempModFac * simpleWatertoAirHP.RatioRatedHeatRatedTotCoolCap / RatedHeatCapTempModFac;
companionCoolingCoil.RatedCapCoolTotal = RatedCapCoolTotalDes;
companionCoolingCoil.RatedCapCoolAtRatedCdts = RatedCapCoolTotalDes * RatedTotCapTempModFac;
companionCoolingCoil.RatedPowerCoolAtRatedCdts =
companionCoolingCoil.RatedCapCoolAtRatedCdts / companionCoolingCoil.RatedCOPCoolAtRatedCdts;
companionCoolingCoil.RatedPowerCool = companionCoolingCoil.RatedPowerCoolAtRatedCdts / RatedCoolPowerTempModFac;
// update Water-to-Air Heat Pumps output reports
OutputReportPredefined::PreDefTableEntry(state,
state.dataOutRptPredefined->pdchWAHPRatedSensCapAtRatedCdts,
state.dataOutRptPredefined->pdchWAHPRatedCapAtRatedCdts,
companionCoolingCoil.Name,
companionCoolingCoil.RatedCapCoolSensDesAtRatedCdts);
OutputReportPredefined::PreDefTableEntry(state, state.dataOutRptPredefined->pdchWAHPDD, companionCoolingCoil.Name, "Heating");
OutputReportPredefined::PreDefTableEntry(state, state.dataOutRptPredefined->pdchWAHPDD, simpleWatertoAirHP.Name, "Heating");
companionCoolingCoil.RatedCapCoolAtRatedCdts);
// update Cooling Coils output reports
OutputReportPredefined::PreDefTableEntry(state,
state.dataOutRptPredefined->pdchCoolCoilLatCap,
companionCoolingCoil.Name,
RatedCapCoolTotalDes - RatedCapCoolSensDes);
OutputReportPredefined::PreDefTableEntry(state,
state.dataOutRptPredefined->pdchCoolCoilSHR,
companionCoolingCoil.Name,
RatedCapCoolSensDes / RatedCapCoolTotalDes);
OutputReportPredefined::PreDefTableEntry(
state, state.dataOutRptPredefined->pdchCoolCoilSensCap, companionCoolingCoil.Name, RatedCapCoolSensDes);
} else {
OutputReportPredefined::PreDefTableEntry(state, state.dataOutRptPredefined->pdchWAHPDD, companionCoolingCoil.Name, "Cooling");
OutputReportPredefined::PreDefTableEntry(state, state.dataOutRptPredefined->pdchWAHPDD, simpleWatertoAirHP.Name, "Cooling");
state, state.dataOutRptPredefined->pdchCoolCoilTotCap, companionCoolingCoil.Name, RatedCapCoolTotalDes);
BaseSizer::reportSizerOutput(
state,
format("COIL:{}:WATERTOAIRHEATPUMP:EQUATIONFIT", WatertoAirHPNamesUC[static_cast<int>(companionCoolingCoil.WAHPType)]),
companionCoolingCoil.Name,
"Design Size Rated Total Cooling Capacity [W]",
companionCoolingCoil.RatedCapCoolTotal);
BaseSizer::reportSizerOutput(
state,
format("COIL:{}:WATERTOAIRHEATPUMP:EQUATIONFIT", WatertoAirHPNamesUC[static_cast<int>(companionCoolingCoil.WAHPType)]),
companionCoolingCoil.Name,
"Design Size Rated Sensible Cooling Capacity [W]",
companionCoolingCoil.RatedCapCoolSens);
} else if (companionCoolingCoil.WAHPPlantType ==
DataPlant::PlantEquipmentType::CoilWAHPCoolingEquationFit) { // case 2: companion coil is of EquationFit type but is
// not autosized
RatedCapHeatDes = companionCoolingCoil.RatedCapCoolTotal * simpleWatertoAirHP.RatioRatedHeatRatedTotCoolCap;
} else { // case 3: companion type is different than EquationFit
RatedCapHeatDes = state.dataSize->DXCoolCap;
}
RatedCapHeatDes =
RatedCapCoolTotalDes * RatedTotCapTempModFac * simpleWatertoAirHP.RatioRatedHeatRatedTotCoolCap / RatedHeatCapTempModFac;
companionCoolingCoil.RatedCapCoolTotal = RatedCapCoolTotalDes;
companionCoolingCoil.RatedCapCoolAtRatedCdts = RatedCapCoolTotalDes * RatedTotCapTempModFac;
companionCoolingCoil.RatedPowerCoolAtRatedCdts =
companionCoolingCoil.RatedCapCoolAtRatedCdts / companionCoolingCoil.RatedCOPCoolAtRatedCdts;
companionCoolingCoil.RatedPowerCool = companionCoolingCoil.RatedPowerCoolAtRatedCdts / RatedCoolPowerTempModFac;
// update Water-to-Air Heat Pumps output reports
OutputReportPredefined::PreDefTableEntry(state,
state.dataOutRptPredefined->pdchWAHPRatedCapAtRatedCdts,
companionCoolingCoil.Name,
companionCoolingCoil.RatedCapCoolAtRatedCdts);
// update Cooling Coils output reports
OutputReportPredefined::PreDefTableEntry(
state, state.dataOutRptPredefined->pdchCoolCoilTotCap, companionCoolingCoil.Name, RatedCapCoolTotalDes);
BaseSizer::reportSizerOutput(
state,
format("COIL:{}:WATERTOAIRHEATPUMP:EQUATIONFIT", WatertoAirHPNamesUC[static_cast<int>(companionCoolingCoil.WAHPType)]),
companionCoolingCoil.Name,
"Design Size Rated Total Cooling Capacity [W]",
companionCoolingCoil.RatedCapCoolTotal);
BaseSizer::reportSizerOutput(
state,
format("COIL:{}:WATERTOAIRHEATPUMP:EQUATIONFIT", WatertoAirHPNamesUC[static_cast<int>(companionCoolingCoil.WAHPType)]),
companionCoolingCoil.Name,
"Design Size Rated Sensible Cooling Capacity [W]",
companionCoolingCoil.RatedCapCoolSens);
} else if (companionCoolingCoil.WAHPPlantType ==
DataPlant::PlantEquipmentType::CoilWAHPCoolingEquationFit) { // case 2: companion coil is of EquationFit type but is
// not autosized
RatedCapHeatDes = companionCoolingCoil.RatedCapCoolTotal * simpleWatertoAirHP.RatioRatedHeatRatedTotCoolCap;
} else { // case 3: companion type is different than EquationFit
RatedCapHeatDes = state.dataSize->DXCoolCap;
}
// heating capacity final determination
simpleWatertoAirHP.RatedCapHeat = RatedCapHeatDes;
Expand Down Expand Up @@ -2734,8 +2740,8 @@ namespace WaterToAirHeatPumpSimple {

// user provided inputs are assumed to be at rated conditions
simpleWatertoAirHP.RatedPowerHeat = simpleWatertoAirHP.RatedCapHeat / simpleWatertoAirHP.RatedCOPHeatAtRatedCdts;
simpleWatertoAirHP.RatedCapHeatAtRatedCdts = 0;
simpleWatertoAirHP.RatedPowerHeatAtRatedCdts = 0;
simpleWatertoAirHP.RatedCapHeatAtRatedCdts = 0; // not sure why these are set = 0, should be RatedCapHeat?
simpleWatertoAirHP.RatedPowerHeatAtRatedCdts = 0; // should be RatedPowerHeat?
}
// Check that heat pump heating capacity is within 20% of cooling capacity. Check only for heating coil and report both.
if (simpleWatertoAirHP.WAHPType == WatertoAirHP::Heating && simpleWatertoAirHP.CompanionCoolingCoilNum > 0) {
Expand Down Expand Up @@ -2877,20 +2883,19 @@ namespace WaterToAirHeatPumpSimple {
RoutineNameAlt);

if (simpleWatertoAirHP.WAHPType == WatertoAirHP::Heating) {
RatedWaterVolFlowRateDes =
simpleWatertoAirHP.RatedCapHeatAtRatedCdts / (state.dataSize->PlantSizData(PltSizNum).DeltaT * Cp * rho);
RatedWaterVolFlowRateDes = simpleWatertoAirHP.RatedCapHeat / (state.dataSize->PlantSizData(PltSizNum).DeltaT * Cp * rho);
} else if (simpleWatertoAirHP.WAHPType == WatertoAirHP::Cooling) {
// use companion heating coil capacity to calculate volumetric flow rate
if (simpleWatertoAirHP.CompanionHeatingCoilNum > 0) {
auto &companionHeatingCoil(
state.dataWaterToAirHeatPumpSimple->SimpleWatertoAirHP(simpleWatertoAirHP.CompanionHeatingCoilNum));
if (companionHeatingCoil.RatedCapHeat == DataSizing::AutoSize) {
SystemCapacity = simpleWatertoAirHP.RatedCapCoolTotal;
SystemCapacity = simpleWatertoAirHP.RatedCapCoolTotal; // but you should use condenser capacity?
} else {
SystemCapacity = companionHeatingCoil.RatedCapHeat;
}
} else {
SystemCapacity = simpleWatertoAirHP.RatedCapCoolAtRatedCdts;
SystemCapacity = simpleWatertoAirHP.RatedCapCoolAtRatedCdts; // RatedCapCoolTotal ? * (1 + 1/COP) ?
Copy link
Contributor

Choose a reason for hiding this comment

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

These should also include the sizing ratio when basing condenser water flow sizing on cooling capacity.

AirLoopHVAC:UnitarySystem,
  N1 , \field DX Heating Coil Sizing Ratio

Copy link
Member

Choose a reason for hiding this comment

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

I'm not awake yet apparently. I read the end comment here as actual code and could not understand what the ternary with multiplier (? *) was doing 😴

}

RatedWaterVolFlowRateDes = SystemCapacity / (state.dataSize->PlantSizData(PltSizNum).DeltaT * Cp * rho);
Expand Down
Loading