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

Jump to bottom

Space Sizing and HVAC part2 - Code cleanups #10174

Merged
merged 15 commits into from
Sep 14, 2023
Merged

Space Sizing and HVAC part2 - Code cleanups #10174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
cebd1ba
Consolidate ZoneSizingData
mjwitte Aug 24, 2023
e92e1be
Rename moisture vars with redundant Zone in name
mjwitte Aug 25, 2023
28d5c4b
Rename moisture vars with redundant Zone in name - plan B
mjwitte Aug 25, 2023
b5a2d4f
Rename sensible vars with redundant Zone in name
mjwitte Aug 25, 2023
9658c81
Merge remote-tracking branch 'remotes/origin/develop' into SpaceSizin…
mjwitte Aug 25, 2023
6d094b0
Rename vars in unit tests
mjwitte Aug 25, 2023
6037259
Rename heat balance vars with redundant Zone in name
mjwitte Aug 28, 2023
dfaaacb
Delete unused vars in ATMixer
mjwitte Aug 28, 2023
c2b4333
Merge remote-tracking branch 'remotes/origin/develop' into SpaceSizin…
mjwitte Aug 29, 2023
8072205
Merge remote-tracking branch 'remotes/origin/develop' into SpaceSizin…
mjwitte Aug 31, 2023
e518d22
Revert some EPVectors
mjwitte Aug 31, 2023
7a0a420
New MovingAvg and remove duplicate
mjwitte Aug 31, 2023
0049fda
Add zero check to MovingAvg
mjwitte Aug 31, 2023
22cbe94
Merge remote-tracking branch 'remotes/origin/develop' into SpaceSizin…
mjwitte Aug 31, 2023
ae38207
Revert MovingAvg
mjwitte Aug 31, 2023
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
146 changes: 73 additions & 73 deletions src/EnergyPlus/AirflowNetwork/src/Solver.cpp
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions src/EnergyPlus/ChilledCeilingPanelSimple.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1238,8 +1238,8 @@ void CoolingPanelParams::CalcCoolingPanel(EnergyPlusData &state, int const Cooli
// iterate like in the low temperature radiant systems because the inlet water condition is known
// not calculated. So, we can deal with this upfront rather than after calculation and then more
// iteration.
Real64 DewPointTemp = Psychrometrics::PsyTdpFnWPb(
state, state.dataZoneTempPredictorCorrector->zoneHeatBalance(ZoneNum).ZoneAirHumRat, state.dataEnvrn->OutBaroPress);
Real64 DewPointTemp =
Psychrometrics::PsyTdpFnWPb(state, state.dataZoneTempPredictorCorrector->zoneHeatBalance(ZoneNum).airHumRat, state.dataEnvrn->OutBaroPress);

if (waterInletTemp < (DewPointTemp + this->CondDewPtDeltaT) && (CoolingPanelOn)) {

Expand Down
14 changes: 7 additions & 7 deletions src/EnergyPlus/ConvectionCoefficients.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2166,7 +2166,7 @@ void CalcCeilingDiffuserIntConvCoeff(EnergyPlusData &state,

Real64 ACH = CalcCeilingDiffuserACH(state, ZoneNum);

Real64 AirHumRat = state.dataZoneTempPredictorCorrector->zoneHeatBalance(ZoneNum).ZoneAirHumRatAvg;
Real64 AirHumRat = state.dataZoneTempPredictorCorrector->zoneHeatBalance(ZoneNum).airHumRatAvg;

for (int spaceNum : state.dataHeatBal->Zone(ZoneNum).spaceIndexes) {
auto const &thisSpace = state.dataHeatBal->space(spaceNum);
Expand Down Expand Up @@ -2726,7 +2726,7 @@ void CalcISO15099WindowIntConvCoeff(EnergyPlusData &state,

// Get humidity ratio
Real64 AirHumRat =
(surface.Zone > 0) ? state.dataZoneTempPredictorCorrector->zoneHeatBalance(surface.Zone).ZoneAirHumRatAvg : state.dataEnvrn->OutHumRat;
(surface.Zone > 0) ? state.dataZoneTempPredictorCorrector->zoneHeatBalance(surface.Zone).airHumRatAvg : state.dataEnvrn->OutHumRat;

Real64 Height = surface.Height;
Real64 TiltDeg = surface.Tilt;
Expand Down Expand Up @@ -3197,7 +3197,7 @@ Real64 EvaluateIntHcModels(EnergyPlusData &state, int const SurfNum, HcInt const

case HcInt::FisherPedersenCeilDiffuserFloor: {
Real64 AirChangeRate = CalcCeilingDiffuserACH(state, ZoneNum);
Real64 AirHumRat = state.dataZoneTempPredictorCorrector->zoneHeatBalance(ZoneNum).ZoneAirHumRatAvg;
Real64 AirHumRat = state.dataZoneTempPredictorCorrector->zoneHeatBalance(ZoneNum).airHumRatAvg;
if (thisSurface.ExtBoundCond == DataSurfaces::KivaFoundation) {

HnFn = [=, &state](double Tsurf, double Tamb, double, double, double cosTilt) -> double {
Expand All @@ -3218,7 +3218,7 @@ Real64 EvaluateIntHcModels(EnergyPlusData &state, int const SurfNum, HcInt const

case HcInt::FisherPedersenCeilDiffuserCeiling: {
Real64 AirChangeRate = CalcCeilingDiffuserACH(state, ZoneNum);
Real64 AirHumRat = state.dataZoneTempPredictorCorrector->zoneHeatBalance(ZoneNum).ZoneAirHumRatAvg;
Real64 AirHumRat = state.dataZoneTempPredictorCorrector->zoneHeatBalance(ZoneNum).airHumRatAvg;
if (thisSurface.ExtBoundCond == DataSurfaces::KivaFoundation) {

HnFn = [=, &state](double Tsurf, double Tamb, double, double, double cosTilt) -> double {
Expand All @@ -3239,7 +3239,7 @@ Real64 EvaluateIntHcModels(EnergyPlusData &state, int const SurfNum, HcInt const

case HcInt::FisherPedersenCeilDiffuserWalls: {
Real64 AirChangeRate = CalcCeilingDiffuserACH(state, ZoneNum);
Real64 AirHumRat = state.dataZoneTempPredictorCorrector->zoneHeatBalance(ZoneNum).ZoneAirHumRatAvg;
Real64 AirHumRat = state.dataZoneTempPredictorCorrector->zoneHeatBalance(ZoneNum).airHumRatAvg;
if (thisSurface.ExtBoundCond == DataSurfaces::KivaFoundation) {

HnFn = [=, &state](double Tsurf, double Tamb, double, double, double cosTilt) -> double {
Expand Down Expand Up @@ -4140,15 +4140,15 @@ void DynamicIntConvSurfaceClassification(EnergyPlusData &state, int const SurfNu

// now select which equipment type is dominant compared to all those that are ON
if (EquipOnCount > 0) {
if (state.dataZoneEnergyDemand->ZoneSysEnergyDemand(zoneNum).ZoneSNLoadPredictedRate >= 0.0) { // heating load
if (state.dataZoneEnergyDemand->ZoneSysEnergyDemand(zoneNum).predictedRate >= 0.0) { // heating load
PriorityEquipOn = 1;
for (int EquipOnLoop = 1; EquipOnLoop <= EquipOnCount; ++EquipOnLoop) {
// assume highest priority/first sim order is dominant for flow regime
if (HeatingPriorityStack[EquipOnLoop] < HeatingPriorityStack[PriorityEquipOn]) {
PriorityEquipOn = EquipOnLoop;
}
}
} else if (state.dataZoneEnergyDemand->ZoneSysEnergyDemand(zoneNum).ZoneSNLoadPredictedRate < 0.0) { // cooling load
} else if (state.dataZoneEnergyDemand->ZoneSysEnergyDemand(zoneNum).predictedRate < 0.0) { // cooling load
PriorityEquipOn = 1;
for (int EquipOnLoop = 1; EquipOnLoop <= EquipOnCount; ++EquipOnLoop) {
// assume highest priority/first sim order is dominant for flow regime
Expand Down
2 changes: 1 addition & 1 deletion src/EnergyPlus/CoolTower.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -718,7 +718,7 @@ namespace CoolTower {
thisZoneHB.CTMFL = thisZoneHB.MCPC / AirSpecHeat;

state.dataCoolTower->CoolTowerSys(CoolTowerNum).SenHeatPower = thisZoneHB.MCPC * std::abs(thisZoneHB.ZT - OutletTemp);
state.dataCoolTower->CoolTowerSys(CoolTowerNum).LatHeatPower = CVF_ZoneNum * std::abs(thisZoneHB.ZoneAirHumRat - OutletHumRat);
state.dataCoolTower->CoolTowerSys(CoolTowerNum).LatHeatPower = CVF_ZoneNum * std::abs(thisZoneHB.airHumRat - OutletHumRat);
state.dataCoolTower->CoolTowerSys(CoolTowerNum).OutletTemp = OutletTemp;
state.dataCoolTower->CoolTowerSys(CoolTowerNum).OutletHumRat = OutletHumRat;
state.dataCoolTower->CoolTowerSys(CoolTowerNum).AirVolFlowRate = CVF_ZoneNum;
Expand Down
26 changes: 13 additions & 13 deletions src/EnergyPlus/DXCoils.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7307,7 +7307,7 @@ void InitDXCoil(EnergyPlusData &state, int const DXCoilNum) // number of the cur
if (thisDXCoil.IsSecondaryDXCoilInZone) {
thisDXCoil.EvapInletWetBulb = PsyTwbFnTdbWPb(state,
state.dataZoneTempPredictorCorrector->zoneHeatBalance(thisDXCoil.SecZonePtr).ZT,
state.dataZoneTempPredictorCorrector->zoneHeatBalance(thisDXCoil.SecZonePtr).ZoneAirHumRat,
state.dataZoneTempPredictorCorrector->zoneHeatBalance(thisDXCoil.SecZonePtr).airHumRat,
state.dataEnvrn->OutBaroPress,
RoutineName);
}
Expand Down Expand Up @@ -9367,7 +9367,7 @@ void CalcDoe2DXCoil(EnergyPlusData &state,
if (thisDXCoil.IsSecondaryDXCoilInZone) {
auto &secZoneHB = state.dataZoneTempPredictorCorrector->zoneHeatBalance(thisDXCoil.SecZonePtr);
OutdoorDryBulb = secZoneHB.ZT;
OutdoorHumRat = secZoneHB.ZoneAirHumRat;
OutdoorHumRat = secZoneHB.airHumRat;
OutdoorWetBulb = thisDXCoil.EvapInletWetBulb;
OutdoorPressure = state.dataEnvrn->OutBaroPress;
}
Expand All @@ -9390,7 +9390,7 @@ void CalcDoe2DXCoil(EnergyPlusData &state,
CondInletTemp = secZoneHB.ZT;
CompAmbTemp = CondInletTemp; // assumes compressor is in same location as secondary coil
OutdoorDryBulb = CondInletTemp;
OutdoorHumRat = secZoneHB.ZoneAirHumRat;
OutdoorHumRat = secZoneHB.airHumRat;
OutdoorWetBulb = thisDXCoil.EvapInletWetBulb;
OutdoorPressure = state.dataEnvrn->OutBaroPress;
}
Expand Down Expand Up @@ -11015,7 +11015,7 @@ void CalcDXHeatingCoil(EnergyPlusData &state,
if (thisDXCoil.IsSecondaryDXCoilInZone) {
auto &secZoneHB = state.dataZoneTempPredictorCorrector->zoneHeatBalance(thisDXCoil.SecZonePtr);
OutdoorDryBulb = secZoneHB.ZT;
OutdoorHumRat = secZoneHB.ZoneAirHumRat;
OutdoorHumRat = secZoneHB.airHumRat;
OutdoorWetBulb = thisDXCoil.EvapInletWetBulb;
OutdoorPressure = state.dataEnvrn->OutBaroPress;
CompAmbTemp = OutdoorDryBulb;
Expand All @@ -11024,7 +11024,7 @@ void CalcDXHeatingCoil(EnergyPlusData &state,
} else if (thisDXCoil.IsSecondaryDXCoilInZone) {
auto &secZoneHB = state.dataZoneTempPredictorCorrector->zoneHeatBalance(thisDXCoil.SecZonePtr);
OutdoorDryBulb = secZoneHB.ZT;
OutdoorHumRat = secZoneHB.ZoneAirHumRat;
OutdoorHumRat = secZoneHB.airHumRat;
OutdoorWetBulb = thisDXCoil.EvapInletWetBulb;
OutdoorPressure = state.dataEnvrn->OutBaroPress;
CompAmbTemp = OutdoorDryBulb;
Expand Down Expand Up @@ -11497,15 +11497,15 @@ void CalcMultiSpeedDXCoil(EnergyPlusData &state,
if (thisDXCoil.IsSecondaryDXCoilInZone) {
auto &secZoneHB = state.dataZoneTempPredictorCorrector->zoneHeatBalance(thisDXCoil.SecZonePtr);
OutdoorDryBulb = secZoneHB.ZT;
OutdoorHumRat = secZoneHB.ZoneAirHumRat;
OutdoorHumRat = secZoneHB.airHumRat;
OutdoorWetBulb = thisDXCoil.EvapInletWetBulb;
OutdoorPressure = state.dataEnvrn->OutBaroPress;
CompAmbTemp = OutdoorDryBulb;
}
} else if (thisDXCoil.IsSecondaryDXCoilInZone) {
auto &secZoneHB = state.dataZoneTempPredictorCorrector->zoneHeatBalance(thisDXCoil.SecZonePtr);
OutdoorDryBulb = secZoneHB.ZT;
OutdoorHumRat = secZoneHB.ZoneAirHumRat;
OutdoorHumRat = secZoneHB.airHumRat;
OutdoorWetBulb = thisDXCoil.EvapInletWetBulb;
OutdoorPressure = state.dataEnvrn->OutBaroPress;
CompAmbTemp = OutdoorDryBulb;
Expand Down Expand Up @@ -12729,14 +12729,14 @@ void CalcMultiSpeedDXCoilCooling(EnergyPlusData &state,
if (thisDXCoil.IsSecondaryDXCoilInZone) {
auto &secZoneHB = state.dataZoneTempPredictorCorrector->zoneHeatBalance(thisDXCoil.SecZonePtr);
OutdoorDryBulb = secZoneHB.ZT;
OutdoorHumRat = secZoneHB.ZoneAirHumRat;
OutdoorHumRat = secZoneHB.airHumRat;
OutdoorWetBulb = thisDXCoil.EvapInletWetBulb;
OutdoorPressure = state.dataEnvrn->OutBaroPress;
}
} else if (thisDXCoil.IsSecondaryDXCoilInZone) {
auto &secZoneHB = state.dataZoneTempPredictorCorrector->zoneHeatBalance(thisDXCoil.SecZonePtr);
OutdoorDryBulb = secZoneHB.ZT;
OutdoorHumRat = secZoneHB.ZoneAirHumRat;
OutdoorHumRat = secZoneHB.airHumRat;
OutdoorWetBulb = thisDXCoil.EvapInletWetBulb;
OutdoorPressure = state.dataEnvrn->OutBaroPress;
} else {
Expand Down Expand Up @@ -13625,14 +13625,14 @@ void CalcMultiSpeedDXCoilHeating(EnergyPlusData &state,
if (thisDXCoil.IsSecondaryDXCoilInZone) {
auto &secZoneHB = state.dataZoneTempPredictorCorrector->zoneHeatBalance(thisDXCoil.SecZonePtr);
OutdoorDryBulb = secZoneHB.ZT;
OutdoorHumRat = secZoneHB.ZoneAirHumRat;
OutdoorHumRat = secZoneHB.airHumRat;
// OutdoorWetBulb = DXCoil( DXCoilNum ).EvapInletWetBulb;
OutdoorPressure = state.dataEnvrn->OutBaroPress;
}
} else if (thisDXCoil.IsSecondaryDXCoilInZone) {
auto &secZoneHB = state.dataZoneTempPredictorCorrector->zoneHeatBalance(thisDXCoil.SecZonePtr);
OutdoorDryBulb = secZoneHB.ZT;
OutdoorHumRat = secZoneHB.ZoneAirHumRat;
OutdoorHumRat = secZoneHB.airHumRat;
// OutdoorWetBulb = DXCoil( DXCoilNum ).EvapInletWetBulb;
OutdoorPressure = state.dataEnvrn->OutBaroPress;
} else {
Expand Down Expand Up @@ -16314,7 +16314,7 @@ void CalcSecondaryDXCoils(EnergyPlusData &state, int const DXCoilNum)
}
thisDXCoil.SecCoilTotalHeatRemovalRate = -TotalHeatRemovalRate; // +DXCoil( DXCoilNum ).DefrostPower;
EvapInletDryBulb = secZoneHB.ZT;
EvapInletHumRat = secZoneHB.ZoneAirHumRat;
EvapInletHumRat = secZoneHB.airHumRat;
RhoAir = PsyRhoAirFnPbTdbW(state, state.dataEnvrn->OutBaroPress, EvapInletDryBulb, EvapInletHumRat);
EvapAirMassFlow = RhoAir * thisDXCoil.SecCoilAirFlow;
;
Expand Down Expand Up @@ -16370,7 +16370,7 @@ void CalcSecondaryDXCoils(EnergyPlusData &state, int const DXCoilNum)
} break;
case CoilDX_MultiSpeedHeating: {
EvapInletDryBulb = secZoneHB.ZT;
EvapInletHumRat = secZoneHB.ZoneAirHumRat;
EvapInletHumRat = secZoneHB.airHumRat;
RhoAir = PsyRhoAirFnPbTdbW(state, state.dataEnvrn->OutBaroPress, EvapInletDryBulb, EvapInletHumRat);
MSSpeedRatio = thisDXCoil.MSSpeedRatio;
MSCycRatio = thisDXCoil.MSCycRatio;
Copy link
Contributor

Choose a reason for hiding this comment

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

Variable name changes only in above 3 source files

Expand Down
Loading