OA Report unit test fixes

NREL · Jul 7, 2020 · 4dd38f2 · 4dd38f2 · nrel-bot-2c · Jul 8, 2020
1 parent 60ee56d
commit 4dd38f2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/src/EnergyPlus/OutputReportTabular.cc b/src/EnergyPlus/OutputReportTabular.cc
@@ -6542,11 +6542,13 @@ namespace OutputReportTabular {
                 if (ctrlZoneNum > 0) {
                     for (int zoneInNode = 1; zoneInNode <= DataZoneEquipment::ZoneEquipConfig(ctrlZoneNum).NumInletNodes; ++zoneInNode) {
                         int airLoopNumber = DataZoneEquipment::ZoneEquipConfig(ctrlZoneNum).InletNodeAirLoopNum(zoneInNode);
-                        if (airLoopName.empty()) {
-                            airLoopName = DataAirSystems::PrimaryAirSystem(airLoopNumber).Name;
-                        }
-                        else {
-                            airLoopName += "; " + DataAirSystems::PrimaryAirSystem(airLoopNumber).Name;
+                        if (airLoopNumber > 0) {
+                            if (airLoopName.empty()) {
+                                airLoopName = DataAirSystems::PrimaryAirSystem(airLoopNumber).Name;
+                            }
+                            else {
+                                airLoopName += "; " + DataAirSystems::PrimaryAirSystem(airLoopNumber).Name;
+                            }
                         }
                     }
                     PreDefTableEntry(pdchOaMvAirLpNm, Zone(iZone).Name, airLoopName);
@@ -6593,7 +6595,7 @@ namespace OutputReportTabular {
                     PreDefTableEntry(pdchOaTaBzTotVentInfil, Zone(iZone).Name, ZonePreDefRep(iZone).MechVentVolTotal
                         + ZonePreDefRep(iZone).SimpVentVolTotal + ZonePreDefRep(iZone).AFNInfilVolTotal + ZonePreDefRep(iZone).InfilVolTotal, 0);
 
-                    if (Zone(iZone).isNominalOccupied) {
+                    if (Zone(iZone).isNominalOccupied && (ZonePreDefRep(iZone).TotTimeOcc > 0.0)) {
                         // Mechanical ventilation
                         Real64 mechVent = ZonePreDefRep(iZone).MechVentVolTotalOcc / ZonePreDefRep(iZone).TotTimeOcc;
                         PreDefTableEntry(pdchOaOccBzMechVent, Zone(iZone).Name, mechVent);

diff --git a/tst/EnergyPlus/unit/UnitaryHybridAirConditioner.unit.cc b/tst/EnergyPlus/unit/UnitaryHybridAirConditioner.unit.cc
@@ -411,6 +411,7 @@ TEST_F(EnergyPlusFixture, Test_UnitaryHybridAirConditioner_Unittest)
     ZoneOAVolStdRho.allocate(NumOfZones);
     ZoneOAVolCrntRho.allocate(NumOfZones);
     ZoneMechACH.allocate(NumOfZones);
+    DataHeatBalance::ZnAirRpt.allocate(NumOfZones);
     MAT.allocate(NumOfZones);
     ZoneAirHumRatAvg.allocate(NumOfZones);
     MaxHeatingLoadMetByVent.allocate(NumOfZones);