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.

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

Latest OS-HPXML #1328

Draft
wants to merge 22 commits into
base: develop
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
3d35282
Merge commit '263e0dbf12c567e8a4e2109188fa05ce95af4bed' into latest-o…
joseph-robertson Dec 3, 2024
263e0db
Squashed 'resources/hpxml-measures/' changes from 5bad046428ef..09fb0…
joseph-robertson Dec 3, 2024
55c6339
Update resstockarguments readme and measure xml.
joseph-robertson Dec 3, 2024
5844bec
Latest results.
Dec 3, 2024
369e1fc
Merge branch 'develop' into latest-os-hpxml
joseph-robertson Dec 4, 2024
30293ca
Fix merge conflicts.
joseph-robertson Dec 4, 2024
004694a
Merge commit '44fe4caf713acca5de48bed8b32d7aee359331b2' into latest-o…
joseph-robertson Dec 17, 2024
44fe4ca
Squashed 'resources/hpxml-measures/' changes from 09fb00ce9e02..24445…
joseph-robertson Dec 17, 2024
7d32039
Update resstockarguments readme and measure xml.
joseph-robertson Dec 17, 2024
497abf7
Latest results.
Dec 17, 2024
57094e5
Squashed 'resources/hpxml-measures/' changes from 2444574cec6d..34fce…
joseph-robertson Dec 20, 2024
48b563e
Merge commit '57094e56c0639248c547d5fd2948484db19d6530' into latest-o…
joseph-robertson Dec 20, 2024
d6c79b9
Add measure.txt with md5hash to resstockarguments resources.
joseph-robertson Dec 20, 2024
028d627
Latest results.
Dec 21, 2024
4df100a
Merge commit '3c7c79c4fe36a75ceb00941823af039d1146b7ff' into latest-o…
joseph-robertson Jan 6, 2025
3c7c79c
Squashed 'resources/hpxml-measures/' changes from 34fce414bfd4..2efcd…
joseph-robertson Jan 6, 2025
e3fb0d7
Update measure xmls.
joseph-robertson Jan 6, 2025
09770cf
Merge branch 'develop' into latest-os-hpxml
joseph-robertson Jan 7, 2025
179c050
Latest results.
Jan 7, 2025
b7599c1
Merge branch 'develop' into latest-os-hpxml
joseph-robertson Jan 17, 2025
b40a51f
Squashed 'resources/hpxml-measures/' changes from 2efcd6b5b873..459ee…
joseph-robertson Jan 17, 2025
01733c4
Merge commit 'b40a51fe060531bb46d531d98b73880acbb1f8c3' into latest-o…
joseph-robertson Jan 17, 2025
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
420 changes: 210 additions & 210 deletions docs/read_the_docs/source/workflow_inputs/characteristics.rst

Large diffs are not rendered by default.

386 changes: 193 additions & 193 deletions measures/ResStockArguments/README.md

Large diffs are not rendered by default.

398 changes: 202 additions & 196 deletions measures/ResStockArguments/measure.xml

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions measures/ResStockArguments/resources/measure.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
357944431a5a88e46e2b12c30da3f703
22 changes: 2 additions & 20 deletions measures/UpgradeCosts/measure.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
<schema_version>3.1</schema_version>
<name>upgrade_costs</name>
<uid>ef51212c-acc4-48d7-9b29-cf2a5c6c4449</uid>
<version_id>bf069249-d884-4cfd-8579-3b5bc1ff55e5</version_id>
<version_modified>2024-11-08T15:53:04Z</version_modified>
<version_id>df9dcc1d-338f-4d7e-ace4-0c5debe2511c</version_id>
<version_modified>2025-01-06T19:50:14Z</version_modified>
<xml_checksum>B1F14CB4</xml_checksum>
<class_name>UpgradeCosts</class_name>
<display_name>Upgrade Costs</display_name>
Expand Down Expand Up @@ -239,24 +239,6 @@
<usage_type>test</usage_type>
<checksum>083B023F</checksum>
</file>
<file>
<filename>in.epw</filename>
<filetype>epw</filetype>
<usage_type>test</usage_type>
<checksum>E23378AA</checksum>
</file>
<file>
<filename>in.osm</filename>
<filetype>osm</filetype>
<usage_type>test</usage_type>
<checksum>92AA6A08</checksum>
</file>
<file>
<filename>in.xml</filename>
<filetype>xml</filetype>
<usage_type>test</usage_type>
<checksum>72608A61</checksum>
</file>
<file>
<filename>upgrade_costs_test.rb</filename>
<filetype>rb</filetype>
Expand Down
404 changes: 202 additions & 202 deletions resources/hpxml-measures/BuildResidentialHPXML/README.md

Large diffs are not rendered by default.

276 changes: 148 additions & 128 deletions resources/hpxml-measures/BuildResidentialHPXML/measure.rb

Large diffs are not rendered by default.

422 changes: 214 additions & 208 deletions resources/hpxml-measures/BuildResidentialHPXML/measure.xml

Large diffs are not rendered by default.

472 changes: 215 additions & 257 deletions resources/hpxml-measures/BuildResidentialHPXML/resources/geometry.rb

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
e8edd0fdf30035cab93a927df4f12ebb

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ def get_generator_inputs(hpxml_bldg, weather, args)
args[:column_names] = args[:schedules_column_names].split(',').map(&:strip) if !args[:schedules_column_names].nil?

if hpxml_bldg.building_occupancy.number_of_residents.nil?
args[:geometry_num_occupants] = Geometry.get_occupancy_default_num(nbeds: hpxml_bldg.building_construction.number_of_bedrooms)
args[:geometry_num_occupants] = Geometry.get_occupancy_default_num(hpxml_bldg.building_construction.number_of_bedrooms)
else
args[:geometry_num_occupants] = hpxml_bldg.building_occupancy.number_of_residents
end
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
<schema_version>3.1</schema_version>
<name>build_residential_schedule_file</name>
<uid>f770b2db-1a9f-4e99-99a7-7f3161a594b1</uid>
<version_id>fac68af6-8045-433e-8eca-df53c8274e61</version_id>
<version_modified>2024-09-29T23:07:27Z</version_modified>
<version_id>c5bb6758-f028-455a-a49d-25f4df40e500</version_id>
<version_modified>2025-01-02T23:31:30Z</version_modified>
<xml_checksum>03F02484</xml_checksum>
<class_name>BuildResidentialScheduleFile</class_name>
<display_name>Schedule File Builder</display_name>
Expand Down Expand Up @@ -133,7 +133,7 @@
<filename>measure.rb</filename>
<filetype>rb</filetype>
<usage_type>script</usage_type>
<checksum>655C4010</checksum>
<checksum>F7D77A2C</checksum>
</file>
<file>
<filename>README.md</filename>
Expand Down Expand Up @@ -229,7 +229,7 @@
<filename>schedules.rb</filename>
<filetype>rb</filetype>
<usage_type>resource</usage_type>
<checksum>F53FB2CB</checksum>
<checksum>F14B1337</checksum>
</file>
<file>
<filename>shower_cluster_size_probability.csv</filename>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ def create_stochastic_schedules(args:,
plugload_tv_monthly_multiplier = Schedule.validate_values(schedules_csv_data[SchedulesFile::Columns[:PlugLoadsTV].name]['PlugLoadsTVMonthlyMultipliers'], 12, 'monthly') # American Time Use Survey
ceiling_fan_weekday_sch = Schedule.validate_values(default_schedules_csv_data[SchedulesFile::Columns[:CeilingFan].name]['WeekdayScheduleFractions'], 24, 'weekday') # Table C.3(5) of ANSI/RESNET/ICC 301-2022 Addendum C
ceiling_fan_weekend_sch = Schedule.validate_values(default_schedules_csv_data[SchedulesFile::Columns[:CeilingFan].name]['WeekendScheduleFractions'], 24, 'weekend') # Table C.3(5) of ANSI/RESNET/ICC 301-2022 Addendum C
ceiling_fan_monthly_multiplier = Schedule.validate_values(Defaults.get_ceiling_fan_months(weather).join(', '), 12, 'monthly') # based on monthly average outdoor temperatures per ANSI/RESNET/ICC 301-2019
ceiling_fan_monthly_multiplier = Schedule.validate_values(Defaults.get_ceiling_fan_months(weather).join(', '), 12, 'monthly') # based on monthly average outdoor temperatures per ANSI/RESNET/ICC 301

sch = get_building_america_lighting_schedule(args[:time_zone_utc_offset], args[:latitude], args[:longitude], schedules_csv_data)
interior_lighting_schedule = []
Expand Down
17 changes: 17 additions & 0 deletions resources/hpxml-measures/Changelog.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,20 @@
## OpenStudio-HPXML v1.10.0

__New Features__

__Bugfixes__
- Fixes zero occupants specified for one unit in a whole MF building from being treated like zero occupants for every unit.
- Fixes using detailed schedules with higher resolution (e.g., 10-min data) than the simulation timestep (e.g., 60-min).
- Fixes possible heating/cooling spikes when using maximum power ratio detailed schedule for variable-speed HVAC systems.

## OpenStudio-HPXML v1.9.1

__New Features__
- Now can be used to obtain ACCA Manual J approval; see the [OpenStudio-HPXML documentation](https://openstudio-hpxml.readthedocs.io/en/latest/intro.html#capabilities).

__Bugfixes__
- Fixes Manual J design load calculations for radiant floors.

## OpenStudio-HPXML v1.9.0

__New Features__
Expand Down
18 changes: 2 additions & 16 deletions resources/hpxml-measures/HPXMLtoOpenStudio/measure.rb
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ def run(model, runner, user_arguments)
end

Version.check_openstudio_version()
Model.reset(model, runner)
Model.reset(runner, model)

args = runner.getArgumentValues(arguments(model), user_arguments)
set_file_paths(args)
Expand Down Expand Up @@ -327,7 +327,7 @@ def create_unit_model(hpxml, hpxml_bldg, runner, model, epw_path, weather, sched
# Conditioned space & setpoints
spaces = {} # Map of HPXML locations => OpenStudio Space objects
Geometry.create_or_get_space(model, spaces, HPXML::LocationConditionedSpace, hpxml_bldg)
hvac_days = HVAC.apply_setpoints(model, runner, weather, spaces, hpxml_bldg, hpxml.header, schedules_file)
hvac_days = HVAC.apply_setpoints(runner, model, weather, spaces, hpxml_bldg, hpxml.header, schedules_file)

# Geometry & Enclosure
Geometry.apply_roofs(runner, model, spaces, hpxml_bldg, hpxml.header)
Expand Down Expand Up @@ -407,20 +407,6 @@ def init(model, hpxml_bldg, hpxml_header)
if hpxml_header.apply_ashrae140_assumptions.nil?
hpxml_header.apply_ashrae140_assumptions = false
end

if not hpxml_bldg.building_occupancy.number_of_residents.nil?
# If zero occupants, ensure end uses of interest are zeroed out
if (hpxml_bldg.building_occupancy.number_of_residents == 0) && (not hpxml_header.apply_ashrae140_assumptions)
hpxml_header.unavailable_periods.add(column_name: 'Vacancy',
begin_month: hpxml_header.sim_begin_month,
begin_day: hpxml_header.sim_begin_day,
begin_hour: 0,
end_month: hpxml_header.sim_end_month,
end_day: hpxml_header.sim_end_day,
end_hour: 24,
natvent_availability: HPXML::ScheduleUnavailable)
end
end
end
end

Expand Down
Loading