OA Report - merge cleanup

NREL · Dec 9, 2020 · b513ed2 · b513ed2 · nrel-bot-3 · Dec 9, 2020
1 parent bb3b8df
commit b513ed2
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/src/EnergyPlus/AirflowNetworkBalanceManager.cc b/src/EnergyPlus/AirflowNetworkBalanceManager.cc
@@ -8517,7 +8517,8 @@ namespace AirflowNetworkBalanceManager {
             state.dataAirflowNetworkBalanceManager->AirflowNetworkZnRpt(i).MixVolume = (state.dataAirflowNetworkBalanceManager->exchangeData(i).SumMMCp / CpAir / AirDensity) * ReportingConstant;
             state.dataAirflowNetworkBalanceManager->AirflowNetworkZnRpt(i).MixMass = (state.dataAirflowNetworkBalanceManager->exchangeData(i).SumMMCp / CpAir) * ReportingConstant;
             // save values for predefined report
-            Real64 StdDensInfilVolume = (dataAirflowNetworkBalanceManager.exchangeData(i).SumMCp / CpAir / StdRhoAir) * ReportingConstant;  // compute volume using standard density air
+            Real64 StdDensInfilVolume = (state.dataAirflowNetworkBalanceManager->exchangeData(i).SumMCp / CpAir / state.dataEnvrn->StdRhoAir) *
+                                        ReportingConstant; // compute volume using standard density air
             ZonePreDefRep(i).AFNInfilVolTotal += StdDensInfilVolume * Zone(i).Multiplier * Zone(i).ListMultiplier;
             if (StdDensInfilVolume < ZonePreDefRep(i).AFNInfilVolMin) {
                 ZonePreDefRep(i).AFNInfilVolMin = StdDensInfilVolume * Zone(i).Multiplier * Zone(i).ListMultiplier;

diff --git a/src/EnergyPlus/DataSizing.cc b/src/EnergyPlus/DataSizing.cc
@@ -945,15 +945,15 @@ namespace DataSizing {
         }
     }
 
-    Real64 ZoneAirDistributionData::calculateEz(int const ZoneNum) // Zone index
+    Real64 ZoneAirDistributionData::calculateEz(EnergyPlusData &state, int const ZoneNum) // Zone index
     {
         Real64 zoneEz = 1.0;
         // Calc the zone supplied OA flow rate counting the zone air distribution effectiveness
         //  First check whether the zone air distribution effectiveness schedule exists, if yes uses it;
         //   otherwise uses the inputs of zone distribution effectiveness in cooling mode or heating mode
         if (this->ZoneADEffSchPtr > 0) {
             // Get schedule value for the zone air distribution effectiveness
-            zoneEz = ScheduleManager::GetCurrentScheduleValue(this->ZoneADEffSchPtr);
+            zoneEz = ScheduleManager::GetCurrentScheduleValue(state, this->ZoneADEffSchPtr);
         } else {
             Real64 zoneLoad = DataZoneEnergyDemands::ZoneSysEnergyDemand(ZoneNum).TotalOutputRequired;
 

diff --git a/src/EnergyPlus/DataSizing.hh b/src/EnergyPlus/DataSizing.hh
@@ -1161,7 +1161,7 @@ namespace DataSizing {
         {
         }
 
-        Real64 calculateEz(int const ZoneNum);   // Zone index
+        Real64 calculateEz(EnergyPlusData &state, int const ZoneNum); // Zone index
     };
 
     // Object Data

diff --git a/src/EnergyPlus/OutputReportTabular.cc b/src/EnergyPlus/OutputReportTabular.cc
@@ -80,7 +80,6 @@
 #include <EnergyPlus/Data/EnergyPlusData.hh>
 #include <EnergyPlus/DataAirLoop.hh>
 #include <EnergyPlus/DataAirSystems.hh>
-#include <EnergyPlus/DataCostEstimate.hh>
 #include <EnergyPlus/DataDaylighting.hh>
 #include <EnergyPlus/DataDefineEquip.hh>
 #include <EnergyPlus/DataEnvironment.hh>
@@ -6523,10 +6522,10 @@ namespace OutputReportTabular {
                         int airLoopNumber = DataZoneEquipment::ZoneEquipConfig(ctrlZoneNum).InletNodeAirLoopNum(zoneInNode);
                         if (airLoopNumber > 0) {
                             if (airLoopName.empty()) {
-                                airLoopName = DataAirSystems::PrimaryAirSystem(airLoopNumber).Name;
+                                airLoopName = state.dataAirSystemsData->PrimaryAirSystems(airLoopNumber).Name;
                             }
                             else {
-                                airLoopName += "; " + DataAirSystems::PrimaryAirSystem(airLoopNumber).Name;
+                                airLoopName += "; " + state.dataAirSystemsData->PrimaryAirSystems(airLoopNumber).Name;
                             }
                         }
                     }

diff --git a/src/EnergyPlus/SystemReports.cc b/src/EnergyPlus/SystemReports.cc
@@ -1950,7 +1950,7 @@ namespace SystemReports {
         ZoneOAVolFlowCrntRho.allocate(state.dataGlobal->NumOfZones);
         ZoneOAVolCrntRho.allocate(state.dataGlobal->NumOfZones);
         ZoneMechACH.allocate(state.dataGlobal->NumOfZones);
-        ZoneTargetVentilationFlowVoz.allocate(NumOfZones);
+        ZoneTargetVentilationFlowVoz.allocate(state.dataGlobal->NumOfZones);
 
         SysTotZoneLoadHTNG.allocate(NumPrimaryAirSys);
         SysTotZoneLoadCLNG.allocate(NumPrimaryAirSys);
@@ -2418,7 +2418,7 @@ namespace SystemReports {
                                 "Average",
                                 ZoneEquipConfig(ZoneIndex).ZoneName);
 
-            SetupOutputVariable("Zone Target Voz Ventilation Flow Rate",
+            SetupOutputVariable(state, "Zone Target Voz Ventilation Flow Rate",
                                 OutputProcessor::Unit::m3_s,
                                 ZoneTargetVentilationFlowVoz(ZoneIndex),
                                 "HVAC",
@@ -4527,11 +4527,11 @@ namespace SystemReports {
             bool UseOccSchFlag = true;
             bool UseMinOASchFlag = true;
             ZoneTargetVentilationFlowVoz = DataZoneEquipment::CalcDesignSpecificationOutdoorAir(
-                ZoneEquipConfig(CtrlZoneNum).ZoneDesignSpecOAIndex, ActualZoneNum, UseOccSchFlag, UseMinOASchFlag);
+                state, ZoneEquipConfig(CtrlZoneNum).ZoneDesignSpecOAIndex, ActualZoneNum, UseOccSchFlag, UseMinOASchFlag);
             if (ZoneEquipConfig(CtrlZoneNum).ZoneAirDistributionIndex > 0) {
                 ZoneTargetVentilationFlowVoz =
                     ZoneTargetVentilationFlowVoz /
-                    DataSizing::ZoneAirDistribution(ZoneEquipConfig(CtrlZoneNum).ZoneAirDistributionIndex).calculateEz(ActualZoneNum);
+                    DataSizing::ZoneAirDistribution(ZoneEquipConfig(CtrlZoneNum).ZoneAirDistributionIndex).calculateEz(state, ActualZoneNum);
             }
 
 

diff --git a/src/EnergyPlus/ZoneEquipmentManager.cc b/src/EnergyPlus/ZoneEquipmentManager.cc
@@ -1279,7 +1279,7 @@ namespace ZoneEquipmentManager {
                     } else {
                         FinalZoneSizing(CtrlZoneNum).ZonePeakOccupancy = TotPeopleInZone;
                     }
-                    ZoneMinOccupancy += TotPeopleInZone * ScheduleManager::GetScheduleMinValue(People(PeopleNum).NumberOfPeoplePtr);
+                    ZoneMinOccupancy += TotPeopleInZone * ScheduleManager::GetScheduleMinValue(state, People(PeopleNum).NumberOfPeoplePtr);
                 }
             }
             FinalZoneSizing(CtrlZoneNum).TotalZoneFloorArea =
-Original file line number
+Diff line change
@@ Expand Up / @@ -1161,7 +1161,7 @@ namespace DataSizing { @@
             {
             }
-            Real64 calculateEz(int const ZoneNum);   // Zone index
+            Real64 calculateEz(EnergyPlusData &state, int const ZoneNum); // Zone index
         };
         // Object Data
@@ Expand Down @@