Skip to content

Commit

Permalink
OA Report - fix row order diffs in LEED summary
Browse files Browse the repository at this point in the history
  • Loading branch information
mjwitte committed Feb 12, 2021
1 parent 1ba4beb commit d7529f9
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 7 deletions.
2 changes: 2 additions & 0 deletions src/EnergyPlus/OutputReportPredefined.hh
Original file line number Diff line number Diff line change
Expand Up @@ -1163,6 +1163,7 @@ struct OutputReportPredefinedData : BaseGlobalStruct {
Real64 TotalTimeNotSimpleASH55EitherForABUPS = 0.0;

// Totals for OA details report
Real64 TotalVozMax = 0.0; // total Voz (max of heating and cooling)
Real64 TotalAnyZoneBelowVozDynForOA = 0.0; // total time any zone below target Voz-Dyn
Real64 TotalAllZonesAtVozDynForOA = 0.0; // total time all zones at target Voz-Dyn
Real64 TotalAnyZoneAboveVozDynForOA = 0.0; // total time any zone above target Voz-Dyn
Expand Down Expand Up @@ -2049,6 +2050,7 @@ struct OutputReportPredefinedData : BaseGlobalStruct {
this->TotalNotMetCoolingOccupiedForABUPS = 0.0;
this->TotalNotMetOccupiedForABUPS = 0.0;
this->TotalTimeNotSimpleASH55EitherForABUPS = 0.0;
this->TotalVozMax = 0.0;
this->TotalAnyZoneBelowVozDynForOA = 0.0;
this->TotalAllZonesAtVozDynForOA = 0.0;
this->TotalAnyZoneAboveVozDynForOA = 0.0;
Expand Down
5 changes: 4 additions & 1 deletion src/EnergyPlus/OutputReportTabular.cc
Original file line number Diff line number Diff line change
Expand Up @@ -6143,7 +6143,10 @@ namespace EnergyPlus::OutputReportTabular {
}
}

// add total rows
// add total rows for outdoor air details
OutputReportPredefined::PreDefTableEntry(state, state.dataOutRptPredefined->pdchOaMvDesZnOa,
"Total", state.dataOutRptPredefined->TotalVozMax, 4);

PreDefTableEntry(state, state.dataOutRptPredefined->pdchOaMvZoneVol, "Total", totalVolume);
PreDefTableEntry(state, state.dataOutRptPredefined->pdchOaMvZoneArea, "Total", totalArea);
PreDefTableEntry(state, state.dataOutRptPredefined->pdchOaMvNomNumOcc, "Total", totalOccupants);
Expand Down
9 changes: 3 additions & 6 deletions src/EnergyPlus/SizingManager.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1647,7 +1647,6 @@ namespace EnergyPlus::SizingManager {
Real64 VbzSum(0.0);
Real64 VozClgSum(0.0);
Real64 VozHtgSum(0.0);
Real64 VozSum(0.0);
Real64 VdzClgSum(0.0);
Real64 VdzHtgSum(0.0);
Real64 VpzMinClgSum(0.0);
Expand Down Expand Up @@ -1788,12 +1787,12 @@ namespace EnergyPlus::SizingManager {
4); // Voz-htg
}
// Outdoor Air Details Report - Design Zone Outdoor Airflow - Voz
Real64 VozMax = std::max(VozHtg, VozClg); // take large of the heating and cooling Voz values
Real64 VozMax = std::max(VozHtg, VozClg); // take larger of the heating and cooling Voz values
OutputReportPredefined::PreDefTableEntry(state, state.dataOutRptPredefined->pdchOaMvDesZnOa,
TermUnitFinalZoneSizing(termUnitSizingIndex).ZoneName,
VozMax,
4);
VozSum += VozMax * DataHeatBalance::Zone(zoneNum).Multiplier * DataHeatBalance::Zone(zoneNum).ListMultiplier;
state.dataOutRptPredefined->TotalVozMax += VozMax * DataHeatBalance::Zone(zoneNum).Multiplier * DataHeatBalance::Zone(zoneNum).ListMultiplier;
OutputReportPredefined::PreDefTableEntry(state, state.dataOutRptPredefined->pdchS62zhdZpz,
TermUnitFinalZoneSizing(termUnitSizingIndex).ZoneName,
TermUnitFinalZoneSizing(termUnitSizingIndex).ZpzHtgByZone,
Expand Down Expand Up @@ -1825,9 +1824,7 @@ namespace EnergyPlus::SizingManager {
}
}
}
// Outdoor Air Details Report - Design Zone Outdoor Airflow - Voz - Total Row
OutputReportPredefined::PreDefTableEntry(state, state.dataOutRptPredefined->pdchOaMvDesZnOa,
"Total", VozSum, 4);

// System Ventilation Parameters, (Table 4)
if (PzSumBySys(AirLoopNum) != 0.0) {
OutputReportPredefined::PreDefTableEntry(state, state.dataOutRptPredefined->pdchS62svpRp,
Expand Down

0 comments on commit d7529f9

Please sign in to comment.