Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix #4869 - Handle AirToAirComponents (ERVs) when cloning AirLoopHVACOutdoorAirSystem #4872

Merged
merged 7 commits into from
Jun 29, 2023
Merged

Fix #4869 - Handle AirToAirComponents (ERVs) when cloning AirLoopHVACOutdoorAirSystem #4872

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a12c319
#4869 - Add test for AirLoopHVACOutdoorAirSystem: general (missing) +…
jmarrec May 2, 2023
fd8ffa7
Add a clone test for AirLoopHVAC with OutdoorAirSystem having an ERV too
jmarrec May 2, 2023
4bcbcf3
Make an even more complicated test with two ERVs
jmarrec May 2, 2023
9fa7495
Modernize AirLoopHVACOutdoorAirSystem + pass IddObjectType in compone…
jmarrec Apr 27, 2023
159768d
Fix #4869 - Handle AirToAirComponents (ERVs) when cloning AirLoopHVAC…
jmarrec May 2, 2023
2d7edbf
Defer getting a few things
jmarrec May 2, 2023
4491c50
Loop: concat helper + erase_remove_if + missing includes
jmarrec May 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions src/model/AirLoopHVAC.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,9 +263,7 @@ namespace model {
ModelObjectVector modelObjects;
modelObjects = supplyComponents(openstudio::IddObjectType::OS_AirLoopHVAC_OutdoorAirSystem);
if (modelObjects.size() == 1) {
if (OptionalAirLoopHVACOutdoorAirSystem oaSystem = modelObjects.front().optionalCast<AirLoopHVACOutdoorAirSystem>()) {
result = oaSystem;
}
return modelObjects.front().optionalCast<AirLoopHVACOutdoorAirSystem>();
}

return result;
Expand Down Expand Up @@ -900,9 +898,9 @@ namespace model {
return {demandComps.begin(), end};
}

std::vector<ModelObject> AirLoopHVAC_Impl::oaComponents(openstudio::IddObjectType /*type*/) const {
std::vector<ModelObject> AirLoopHVAC_Impl::oaComponents(openstudio::IddObjectType type) const {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems like ignoring type argument might have been a bug in its own right.

if (airLoopHVACOutdoorAirSystem()) {
return airLoopHVACOutdoorAirSystem()->components();
return airLoopHVACOutdoorAirSystem()->components(type);
} else {
return {};
}
Expand Down
Loading