Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Global-Elements #8625

Merged
merged 17 commits into from
Mar 17, 2021
Merged

Global-Elements #8625

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
73f694f
redid iComponentTypeNum
jmythms Mar 15, 2021
8d3af6a
redid iEPlusComponentType
jmythms Mar 15, 2021
47f4f32
redid iEPlusNodeType
jmythms Mar 15, 2021
cc8ca99
fix conflicts + merge develop
jmythms Mar 15, 2021
95de618
intermediate check commit - iWPCCntr
jmythms Mar 16, 2021
5a81ddf
deleted redundant code
jmythms Mar 16, 2021
487cf91
create baseglobalstate-1
jmythms Mar 16, 2021
ea4ef28
ep building AirflowNetworkNodeSimu, AirflowNetworkLinkSimu
jmythms Mar 16, 2021
b3dfdcc
ep-test building AirflowNetworkNodeSimu, AirflowNetworkLinkSimu check…
jmythms Mar 16, 2021
e56f33c
All extern arrays
jmythms Mar 16, 2021
cbbb749
constexpr: AirflowNetworkControlSimple
jmythms Mar 16, 2021
a39b540
this keyword in global struct
jmythms Mar 16, 2021
8b886b7
fixed EIO diffs
jmythms Mar 16, 2021
f9c7b05
rest of the extern variables
jmythms Mar 16, 2021
ba2306a
PressureCtrl vars -final check
jmythms Mar 16, 2021
dfb0cab
Merge branch 'develop' into Global-Elements
jmythms Mar 16, 2021
74f93aa
Fixed capitalization
jmythms Mar 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
369 changes: 225 additions & 144 deletions src/EnergyPlus/AirflowNetwork/include/AirflowNetwork/Elements.hpp
View file
Open in desktop

Large diffs are not rendered by default.

7 changes: 4 additions & 3 deletions src/EnergyPlus/AirflowNetwork/include/AirflowNetwork/Solver.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,8 @@ namespace AirflowNetwork {
{}

void allocate(EnergyPlusData &state);
void initialize();
void setsky();
void initialize(EnergyPlusData &state);
void setsky(EnergyPlusData &state);
void airmov(EnergyPlusData &state);
void solvzp(EnergyPlusData &state, int &ITER); // number of iterations
void filjac(EnergyPlusData &state,
Expand Down Expand Up @@ -238,7 +238,8 @@ namespace AirflowNetwork {
std::ostream &UOUT // Output file
);

void PresProfile(int const il, // Linkage number
void PresProfile(EnergyPlusData &state,
int const il, // Linkage number
int const Pprof, // Opening number
Real64 const G, // gravitation field strength [N/kg]
const Array1D<Real64> &DpF, // Stack pressures at start heights of Layers
Expand Down
313 changes: 59 additions & 254 deletions src/EnergyPlus/AirflowNetwork/src/Elements.cpp
View file
Open in desktop

Large diffs are not rendered by default.

269 changes: 135 additions & 134 deletions src/EnergyPlus/AirflowNetwork/src/Solver.cpp
View file
Open in desktop

Large diffs are not rendered by default.

6,166 changes: 3,083 additions & 3,083 deletions src/EnergyPlus/AirflowNetworkBalanceManager.cc
View file
Open in desktop

Large diffs are not rendered by default.

198 changes: 99 additions & 99 deletions src/EnergyPlus/CrossVentMgr.cc
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions src/EnergyPlus/Data/EnergyPlusData.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ namespace EnergyPlus {
this->dataAirLoopHVACDOAS = std::make_unique<AirLoopHVACDOASData>();
this->dataAirSystemsData = std::make_unique<AirSystemsData>();
this->dataAirflowNetworkBalanceManager = std::make_unique<AirflowNetworkBalanceManagerData>();
this->dataAirflowNetwork = std::make_unique<AirflowNetworkData>();
this->dataAutoSizingBase = std::make_unique<AutoSizingBaseData>();
this->dataBSDFWindow = std::make_unique<BSDFWindowData>();
this->dataBaseSizerFanHeatInputs = std::make_unique<BaseSizerWithFanHeatInputsData>();
Expand Down Expand Up @@ -305,6 +306,7 @@ namespace EnergyPlus {
this->dataAirLoopHVACDOAS->clear_state();
this->dataAirSystemsData->clear_state();
this->dataAirflowNetworkBalanceManager->clear_state();
this->dataAirflowNetwork->clear_state();
this->dataAutoSizingBase->clear_state();
this->dataBSDFWindow->clear_state();
this->dataBaseSizerFanHeatInputs->clear_state();
Expand Down
2 changes: 2 additions & 0 deletions src/EnergyPlus/Data/EnergyPlusData.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ namespace EnergyPlus {
struct AirLoopHVACDOASData;
struct AirSystemsData;
struct AirflowNetworkBalanceManagerData;
struct AirflowNetworkData;
struct AutoSizingBaseData;
struct BSDFWindowData;
struct BaseSizerWithFanHeatInputsData;
Expand Down Expand Up @@ -312,6 +313,7 @@ struct EnergyPlusData : BaseGlobalStruct {
std::unique_ptr<AirLoopHVACDOASData> dataAirLoopHVACDOAS;
std::unique_ptr<AirSystemsData> dataAirSystemsData;
std::unique_ptr<AirflowNetworkBalanceManagerData> dataAirflowNetworkBalanceManager;
std::unique_ptr<AirflowNetworkData> dataAirflowNetwork;
std::unique_ptr<AutoSizingBaseData> dataAutoSizingBase;
std::unique_ptr<BSDFWindowData> dataBSDFWindow;
std::unique_ptr<BaseSizerWithFanHeatInputsData> dataBaseSizerFanHeatInputs;
Expand Down
26 changes: 13 additions & 13 deletions src/EnergyPlus/DisplacementVentMgr.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -710,7 +710,7 @@ namespace EnergyPlus::DisplacementVentMgr {
SumMCp = state.dataHeatBalFanSys->MCPI(ZoneNum) + state.dataHeatBalFanSys->MCPV(ZoneNum) + state.dataHeatBalFanSys->MCPM(ZoneNum) + state.dataHeatBalFanSys->MCPE(ZoneNum) + state.dataHeatBalFanSys->MCPC(ZoneNum) + state.dataHeatBalFanSys->MDotCPOA(ZoneNum);
SumMCpT =
state.dataHeatBalFanSys->MCPTI(ZoneNum) + state.dataHeatBalFanSys->MCPTV(ZoneNum) + state.dataHeatBalFanSys->MCPTM(ZoneNum) + state.dataHeatBalFanSys->MCPTE(ZoneNum) + state.dataHeatBalFanSys->MCPTC(ZoneNum) + state.dataHeatBalFanSys->MDotCPOA(ZoneNum) * Zone(ZoneNum).OutDryBulbTemp;
if (AirflowNetwork::SimulateAirflowNetwork == AirflowNetwork::AirflowNetworkControlMultizone) {
if (state.dataAirflowNetwork->SimulateAirflowNetwork == AirflowNetwork::AirflowNetworkControlMultizone) {
SumMCp = state.dataAirflowNetworkBalanceManager->exchangeData(ZoneNum).SumMCp + state.dataAirflowNetworkBalanceManager->exchangeData(ZoneNum).SumMMCp;
SumMCpT = state.dataAirflowNetworkBalanceManager->exchangeData(ZoneNum).SumMCpT + state.dataAirflowNetworkBalanceManager->exchangeData(ZoneNum).SumMMCpT;
}
Expand Down Expand Up @@ -742,19 +742,19 @@ namespace EnergyPlus::DisplacementVentMgr {
// outflowing. The lower apertures have to be located below 0.8m and the upper apertures
// have to be located above 1.8m.

if (AirflowNetwork::NumOfLinksMultiZone > 0) {
if (state.dataAirflowNetwork->NumOfLinksMultiZone > 0) {
for (Loop = 1; Loop <= state.dataRoomAirMod->AirflowNetworkSurfaceUCSDCV(0, ZoneNum); ++Loop) {
// direct AirflowNetwork surface

if (state.dataSurface->Surface(AirflowNetwork::MultizoneSurfaceData(state.dataRoomAirMod->AirflowNetworkSurfaceUCSDCV(Loop, ZoneNum)).SurfNum).Zone == ZoneNum) {
if (state.dataSurface->Surface(state.dataAirflowNetwork->MultizoneSurfaceData(state.dataRoomAirMod->AirflowNetworkSurfaceUCSDCV(Loop, ZoneNum)).SurfNum).Zone == ZoneNum) {

if ((state.dataRoomAirMod->SurfParametersCVDV(state.dataRoomAirMod->AirflowNetworkSurfaceUCSDCV(Loop, ZoneNum)).Zmax < 0.8 &&
AirflowNetwork::AirflowNetworkLinkSimu(state.dataRoomAirMod->AirflowNetworkSurfaceUCSDCV(Loop, ZoneNum)).VolFLOW > 0)) {
state.dataAirflowNetwork->AirflowNetworkLinkSimu(state.dataRoomAirMod->AirflowNetworkSurfaceUCSDCV(Loop, ZoneNum)).VolFLOW > 0)) {
FlagApertures = 0;
break;
}
if (state.dataRoomAirMod->SurfParametersCVDV(state.dataRoomAirMod->AirflowNetworkSurfaceUCSDCV(Loop, ZoneNum)).Zmin > 1.8 &&
AirflowNetwork::AirflowNetworkLinkSimu(state.dataRoomAirMod->AirflowNetworkSurfaceUCSDCV(Loop, ZoneNum)).VolFLOW2 > 0) {
state.dataAirflowNetwork->AirflowNetworkLinkSimu(state.dataRoomAirMod->AirflowNetworkSurfaceUCSDCV(Loop, ZoneNum)).VolFLOW2 > 0) {
FlagApertures = 0;
break;
}
Expand All @@ -770,38 +770,38 @@ namespace EnergyPlus::DisplacementVentMgr {
} else {

if (state.dataRoomAirMod->SurfParametersCVDV(state.dataRoomAirMod->AirflowNetworkSurfaceUCSDCV(Loop, ZoneNum)).Zmax +
Zone(state.dataSurface->Surface(AirflowNetwork::MultizoneSurfaceData(state.dataRoomAirMod->AirflowNetworkSurfaceUCSDCV(Loop, ZoneNum)).SurfNum).Zone).OriginZ -
Zone(state.dataSurface->Surface(state.dataAirflowNetwork->MultizoneSurfaceData(state.dataRoomAirMod->AirflowNetworkSurfaceUCSDCV(Loop, ZoneNum)).SurfNum).Zone).OriginZ -
Zone(ZoneNum).OriginZ <
0.8 &&
AirflowNetwork::AirflowNetworkLinkSimu(state.dataRoomAirMod->AirflowNetworkSurfaceUCSDCV(Loop, ZoneNum)).VolFLOW2 > 0) {
state.dataAirflowNetwork->AirflowNetworkLinkSimu(state.dataRoomAirMod->AirflowNetworkSurfaceUCSDCV(Loop, ZoneNum)).VolFLOW2 > 0) {
FlagApertures = 0;
break;
}
if (state.dataRoomAirMod->SurfParametersCVDV(state.dataRoomAirMod->AirflowNetworkSurfaceUCSDCV(Loop, ZoneNum)).Zmin +
Zone(state.dataSurface->Surface(AirflowNetwork::MultizoneSurfaceData(state.dataRoomAirMod->AirflowNetworkSurfaceUCSDCV(Loop, ZoneNum)).SurfNum).Zone).OriginZ -
Zone(state.dataSurface->Surface(state.dataAirflowNetwork->MultizoneSurfaceData(state.dataRoomAirMod->AirflowNetworkSurfaceUCSDCV(Loop, ZoneNum)).SurfNum).Zone).OriginZ -
Zone(ZoneNum).OriginZ >
1.8 &&
AirflowNetwork::AirflowNetworkLinkSimu(state.dataRoomAirMod->AirflowNetworkSurfaceUCSDCV(Loop, ZoneNum)).VolFLOW > 0) {
state.dataAirflowNetwork->AirflowNetworkLinkSimu(state.dataRoomAirMod->AirflowNetworkSurfaceUCSDCV(Loop, ZoneNum)).VolFLOW > 0) {
FlagApertures = 0;
break;
}
if ((state.dataRoomAirMod->SurfParametersCVDV(state.dataRoomAirMod->AirflowNetworkSurfaceUCSDCV(Loop, ZoneNum)).Zmin +
Zone(state.dataSurface->Surface(AirflowNetwork::MultizoneSurfaceData(state.dataRoomAirMod->AirflowNetworkSurfaceUCSDCV(Loop, ZoneNum)).SurfNum).Zone)
Zone(state.dataSurface->Surface(state.dataAirflowNetwork->MultizoneSurfaceData(state.dataRoomAirMod->AirflowNetworkSurfaceUCSDCV(Loop, ZoneNum)).SurfNum).Zone)
.OriginZ -
Zone(ZoneNum).OriginZ >
0.8 &&
state.dataRoomAirMod->SurfParametersCVDV(state.dataRoomAirMod->AirflowNetworkSurfaceUCSDCV(Loop, ZoneNum)).Zmin +
Zone(state.dataSurface->Surface(AirflowNetwork::MultizoneSurfaceData(state.dataRoomAirMod->AirflowNetworkSurfaceUCSDCV(Loop, ZoneNum)).SurfNum).Zone)
Zone(state.dataSurface->Surface(state.dataAirflowNetwork->MultizoneSurfaceData(state.dataRoomAirMod->AirflowNetworkSurfaceUCSDCV(Loop, ZoneNum)).SurfNum).Zone)
.OriginZ -
Zone(ZoneNum).OriginZ <
1.8) ||
(state.dataRoomAirMod->SurfParametersCVDV(state.dataRoomAirMod->AirflowNetworkSurfaceUCSDCV(Loop, ZoneNum)).Zmax +
Zone(state.dataSurface->Surface(AirflowNetwork::MultizoneSurfaceData(state.dataRoomAirMod->AirflowNetworkSurfaceUCSDCV(Loop, ZoneNum)).SurfNum).Zone)
Zone(state.dataSurface->Surface(state.dataAirflowNetwork->MultizoneSurfaceData(state.dataRoomAirMod->AirflowNetworkSurfaceUCSDCV(Loop, ZoneNum)).SurfNum).Zone)
.OriginZ -
Zone(ZoneNum).OriginZ >
0.8 &&
state.dataRoomAirMod->SurfParametersCVDV(state.dataRoomAirMod->AirflowNetworkSurfaceUCSDCV(Loop, ZoneNum)).Zmax +
Zone(state.dataSurface->Surface(AirflowNetwork::MultizoneSurfaceData(state.dataRoomAirMod->AirflowNetworkSurfaceUCSDCV(Loop, ZoneNum)).SurfNum).Zone)
Zone(state.dataSurface->Surface(state.dataAirflowNetwork->MultizoneSurfaceData(state.dataRoomAirMod->AirflowNetworkSurfaceUCSDCV(Loop, ZoneNum)).SurfNum).Zone)
.OriginZ -
Zone(ZoneNum).OriginZ <
1.8)) {
Expand Down
2 changes: 1 addition & 1 deletion src/EnergyPlus/Fans.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2320,7 +2320,7 @@ namespace EnergyPlus::Fans {

if (Fan(FanNum).FanType_Num == FanType_ZoneExhaust) {
state.dataLoopNodes->Node(InletNode).MassFlowRate = Fan(FanNum).InletAirMassFlowRate;
if (AirflowNetwork::AirflowNetworkNumOfExhFan == 0) {
if (state.dataAirflowNetwork->AirflowNetworkNumOfExhFan == 0) {
UnbalExhMassFlow = Fan(FanNum).InletAirMassFlowRate;
if (Fan(FanNum).BalancedFractSchedNum > 0) {
BalancedExhMassFlow = UnbalExhMassFlow * GetCurrentScheduleValue(state, Fan(FanNum).BalancedFractSchedNum);
Expand Down
10 changes: 5 additions & 5 deletions src/EnergyPlus/Furnaces.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5249,11 +5249,11 @@ namespace Furnaces {
}
}

// Calcuate air distribution losses
// Calculate air distribution losses
if (!FirstHVACIteration && state.dataFurnaces->AirLoopPass == 1) {
ZoneInNode = state.dataFurnaces->Furnace(FurnaceNum).ZoneInletNode;
MassFlowRate = Node(ZoneInNode).MassFlowRate / state.dataFurnaces->Furnace(FurnaceNum).ControlZoneMassFlowFrac;
if (AirflowNetwork::SimulateAirflowNetwork > AirflowNetwork::AirflowNetworkControlMultizone) {
if (state.dataAirflowNetwork->SimulateAirflowNetwork > AirflowNetwork::AirflowNetworkControlMultizone) {
DeltaMassRate = Node(state.dataFurnaces->Furnace(FurnaceNum).FurnaceOutletNodeNum).MassFlowRate -
Node(ZoneInNode).MassFlowRate / state.dataFurnaces->Furnace(FurnaceNum).ControlZoneMassFlowFrac;
if (DeltaMassRate < 0.0) DeltaMassRate = 0.0;
Expand Down Expand Up @@ -5813,7 +5813,7 @@ namespace Furnaces {
}

// AirflowNetwork global variable
if (AirflowNetwork::SimulateAirflowNetwork > AirflowNetwork::AirflowNetworkControlMultizone) {
if (state.dataAirflowNetwork->SimulateAirflowNetwork > AirflowNetwork::AirflowNetworkControlMultizone) {
state.dataAirLoop->AirLoopAFNInfo(AirLoopNum).AFNLoopHeatingCoilMaxRTF = 0.0;
}
}
Expand Down Expand Up @@ -9563,8 +9563,8 @@ namespace Furnaces {
}

// Set mass flow rates during on and off cylce using an OnOff fan
if (AirflowNetwork::SimulateAirflowNetwork == AirflowNetwork::AirflowNetworkControlMultiADS ||
AirflowNetwork::SimulateAirflowNetwork == AirflowNetwork::AirflowNetworkControlSimpleADS) {
if (state.dataAirflowNetwork->SimulateAirflowNetwork == AirflowNetwork::AirflowNetworkControlMultiADS ||
state.dataAirflowNetwork->SimulateAirflowNetwork == AirflowNetwork::AirflowNetworkControlSimpleADS) {
state.dataAirLoop->AirLoopAFNInfo(AirLoopNum).LoopSystemOnMassFlowrate = state.dataFurnaces->CompOnMassFlow;
state.dataAirLoop->AirLoopAFNInfo(AirLoopNum).LoopSystemOffMassFlowrate = state.dataFurnaces->CompOffMassFlow;
state.dataAirLoop->AirLoopAFNInfo(AirLoopNum).LoopFanOperationMode = state.dataFurnaces->Furnace(FurnaceNum).OpMode;
Expand Down
30 changes: 15 additions & 15 deletions src/EnergyPlus/HVACManager.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,8 +290,8 @@ namespace EnergyPlus::HVACManager {
ManageHybridVentilation(state);

CalcAirFlowSimple(state);
if (AirflowNetwork::SimulateAirflowNetwork > AirflowNetwork::AirflowNetworkControlSimple) {
AirflowNetwork::RollBackFlag = false;
if (state.dataAirflowNetwork->SimulateAirflowNetwork > AirflowNetwork::AirflowNetworkControlSimple) {
state.dataAirflowNetwork->RollBackFlag = false;
ManageAirflowNetworkBalance(state, false);
}

Expand Down Expand Up @@ -349,8 +349,8 @@ namespace EnergyPlus::HVACManager {

ManageHybridVentilation(state);
CalcAirFlowSimple(state, SysTimestepLoop);
if (AirflowNetwork::SimulateAirflowNetwork > AirflowNetwork::AirflowNetworkControlSimple) {
AirflowNetwork::RollBackFlag = false;
if (state.dataAirflowNetwork->SimulateAirflowNetwork > AirflowNetwork::AirflowNetworkControlSimple) {
state.dataAirflowNetwork->RollBackFlag = false;
ManageAirflowNetworkBalance(state, false);
}

Expand Down Expand Up @@ -1732,7 +1732,7 @@ namespace EnergyPlus::HVACManager {
if (FirstHVACIteration) {
RepIterAir = 0;
// Call AirflowNetwork simulation to calculate air flows and pressures
if (AirflowNetwork::SimulateAirflowNetwork > AirflowNetwork::AirflowNetworkControlSimple) {
if (state.dataAirflowNetwork->SimulateAirflowNetwork > AirflowNetwork::AirflowNetworkControlSimple) {
ManageAirflowNetworkBalance(state, FirstHVACIteration);
}
ManageAirLoops(state, FirstHVACIteration, SimAirLoops, SimZoneEquipment);
Expand All @@ -1756,7 +1756,7 @@ namespace EnergyPlus::HVACManager {
++IterAir; // Increment the iteration counter
// Call AirflowNetwork simulation to calculate air flows and pressures
ResimulateAirZone = false;
if (AirflowNetwork::SimulateAirflowNetwork > AirflowNetwork::AirflowNetworkControlSimple) {
if (state.dataAirflowNetwork->SimulateAirflowNetwork > AirflowNetwork::AirflowNetworkControlSimple) {
ManageAirflowNetworkBalance(state, FirstHVACIteration, IterAir, ResimulateAirZone);
}
if (SimAirLoops) {
Expand All @@ -1782,7 +1782,7 @@ namespace EnergyPlus::HVACManager {
FlowMaxAvailAlreadyReset = false;

// IterAir = IterAir + 1 ! Increment the iteration counter
if (AirflowNetwork::SimulateAirflowNetwork > AirflowNetwork::AirflowNetworkControlSimple) {
if (state.dataAirflowNetwork->SimulateAirflowNetwork > AirflowNetwork::AirflowNetworkControlSimple) {
if (ResimulateAirZone) { // Need to make sure that SimAirLoop and SimZoneEquipment are simulated
SimAirLoops = true; // at min three times using ONOFF fan with the AirflowNetwork model
SimZoneEquipment = true;
Expand Down Expand Up @@ -2189,18 +2189,18 @@ namespace EnergyPlus::HVACManager {
auto &Fan(state.dataFans->Fan);

// Ensure no airflownetwork and simple calculations
if (AirflowNetwork::SimulateAirflowNetwork == 0) return;
if (state.dataAirflowNetwork->SimulateAirflowNetwork == 0) return;

if (AirflowNetwork::SimulateAirflowNetwork > AirflowNetwork::AirflowNetworkControlSimple) ReportAirflowNetwork(state);
if (state.dataAirflowNetwork->SimulateAirflowNetwork > AirflowNetwork::AirflowNetworkControlSimple) ReportAirflowNetwork(state);

// Reports zone exhaust loss by exhaust fans
for (ZoneLoop = 1; ZoneLoop <= state.dataGlobal->NumOfZones; ++ZoneLoop) { // Start of zone loads report variable update loop ...
CpAir = PsyCpAirFnW(state.dataEnvrn->OutHumRat);
H2OHtOfVap = PsyHgAirFnWTdb(state.dataEnvrn->OutHumRat, Zone(ZoneLoop).OutDryBulbTemp);
ADSCorrectionFactor = 1.0;
if (AirflowNetwork::SimulateAirflowNetwork == AirflowNetwork::AirflowNetworkControlSimpleADS) {
if (state.dataAirflowNetwork->SimulateAirflowNetwork == AirflowNetwork::AirflowNetworkControlSimpleADS) {
if ((state.dataZoneEquip->ZoneEquipAvail(ZoneLoop) == CycleOn || state.dataZoneEquip->ZoneEquipAvail(ZoneLoop) == CycleOnZoneFansOnly) &&
AirflowNetwork::AirflowNetworkZoneFlag(ZoneLoop)) {
state.dataAirflowNetwork->AirflowNetworkZoneFlag(ZoneLoop)) {
ADSCorrectionFactor = 0.0;
}
}
Expand All @@ -2227,8 +2227,8 @@ namespace EnergyPlus::HVACManager {
}

// Report results for SIMPLE option only
if (!(AirflowNetwork::SimulateAirflowNetwork == AirflowNetwork::AirflowNetworkControlSimple ||
AirflowNetwork::SimulateAirflowNetwork == AirflowNetwork::AirflowNetworkControlSimpleADS))
if (!(state.dataAirflowNetwork->SimulateAirflowNetwork == AirflowNetwork::AirflowNetworkControlSimple ||
state.dataAirflowNetwork->SimulateAirflowNetwork == AirflowNetwork::AirflowNetworkControlSimpleADS))
return;

if (ReportAirHeatBalanceFirstTimeFlag) {
Expand All @@ -2242,10 +2242,10 @@ namespace EnergyPlus::HVACManager {
// Break the infiltration load into heat gain and loss components
ADSCorrectionFactor = 1.0;

if (AirflowNetwork::SimulateAirflowNetwork == AirflowNetwork::AirflowNetworkControlSimpleADS) {
if (state.dataAirflowNetwork->SimulateAirflowNetwork == AirflowNetwork::AirflowNetworkControlSimpleADS) {
// CR7608 IF (TurnFansOn .AND. AirflowNetworkZoneFlag(ZoneLoop)) ADSCorrectionFactor=0
if ((state.dataZoneEquip->ZoneEquipAvail(ZoneLoop) == CycleOn || state.dataZoneEquip->ZoneEquipAvail(ZoneLoop) == CycleOnZoneFansOnly) &&
AirflowNetwork::AirflowNetworkZoneFlag(ZoneLoop))
state.dataAirflowNetwork->AirflowNetworkZoneFlag(ZoneLoop))
ADSCorrectionFactor = 0.0;
}

Expand Down
Loading