Skip to content

Commit

Permalink
The real issue is that we define resource objects as children
Browse files Browse the repository at this point in the history
  • Loading branch information
jmarrec committed Apr 14, 2022
1 parent e3de2bd commit 133cdae
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion src/model/CoilCoolingDX.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ namespace model {
std::vector<ModelObject> 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<AirflowNetworkEquivalentDuct> myAFNItems =
getObject<ModelObject>().getModelObjectSources<AirflowNetworkEquivalentDuct>(AirflowNetworkEquivalentDuct::iddObjectType());
Expand Down
4 changes: 2 additions & 2 deletions src/model/CoilCoolingDXCurveFitOperatingMode.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,8 @@ namespace model {

std::vector<ModelObject> CoilCoolingDXCurveFitOperatingMode_Impl::children() const {
// These are ResourceObjects, so they shouldn't really be children except for OS App / IG
std::vector<ModelObject> result = subsetCastVector<ModelObject>(speeds());

// std::vector<ModelObject> result = subsetCastVector<ModelObject>(speeds());
std::vector<ModelObject> result;
return result;
}

Expand Down
14 changes: 7 additions & 7 deletions src/model/CoilCoolingDXCurveFitPerformance.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -98,13 +98,13 @@ namespace model {
std::vector<ModelObject> 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;
}
Expand Down

0 comments on commit 133cdae

Please sign in to comment.