Skip to content

Conversation

@joseph-robertson
Copy link
Contributor

@joseph-robertson joseph-robertson commented Nov 5, 2025

Pull Request Description

Keep ResStock up-to-date w/the master branch of OpenStudio-HPXML.

Related Pull Requests

Pulls in:

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

Related Pull Requests

[related PRs from different repositories]

Related Issues

[What issue(s) is the PR addressing]

Checklist

Required:

Optional (not all items may apply):

…898924b33

6934898924b33 More progress [ci skip]
4b35aee67831c Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os311
573a64ede3205 Merge pull request #2092 from NREL/gshp_sizing_error
19c1c9ddb2165 Minor cleanup. [ci skip]
a451b1832a5eb Merge branch 'gshp_sizing_error' of https://github.com/NREL/OpenStudio-HPXML into gshp_sizing_error
107de13bd8ec5 Update test.
3ed31906dba47 Latest results.
c44d74678e045 Convert var to snake_case
c98cf463e5536 Fixes possible ground-source heat pump sizing error if the heating or cooling design temperature differences are zero.
8724df25d2c85 Merge pull request #2086 from NREL/hpwh_adjustment_confined_space
f14b342567b92 Minor improvement to schematron
f4424e21dfce2 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hpwh_adjustment_confined_space
34535d1f3d069 Merge pull request #2091 from NREL/panel-outputs
fcca4eb0026d1 Revert zone load adjustment.
f63523cb42ce3 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hpwh_adjustment_confined_space
f5d6b8311fdc2 Move method for returning number of occupied spaces to hpxml class.
a70261a4a20c0 Temporary workaround
fd149fd54576f Merge branch 'master' into panel-outputs
3d0a1971eebfa Skip warnings for now
2f4da2f51f896 Latest results.
efd0a40755a42 bugfix
6e92e95718a4b add regression for load fractions
4d816c79e9e6d Merge branch 'hpwh_adjustment_confined_space' of https://github.com/NREL/OpenStudio-HPXML into hpwh_adjustment_confined_space
fd7ca987b0855 address comments
dd9610eb7a06f Temporarily ignore this warning.
e56582f109d81 Update tests after headroom and total changes.
67eb965475e60 Move headroom and total from Outputs to main schema.
c86ed444ddc72 Minor updates to docs/schematron.
3c018f4e205f8 Merge branch 'hpwh_adjustment_confined_space' of https://github.com/NREL/OpenStudio-HPXML into hpwh_adjustment_confined_space
247539f341bf9 address comments, rename inputs, docs, etc.
a7c4e39d0963d Revert this part too [ci skip]
de0cce16c03c5 Not worth it, reverting some things [ci skip]
66efbcea46cbf Another fix
115700d0f01dc Fix yaml
1684ccc791a56 Bump OS version & ubuntu version.
5141bcd2f2a2c Latest results.
7a6951602a788 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hpwh_adjustment_confined_space
9e0a49dae5940 not to adjust capacities; docs, changelog, warnings.
798709532be5d Latest results.
f545ae21b1d33 Add boolean inputs, error-checking, unit tests, etc.
2bcb652b680ab Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hpwh_adjustment_confined_space
31f529e5f8573 Latest results.
85712a6d9ff44 first cut adding adjustment

git-subtree-dir: resources/hpxml-measures
git-subtree-split: 6934898924b335063700646660ed923e4d777960
@joseph-robertson joseph-robertson self-assigned this Nov 5, 2025
@shorowit shorowit linked an issue Nov 20, 2025 that may be closed by this pull request
joseph-robertson and others added 11 commits November 20, 2025 15:41
… header but the wrong number of Extreme fields.
…7ea349a63

75947ea349a63 Merge pull request #1983 from NREL/mains_temps
d6792c31a3d44 Merge branch 'mains_temps' of https://github.com/NREL/OpenStudio-HPXML into mains_temps
002d1d9675137 Update tests. (Unrelated: Remove unused battery lifetime code.)
1742cf62e44d3 Latest results.
0d5fc7c57b9bc Merge branch 'os311' of https://github.com/NREL/OpenStudio-HPXML into mains_temps
1dec9e5ffa71c No longer need this code
5f7f6592695d9 Merge pull request #2094 from NREL/os311_fixmes
6bb52779ff241 Latest results.
02099e80f375e Update comment
1aac02b96d9ba Merge branch 'os311' of https://github.com/NREL/OpenStudio-HPXML into mains_temps
1324a35451f1b update xmls
6774fdf5c9007 Merge branch 'os311' of https://github.com/NREL/OpenStudio-HPXML into os311_fixmes
54d47281a9383 Latest results.
bfbc364491f09 Update tests
b9bba0362c3b3 Shouldn't need this exception anymore.
31fe289b72a49 Try new docker container on CI
144790b7269c3 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os311
167022895880f Relax tol a bit [ci skip]
c702f0001bf91 Revert FIXMEs due to OpenStudio 3.11 updates [ci skip]
862c702fe00dc Merge pull request #2093 from NREL/change_zerh_to_denh
4a5249019fa5c Revert Changelog.md [ci skip]
bd1b5b0991771 Update changelog
c0dd9e29efa97 run update_measures
4b90e8b2eb385 Rename ZERHCalculation to DENHCalculation in HPXML class
85e4a966a4947 First pass on using the E+ built-in correlation for mains temperature. Will need NREL/EnergyPlus#11037 for DWHR systems.

git-subtree-dir: resources/hpxml-measures
git-subtree-split: 75947ea349a63b60dfafc8f9bdfb03a8e57d6a70
@joseph-robertson joseph-robertson changed the base branch from develop to refactor-applyupgrade-posthpxml November 24, 2025 17:39
joseph-robertson and others added 7 commits November 24, 2025 11:43
…9406f48bb

30559406f48bb A little cleanup
43b8c29434c26 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os311
a2093af4d788f Latest results.
d96c61f257de5 Update HPXML
cf5c3f81eca59 Fix CI?
59c86567274eb Merge pull request #2099 from NREL/option_cleanup
6c8ae2b4e02a0 Merge branch 'option_cleanup' of https://github.com/NREL/OpenStudio-HPXML into os311
93968a868a05f Remove InfiltrationVolume too.
f713af64e72b9 Rename options for consistency [ci skip]
d1b4d4f9e0f0a Latest results.
83c62db530454 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into option_cleanup
18eb1c40b13b8 Apply same logic from walls to rim joists.
3a5ba89943109 A few tweaks.
973b96204b5d0 Better description of the source of the humidity capacity multiplier.
5959dd85034f6 Latest results.
4d9bdbb8a8a85 Add carpet to MF unit sample files.
8b864c1e7fb8a Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into option_cleanup
0690c06d3a996 Merge pull request #2102 from NREL/unit_test_validation
f1c6d62e56667 Merge pull request #2101 from NREL/panel-spaces-fix
f3458b64de186 Minor updates to docs [ci skip]
b3602cd239f38 Set rated total spaces as a defaulted value [ci skip]
f20e3ae2b9e5a Update another panel test after pulling in defaulted HPXML validation.
d02e92cef4ca0 Update panel tests after pulling in defaulted HPXML validation.
6ffaefb412c4d Merge branch 'unit_test_validation' into panel-spaces-fix
b01fabd9f2a31 Revert this change.
2201a0f5b3c21 Fix test_defaults.rb
a25a7ba32b163 Latest results.
579bd6c86d478 Remove Breaker Spaces note altogether. [ci skip]
05fecf9748bc2 Validate the `in.xml` files created during unit tests.
624d2e7e2379f Update workflow outputs docs.
ebcb5061c9c08 Update panel and validation tests.
dc94dcaa955b5 Check that HeadroomSpaces is not negative.
f82ee871ac2bd Found some more things to clean up.
439c765f571c9 Update measure
2f96a75948a9e Merge branch 'option_cleanup' of https://github.com/NREL/OpenStudio-HPXML into option_cleanup
d299a143b4713 Some more cleanup.
5a4d287d28882 Latest results.
864ef82f38002 Add carpet input to BuildResidentialHPXML measure.
bb4449976fcce Update a couple tests; revert roof color change in base.xml.
a39cabc6ec49b A bit more cleanup.
d7cfe76a00302 Cleanup
728a74da9f4be Some more option updates. Simplify sample files further. Remove a bunch of unnecessary logic in BuildResidentialHPXML measure.
2252833d711ad Rename some of the options for clarity.
e9ae6e3bde87e Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os311
9c5d4247e1f2c Merge pull request #2098 from NREL/materials_rb
06a4f7d403b8a Add Pearl [ci skip]
be15e3533f925 Latest results.
d14d1553f7bb4 Relax tol slightly
8314e076b0d92 Latest results.
10a8f1432137b Update some more names for clarity. Update outside coefficient.
c6782527f4321 Rename inside/outside to interior/exterior.
53fea54c197ea Bugfix.
791a1b817af72 Document materials and some code refactor.

git-subtree-dir: resources/hpxml-measures
git-subtree-split: 30559406f48bb9c7bfe37dae8e4606bf59f55316
GitHub Action and others added 30 commits December 11, 2025 04:58
…51e892643

5b2a51e892643 Latest results.
1e5f86e368931 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os311
795ab571008f8 Merge pull request #2124 from NREL/dsh_with_experimental_ghp
4c931e1a84632 Latest results.
2c1474c67f22a Merge branch 'dsh_with_experimental_ghp' of https://github.com/NREL/OpenStudio-HPXML into dsh_with_experimental_ghp
475e1ad71b4a3 Unrelated: round defaulted crankcase power.
bcb0cee25f397 Latest results.
c00a14d509d89 Allow desuperheater w/ experimental GHP.
74966fcb5069e Merge pull request #2123 from NREL/whole_mf_sim_validation
288368eb58d26 Might as well still allow schema validation.
b44c2222c3f2f Fix CI tests.
7735564fdea63 Adds error-checking to make sure WholeSFAorMFBuildingSimulation isn't true for a SFD/MH model.
5dc8847f0fd32 update alliance name [ci skip]
edddfc7552ae4 Update BEopt link [ci skip]
0b5b62656c206 Merge pull request #2122 from NREL/fix_grg_slab_ins
f1ba352491282 Don't apply slab insulation to the garage slab. Impact on results is very small since the garage is not conditioned.
22dbf37c2d277 Merge pull request #2121 from NREL/fix_interzonal_grg_wall_siding
ded63ef51b873 Latest results.
2d234c530ab84 Exclude siding from assembly R-value for interzonal walls (e.g., wall between conditioned space and garage).

git-subtree-dir: resources/hpxml-measures
git-subtree-split: 5b2a51e892643eeb223322ae4be1ee3be7199173
…1411d715a

c5261411d715a Latest results.
221773d37e859 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os311
33adc14029184 Merge pull request #2125 from NREL/fix-storm-window-ids
cb7fb4545c056 Add interior and exterior shading and storm window skylight id attributes.
21508dc6ef55a Latest results.
46b0dde04030c Add insect screen and storm window id attributes.

git-subtree-dir: resources/hpxml-measures
git-subtree-split: c5261411d715a051815cff9b70cc45d50aef5c2b
…562e7cb13

a563562e7cb13 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os311
b8fe5f25e5ea9 Merge pull request #2128 from NREL/hpxml_v5_rc1
169ad81ef4704 Latest results.
baa9af7509456 Merge branch 'hpxml_v5_rc1' of https://github.com/NREL/OpenStudio-HPXML into hpxml_v5_rc1
bdaec34c5fccc Add siding/roof material to 140 test files.
802165dc8983f Latest results.
eac0c155ab40b Relax tolerance a bit
6bf8b8e8665d3 Update test.
a946227ce9e3e Update to rc2
bee6b17c840d3 Re-add schedule CSVs.
23ed9817f219d Allow SLA for infiltration
c10cb96043041 Merge branch 'hpxml_v5_rc1' of https://github.com/NREL/OpenStudio-HPXML into hpxml_v5_rc1
4bed99877c488 First pass on stone veneer and medium light color.
1d155c3992e4e Merge pull request #2126 from NREL/not_present
ba4decc38f762 Merge pull request #2108 from NREL/panel-spaces-fix2
72ea7c4037931 Merge branch 'not_present' of https://github.com/NREL/OpenStudio-HPXML into panel-spaces-fix2
0516c97eed5ce Latest results.
efca045a555c7 Merge branch 'hpxml_v5_rc1' of https://github.com/NREL/OpenStudio-HPXML into not_present
97a9ce1a64b54 Initial scaffolding [ci skip]
90131fe269301 Address reviewer comments. Simplify code a tiny bit.
7b50baf169859 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into panel-spaces-fix2
8e7c220ab085b Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into not_present
09e2e67e8df91 Missed one
f262206ed8dfb First pass on pulling in hpxmlwg/hpxml#451
bd04e12d2050c Remove one more test.
ca24a821fad80 Follow-up to #2101. Makes use of proposed change in hpxmlwg/hpxml#456.

git-subtree-dir: resources/hpxml-measures
git-subtree-split: a563562e7cb133e39be8d1c3c868a91037151803
…390ec1e05

3a43390ec1e05 Exclude HVAC installation quality files from unmet hours check.
a37e0bff97199 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os311
6cf928367fd7a Update sha
db4fca236b226 Merge pull request #2131 from NREL/hp_17f_error_checking
3071e78b54003 Throw an error if HeatingCapacity17F is provided but HeatingCapacity is not.
aa7f14320687e Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os311
acd443c2d7900 Add R-3 wall insulation per user request.

git-subtree-dir: resources/hpxml-measures
git-subtree-split: 3a43390ec1e05dd36c8b2dfca028892b0e12aad2
…494c85bf9

37fc494c85bf9 Merge pull request #2089 from NREL/os311
4622ed776c6e0 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os311
8e9cf5d341615 Remove temp code [ci skip]
a635029d3b8b5 Merge pull request #2136 from NREL/hers_sizing_bugfix
2230eb677c487 Merge pull request #2117 from NREL/hpwh_exhaust_ducting
aafd0a6dd37aa Latest results.
36d0568ad0592 Merge branch 'hers_sizing_bugfix' of https://github.com/NREL/OpenStudio-HPXML into hers_sizing_bugfix
4b0861fa76a2d Add test.
02484fcda9ef3 Update new HPXML
2b35084446bf1 Merge branch 'os311' of https://github.com/NREL/OpenStudio-HPXML into hpwh_exhaust_ducting
6841c15d3b0f2 Latest results.
405e7deb0288b Exclude fan heat too.
fe64f8fcf12cb Merge pull request #2135 from NREL/osw_suppress_log_messages
0b2ccb078332f Latest results.
5556a2642fecb Got it backwards [ci skip]
20bf7e5f82a76 Fixes HERS sizing methodology when compressor lockout temperature is below heating design temperature.
c2f1a60fdf37b Add new output to changelog [ci skip]
eb102d826d4bd Suppress log messages when running e.g. template-build-hpxml.osw.
f61c8f0959fc1 Latest results.
3f699811323aa Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os311
545e2e05def8a Update HPXML
2337062fc7406 Update to 2026 [ci skip]
1791d0f1ee0b9 Widen tolerance for peak loads.
a17e6116f4e59 Use NREL/OpenStudio#5551 to address hardcoded outlet node name. [ci skip]
e85f5a91a678c Merge branch 'os311' of https://github.com/NREL/OpenStudio-HPXML into hpwh_exhaust_ducting
8b56d84451cb9 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hpwh_exhaust_ducting
bf94d169584df Address ducted water heaters in unconditioned space.
c50317759908a Latest results.
682698213603a Only adjust infiltration when HPWH is in conditioned space. Update airflow rate to 200 cfm, a better average value.
b05ddaea2f92e Latest results.
5dab3700cc26c Temporarily skip 10x test for new sample file
63fdeb3598b72 Add tests for warnings and minor cleanup.
ec1af6a3db03e First pass on allowing HPWH exhaust air to be ducted to the outside.

git-subtree-dir: resources/hpxml-measures
git-subtree-split: 37fc494c85bf92a1b93f79876574a8346f95e73c
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.

Use OSArgument.setRequired w/ OS 3.11

2 participants