Skip to content

Commit 2925107

Browse files
committed
Different node names
1 parent c7628e5 commit 2925107

File tree

1 file changed

+39
-19
lines changed

1 file changed

+39
-19
lines changed

tst/EnergyPlus/unit/RoomAirflowNetwork.unit.cc

Lines changed: 39 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -628,36 +628,44 @@ TEST_F(EnergyPlusFixture, RoomAirflowNetwork_CheckEquipName_Test)
628628
EXPECT_EQ("SupplyNode", SupplyNodeName);
629629
}
630630

631+
state->dataLoopNodes->NodeID(1) = "SupplyNode1";
632+
state->dataLoopNodes->NodeID(2) = "ReturnNode1";
631633
zoneEquipType = DataZoneEquipment::ZoneEquipType::EnergyRecoveryVentilator;
632634
state->dataFans->GetFanInputFlag = false;
633635
state->dataFans->Fan.allocate(1);
634636
state->dataFans->Fan(1).FanName = EquipName;
635637
state->dataFans->Fan(1).OutletNodeNum = 1;
636638
check = CheckEquipName(*state, EquipName, SupplyNodeName, ReturnNodeName, EquipIndex, zoneEquipType);
637639
if (check) {
638-
EXPECT_EQ("SupplyNode", SupplyNodeName);
640+
EXPECT_EQ("SupplyNode1", SupplyNodeName);
639641
}
640642

643+
state->dataLoopNodes->NodeID(1) = "SupplyNode2";
644+
state->dataLoopNodes->NodeID(2) = "ReturnNode2";
641645
zoneEquipType = DataZoneEquipment::ZoneEquipType::FourPipeFanCoil;
642646
state->dataFanCoilUnits->FanCoil.allocate(1);
643647
state->dataFanCoilUnits->FanCoil(EquipIndex).AirOutNode = 1;
644648
state->dataFanCoilUnits->FanCoil(EquipIndex).AirInNode = 2;
645649
check = CheckEquipName(*state, EquipName, SupplyNodeName, ReturnNodeName, EquipIndex, zoneEquipType);
646650
if (check) {
647-
EXPECT_EQ("SupplyNode", SupplyNodeName);
648-
EXPECT_EQ("ReturnNode", ReturnNodeName);
651+
EXPECT_EQ("SupplyNode2", SupplyNodeName);
652+
EXPECT_EQ("ReturnNode2", ReturnNodeName);
649653
}
650654

655+
state->dataLoopNodes->NodeID(1) = "SupplyNode3";
656+
state->dataLoopNodes->NodeID(2) = "ReturnNode3";
651657
zoneEquipType = DataZoneEquipment::ZoneEquipType::OutdoorAirUnit;
652658
state->dataOutdoorAirUnit->OutAirUnit.allocate(1);
653659
state->dataOutdoorAirUnit->OutAirUnit(EquipIndex).AirOutletNode = 1;
654660
state->dataOutdoorAirUnit->OutAirUnit(EquipIndex).AirInletNode = 2;
655661
check = CheckEquipName(*state, EquipName, SupplyNodeName, ReturnNodeName, EquipIndex, zoneEquipType);
656662
if (check) {
657-
EXPECT_EQ("SupplyNode", SupplyNodeName);
658-
EXPECT_EQ("ReturnNode", ReturnNodeName);
663+
EXPECT_EQ("SupplyNode3", SupplyNodeName);
664+
EXPECT_EQ("ReturnNode3", ReturnNodeName);
659665
}
660666

667+
state->dataLoopNodes->NodeID(1) = "SupplyNode4";
668+
state->dataLoopNodes->NodeID(2) = "ReturnNode4";
661669
zoneEquipType = DataZoneEquipment::ZoneEquipType::PackagedTerminalAirConditioner;
662670
UnitarySystems::UnitarySys thisUnit;
663671
state->dataUnitarySystems->unitarySys.push_back(thisUnit);
@@ -668,10 +676,12 @@ TEST_F(EnergyPlusFixture, RoomAirflowNetwork_CheckEquipName_Test)
668676
state->dataUnitarySystems->unitarySys[EquipIndex - 1].AirInNode = 2;
669677
check = CheckEquipName(*state, EquipName, SupplyNodeName, ReturnNodeName, EquipIndex, zoneEquipType);
670678
if (check) {
671-
EXPECT_EQ("SupplyNode", SupplyNodeName);
672-
EXPECT_EQ("ReturnNode", ReturnNodeName);
679+
EXPECT_EQ("SupplyNode4", SupplyNodeName);
680+
EXPECT_EQ("ReturnNode4", ReturnNodeName);
673681
}
674682

683+
state->dataLoopNodes->NodeID(1) = "SupplyNode5";
684+
state->dataLoopNodes->NodeID(2) = "ReturnNode5";
675685
zoneEquipType = DataZoneEquipment::ZoneEquipType::PackagedTerminalHeatPump;
676686
// UnitarySystems::UnitarySys thisUnit;
677687
// state->dataUnitarySystems->unitarySys.push_back(thisUnit);
@@ -682,9 +692,11 @@ TEST_F(EnergyPlusFixture, RoomAirflowNetwork_CheckEquipName_Test)
682692
state->dataUnitarySystems->unitarySys[EquipIndex - 1].AirInNode = 2;
683693
check = CheckEquipName(*state, EquipName, SupplyNodeName, ReturnNodeName, EquipIndex, zoneEquipType);
684694
if (check) {
685-
EXPECT_EQ("SupplyNode", SupplyNodeName);
686-
EXPECT_EQ("ReturnNode", ReturnNodeName);
695+
EXPECT_EQ("SupplyNode5", SupplyNodeName);
696+
EXPECT_EQ("ReturnNode5", ReturnNodeName);
687697
}
698+
state->dataLoopNodes->NodeID(1) = "SupplyNode6";
699+
state->dataLoopNodes->NodeID(2) = "ReturnNode6";
688700
zoneEquipType = DataZoneEquipment::ZoneEquipType::PackagedTerminalHeatPumpWaterToAir;
689701
// UnitarySystems::UnitarySys thisUnit;
690702
// state->dataUnitarySystems->unitarySys.push_back(thisUnit);
@@ -695,47 +707,55 @@ TEST_F(EnergyPlusFixture, RoomAirflowNetwork_CheckEquipName_Test)
695707
state->dataUnitarySystems->unitarySys[EquipIndex - 1].AirInNode = 2;
696708
check = CheckEquipName(*state, EquipName, SupplyNodeName, ReturnNodeName, EquipIndex, zoneEquipType);
697709
if (check) {
698-
EXPECT_EQ("SupplyNode", SupplyNodeName);
699-
EXPECT_EQ("ReturnNode", ReturnNodeName);
710+
EXPECT_EQ("SupplyNode6", SupplyNodeName);
711+
EXPECT_EQ("ReturnNode6", ReturnNodeName);
700712
}
701713

714+
state->dataLoopNodes->NodeID(1) = "SupplyNode7";
715+
state->dataLoopNodes->NodeID(2) = "ReturnNode7";
702716
zoneEquipType = DataZoneEquipment::ZoneEquipType::UnitHeater;
703717
state->dataUnitHeaters->UnitHeat.allocate(1);
704718
state->dataUnitHeaters->UnitHeat(EquipIndex).AirOutNode = 1;
705719
state->dataUnitHeaters->UnitHeat(EquipIndex).AirInNode = 2;
706720
check = CheckEquipName(*state, EquipName, SupplyNodeName, ReturnNodeName, EquipIndex, zoneEquipType);
707721
if (check) {
708-
EXPECT_EQ("SupplyNode", SupplyNodeName);
709-
EXPECT_EQ("ReturnNode", ReturnNodeName);
722+
EXPECT_EQ("SupplyNode7", SupplyNodeName);
723+
EXPECT_EQ("ReturnNode7", ReturnNodeName);
710724
}
711725

726+
state->dataLoopNodes->NodeID(1) = "SupplyNode8";
727+
state->dataLoopNodes->NodeID(2) = "ReturnNode8";
712728
zoneEquipType = DataZoneEquipment::ZoneEquipType::UnitVentilator;
713729
state->dataUnitVentilators->UnitVent.allocate(1);
714730
state->dataUnitVentilators->UnitVent(EquipIndex).AirOutNode = 1;
715731
state->dataUnitVentilators->UnitVent(EquipIndex).AirInNode = 2;
716732
check = CheckEquipName(*state, EquipName, SupplyNodeName, ReturnNodeName, EquipIndex, zoneEquipType);
717733
if (check) {
718-
EXPECT_EQ("SupplyNode", SupplyNodeName);
719-
EXPECT_EQ("ReturnNode", ReturnNodeName);
734+
EXPECT_EQ("SupplyNode8", SupplyNodeName);
735+
EXPECT_EQ("ReturnNode8", ReturnNodeName);
720736
}
721737

738+
state->dataLoopNodes->NodeID(1) = "SupplyNode9";
739+
state->dataLoopNodes->NodeID(2) = "ReturnNode9";
722740
zoneEquipType = DataZoneEquipment::ZoneEquipType::VentilatedSlab;
723741
state->dataVentilatedSlab->VentSlab.allocate(1);
724742
state->dataVentilatedSlab->VentSlab(EquipIndex).ZoneAirInNode = 1;
725743
state->dataVentilatedSlab->VentSlab(EquipIndex).ReturnAirNode = 2;
726744
check = CheckEquipName(*state, EquipName, SupplyNodeName, ReturnNodeName, EquipIndex, zoneEquipType);
727745
if (check) {
728-
EXPECT_EQ("SupplyNode", SupplyNodeName);
729-
EXPECT_EQ("ReturnNode", ReturnNodeName);
746+
EXPECT_EQ("SupplyNode9", SupplyNodeName);
747+
EXPECT_EQ("ReturnNode9", ReturnNodeName);
730748
}
731749

750+
state->dataLoopNodes->NodeID(1) = "SupplyNode10";
751+
state->dataLoopNodes->NodeID(2) = "ReturnNode10";
732752
zoneEquipType = DataZoneEquipment::ZoneEquipType::WindowAirConditioner;
733753
state->dataWindowAC->WindAC.allocate(1);
734754
state->dataWindowAC->WindAC(EquipIndex).AirOutNode = 1;
735755
state->dataWindowAC->WindAC(EquipIndex).AirInNode = 2;
736756
check = CheckEquipName(*state, EquipName, SupplyNodeName, ReturnNodeName, EquipIndex, zoneEquipType);
737757
if (check) {
738-
EXPECT_EQ("SupplyNode", SupplyNodeName);
739-
EXPECT_EQ("ReturnNode", ReturnNodeName);
758+
EXPECT_EQ("SupplyNode10", SupplyNodeName);
759+
EXPECT_EQ("ReturnNode10", ReturnNodeName);
740760
}
741761
}

0 commit comments

Comments
 (0)