Skip to content

Commit

Permalink
Initial predefined report variables and column headings
Browse files Browse the repository at this point in the history
  • Loading branch information
@JasonGlazer
JasonGlazer committed Mar 27, 2020
1 parent 0ae002b commit 11c3aaa
Show file tree
Hide file tree
Showing 2 changed files with 287 additions and 0 deletions.
215 changes: 215 additions & 0 deletions src/EnergyPlus/OutputReportPredefined.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -529,6 +529,8 @@ namespace OutputReportPredefined {

// Outside Air Report
int pdrOutsideAir;

// remove this subtable when new subtables have been implemented
int pdstOAavgOcc;
int pdchOaoAvgNumOcc1;
int pdchOaoNomNumOcc1;
Expand All @@ -538,6 +540,7 @@ namespace OutputReportPredefined {
int pdchOaoAvgAFNInfil;
int pdchOaoAvgSimpVent;
int pdchOaoAvgTotVent;
// remove this subtable when new subtables have been implemented
int pdstOAminOcc;
int pdchOaoAvgNumOcc2;
int pdchOaoNomNumOcc2;
Expand All @@ -548,6 +551,75 @@ namespace OutputReportPredefined {
int pdchOaoMinSimpVent;
int pdchOaoMinTotVent;

int pdstOAmechVentParByZone;
int pdchOaMvAirLpNm;
int pdchOaMvAvgNumOcc;
int pdchOaMvNomNumOcc;
int pdchOaMvZoneVol;
int pdchOaMvZoneArea;
int pdchOaMvDesZnOa;
int pdchOaMvMinDynTrgVent;

int pdstOAtotAirByZone;
int pdchOaTaBzMechVent;
int pdchOaTaBzNatVent;
int pdchOaTaBzTotVent;
int pdchOaTaBzInfil;
int pdchOaTaBzTotVentInfil;
int pdchOaTaBzDynTrgVent;
int pdchOaTaBzTmBelow;
int pdchOaTaBzTmAt;
int pdchOaTaBzTmAbove;
int pdchOaTaBzTmAboveUnocc;

int pdstOAavgOccByZone;
int pdchOaOccBzMechVent;
int pdchOaOccBzNatVent;
int pdchOaOccBzTotVent;
int pdchOaOccBzInfil;
int pdchOaOccBzTotVentInfil;
int pdchOaOccBzDynTrgVent;
int pdchOaOccBzTmBelow;
int pdchOaOccBzTmAt;
int pdchOaOccBzTmAbove;

int pdstOAtotAirByLoop;
int pdchOaTaAlMechVent;
int pdchOaTaAlSumDynTrgVent;
int pdchOaTaAlTmBelow;
int pdchOaTaAlTmAt;
int pdchOaTaAlTmAbove;
int pdchOaTaAlTmAboveUnocc;

int pdstOAavgOccByLoop;
int pdchOaOccAlMechVent;
int pdchOaOccAlSumDynTrgVent;
int pdchOaOccAlTmBelow;
int pdchOaOccAlTmAt;
int pdchOaOccAlTmAbove;

int pdstOAtimeFactorsDurOcc;
int pdchOaTmFctNoLimit;
int pdchOaTmFctHiHumid;
int pdchOaTmFctNiteVent;
int pdchOaTmFctEcono;
int pdchOaTmFctDCV;
int pdchOaTmFctExhaust;
int pdchOaTmFctLimit;
int pdchOaTmFctDemand;
int pdchOaTmFctEMS;

int pdstOAavgFactorsDurOcc;
int pdchOaAvFctNoLimit;
int pdchOaAvFctHiHumid;
int pdchOaAvFctNiteVent;
int pdchOaAvFctEcono;
int pdchOaAvFctDCV;
int pdchOaAvFctExhaust;
int pdchOaAvFctLimit;
int pdchOaAvFctDemand;
int pdchOaAvFctEMS;

// Object Count Report
int pdrObjCnt;
int pdstSurfCnt;
Expand Down Expand Up @@ -1303,6 +1375,7 @@ namespace OutputReportPredefined {
pdchULnotMetHeatOcc = 0;
pdchULnotMetCoolOcc = 0;
pdrOutsideAir = 0;
// remove this subtable when new subtables have been implemented
pdstOAavgOcc = 0;
pdchOaoAvgNumOcc1 = 0;
pdchOaoNomNumOcc1 = 0;
Expand All @@ -1312,6 +1385,7 @@ namespace OutputReportPredefined {
pdchOaoAvgAFNInfil = 0;
pdchOaoAvgSimpVent = 0;
pdchOaoAvgTotVent = 0;
// remove this subtable when new subtables have been implemented
pdstOAminOcc = 0;
pdchOaoAvgNumOcc2 = 0;
pdchOaoNomNumOcc2 = 0;
Expand All @@ -1321,6 +1395,76 @@ namespace OutputReportPredefined {
pdchOaoMinAFNInfil = 0;
pdchOaoMinSimpVent = 0;
pdchOaoMinTotVent = 0;

pdstOAmechVentParByZone = 0;
pdchOaMvAirLpNm = 0;
pdchOaMvAvgNumOcc = 0;
pdchOaMvNomNumOcc = 0;
pdchOaMvZoneVol = 0;
pdchOaMvZoneArea = 0;
pdchOaMvDesZnOa = 0;
pdchOaMvMinDynTrgVent = 0;

pdstOAtotAirByZone = 0;
pdchOaTaBzMechVent = 0;
pdchOaTaBzNatVent = 0;
pdchOaTaBzTotVent = 0;
pdchOaTaBzInfil = 0;
pdchOaTaBzTotVentInfil = 0;
pdchOaTaBzDynTrgVent = 0;
pdchOaTaBzTmBelow = 0;
pdchOaTaBzTmAt = 0;
pdchOaTaBzTmAbove = 0;
pdchOaTaBzTmAboveUnocc = 0;

pdstOAavgOccByZone = 0;
pdchOaOccBzMechVent = 0;
pdchOaOccBzNatVent = 0;
pdchOaOccBzTotVent = 0;
pdchOaOccBzInfil = 0;
pdchOaOccBzTotVentInfil = 0;
pdchOaOccBzDynTrgVent = 0;
pdchOaOccBzTmBelow = 0;
pdchOaOccBzTmAt = 0;
pdchOaOccBzTmAbove = 0;

pdstOAtotAirByLoop = 0;
pdchOaTaAlMechVent = 0;
pdchOaTaAlSumDynTrgVent = 0;
pdchOaTaAlTmBelow = 0;
pdchOaTaAlTmAt = 0;
pdchOaTaAlTmAbove = 0;
pdchOaTaAlTmAboveUnocc = 0;

pdstOAavgOccByLoop = 0;
pdchOaOccAlMechVent = 0;
pdchOaOccAlSumDynTrgVent = 0;
pdchOaOccAlTmBelow = 0;
pdchOaOccAlTmAt = 0;
pdchOaOccAlTmAbove = 0;

pdstOAtimeFactorsDurOcc = 0;
pdchOaTmFctNoLimit = 0;
pdchOaTmFctHiHumid = 0;
pdchOaTmFctNiteVent = 0;
pdchOaTmFctEcono = 0;
pdchOaTmFctDCV = 0;
pdchOaTmFctExhaust = 0;
pdchOaTmFctLimit = 0;
pdchOaTmFctDemand = 0;
pdchOaTmFctEMS = 0;

pdstOAavgFactorsDurOcc = 0;
pdchOaAvFctNoLimit = 0;
pdchOaAvFctHiHumid = 0;
pdchOaAvFctNiteVent = 0;
pdchOaAvFctEcono = 0;
pdchOaAvFctDCV = 0;
pdchOaAvFctExhaust = 0;
pdchOaAvFctLimit = 0;
pdchOaAvFctDemand = 0;
pdchOaAvFctEMS = 0;

pdrObjCnt = 0;
pdstSurfCnt = 0;
pdchSurfCntTot = 0;
Expand Down Expand Up @@ -2172,6 +2316,7 @@ namespace OutputReportPredefined {
// Outside Air Report
pdrOutsideAir = newPreDefReport("OutdoorAirSummary", "OA", "Outdoor Air Summary");

// remove this subtable when new subtables have been implemented
pdstOAavgOcc = newPreDefSubTable(pdrOutsideAir, "Average Outdoor Air During Occupied Hours");

pdchOaoAvgNumOcc1 = newPreDefColumn(pdstOAavgOcc, "Average Number of Occupants");
Expand All @@ -2185,6 +2330,7 @@ namespace OutputReportPredefined {

addFootNoteSubTable(pdstOAavgOcc, "Values shown for a single zone without multipliers");

// remove this subtable when new subtables have been implemented
pdstOAminOcc = newPreDefSubTable(pdrOutsideAir, "Minimum Outdoor Air During Occupied Hours");

pdchOaoAvgNumOcc2 = newPreDefColumn(pdstOAminOcc, "Average Number of Occupants");
Expand All @@ -2197,6 +2343,75 @@ namespace OutputReportPredefined {
// pdchOaoMinTotVent = newPreDefColumn(pdstOAminOcc,'Total Ventilation [ach]')
addFootNoteSubTable(pdstOAminOcc, "Values shown for a single zone without multipliers");

pdstOAmechVentParByZone = newPreDefSubTable(pdrOutsideAir, "Mechanical Ventilation Parameters by Zone");
pdchOaMvAirLpNm = newPreDefColumn(pdstOAmechVentParByZone, "AirLoop Name");
pdchOaMvAvgNumOcc = newPreDefColumn(pdstOAmechVentParByZone, "Average Number of Occupants");
pdchOaMvNomNumOcc = newPreDefColumn(pdstOAmechVentParByZone, "Nominal Number of Occupants");
pdchOaMvZoneVol = newPreDefColumn(pdstOAmechVentParByZone, "Zone Volume [m3]");
pdchOaMvZoneArea = newPreDefColumn(pdstOAmechVentParByZone, "Zone Area [m2]");
pdchOaMvDesZnOa = newPreDefColumn(pdstOAmechVentParByZone, "Design Zone Outdoor Airflow - Voz [m3/s]");
pdchOaMvMinDynTrgVent = newPreDefColumn(pdstOAmechVentParByZone, "Minimum Dynamic Target Ventilation - Voz-dyn-min [m3/s]");

pdstOAtotAirByZone = newPreDefSubTable(pdrOutsideAir, "Total Outdoor Air by Zone");
pdchOaTaBzMechVent = newPreDefColumn(pdstOAtotAirByZone, "Mechanical Ventilation [m3]");
pdchOaTaBzNatVent = newPreDefColumn(pdstOAtotAirByZone, "Natural Ventilation [m3]");
pdchOaTaBzTotVent = newPreDefColumn(pdstOAtotAirByZone, "Total Ventilation [m3]");
pdchOaTaBzInfil = newPreDefColumn(pdstOAtotAirByZone, "Infiltration [m3]");
pdchOaTaBzTotVentInfil = newPreDefColumn(pdstOAtotAirByZone, "Total Ventilation and Infiltration [m3]");
pdchOaTaBzDynTrgVent = newPreDefColumn(pdstOAtotAirByZone, "Dynamic Target Ventilation - Voz-dyn [m3]");
pdchOaTaBzTmBelow = newPreDefColumn(pdstOAtotAirByZone, "Time Below Voz-dyn [hr]");
pdchOaTaBzTmAt = newPreDefColumn(pdstOAtotAirByZone, "Time At Voz-dyn [hr]");
pdchOaTaBzTmAbove = newPreDefColumn(pdstOAtotAirByZone, "Time Above Voz-dyn [hr]");
pdchOaTaBzTmAboveUnocc = newPreDefColumn(pdstOAtotAirByZone, "Time Above Zero When Unoccupied [hr]");

pdstOAavgOccByZone = newPreDefSubTable(pdrOutsideAir, "Average Outdoor Air During Occupancy by Zone - Flow Rates");
pdchOaOccBzMechVent = newPreDefColumn(pdstOAavgOccByZone, "Mechanical Ventilation [m3/s]");
pdchOaOccBzNatVent = newPreDefColumn(pdstOAavgOccByZone, "Natural Ventilation [m3/s]");
pdchOaOccBzTotVent = newPreDefColumn(pdstOAavgOccByZone, "Total Ventilation [m3/s]");
pdchOaOccBzInfil = newPreDefColumn(pdstOAavgOccByZone, "Infiltration [m3/s]");
pdchOaOccBzTotVentInfil = newPreDefColumn(pdstOAavgOccByZone, "Total Ventilation and Infiltration [m3/s]");
pdchOaOccBzDynTrgVent = newPreDefColumn(pdstOAavgOccByZone, "Dynamic Target Ventilation - Voz-dyn [m3/s]");
pdchOaOccBzTmBelow = newPreDefColumn(pdstOAavgOccByZone, "Time Below Voz-dyn [hr]");
pdchOaOccBzTmAt = newPreDefColumn(pdstOAavgOccByZone, "Time At Voz-dyn [hr]");
pdchOaOccBzTmAbove = newPreDefColumn(pdstOAavgOccByZone, "Time Above Voz-dyn [hr]");

pdstOAtotAirByLoop = newPreDefSubTable(pdrOutsideAir, "Total Outdoor Air by Airloop");
pdchOaTaAlMechVent = newPreDefColumn(pdstOAtotAirByLoop, "Mechanical Ventilation [m3]");
pdchOaTaAlSumDynTrgVent = newPreDefColumn(pdstOAtotAirByLoop, "Sum Zone Dynamic Target Ventilation - Voz-sum-dyn [m3]");
pdchOaTaAlTmBelow = newPreDefColumn(pdstOAtotAirByLoop, "Time Below Voz-sum-dyn [hr]");
pdchOaTaAlTmAt = newPreDefColumn(pdstOAtotAirByLoop, "Time At Voz-sum-dyn [hr]");
pdchOaTaAlTmAbove = newPreDefColumn(pdstOAtotAirByLoop, "Time Above Voz-sum-dyn [hr]");
pdchOaTaAlTmAboveUnocc = newPreDefColumn(pdstOAtotAirByLoop, "Time Above Zero When Unoccupied [hr]");

pdstOAavgOccByLoop = newPreDefSubTable(pdrOutsideAir, "Average Outdoor Air During Occupancy by Airloop");
pdchOaOccAlMechVent = newPreDefColumn(pdstOAavgOccByLoop, "Mechanical Ventilation [m3/s]");
pdchOaOccAlSumDynTrgVent = newPreDefColumn(pdstOAavgOccByLoop, "Sum Zone Dynamic Zone Outdoor Airflow - Voz-sum-dyn [m3/s]");
pdchOaOccAlTmBelow = newPreDefColumn(pdstOAavgOccByLoop, "Time Below Voz-sum-dyn [hr]");
pdchOaOccAlTmAt = newPreDefColumn(pdstOAavgOccByLoop, "Time At Voz-sum-dyn [hr]");
pdchOaOccAlTmAbove = newPreDefColumn(pdstOAavgOccByLoop, "Time Above Voz-sum-dyn [hr]");

pdstOAtimeFactorsDurOcc = newPreDefSubTable(pdrOutsideAir, "Times for Outdoor Air Limiting Factors During Occupancy");
pdchOaTmFctNoLimit = newPreDefColumn(pdstOAtimeFactorsDurOcc, "No Limiting Factor [hr]");
pdchOaTmFctHiHumid = newPreDefColumn(pdstOAtimeFactorsDurOcc, "High Humidity [hr]");
pdchOaTmFctNiteVent = newPreDefColumn(pdstOAtimeFactorsDurOcc, "Night Ventilation [hr]");
pdchOaTmFctEcono = newPreDefColumn(pdstOAtimeFactorsDurOcc, "Economizer [hr]");
pdchOaTmFctDCV = newPreDefColumn(pdstOAtimeFactorsDurOcc, "Demand Controlled Ventilation [hr]");
pdchOaTmFctExhaust = newPreDefColumn(pdstOAtimeFactorsDurOcc, "Exhaust Flow [hr]");
pdchOaTmFctLimit = newPreDefColumn(pdstOAtimeFactorsDurOcc, "Limits and Scheduled Limits [hr]");
pdchOaTmFctDemand = newPreDefColumn(pdstOAtimeFactorsDurOcc, "Demand Limiting [hr]");
pdchOaTmFctEMS = newPreDefColumn(pdstOAtimeFactorsDurOcc, "Energy Management System [hr]");

pdstOAavgFactorsDurOcc = newPreDefSubTable(pdrOutsideAir, "Average Outdoor Air For Each Outdoor Air Limiting Factors During Occupancy");
pdchOaAvFctNoLimit = newPreDefColumn(pdstOAavgFactorsDurOcc, "No Limiting Factor [m3/s]");
pdchOaAvFctHiHumid = newPreDefColumn(pdstOAavgFactorsDurOcc, "High Humidity [m3/s]");
pdchOaAvFctNiteVent = newPreDefColumn(pdstOAavgFactorsDurOcc, "Night Ventilation [m3/s]");
pdchOaAvFctEcono = newPreDefColumn(pdstOAavgFactorsDurOcc, "Economizer [m3/s]");
pdchOaAvFctDCV = newPreDefColumn(pdstOAavgFactorsDurOcc, "Demand Controlled Ventilation [m3/s]");
pdchOaAvFctExhaust = newPreDefColumn(pdstOAavgFactorsDurOcc, "Exhaust Flow [m3/s]");
pdchOaAvFctLimit = newPreDefColumn(pdstOAavgFactorsDurOcc, "Limits and Scheduled Limits [m3/s]");
pdchOaAvFctDemand = newPreDefColumn(pdstOAavgFactorsDurOcc, "Demand Limiting [m3/s]");
pdchOaAvFctEMS = newPreDefColumn(pdstOAavgFactorsDurOcc, "Energy Management System [m3/s]");

// Object Count Report
pdrObjCnt = newPreDefReport("ObjectCountSummary", "Count", "Object Count Summary");

Expand Down
72 changes: 72 additions & 0 deletions src/EnergyPlus/OutputReportPredefined.hh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -513,6 +513,8 @@ namespace OutputReportPredefined {

// Outside Air Report
extern int pdrOutsideAir;

// remove this subtable when new subtables have been implemented
extern int pdstOAavgOcc;
extern int pdchOaoAvgNumOcc1;
extern int pdchOaoNomNumOcc1;
Expand All @@ -522,6 +524,7 @@ namespace OutputReportPredefined {
extern int pdchOaoAvgAFNInfil;
extern int pdchOaoAvgSimpVent;
extern int pdchOaoAvgTotVent;
// remove this subtable when new subtables have been implemented
extern int pdstOAminOcc;
extern int pdchOaoAvgNumOcc2;
extern int pdchOaoNomNumOcc2;
Expand All @@ -532,6 +535,75 @@ namespace OutputReportPredefined {
extern int pdchOaoMinSimpVent;
extern int pdchOaoMinTotVent;

extern int pdstOAmechVentParByZone;
extern int pdchOaMvAirLpNm;
extern int pdchOaMvAvgNumOcc;
extern int pdchOaMvNomNumOcc;
extern int pdchOaMvZoneVol;
extern int pdchOaMvZoneArea;
extern int pdchOaMvDesZnOa;
extern int pdchOaMvMinDynTrgVent;

extern int pdstOAtotAirByZone;
extern int pdchOaTaBzMechVent;
extern int pdchOaTaBzNatVent;
extern int pdchOaTaBzTotVent;
extern int pdchOaTaBzInfil;
extern int pdchOaTaBzTotVentInfil;
extern int pdchOaTaBzDynTrgVent;
extern int pdchOaTaBzTmBelow;
extern int pdchOaTaBzTmAt;
extern int pdchOaTaBzTmAbove;
extern int pdchOaTaBzTmAboveUnocc;

extern int pdstOAavgOccByZone;
extern int pdchOaOccBzMechVent;
extern int pdchOaOccBzNatVent;
extern int pdchOaOccBzTotVent;
extern int pdchOaOccBzInfil;
extern int pdchOaOccBzTotVentInfil;
extern int pdchOaOccBzDynTrgVent;
extern int pdchOaOccBzTmBelow;
extern int pdchOaOccBzTmAt;
extern int pdchOaOccBzTmAbove;

extern int pdstOAtotAirByLoop;
extern int pdchOaTaAlMechVent;
extern int pdchOaTaAlSumDynTrgVent;
extern int pdchOaTaAlTmBelow;
extern int pdchOaTaAlTmAt;
extern int pdchOaTaAlTmAbove;
extern int pdchOaTaAlTmAboveUnocc;

extern int pdstOAavgOccByLoop;
extern int pdchOaOccAlMechVent;
extern int pdchOaOccAlSumDynTrgVent;
extern int pdchOaOccAlTmBelow;
extern int pdchOaOccAlTmAt;
extern int pdchOaOccAlTmAbove;

extern int pdstOAtimeFactorsDurOcc;
extern int pdchOaTmFctNoLimit;
extern int pdchOaTmFctHiHumid;
extern int pdchOaTmFctNiteVent;
extern int pdchOaTmFctEcono;
extern int pdchOaTmFctDCV;
extern int pdchOaTmFctExhaust;
extern int pdchOaTmFctLimit;
extern int pdchOaTmFctDemand;
extern int pdchOaTmFctEMS;

extern int pdstOAavgFactorsDurOcc;
extern int pdchOaAvFctNoLimit;
extern int pdchOaAvFctHiHumid;
extern int pdchOaAvFctNiteVent;
extern int pdchOaAvFctEcono;
extern int pdchOaAvFctDCV;
extern int pdchOaAvFctExhaust;
extern int pdchOaAvFctLimit;
extern int pdchOaAvFctDemand;
extern int pdchOaAvFctEMS;

// Object Count Report
extern int pdrObjCnt;
extern int pdstSurfCnt;
Expand Down

7 comments on commit 11c3aaa

@nrel-bot-3
Copy link

Choose a reason for hiding this comment

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

EnhanceOutdoorAirReporting (JasonGlazer) - x86_64-MacOS-10.13-clang: OK (2748 of 2748 tests passed, 692 test warnings)

Messages:\n

  • 692 tests had: AUD diffs.

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

EnhanceOutdoorAirReporting (JasonGlazer) - x86_64-Linux-Ubuntu-18.04-cppcheck: OK (0 of 0 tests passed, 0 test warnings)

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

EnhanceOutdoorAirReporting (JasonGlazer) - x86_64-Linux-Ubuntu-18.04-custom_check: OK (12 of 12 tests passed, 0 test warnings)

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

EnhanceOutdoorAirReporting (JasonGlazer) - x86_64-Linux-Ubuntu-18.04-gcc-7.5: OK (2788 of 2788 tests passed, 696 test warnings)

Messages:\n

  • 696 tests had: AUD diffs.

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

EnhanceOutdoorAirReporting (JasonGlazer) - x86_64-Linux-Ubuntu-18.04-gcc-7.5-UnitTestsCoverage-Debug: OK (1362 of 1362 tests passed, 0 test warnings)

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

EnhanceOutdoorAirReporting (JasonGlazer) - x86_64-Linux-Ubuntu-18.04-gcc-7.5-IntegrationCoverage-Debug: OK (696 of 697 tests passed, 0 test warnings)

Failures:\n

integration Test Summary

  • Passed: 696
  • Timeout: 1

Build Badge Test Badge Coverage Badge

@nrel-bot
Copy link

Choose a reason for hiding this comment

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

EnhanceOutdoorAirReporting (JasonGlazer) - Win64-Windows-10-VisualStudio-16: OK (2742 of 2744 tests passed, 692 test warnings)

Messages:\n

  • 692 tests had: AUD diffs.

Failures:\n

EnergyPlusFixture Test Summary

  • Passed: 922
  • Failed: 2

Build Badge Test Badge

Please sign in to comment.