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 #1240

Merged
merged 20 commits into from
May 17, 2024
Merged

Latest OS-HPXML #1240

merged 20 commits into from
May 17, 2024

Conversation

joseph-robertson
Copy link
Contributor

@joseph-robertson joseph-robertson commented May 9, 2024

Pull Request Description

Pulls in:

Checked means that something in resstock was changed or updated as a result of pulling in.

Additionally:

  • remove FIXME from UpgradeCosts measure
  • clean up test_analysis_tools.rb file
  • add Insulation Ceiling|R-49 apply logic to sample upgrade yml files
  • fix typo in ResStockArguments measure

Checklist

Not all may apply:

  • Tests (and test files) have been updated
  • Documentation has been updated
  • Changelog has been updated
  • openstudio tasks.rb update_measures has been run
  • No unexpected regression test changes on CI (checked comparison artifacts)

c38c7df48b Merge pull request #1215 from NREL/comp_load_alternative
81ddf8cb4e Latest results.
4104001210 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into comp_load_alternative
a57972291b Merge pull request #1576 from NREL/replace_ec_adj_ems
1969ce8517 Latest results.
ccde2e587d Fix tests.
b81ff3f034 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into replace_ec_adj_ems
fb3b34ad70 Merge pull request #1630 from NREL/os380
7a59fd27a8 Handle negative elevations.
f056f1e72e Latest results.
2d551932ac Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into comp_load_alternative
cd52b954e0 Remove unused fallback when no HVAC system.
1c89cb2466 Latest results.
4ce3aedb69 Bugfixes.
e08552664d Bugfix and simplify code.
883fa861f5 Incorporate HVAC seasons into logic.
84cfc8160c Fix changelog merge.
d962fcc9b5 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into comp_load_alternative
58c87aaa94 Minor tweaks for completeness (parasitics, HPWH fan, etc.).
73cdf01776 Latest results.
e9ebe90521 Update test values.
de71ec5a87 Merge branch 'os380' of https://github.com/NREL/OpenStudio-HPXML into replace_ec_adj_ems
7a575e98bc Merge update [ci skip]
44c68dd49d Merge branch 'os380' of https://github.com/NREL/OpenStudio-HPXML into replace_ec_adj_ems
3c59cdb742 Replaces the ECadj EMS program with an adjustment to the efficiency of the water heater objects.
f03e08dfe7 Latest results.
3f54ba3b8c Merge bugfix.
050d1e35b6 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into comp_load_alternative
b46426836c Merge branch 'comp_load_alternative' of https://github.com/NREL/OpenStudio-HPXML into comp_load_alternative
0186c3358a update changelog
bac00ce687 update measures
087727a3a5 Latest results.
ba86b038e3 Merge remote-tracking branch 'origin/master' into comp_load_alternative
fb5aaac13f Latest results.
a62a99ba88 always assign component loads to cooling when whf is on
2d3627e785 revert inadvertent delete
6eeb1fd00f drop duplicate code added in merge
ddb60e0ae7 Merge remote-tracking branch 'origin/master' into comp_load_alternative
76405f0926 Latest results.
a2c80b50ff break out lighting from internal gains component loads
aef3c5ae41 break out window component loads into conduction and solar
c1977ecce3 Merge remote-tracking branch 'origin/master' into comp_load_alternative
4ef38d6207 Revert "enable cooling setpoints to be set without cooling system"
d27a5812a2 Revert "allow heating setpoint inputs for homes with no heat load served"
ce5d5d3204 Latest results.
f24c88b235 Merge remote-tracking branch 'origin/master' into comp_load_alternative
66d1120985 Latest results.
5ea2e808bd Merge remote-tracking branch 'origin/fix_tsp_input' into comp_load_alternative
152db02c1c Merge remote-tracking branch 'origin/master' into fix_tsp_input
a0dae6e92b Merge remote-tracking branch 'origin/master' into comp_load_alternative
59eeb0c274 Merge remote-tracking branch 'origin/master' into fix_tsp_input
d75229c54c allow heating setpoint inputs for homes with no heat load served
8f57c1a302 enable cooling setpoints to be set without cooling system
e3784e9e6f Latest results.
9e0db139e0 Comment out asserts for now.
10a66db83a Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into comp_load_alternative
fc6d53ad99 Handle natural ventilation.
4b96887c32 Remove old comment [ci skip]
38f672b24f Alternative approach to component loads for hours where there is no heating/cooling load.

git-subtree-dir: resources/hpxml-measures
git-subtree-split: c38c7df48b0d10fe3cb299b976dd9fda89f12554
@joseph-robertson joseph-robertson added this to the ResStock v3.3.0 milestone May 9, 2024
@joseph-robertson joseph-robertson self-assigned this May 9, 2024
96448f19cc Merge pull request #1693 from NREL/sfa_mf_default_shielding
e9cb7f73a7 Latest results.
b04838a6d5 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into sfa_mf_default_shielding
99c70a29ae Merge pull request #1689 from NREL/geothermal_loop_outputs
10c2830349 Merge pull request #1578 from NREL/room-by-room-sizing
6061a1325c Latest results.
588065613b Close enough [ci skip]
d08ef30c09 Merge branch 'room-by-room-sizing' of https://github.com/NREL/OpenStudio-HPXML into geothermal_loop_outputs
32f5187507 Merge pull request #1705 from NREL/zone_design_loads
1206d19995 Merge pull request #1713 from NREL/hpxml_subsurface_attrs
14703509e9 Merge branch 'zone_design_loads' of https://github.com/NREL/OpenStudio-HPXML into hpxml_subsurface_attrs
90bddbf5cb I like this better.
a7798ecf90 Address review comments.
c00e1b7802 Oops, missed these two.
c70466fbe3 Merge branch 'zone_design_loads' of https://github.com/NREL/OpenStudio-HPXML into hpxml_subsurface_attrs
c54e7d9070 Latest results.
a2d89a293c Bugfix.
9d3237a3f3 Rename attributes to be more consistent w/ HPXML. Minor refactor. No diffs expected.
3f3c2a8910 Add a warning if a skylight is not connected to conditioned space. Fix house045 skylight.
161f2efead minor cleanup for window, no diff expected
c4d0228d1f Latest results.
21cb116165 Fixed duct load apportioning.
dfbeb5f031 Merge branch 'zone_design_loads' of https://github.com/NREL/OpenStudio-HPXML into zone_design_loads
0b3df9bbf8 Revert change to WAR; should be gross wall area, not net wall area. Minor cleanup.
3f446f8364 Latest results.
c2de286ec7 Add sample file and unit tests. Fix zone AED curves.
97dec98a72 Merge branch 'room-by-room-sizing' of https://github.com/NREL/OpenStudio-HPXML into zone_design_loads
08a26bf133 Remove obsolete files
fad7a6b76a Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into room-by-room-sizing
4a2edc0760 Merge pull request #1710 from NREL/Sashadf1-patch-1
6461a2669b Update usage_instructions.rst
371eb7d70d Latest results.
e17fa5c478 Merge branch 'room-by-room-sizing' of https://github.com/NREL/OpenStudio-HPXML into zone_design_loads
308715bb27 Merge branch 'room-by-room-sizing' of https://github.com/NREL/OpenStudio-HPXML into room-by-room-sizing
a73e3a7541 revert cobb east wall exterior adjacent to based on manual J description
6ba7944e40 Merge branch 'room-by-room-sizing' of https://github.com/NREL/OpenStudio-HPXML into zone_design_loads
4eef071cbb Bugfixes.
ade22b65d4 Latest results.
87fd89f50f Oops.
6dcbe10569 Fix HP supplemental load served when the HP's fraction heat load served is less than 1.
192034b7cd Merge branch 'zone_design_loads' of https://github.com/NREL/OpenStudio-HPXML into zone_design_loads
8a05f4b990 Merge branch 'room-by-room-sizing' of https://github.com/NREL/OpenStudio-HPXML into zone_design_loads
520cb58254 Latest results.
ba4236a4c0 one more update from pulling master
b5c4c2c111 rim joist
148bc90a7a Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into room-by-room-sizing
bcf03777c4 fix bugs in merging
6c6039004e Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into room-by-room-sizing
28f4ecff66 allow garage and non freezing space as exposed?
0013816d85 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into room-by-room-sizing
048d93b6c0 Update changelog [ci skip]
897cef4a3c Latest results.
4a2e930c8e Address regressions for e.g. partial HVAC systems.
e2438958da Update error checking and add validation tests.
983f695be8 Document AttachedToSpace/AttachedToZone.
b2fd3f5c9c Update docs, etc.
a7e7bfc092 Small changes. [ci skip]
fcaedcecf4 Latest results.
52294e640c Need to exclude HVAC Zone Design Load too.
91f97a355a Fix CI failure.
cca9076a5d More robust logic for AttachedToSpace/AttachedToZone elements. Start using Skylight/AttachedToFloor elements for skylights with shafts.
b8c9f8ab99 Simplify code. Address buildings without cooling/heating.
b4f98d1510 Merge branch 'zone_design_loads' of https://github.com/NREL/OpenStudio-HPXML into zone_design_loads
587fdea494 Update outputs; design loads now created on each in.xml Zone element rather than the HVACPlant element. Huge refactor & cleanup of variable names. Address duct loads for dual-fuel HPs. Add error-checking for HVAC systems attached to unconditioned zones.
ac4500a8a0 Latest results.
b62a3bdeb1 Another pass.
1a6e423036 Another bugfix.
0b26d0d005 Bugfix.
af06dc6c1f Calculate block design loads at the HPXML Zone level. If no HPXML Zones are present, the entire building is treated as a single zone.
e434cf4c79 Initial progress.
63a020b647 Latest results.
203b71ad70 changed the unit test sizing results (newly added by pulling master)
d28b8e5691 fix unit tests
e523c5db8a update hpxmls
c10d13d824 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into room-by-room-sizing
245bc51978 simplify EPvalidator.xml
3cf445b747 update measures
53cebc6f04 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into room-by-room-sizing
27526d30dd add errorchecking for attachedtozone, small cleanup and refactor for spaces
3bdfb4f10d Bugfix/cleanup. Add more tests.
897f4cfebf Merge branch 'room-by-room-sizing' of https://github.com/NREL/OpenStudio-HPXML into room-by-room-sizing
60c930afb6 proposed space duct load
9651eda1d8 Latest results.
4504ffc0fb add attached to zone input
2e10f5ca43 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into room-by-room-sizing
676137a763 Latest results.
6b5cb42f43 Update tol, provide debug output when hitting 10x test failure.
7c4369ffff Updates default `ShieldingofHome` to be "well-shielded" for single-family attached and multifamily dwelling units. Some minor code refactor.
345f28e8a5 Light code refactoring/simplification.
a4d42e99f4 fixed last hour aed curve for peak procedure
b177447f54 rounding
1a7f210a02 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into room-by-room-sizing
1f267ca496 added aed curve unit tests
0ad3257058 Latest results.
00a2ac4473 Fix test, update output fields.
cedb0e5ba5 Update tests.
217f59ea15 Add test and update Changelog.md.
e06c953b97 Adds geothermal loop outputs to the annual results output file. And some other minor cleanup.
0a4a6f9341 Add clarification for bay/garden windows. [ci skip]
15c641d9d4 Handle hydronic radiant floors too.
23fcff86bd Latest results.
cd79e173e2 Update test.
7899313026 Handle whole MF buildings (with multiple HPXML Building elements) in the results_design_load_details output file.
65380ef1ea Fix/update tests.
c270589a77 Fix basement shortest side calculation. Improve handling of window ISC vs ESC. Add number of occupants input for spaces. Move space internal loads and occupant defaulting to hpxml_defaults.rb. Add block/space totals to Form J1 output file.
b6c5b419d4 remove unconditioned spaces and surface references
727a1ddb38 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into room-by-room-sizing
9e91f97e6c some changes to Smith configuration for foundation
2a623798d0 Update HPXMLs
250f976047 Run update_measures
0ef451aaca Fix missing foundation walls in results_design_load_details.csv.
391d0c8988 internal gains for other template homes
ec2c1438f8 Merge branch 'room-by-room-sizing' of https://github.com/NREL/OpenStudio-HPXML into room-by-room-sizing
2dc012c538 add room load unit tests for other template homes, still debugging
a466ac48c1 Latest results.
4d715e51e9 Latest results.
3bb03f6cfe fix north wall diff
150c30cd22 Merge branch 'room-by-room-sizing' of https://github.com/NREL/OpenStudio-HPXML into room-by-room-sizing
15bac5d097 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into room-by-room-sizing
05f3076bf2 Latest results.
90e3510a80 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into room-by-room-sizing
f61f7d5187 Fix tests.
44d9efd86b Write the HVAC design loads/capacities into the annual results CSV even when --skip-simulation is used.
29ddea28d5 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into room-by-room-sizing
ef990d9842 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into room-by-room-sizing
49e1775231 revert roof assignments
0c2ed0833c Bell_Residence.xml
b816f4f536 cobb
df7f2fbe93 fixed slab ExposedPerimeter in Smith and added room by room specs in Walker_Residence.xml
3a0775dab3 update hpxmls
e692fdb93c Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into room-by-room-sizing
a6aa2f332a Merge branch 'room-by-room-sizing' of https://github.com/NREL/OpenStudio-HPXML into room-by-room-sizing
a50037b934 Smith_Residence with Room by room specification
8ff3f7043d Latest results.
e785bd363e Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into room-by-room-sizing
336c691544 Allow filename and output format (csv vs json) for the detailed design load output file. Added documentation and test.
da58894d68 Merge branch 'room-by-room-sizing' of https://github.com/NREL/OpenStudio-HPXML into room-by-room-sizing
e9c6175e9b Light refactor to avoid using a global variable for space design loads.
4d2e45063b Latest results.
d9a00d2b6a Fix CI test.
60957144a8 Relax HPXML constraints so that it can have any number of conditioned/unconditioned zones, spaces, and attached surfaces. First stab at documentation. Added a couple sample files. Renamed "AED excursion"/"peak load" fenestration load procedure choices to "standard"/"peak".
83433b587b relax further
0fab55d610 remove delta check because epsilon looks sufficient for room by room calculation result checks Add some notes to justify diffs
68f442cd12 Some refactoring to clarify wall groups. No diffs expected.
46be2b86d3 relative error tests added, excluding two known items.
63d962251d add long residence unit test, fix typo
48c3b14fca added unit test for user provided room by room sizing inputs
08544b0cc1 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into room-by-room-sizing
444a31e340 bugfixes
1c2b6b7455 Merge branch 'room-by-room-sizing' of https://github.com/NREL/OpenStudio-HPXML into room-by-room-sizing
ee4ad79754 fenestration load procedure first cut
2108471239 Latest results.
d9eafbacfd Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into room-by-room-sizing
b78f42577c Latest results.
4805d64557 Update Changelog.md [ci skip]
3bedb23efb Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into room-by-room-sizing
219c7f7fec Merge pull request #1632 from NREL/mj8_reporting
8a1f98a93c Latest results.
7583d953d3 Disaggregate infiltration and ventilation design loads.
51611505c2 Disaggregate AED excursion from windows cooling sensible design load.
5f55f1d3d3 Add AED curve outputs.
ee1d073204 Merge branch 'room-by-room-sizing' of https://github.com/NREL/OpenStudio-HPXML into mj8_reporting
a0c1dfe0f7 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into room-by-room-sizing
3e35f32f7f update measures
0a71bcc3cd this should be the right fix for hpxml load reporting
8e19e1070e Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into room-by-room-sizing
de52e18b0e Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into room-by-room-sizing
8461928bf1 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into room-by-room-sizing
a2e7a34afb fix hpxml file load reporting
ee2d8d44ab Apply automatic formatting to ACCA example HPXMLs.
d10d49baa7 bugfix
39bef5ad81 windows + internal gains
4be082ae73 Latest results.
34d5991a54 Fix merge.
bfd0dc9e60 Bugfix for walls.
415a1f6136 Merge branch 'room-by-room-sizing' of https://github.com/NREL/OpenStudio-HPXML into mj8_reporting
f123313747 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into room-by-room-sizing
79766f7f68 Merge branch 'room-by-room-sizing' of https://github.com/NREL/OpenStudio-HPXML into mj8_reporting
066fc6ffd0 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into room-by-room-sizing
c88079b54c Update comments.
389a1a5987 First pass.
4a4ee41771 update measures
7a785befaa added validation tests, cleanups, added war and infiltration calculations
bc656b7db2 remove print statement
b6c23a6bdc doors
ef3ffb08dc a few conflicts
6c53c7e4ff Merge branch 'misc_mj8' of https://github.com/NREL/OpenStudio-HPXML into room-by-room-sizing
5809c67cc3 Merge branch 'room-by-room-sizing' of https://github.com/NREL/OpenStudio-HPXML into room-by-room-sizing
e4858ef8a3 First pass on CSV/HPXML outputs for room design loads.
2d1736a15a Latest results.
4b0b54054a Merge branch 'misc_mj8' of https://github.com/NREL/OpenStudio-HPXML into room-by-room-sizing
c12ef3d2c6 sizing, roof and wall first cut
137cef70d7 hpxml class structure for zone, space and space idrefs
1e27effe90 Merge branch 'misc_mj8' of https://github.com/NREL/OpenStudio-HPXML into room-by-room-sizing
29e3aaeec5 Add basic EPvalidator rules
013ea16af7 changed space to be named by id, removed window double specification
5e2de8c41b change attachedtospace to be idref format
8fd79894a4 bugfix for long residence window specification, added test file for room-by-room calculations with surfaces and spaces

git-subtree-dir: resources/hpxml-measures
git-subtree-split: 96448f19cc8057405311330898fa0a610c50574d
47507e4531 Merge pull request #1716 from NREL/os380rc3
a1fca5c03a Enable Windows
38840bc0ea Bump to rc3

git-subtree-dir: resources/hpxml-measures
git-subtree-split: 47507e45313d13986b2b802d1902838147253e50
…1d4e2

53ba621d4e2 Merge pull request #1717 from NREL/revert_replace_ec_adj_ems
21dcbd48226 Latest results.
93137933109 Revert NREL/OpenStudio-HPXML#1576

git-subtree-dir: resources/hpxml-measures
git-subtree-split: 53ba621d4e2b598f38023a40b9fd9769f66a0e41
@joseph-robertson joseph-robertson marked this pull request as ready for review May 16, 2024 17:42
@joseph-robertson joseph-robertson merged commit ecd3e01 into develop May 17, 2024
7 checks passed
@joseph-robertson joseph-robertson deleted the latest-os-hpxml branch May 17, 2024 02:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant