From b513ed282658444ac319ece87bdb551324975b0d Mon Sep 17 00:00:00 2001 From: mjwitte Date: Tue, 8 Dec 2020 18:21:44 -0600 Subject: [PATCH] OA Report - merge cleanup --- src/EnergyPlus/AirflowNetworkBalanceManager.cc | 3 ++- src/EnergyPlus/DataSizing.cc | 4 ++-- src/EnergyPlus/DataSizing.hh | 2 +- src/EnergyPlus/OutputReportTabular.cc | 5 ++--- src/EnergyPlus/SystemReports.cc | 8 ++++---- src/EnergyPlus/ZoneEquipmentManager.cc | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/EnergyPlus/AirflowNetworkBalanceManager.cc b/src/EnergyPlus/AirflowNetworkBalanceManager.cc index 6371ea36426..3cb1646b953 100644 --- 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 index e8a01a600e7..3c0e8fbbd65 100644 --- a/src/EnergyPlus/DataSizing.cc +++ b/src/EnergyPlus/DataSizing.cc @@ -945,7 +945,7 @@ 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 @@ -953,7 +953,7 @@ namespace DataSizing { // 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 index c75eec07d74..1c81f76dc5e 100644 --- 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 index f91e264826c..523d65f1886 100644 --- a/src/EnergyPlus/OutputReportTabular.cc +++ b/src/EnergyPlus/OutputReportTabular.cc @@ -80,7 +80,6 @@ #include #include #include -#include #include #include #include @@ -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 index 0b7c2dea45d..8a077690047 100644 --- 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 index 43ac2564802..b98b76fda24 100644 --- 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 =