From 01c2a82ab095db4d40d46f191ce68deb02374816 Mon Sep 17 00:00:00 2001 From: Lixing Gu Date: Wed, 10 Jul 2024 15:37:12 -0400 Subject: [PATCH] Address comments and cleanup --- src/EnergyPlus/FanCoilUnits.cc | 22 ---- src/EnergyPlus/FanCoilUnits.hh | 2 - src/EnergyPlus/PurchasedAirManager.cc | 15 --- src/EnergyPlus/PurchasedAirManager.hh | 2 - src/EnergyPlus/UnitHeater.cc | 33 ------ src/EnergyPlus/UnitHeater.hh | 4 - src/EnergyPlus/VentilatedSlab.cc | 31 ------ src/EnergyPlus/VentilatedSlab.hh | 4 - src/EnergyPlus/WaterThermalTanks.cc | 30 ------ src/EnergyPlus/WaterThermalTanks.hh | 4 - src/EnergyPlus/ZoneDehumidifier.cc | 30 ------ src/EnergyPlus/ZoneDehumidifier.hh | 4 - .../unit/RoomAirflowNetwork.unit.cc | 102 ++++++++---------- 13 files changed, 44 insertions(+), 239 deletions(-) diff --git a/src/EnergyPlus/FanCoilUnits.cc b/src/EnergyPlus/FanCoilUnits.cc index 048abf9b95e..1e05e8f7056 100644 --- a/src/EnergyPlus/FanCoilUnits.cc +++ b/src/EnergyPlus/FanCoilUnits.cc @@ -4119,28 +4119,6 @@ namespace FanCoilUnits { return 0; } - int GetFanCoilAirInNode(EnergyPlusData &state, int const FanCoilNum) - { - - // FUNCTION INFORMATION: - // AUTHOR B Griffith - // DATE WRITTEN Dec 2006 - - // PURPOSE OF THIS FUNCTION: - // lookup function for OA inlet node for ventilation rate reporting - - if (state.dataFanCoilUnits->GetFanCoilInputFlag) { - GetFanCoilUnits(state); - state.dataFanCoilUnits->GetFanCoilInputFlag = false; - } - - if (FanCoilNum > 0 && FanCoilNum <= state.dataFanCoilUnits->NumFanCoils) { - return state.dataFanCoilUnits->FanCoil(FanCoilNum).AirInNode; - } - - return 0; - } - int GetFanCoilOutAirNode(EnergyPlusData &state, int const FanCoilNum) { diff --git a/src/EnergyPlus/FanCoilUnits.hh b/src/EnergyPlus/FanCoilUnits.hh index 5dce466105b..6f09a1523fa 100644 --- a/src/EnergyPlus/FanCoilUnits.hh +++ b/src/EnergyPlus/FanCoilUnits.hh @@ -321,8 +321,6 @@ namespace FanCoilUnits { int GetFanCoilZoneInletAirNode(EnergyPlusData &state, int const FanCoilNum); - int GetFanCoilAirInNode(EnergyPlusData &state, int const FanCoilNum); - int GetFanCoilOutAirNode(EnergyPlusData &state, int FanCoilNum); int GetFanCoilReturnAirNode(EnergyPlusData &state, int FanCoilNum); diff --git a/src/EnergyPlus/PurchasedAirManager.cc b/src/EnergyPlus/PurchasedAirManager.cc index 5b1d719f2a2..e3b58a930da 100644 --- a/src/EnergyPlus/PurchasedAirManager.cc +++ b/src/EnergyPlus/PurchasedAirManager.cc @@ -3318,21 +3318,6 @@ int GetPurchasedAirReturnAirNode(EnergyPlusData &state, int const PurchAirNum) return GetPurchasedAirReturnAirNode; } -int GetPurchasedAirZoneExhaustAirNode(EnergyPlusData &state, int PurchAirNum) -{ - if (state.dataPurchasedAirMgr->GetPurchAirInputFlag) { - GetPurchasedAir(state); - state.dataPurchasedAirMgr->GetPurchAirInputFlag = false; - } - - int GetPurchasedAirZoneExhaustAirNode = 0; - if (PurchAirNum > 0 && PurchAirNum <= state.dataPurchasedAirMgr->NumPurchAir) { - GetPurchasedAirZoneExhaustAirNode = state.dataPurchasedAirMgr->PurchAir(PurchAirNum).ZoneExhaustAirNodeNum; - } - - return GetPurchasedAirZoneExhaustAirNode; -} - int getPurchasedAirIndex(EnergyPlusData &state, std::string_view PurchAirName, bool &errFlag) { if (state.dataPurchasedAirMgr->GetPurchAirInputFlag) { diff --git a/src/EnergyPlus/PurchasedAirManager.hh b/src/EnergyPlus/PurchasedAirManager.hh index db21045584b..1058b9953c1 100644 --- a/src/EnergyPlus/PurchasedAirManager.hh +++ b/src/EnergyPlus/PurchasedAirManager.hh @@ -379,8 +379,6 @@ namespace PurchasedAirManager { int GetPurchasedAirReturnAirNode(EnergyPlusData &state, int PurchAirNum); - int GetPurchasedAirZoneExhaustAirNode(EnergyPlusData &state, int PurchAirNum); - int getPurchasedAirIndex(EnergyPlusData &state, std::string_view PurchAirName, bool &errFlag); Real64 GetPurchasedAirMixedAirTemp(EnergyPlusData &state, int PurchAirNum); diff --git a/src/EnergyPlus/UnitHeater.cc b/src/EnergyPlus/UnitHeater.cc index 127fe2079bc..e1ced26febe 100644 --- a/src/EnergyPlus/UnitHeater.cc +++ b/src/EnergyPlus/UnitHeater.cc @@ -1894,39 +1894,6 @@ namespace UnitHeater { } } - int GetUnitHeaterAirOutletNode(EnergyPlusData &state, int UnitHeaterNum) - { - // Return value - int GetUnitHeaterAirOutletNode = 0; - - if (state.dataUnitHeaters->GetUnitHeaterInputFlag) { - GetUnitHeaterInput(state); - state.dataUnitHeaters->GetUnitHeaterInputFlag = false; - } - - if (UnitHeaterNum > 0 && UnitHeaterNum <= state.dataUnitHeaters->NumOfUnitHeats) { - GetUnitHeaterAirOutletNode = state.dataUnitHeaters->UnitHeat(UnitHeaterNum).AirOutNode; - } - - return GetUnitHeaterAirOutletNode; - } - - int GetUnitHeaterAirInletNode(EnergyPlusData &state, int UnitHeaterNum) - { - int GetUnitHeaterAirInletNode = 0; - - if (state.dataUnitHeaters->GetUnitHeaterInputFlag) { - GetUnitHeaterInput(state); - state.dataUnitHeaters->GetUnitHeaterInputFlag = false; - } - - if (UnitHeaterNum > 0 && UnitHeaterNum <= state.dataUnitHeaters->NumOfUnitHeats) { - GetUnitHeaterAirInletNode = state.dataUnitHeaters->UnitHeat(UnitHeaterNum).AirInNode; - } - - return GetUnitHeaterAirInletNode; - } - int getUnitHeaterIndex(EnergyPlusData &state, std::string_view CompName, bool &errFlag) { if (state.dataUnitHeaters->GetUnitHeaterInputFlag) { diff --git a/src/EnergyPlus/UnitHeater.hh b/src/EnergyPlus/UnitHeater.hh index e84f7790d14..a2158cb8b0e 100644 --- a/src/EnergyPlus/UnitHeater.hh +++ b/src/EnergyPlus/UnitHeater.hh @@ -202,10 +202,6 @@ namespace UnitHeater { void ReportUnitHeater(EnergyPlusData &state, int const UnitHeatNum); // Unit index in unit heater array - int GetUnitHeaterAirOutletNode(EnergyPlusData &state, int UnitHeatNum); - - int GetUnitHeaterAirInletNode(EnergyPlusData &state, int UnitHeatNum); - int getUnitHeaterIndex(EnergyPlusData &state, std::string_view CompName, bool &errFlag); } // namespace UnitHeater diff --git a/src/EnergyPlus/VentilatedSlab.cc b/src/EnergyPlus/VentilatedSlab.cc index f132ee63d8e..650530ee64b 100644 --- a/src/EnergyPlus/VentilatedSlab.cc +++ b/src/EnergyPlus/VentilatedSlab.cc @@ -4735,37 +4735,6 @@ namespace VentilatedSlab { } } - int GetVentilatedSlabReturnAirNode(EnergyPlusData &state, int const VentSlabNum) - { - int ReturnAirNode = 0; - if (state.dataVentilatedSlab->GetInputFlag) { - GetVentilatedSlabInput(state); - state.dataVentilatedSlab->GetInputFlag = false; - } - - if (VentSlabNum > 0 && VentSlabNum <= state.dataVentilatedSlab->NumOfVentSlabs) { - ReturnAirNode = state.dataVentilatedSlab->VentSlab(VentSlabNum).ReturnAirNode; - } - - return ReturnAirNode; - } - - int GetVentilatedSlabZoneAirInNode(EnergyPlusData &state, int const VentSlabNum) - { - int ZoneAirInNode = 0; - - if (state.dataVentilatedSlab->GetInputFlag) { - GetVentilatedSlabInput(state); - state.dataVentilatedSlab->GetInputFlag = false; - } - - if (VentSlabNum > 0 && VentSlabNum <= state.dataVentilatedSlab->NumOfVentSlabs) { - ZoneAirInNode = state.dataVentilatedSlab->VentSlab(VentSlabNum).ZoneAirInNode; - } - - return ZoneAirInNode; - } - int getVentilatedSlabIndex(EnergyPlusData &state, std::string_view CompName, bool &errFlag) { if (state.dataVentilatedSlab->GetInputFlag) { diff --git a/src/EnergyPlus/VentilatedSlab.hh b/src/EnergyPlus/VentilatedSlab.hh index f20180c8602..c121528a7f5 100644 --- a/src/EnergyPlus/VentilatedSlab.hh +++ b/src/EnergyPlus/VentilatedSlab.hh @@ -383,10 +383,6 @@ namespace VentilatedSlab { void ReportVentilatedSlab(EnergyPlusData &state, int const Item); // Index for the ventilated slab under consideration within the derived types - int GetVentilatedSlabReturnAirNode(EnergyPlusData &state, int const VentSlabNum); - - int GetVentilatedSlabZoneAirInNode(EnergyPlusData &state, int const VentSlabNum); - int getVentilatedSlabIndex(EnergyPlusData &state, std::string_view CompName, bool &errFlag); //***************************************************************************************** diff --git a/src/EnergyPlus/WaterThermalTanks.cc b/src/EnergyPlus/WaterThermalTanks.cc index bdea7fce4c8..02ed3f8d309 100644 --- a/src/EnergyPlus/WaterThermalTanks.cc +++ b/src/EnergyPlus/WaterThermalTanks.cc @@ -12465,36 +12465,6 @@ bool GetHeatPumpWaterHeaterNodeNumber(EnergyPlusData &state, int const NodeNumbe return HeatPumpWaterHeaterNodeException; } -int GetHeatPumpWaterHeaterAirInletNodeNum(EnergyPlusData &state, int HPNum) -{ - int HeatPumpWaterHeaterAirInletNodeNum = 0; - if (state.dataWaterThermalTanks->getWaterThermalTankInputFlag) { - GetWaterThermalTankInput(state); - state.dataWaterThermalTanks->getWaterThermalTankInputFlag = false; - } - - if (HPNum > 0 && HPNum <= state.dataWaterThermalTanks->numHeatPumpWaterHeater) { - HeatPumpWaterHeaterAirInletNodeNum = state.dataWaterThermalTanks->HPWaterHeater(HPNum).HeatPumpAirInletNode; - } - - return HeatPumpWaterHeaterAirInletNodeNum; -} - -int GetHeatPumpWaterHeaterAirOutletNodeNum(EnergyPlusData &state, int HPNum) -{ - int HeatPumpWaterHeaterAirOutletNodeNum = 0; - if (state.dataWaterThermalTanks->getWaterThermalTankInputFlag) { - GetWaterThermalTankInput(state); - state.dataWaterThermalTanks->getWaterThermalTankInputFlag = false; - } - - if (HPNum > 0 && HPNum <= state.dataWaterThermalTanks->numHeatPumpWaterHeater) { - HeatPumpWaterHeaterAirOutletNodeNum = state.dataWaterThermalTanks->HPWaterHeater(HPNum).HeatPumpAirOutletNode; - } - - return HeatPumpWaterHeaterAirOutletNodeNum; -} - int getHeatPumpWaterHeaterIndex(EnergyPlusData &state, std::string_view CompName, bool &errFlag) { if (state.dataWaterThermalTanks->getWaterThermalTankInputFlag) { diff --git a/src/EnergyPlus/WaterThermalTanks.hh b/src/EnergyPlus/WaterThermalTanks.hh index 7ff93332d85..014ba54f05f 100644 --- a/src/EnergyPlus/WaterThermalTanks.hh +++ b/src/EnergyPlus/WaterThermalTanks.hh @@ -988,10 +988,6 @@ namespace WaterThermalTanks { bool GetHeatPumpWaterHeaterNodeNumber(EnergyPlusData &state, int NodeNumber); - int GetHeatPumpWaterHeaterAirInletNodeNum(EnergyPlusData &state, int HPNum); - - int GetHeatPumpWaterHeaterAirOutletNodeNum(EnergyPlusData &state, int HPNum); - int getHeatPumpWaterHeaterIndex(EnergyPlusData &state, std::string_view CompName, bool &errFlag); } // namespace WaterThermalTanks diff --git a/src/EnergyPlus/ZoneDehumidifier.cc b/src/EnergyPlus/ZoneDehumidifier.cc index e21e5f4c887..0eafa52b1ab 100644 --- a/src/EnergyPlus/ZoneDehumidifier.cc +++ b/src/EnergyPlus/ZoneDehumidifier.cc @@ -1179,36 +1179,6 @@ namespace ZoneDehumidifier { return FindZoneDehumidifierNodeNumber; } - int GetZoneDehumidifierAirOutletNodeNum(EnergyPlusData &state, int ZoneDehumidNum) - { - int ZoneDehumidifierAirOutletNodeNum = 0; - if (state.dataZoneDehumidifier->GetInputFlag) { - GetZoneDehumidifierInput(state); - state.dataZoneDehumidifier->GetInputFlag = false; - } - - if (ZoneDehumidNum > 0 && ZoneDehumidNum <= (int)state.dataZoneDehumidifier->ZoneDehumid.size()) { - ZoneDehumidifierAirOutletNodeNum = state.dataZoneDehumidifier->ZoneDehumid(ZoneDehumidNum).AirOutletNodeNum; - } - - return ZoneDehumidifierAirOutletNodeNum; - } - - int GetZoneDehumidifierAirInletNodeNum(EnergyPlusData &state, int ZoneDehumidNum) - { - int ZoneDehumidifierAirInletNodeNum = 0; - if (state.dataZoneDehumidifier->GetInputFlag) { - GetZoneDehumidifierInput(state); - state.dataZoneDehumidifier->GetInputFlag = false; - } - - if (ZoneDehumidNum > 0 && ZoneDehumidNum <= (int)state.dataZoneDehumidifier->ZoneDehumid.size()) { - ZoneDehumidifierAirInletNodeNum = state.dataZoneDehumidifier->ZoneDehumid(ZoneDehumidNum).AirInletNodeNum; - } - - return ZoneDehumidifierAirInletNodeNum; - } - int getZoneDehumidifierIndex(EnergyPlusData &state, std::string_view CompName, bool &errFlag) { if (state.dataZoneDehumidifier->GetInputFlag) { diff --git a/src/EnergyPlus/ZoneDehumidifier.hh b/src/EnergyPlus/ZoneDehumidifier.hh index 57adbfe4d57..b4800340a34 100644 --- a/src/EnergyPlus/ZoneDehumidifier.hh +++ b/src/EnergyPlus/ZoneDehumidifier.hh @@ -153,10 +153,6 @@ namespace ZoneDehumidifier { bool GetZoneDehumidifierNodeNumber(EnergyPlusData &state, int NodeNumber); // Node being tested - int GetZoneDehumidifierAirOutletNodeNum(EnergyPlusData &state, int ZoneDehumidNum); - - int GetZoneDehumidifierAirInletNodeNum(EnergyPlusData &state, int ZoneDehumidNum); - int getZoneDehumidifierIndex(EnergyPlusData &state, std::string_view CompName, bool &errFlag); } // namespace ZoneDehumidifier diff --git a/tst/EnergyPlus/unit/RoomAirflowNetwork.unit.cc b/tst/EnergyPlus/unit/RoomAirflowNetwork.unit.cc index 36709ad80c0..7522f82eb6a 100644 --- a/tst/EnergyPlus/unit/RoomAirflowNetwork.unit.cc +++ b/tst/EnergyPlus/unit/RoomAirflowNetwork.unit.cc @@ -628,9 +628,8 @@ TEST_F(EnergyPlusFixture, RoomAirflowNetwork_CheckEquipName_Test) state->dataHVACVarRefFlow->NumVRFTU = 1; state->dataHVACVarRefFlow->VRFTU(1).Name = EquipName; check = CheckEquipName(*state, EquipName, SupplyNodeName, ReturnNodeName, zoneEquipType); - if (check) { - EXPECT_EQ("SupplyNode", SupplyNodeName); - } + EXPECT_TRUE(check); + EXPECT_EQ("SupplyNode", SupplyNodeName); state->dataLoopNodes->NodeID(1) = "SupplyNode1"; state->dataLoopNodes->NodeID(2) = "ReturnNode1"; @@ -641,9 +640,8 @@ TEST_F(EnergyPlusFixture, RoomAirflowNetwork_CheckEquipName_Test) state->dataHVACStandAloneERV->StandAloneERV(1).SupplyAirInletNode = 1; state->dataHVACStandAloneERV->StandAloneERV(1).Name = EquipName; check = CheckEquipName(*state, EquipName, SupplyNodeName, ReturnNodeName, zoneEquipType); - if (check) { - EXPECT_EQ("SupplyNode1", SupplyNodeName); - } + EXPECT_TRUE(check); + EXPECT_EQ("SupplyNode1", SupplyNodeName); state->dataLoopNodes->NodeID(1) = "SupplyNode2"; state->dataLoopNodes->NodeID(2) = "ReturnNode2"; @@ -655,10 +653,9 @@ TEST_F(EnergyPlusFixture, RoomAirflowNetwork_CheckEquipName_Test) state->dataFanCoilUnits->GetFanCoilInputFlag = false; state->dataFanCoilUnits->FanCoil(EquipIndex).Name = EquipName; check = CheckEquipName(*state, EquipName, SupplyNodeName, ReturnNodeName, zoneEquipType); - if (check) { - EXPECT_EQ("SupplyNode2", SupplyNodeName); - EXPECT_EQ("ReturnNode2", ReturnNodeName); - } + EXPECT_TRUE(check); + EXPECT_EQ("SupplyNode2", SupplyNodeName); + EXPECT_EQ("ReturnNode2", ReturnNodeName); state->dataLoopNodes->NodeID(1) = "SupplyNode3"; state->dataLoopNodes->NodeID(2) = "ReturnNode3"; @@ -670,10 +667,9 @@ TEST_F(EnergyPlusFixture, RoomAirflowNetwork_CheckEquipName_Test) state->dataOutdoorAirUnit->GetOutdoorAirUnitInputFlag = false; state->dataOutdoorAirUnit->OutAirUnit(EquipIndex).Name = EquipName; check = CheckEquipName(*state, EquipName, SupplyNodeName, ReturnNodeName, zoneEquipType); - if (check) { - EXPECT_EQ("SupplyNode3", SupplyNodeName); - EXPECT_EQ("ReturnNode3", ReturnNodeName); - } + EXPECT_TRUE(check); + EXPECT_EQ("SupplyNode3", SupplyNodeName); + EXPECT_EQ("ReturnNode3", ReturnNodeName); state->dataLoopNodes->NodeID(1) = "SupplyNode4"; state->dataLoopNodes->NodeID(2) = "ReturnNode4"; @@ -686,10 +682,9 @@ TEST_F(EnergyPlusFixture, RoomAirflowNetwork_CheckEquipName_Test) state->dataUnitarySystems->unitarySys[EquipIndex - 1].AirOutNode = 1; state->dataUnitarySystems->unitarySys[EquipIndex - 1].AirInNode = 2; check = CheckEquipName(*state, EquipName, SupplyNodeName, ReturnNodeName, zoneEquipType); - if (check) { - EXPECT_EQ("SupplyNode4", SupplyNodeName); - EXPECT_EQ("ReturnNode4", ReturnNodeName); - } + EXPECT_TRUE(check); + EXPECT_EQ("SupplyNode4", SupplyNodeName); + EXPECT_EQ("ReturnNode4", ReturnNodeName); state->dataLoopNodes->NodeID(1) = "SupplyNode5"; state->dataLoopNodes->NodeID(2) = "ReturnNode5"; @@ -702,10 +697,10 @@ TEST_F(EnergyPlusFixture, RoomAirflowNetwork_CheckEquipName_Test) state->dataUnitarySystems->unitarySys[EquipIndex - 1].AirOutNode = 1; state->dataUnitarySystems->unitarySys[EquipIndex - 1].AirInNode = 2; check = CheckEquipName(*state, EquipName, SupplyNodeName, ReturnNodeName, zoneEquipType); - if (check) { - EXPECT_EQ("SupplyNode5", SupplyNodeName); - EXPECT_EQ("ReturnNode5", ReturnNodeName); - } + EXPECT_TRUE(check); + EXPECT_EQ("SupplyNode5", SupplyNodeName); + EXPECT_EQ("ReturnNode5", ReturnNodeName); + state->dataLoopNodes->NodeID(1) = "SupplyNode6"; state->dataLoopNodes->NodeID(2) = "ReturnNode6"; zoneEquipType = DataZoneEquipment::ZoneEquipType::PackagedTerminalHeatPumpWaterToAir; @@ -717,10 +712,9 @@ TEST_F(EnergyPlusFixture, RoomAirflowNetwork_CheckEquipName_Test) state->dataUnitarySystems->unitarySys[EquipIndex - 1].AirOutNode = 1; state->dataUnitarySystems->unitarySys[EquipIndex - 1].AirInNode = 2; check = CheckEquipName(*state, EquipName, SupplyNodeName, ReturnNodeName, zoneEquipType); - if (check) { - EXPECT_EQ("SupplyNode6", SupplyNodeName); - EXPECT_EQ("ReturnNode6", ReturnNodeName); - } + EXPECT_TRUE(check); + EXPECT_EQ("SupplyNode6", SupplyNodeName); + EXPECT_EQ("ReturnNode6", ReturnNodeName); state->dataLoopNodes->NodeID(1) = "SupplyNode7"; state->dataLoopNodes->NodeID(2) = "ReturnNode7"; @@ -732,10 +726,9 @@ TEST_F(EnergyPlusFixture, RoomAirflowNetwork_CheckEquipName_Test) state->dataUnitHeaters->GetUnitHeaterInputFlag = false; state->dataUnitHeaters->UnitHeat(EquipIndex).Name = EquipName; check = CheckEquipName(*state, EquipName, SupplyNodeName, ReturnNodeName, zoneEquipType); - if (check) { - EXPECT_EQ("SupplyNode7", SupplyNodeName); - EXPECT_EQ("ReturnNode7", ReturnNodeName); - } + EXPECT_TRUE(check); + EXPECT_EQ("SupplyNode7", SupplyNodeName); + EXPECT_EQ("ReturnNode7", ReturnNodeName); state->dataLoopNodes->NodeID(1) = "SupplyNode8"; state->dataLoopNodes->NodeID(2) = "ReturnNode8"; @@ -747,10 +740,9 @@ TEST_F(EnergyPlusFixture, RoomAirflowNetwork_CheckEquipName_Test) state->dataUnitVentilators->UnitVent(EquipIndex).Name = EquipName; state->dataUnitVentilators->GetUnitVentilatorInputFlag = false; check = CheckEquipName(*state, EquipName, SupplyNodeName, ReturnNodeName, zoneEquipType); - if (check) { - EXPECT_EQ("SupplyNode8", SupplyNodeName); - EXPECT_EQ("ReturnNode8", ReturnNodeName); - } + EXPECT_TRUE(check); + EXPECT_EQ("SupplyNode8", SupplyNodeName); + EXPECT_EQ("ReturnNode8", ReturnNodeName); state->dataLoopNodes->NodeID(1) = "SupplyNode9"; state->dataLoopNodes->NodeID(2) = "ReturnNode9"; @@ -762,10 +754,9 @@ TEST_F(EnergyPlusFixture, RoomAirflowNetwork_CheckEquipName_Test) state->dataVentilatedSlab->GetInputFlag = false; state->dataVentilatedSlab->VentSlab(EquipIndex).Name = EquipName; check = CheckEquipName(*state, EquipName, SupplyNodeName, ReturnNodeName, zoneEquipType); - if (check) { - EXPECT_EQ("SupplyNode9", SupplyNodeName); - EXPECT_EQ("ReturnNode9", ReturnNodeName); - } + EXPECT_TRUE(check); + EXPECT_EQ("SupplyNode9", SupplyNodeName); + EXPECT_EQ("ReturnNode9", ReturnNodeName); state->dataLoopNodes->NodeID(1) = "SupplyNode10"; state->dataLoopNodes->NodeID(2) = "ReturnNode10"; @@ -782,10 +773,9 @@ TEST_F(EnergyPlusFixture, RoomAirflowNetwork_CheckEquipName_Test) state->dataWindowAC->WindAC(EquipIndex).Name = EquipName; state->dataMixedAir->GetOAMixerInputFlag = false; check = CheckEquipName(*state, EquipName, SupplyNodeName, ReturnNodeName, zoneEquipType); - if (check) { - EXPECT_EQ("SupplyNode10", SupplyNodeName); - EXPECT_EQ("ReturnNode10", ReturnNodeName); - } + EXPECT_TRUE(check); + EXPECT_EQ("SupplyNode10", SupplyNodeName); + EXPECT_EQ("ReturnNode10", ReturnNodeName); state->dataLoopNodes->NodeID(1) = "SupplyNode11"; state->dataLoopNodes->NodeID(2) = "ReturnNode11"; @@ -796,10 +786,9 @@ TEST_F(EnergyPlusFixture, RoomAirflowNetwork_CheckEquipName_Test) state->dataZoneDehumidifier->ZoneDehumid(EquipIndex).Name = EquipName; state->dataZoneDehumidifier->GetInputFlag = false; check = CheckEquipName(*state, EquipName, SupplyNodeName, ReturnNodeName, zoneEquipType); - if (check) { - EXPECT_EQ("SupplyNode11", SupplyNodeName); - EXPECT_EQ("ReturnNode11", ReturnNodeName); - } + EXPECT_TRUE(check); + EXPECT_EQ("SupplyNode11", SupplyNodeName); + EXPECT_EQ("ReturnNode11", ReturnNodeName); state->dataLoopNodes->NodeID(1) = "SupplyNode12"; state->dataLoopNodes->NodeID(2) = "ReturnNode12"; @@ -811,10 +800,9 @@ TEST_F(EnergyPlusFixture, RoomAirflowNetwork_CheckEquipName_Test) state->dataPurchasedAirMgr->PurchAir(EquipIndex).Name = EquipName; state->dataPurchasedAirMgr->GetPurchAirInputFlag = false; check = CheckEquipName(*state, EquipName, SupplyNodeName, ReturnNodeName, zoneEquipType); - if (check) { - EXPECT_EQ("SupplyNode12", SupplyNodeName); - EXPECT_EQ("ReturnNode12", ReturnNodeName); - } + EXPECT_TRUE(check); + EXPECT_EQ("SupplyNode12", SupplyNodeName); + EXPECT_EQ("ReturnNode12", ReturnNodeName); state->dataLoopNodes->NodeID(1) = "SupplyNode13"; state->dataLoopNodes->NodeID(2) = "ReturnNode13"; @@ -826,10 +814,9 @@ TEST_F(EnergyPlusFixture, RoomAirflowNetwork_CheckEquipName_Test) state->dataHybridUnitaryAC->ZoneHybridUnitaryAirConditioner(EquipIndex).Name = EquipName; state->dataHybridUnitaryAC->GetInputZoneHybridEvap = false; check = CheckEquipName(*state, EquipName, SupplyNodeName, ReturnNodeName, zoneEquipType); - if (check) { - EXPECT_EQ("SupplyNode13", SupplyNodeName); - EXPECT_EQ("ReturnNode13", ReturnNodeName); - } + EXPECT_TRUE(check); + EXPECT_EQ("SupplyNode13", SupplyNodeName); + EXPECT_EQ("ReturnNode13", ReturnNodeName); state->dataLoopNodes->NodeID(1) = "SupplyNode14"; state->dataLoopNodes->NodeID(2) = "ReturnNode14"; @@ -841,8 +828,7 @@ TEST_F(EnergyPlusFixture, RoomAirflowNetwork_CheckEquipName_Test) state->dataWaterThermalTanks->HPWaterHeater(EquipIndex).Name = EquipName; state->dataWaterThermalTanks->getWaterThermalTankInputFlag = false; check = CheckEquipName(*state, EquipName, SupplyNodeName, ReturnNodeName, zoneEquipType); - if (check) { - EXPECT_EQ("SupplyNode14", SupplyNodeName); - EXPECT_EQ("ReturnNode14", ReturnNodeName); - } + EXPECT_TRUE(check); + EXPECT_EQ("SupplyNode14", SupplyNodeName); + EXPECT_EQ("ReturnNode14", ReturnNodeName); }