diff --git a/src/model/CoilCoolingDX.cpp b/src/model/CoilCoolingDX.cpp index 52d5c3cb46e..a628f46580b 100644 --- a/src/model/CoilCoolingDX.cpp +++ b/src/model/CoilCoolingDX.cpp @@ -134,7 +134,7 @@ namespace model { std::vector result; // This is a ResourceObject, so it shouldn't really be a child except for OS App / IG - result.push_back(performanceObject()); + // result.push_back(performanceObject()); std::vector myAFNItems = getObject().getModelObjectSources(AirflowNetworkEquivalentDuct::iddObjectType()); diff --git a/src/model/CoilCoolingDXCurveFitOperatingMode.cpp b/src/model/CoilCoolingDXCurveFitOperatingMode.cpp index 82357b828cd..188fd553f66 100644 --- a/src/model/CoilCoolingDXCurveFitOperatingMode.cpp +++ b/src/model/CoilCoolingDXCurveFitOperatingMode.cpp @@ -85,8 +85,8 @@ namespace model { std::vector CoilCoolingDXCurveFitOperatingMode_Impl::children() const { // These are ResourceObjects, so they shouldn't really be children except for OS App / IG - std::vector result = subsetCastVector(speeds()); - + // std::vector result = subsetCastVector(speeds()); + std::vector result; return result; } diff --git a/src/model/CoilCoolingDXCurveFitPerformance.cpp b/src/model/CoilCoolingDXCurveFitPerformance.cpp index 3375b8de3ee..ba6cb1263e3 100644 --- a/src/model/CoilCoolingDXCurveFitPerformance.cpp +++ b/src/model/CoilCoolingDXCurveFitPerformance.cpp @@ -99,13 +99,13 @@ namespace model { std::vector result; // These are ResourceObjects, so they shouldn't really be children except for OS App / IG - result.push_back(baseOperatingMode()); - if (auto _mode = alternativeOperatingMode1()) { - result.push_back(_mode.get()); - } - if (auto _mode = alternativeOperatingMode2()) { - result.push_back(_mode.get()); - } + // result.push_back(baseOperatingMode()); + // if (auto _mode = alternativeOperatingMode1()) { + // result.push_back(_mode.get()); + // } + // if (auto _mode = alternativeOperatingMode2()) { + // result.push_back(_mode.get()); + // } return result; } diff --git a/src/model/test/CoilCoolingDX_GTest.cpp b/src/model/test/CoilCoolingDX_GTest.cpp index 02e72def85e..473b9975257 100644 --- a/src/model/test/CoilCoolingDX_GTest.cpp +++ b/src/model/test/CoilCoolingDX_GTest.cpp @@ -372,3 +372,29 @@ TEST_F(ModelFixture, CoilCoolingDX_cloneParent) { EXPECT_EQ(dx, unitary.coolingCoil().get()); EXPECT_NE(dx, unitaryClone.coolingCoil().get()); } + +TEST_F(ModelFixture, CoilCoolingDX_cloneOtherModel) { + Model model; + + CoilCoolingDXCurveFitOperatingMode operatingMode(model); + CoilCoolingDXCurveFitPerformance performance(model, operatingMode); + CoilCoolingDX dx(model, performance); + + EXPECT_EQ(performance, dx.performanceObject()); + EXPECT_EQ(1u, model.getConcreteModelObjects().size()); + EXPECT_EQ(1u, model.getConcreteModelObjects().size()); + EXPECT_EQ(1u, model.getConcreteModelObjects().size()); + + Model model2; + auto dxClone = dx.clone(model2).cast(); + EXPECT_EQ(1u, model.getConcreteModelObjects().size()); + EXPECT_EQ(1u, model.getConcreteModelObjects().size()); + EXPECT_EQ(1u, model.getConcreteModelObjects().size()); + + EXPECT_EQ(1u, model2.getConcreteModelObjects().size()); + EXPECT_EQ(1u, model2.getConcreteModelObjects().size()); + EXPECT_EQ(1u, model2.getConcreteModelObjects().size()); + + EXPECT_EQ(performance, dx.performanceObject()); + EXPECT_NE(performance, dxClone.performanceObject()); +}