diff --git a/src/model/ZoneHVACEvaporativeCoolerUnit.cpp b/src/model/ZoneHVACEvaporativeCoolerUnit.cpp index 588f95c39d..097629289f 100644 --- a/src/model/ZoneHVACEvaporativeCoolerUnit.cpp +++ b/src/model/ZoneHVACEvaporativeCoolerUnit.cpp @@ -86,28 +86,6 @@ namespace model { return std::move(evaporativeCoolUnitClone); } - std::vector ZoneHVACEvaporativeCoolerUnit_Impl::remove() { - std::vector result; - - if (OptionalHVACComponent intermediate = optionalSupplyAirFan()) { - std::vector removedSupplyAirFans = intermediate->remove(); - result.insert(result.end(), removedSupplyAirFans.begin(), removedSupplyAirFans.end()); - } - if (OptionalHVACComponent intermediate = optionalFirstEvaporativeCooler()) { - std::vector removedFirstEvaporativeCoolers = intermediate->remove(); - result.insert(result.end(), removedFirstEvaporativeCoolers.begin(), removedFirstEvaporativeCoolers.end()); - } - if (OptionalHVACComponent intermediate = secondEvaporativeCooler()) { - std::vector removedSecondEvaporativeCoolers = intermediate->remove(); - result.insert(result.end(), removedSecondEvaporativeCoolers.begin(), removedSecondEvaporativeCoolers.end()); - } - - std::vector removedZoneHVACEvaporativeCoolerUnit = ZoneHVACComponent_Impl::remove(); - result.insert(result.end(), removedZoneHVACEvaporativeCoolerUnit.begin(), removedZoneHVACEvaporativeCoolerUnit.end()); - - return result; - } - const std::vector& ZoneHVACEvaporativeCoolerUnit_Impl::outputVariableNames() const { static std::vector result; if (result.empty()) { diff --git a/src/model/ZoneHVACEvaporativeCoolerUnit_Impl.hpp b/src/model/ZoneHVACEvaporativeCoolerUnit_Impl.hpp index f97b213240..d4c3392dc9 100644 --- a/src/model/ZoneHVACEvaporativeCoolerUnit_Impl.hpp +++ b/src/model/ZoneHVACEvaporativeCoolerUnit_Impl.hpp @@ -62,8 +62,6 @@ namespace model { virtual ModelObject clone(Model model) const override; - virtual std::vector remove() override; - virtual const std::vector& outputVariableNames() const override; virtual IddObjectType iddObjectType() const override; diff --git a/src/model/test/ZoneHVACEvaporativeCoolerUnit_GTest.cpp b/src/model/test/ZoneHVACEvaporativeCoolerUnit_GTest.cpp index 8c28b28245..d45d6d2b40 100644 --- a/src/model/test/ZoneHVACEvaporativeCoolerUnit_GTest.cpp +++ b/src/model/test/ZoneHVACEvaporativeCoolerUnit_GTest.cpp @@ -33,6 +33,8 @@ #include "../ZoneHVACEvaporativeCoolerUnit_Impl.hpp" #include "../Schedule.hpp" #include "../Schedule_Impl.hpp" +#include "../ScheduleConstant.hpp" +#include "../ScheduleConstant_Impl.hpp" #include "../FanComponentModel.hpp" #include "../FanComponentModel_Impl.hpp" #include "../EvaporativeCoolerDirectResearchSpecial.hpp" @@ -204,9 +206,9 @@ TEST_F(ModelFixture, ZoneHVACEvaporativeCoolerUnit_clone) { EXPECT_NE(firstEvaporativeCooler.handle(), zonehvacClone.firstEvaporativeCooler().handle()); ASSERT_TRUE(zonehvacClone.secondEvaporativeCooler()); EXPECT_NE(secondEvaporativeCooler.handle(), zonehvacClone.secondEvaporativeCooler().get().handle()); - EXPECT_EQ(1u, m.getConcreteModelObjects().size()); - EXPECT_EQ(1u, m.getConcreteModelObjects().size()); - EXPECT_EQ(1u, m.getConcreteModelObjects().size()); + EXPECT_EQ(2u, m.getConcreteModelObjects().size()); + EXPECT_EQ(2u, m.getConcreteModelObjects().size()); + EXPECT_EQ(2u, m.getConcreteModelObjects().size()); } } @@ -215,9 +217,18 @@ TEST_F(ModelFixture, ZoneHVACEvaporativeCoolerUnit_remove) { ZoneHVACEvaporativeCoolerUnit zonehvac(m); auto size = m.modelObjects().size(); + EXPECT_EQ(1, m.getConcreteModelObjects().size()); + EXPECT_EQ(1, m.getConcreteModelObjects().size()); + EXPECT_EQ(1, m.getConcreteModelObjects().size()); + EXPECT_EQ(0, m.getConcreteModelObjects().size()); + EXPECT_EQ(1, m.getConcreteModelObjects().size()); EXPECT_FALSE(zonehvac.remove().empty()); EXPECT_EQ(size - 1, m.modelObjects().size()); EXPECT_EQ(0, m.getConcreteModelObjects().size()); + EXPECT_EQ(0, m.getConcreteModelObjects().size()); + EXPECT_EQ(0, m.getConcreteModelObjects().size()); + EXPECT_EQ(0, m.getConcreteModelObjects().size()); + EXPECT_EQ(1, m.getConcreteModelObjects().size()); } TEST_F(ModelFixture, ZoneHVACEvaporativeCoolerUnit_addToNode) { @@ -238,8 +249,8 @@ TEST_F(ModelFixture, ZoneHVACEvaporativeCoolerUnit_addToNode) { PlantLoop plantLoop(m); supplyOutletNode = plantLoop.supplyOutletNode(); - EXPECT_TRUE(zonehvac.addToNode(supplyOutletNode)); - EXPECT_EQ(7, plantLoop.supplyComponents().size()); + EXPECT_FALSE(zonehvac.addToNode(supplyOutletNode)); + EXPECT_EQ(5, plantLoop.supplyComponents().size()); Node demandOutletNode = plantLoop.demandOutletNode(); EXPECT_FALSE(zonehvac.addToNode(demandOutletNode)); @@ -248,6 +259,6 @@ TEST_F(ModelFixture, ZoneHVACEvaporativeCoolerUnit_addToNode) { auto zonehvacClone = zonehvac.clone(m).cast(); supplyOutletNode = plantLoop.supplyOutletNode(); - EXPECT_TRUE(zonehvacClone.addToNode(supplyOutletNode)); - EXPECT_EQ(9, plantLoop.supplyComponents().size()); + EXPECT_FALSE(zonehvacClone.addToNode(supplyOutletNode)); + EXPECT_EQ(5, plantLoop.supplyComponents().size()); }