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

148-ducts-in-multiple-locations #151

Merged
merged 3 commits into from
Dec 3, 2024
Merged

148-ducts-in-multiple-locations #151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
052ce64
fixing Ducts in multiple locations #148
mnblonsky Nov 12, 2024
cbc1c99
update changelog
mnblonsky Nov 13, 2024
9c0f0a4
adding links to changelog
mnblonsky Nov 13, 2024
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
10 changes: 6 additions & 4 deletions changelog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,14 @@
- added EV average SOC and unmet load metrics
- Updated PV model to use latitude/south for tilt/azimuth if no roof model exists
- Enabled .epw files with leap year data (we remove Feb 29, similar to Cambium)
- Added multi-speed HVAC parameters for ResStock 2024 dataset
- Updated with OS-HPXML v1.7 naming conventions (e.g., spa equipment, indoor zone)
- Fixed EV unmet load units
- Added multi-speed HVAC parameters for ResStock 2024 dataset [#128](https://github.com/NREL/OCHRE/issues/128)
- Updated with OS-HPXML v1.7 naming conventions (e.g., spa equipment, indoor
zone) #76
- Fixed EV unmet load units [#144](https://github.com/NREL/OCHRE/issues/144)
- Fixed garage interior ceiling connections
- Fixed issue with attic-garage boundaries (#149)
- Fixed issue with attic-garage boundaries [#96](https://github.com/NREL/OCHRE/issues/96)
- Fixed issue with adjacent doors (e.g., for multi-family units, hallways)
- Fixed issue with ducts in multiple locations [#148](https://github.com/NREL/OCHRE/issues/148)
- Allowed "Occupancy" adjustments in input arguments

### OCHRE v0.8.5-beta
Expand Down
6 changes: 4 additions & 2 deletions ochre/utils/hpxml.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -884,8 +884,10 @@ def parse_hvac(hvac_type, hvac_all):
distribution_type = distribution.get('DistributionSystemType', {})
air_distribution = distribution_type.get('AirDistribution', {})
duct_leakage = air_distribution.get('DuctLeakageMeasurement')
ducts = [d for d in air_distribution.get('Ducts', {}).values()
if parse_zone_name(d.get('DuctLocation')) not in ['Indoor', None]]
ducts = air_distribution.get('Ducts', [])
if isinstance(ducts, dict):
ducts = list(ducts.values())
ducts = [d for d in ducts if parse_zone_name(d.get("DuctLocation")) not in ["Indoor", None]]

if f'Annual{hvac_type}DistributionSystemEfficiency' in distribution:
# Note, ducts are assumed to be in ambient space, DSE losses aren't added to another zone
Expand Down