Adds multiplier/offset fields for Site:WaterMainsTemperature
#11037
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
|
Contributor
Author
|
All diffs are simply a change to the number of defaulted fields. |
shorowit
added a commit
to NREL/OpenStudio-HPXML
that referenced
this pull request
Apr 17, 2025
…. Will need NREL/EnergyPlus#11037 for DWHR systems.
Merged
7 tasks
rraustad
reviewed
Apr 18, 2025
|
|
mjwitte
reviewed
Apr 23, 2025
|
|
@shorowit @Myoldmopar it has been 28 days since this pull request was last updated. |
Member
|
Seriously @shorowit I haven't the slightest clue why Decent CI doesn't like your branches. No idea at all. Anyway, I pulled in develop and we'll let CI run here. |
|
Contributor
Author
Yeah, it's pretty weird. It's not like my name is Little Bobby Tables. |
Member
|
This will still have the spurious table diffs, but CI should otherwise be all clean now. |
|
Member
|
Indeed it still has the spurious diffs, but this is clean. Merging. Thanks @shorowit |
joseph-robertson
added a commit
to NREL/resstock
that referenced
this pull request
Nov 20, 2025
…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
shorowit
added a commit
to NREL/OpenStudio-ERI
that referenced
this pull request
Jan 7, 2026
37fc494c85 Merge pull request #2089 from NREL/os311 4622ed776c Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os311 8e9cf5d341 Remove temp code [ci skip] 2230eb677c Merge pull request #2117 from NREL/hpwh_exhaust_ducting aafd0a6dd3 Latest results. 02484fcda9 Update new HPXML 2b35084446 Merge branch 'os311' of https://github.com/NREL/OpenStudio-HPXML into hpwh_exhaust_ducting 405e7deb02 Exclude fan heat too. f61c8f0959 Latest results. 3f69981132 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os311 545e2e05de Update HPXML 1791d0f1ee Widen tolerance for peak loads. 3a43390ec1 Exclude HVAC installation quality files from unmet hours check. a37e0bff97 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os311 6cf928367f Update sha aa7f143206 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os311 a563562e7c Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os311 a946227ce9 Update to rc2 c5261411d7 Latest results. 221773d37e Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os311 5b2a51e892 Latest results. 1e5f86e368 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os311 a17e6116f4 Use NREL/OpenStudio#5551 to address hardcoded outlet node name. [ci skip] e85f5a91a6 Merge branch 'os311' of https://github.com/NREL/OpenStudio-HPXML into hpwh_exhaust_ducting dc4bc5a2e5 Latest results. 5ee433e11f Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os311 8b56d84451 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hpwh_exhaust_ducting bf94d16958 Address ducted water heaters in unconditioned space. c503177599 Latest results. 6826982136 Only adjust infiltration when HPWH is in conditioned space. Update airflow rate to 200 cfm, a better average value. b05ddaea2f Latest results. 5dab3700cc Temporarily skip 10x test for new sample file 63fdeb3598 Add tests for warnings and minor cleanup. ec1af6a3db First pass on allowing HPWH exhaust air to be ducted to the outside. ccb85e0585 Latest results. d9d1e1fc8f Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os311 37a0268f63 Update docs [ci skip] 6a0595463f Merge pull request #2115 from NREL/os311_os_cli_on_ci 693925da41 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os311_os_cli_on_ci 7dd760b5ff Latest results. 2b7840bc31 Merge branch 'os_cli_on_ci' of https://github.com/NREL/OpenStudio-HPXML into os311_os_cli_on_ci 5fdbe41cb4 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os311 a674a906a3 Merge pull request #2112 from NREL/os311_tmyx cadc323716 Merge branch 'os311_tmyx' of https://github.com/NREL/OpenStudio-HPXML into os311_tmyx 9341f775a2 Update Changelog.md [ci skip] 53d4f526fd Latest results. 7145848c80 Add test for TMYx EPW. 52d05ddaf4 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os311 30559406f4 A little cleanup 43b8c29434 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os311 a2093af4d7 Latest results. d96c61f257 Update HPXML cf5c3f81ec Fix CI? 6c8ae2b4e0 Merge branch 'option_cleanup' of https://github.com/NREL/OpenStudio-HPXML into os311 e9ae6e3bde Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os311 75947ea349 Merge pull request #1983 from NREL/mains_temps d6792c31a3 Merge branch 'mains_temps' of https://github.com/NREL/OpenStudio-HPXML into mains_temps 002d1d9675 Update tests. (Unrelated: Remove unused battery lifetime code.) 1742cf62e4 Latest results. 0d5fc7c57b Merge branch 'os311' of https://github.com/NREL/OpenStudio-HPXML into mains_temps 1dec9e5ffa No longer need this code 5f7f659269 Merge pull request #2094 from NREL/os311_fixmes 6bb52779ff Latest results. 02099e80f3 Update comment 1aac02b96d Merge branch 'os311' of https://github.com/NREL/OpenStudio-HPXML into mains_temps 1324a35451 update xmls 6774fdf5c9 Merge branch 'os311' of https://github.com/NREL/OpenStudio-HPXML into os311_fixmes 54d47281a9 Latest results. bfbc364491 Update tests b9bba0362c Shouldn't need this exception anymore. 31fe289b72 Try new docker container on CI 144790b726 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os311 1670228958 Relax tol a bit [ci skip] c702f0001b Revert FIXMEs due to OpenStudio 3.11 updates [ci skip] 6934898924 More progress [ci skip] 4b35aee678 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os311 a70261a4a2 Temporary workaround 3d0a1971ee Skip warnings for now dd9610eb7a Temporarily ignore this warning. a7c4e39d09 Revert this part too [ci skip] de0cce16c0 Not worth it, reverting some things [ci skip] 66efbcea46 Another fix 115700d0f0 Fix yaml 1684ccc791 Bump OS version & ubuntu version. 85e4a966a4 First pass on using the E+ built-in correlation for mains temperature. Will need NREL/EnergyPlus#11037 for DWHR systems. git-subtree-dir: hpxml-measures git-subtree-split: 37fc494c85bf92a1b93f79876574a8346f95e73c
shorowit
added a commit
to NREL/OpenStudio-HPXML-Calibration
that referenced
this pull request
Jan 16, 2026
d64c6c94e Merge pull request #2145 from NREL/os311final fdd95b20d Update to final build 650d319e0 Merge pull request #2144 from NREL/pan_heater_controls 9883ce133 Latest results. cec3f319d Minor cleanup [ci skip] a4d2e0c5c Adds PanHeaterControlType choice of "heat pump mode", in which the pan heater will run whenever the HP is running (and the outdoor temperature is below 32F). Updates PanHeaterControlType choice of "continuous" to avoid pan heater operation when the outdoor temperature is below the minimum compressor temperature. bfcf02289 Merge pull request #2143 from NREL/duct_lto_error_msg d8264838e Merge branch 'duct_lto_error_msg' of https://github.com/NREL/OpenStudio-HPXML into duct_lto_error_msg 8a85cf4ac Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into duct_lto_error_msg 6ae6d4e9f Latest results. f946cb50f Adds error-checking for when the sum of supply/return duct leakage to outside values is too high. 24df99f16 Merge pull request #2141 from NREL/attic_ctf_workaround 7f512cecb Latest results. e531c0f03 Update Changelog.md [ci skip] ee62e4c9f Revert to previous thickness to accommodate lower roof assembly R-values. 2e41b098f Prevent thin rigid insulation layers too. 8d25b313c Fix combined cp calculation. See if we no longer get an attic warning from E+. 76fe55a38 A little cleanup. 61859b1fa Combines the roof material and OSB layers into a single layer for the roof to help avoid attic temperature out of bounds errors. Also moves construction-related code from geometry.rb to constructions.rb. 058d86511 Add software user, clean up IRA reference [ci skip] 168dbb2cf Merge pull request #2132 from NREL/update_utility_rates c3dee04ab Latest results. e3d863c80 Update a couple links [ci skip] 24686ab11 Merge pull request #2139 from NREL/os311-rc3 2315b67cb Merge branch 'update_utility_rates' of github.com:NREL/OpenStudio-HPXML into update_utility_rates a5a8dbc1f update inputs doc f5963b964 Merge branch 'master' of github.com:NREL/OpenStudio-HPXML into update_utility_rates 8853cd943 Fix sha eb6958764 Bump to rc3 37fc494c8 Merge pull request #2089 from NREL/os311 4622ed776 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os311 8e9cf5d34 Remove temp code [ci skip] a635029d3 Merge pull request #2136 from NREL/hers_sizing_bugfix 2230eb677 Merge pull request #2117 from NREL/hpwh_exhaust_ducting aafd0a6dd Latest results. 36d0568ad Merge branch 'hers_sizing_bugfix' of https://github.com/NREL/OpenStudio-HPXML into hers_sizing_bugfix 4b0861fa7 Add test. bc52124be Latest results. 02484fcda Update new HPXML 2b3508444 Merge branch 'os311' of https://github.com/NREL/OpenStudio-HPXML into hpwh_exhaust_ducting 6841c15d3 Latest results. 405e7deb0 Exclude fan heat too. b579d9669 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into update_utility_rates 5556a2642 Got it backwards [ci skip] 20bf7e5f8 Fixes HERS sizing methodology when compressor lockout temperature is below heating design temperature. f61c8f095 Latest results. 3f6998113 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os311 545e2e05d Update HPXML 1791d0f1e Widen tolerance for peak loads. 3a43390ec Exclude HVAC installation quality files from unmet hours check. a37e0bff9 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os311 6cf928367 Update sha c65bb6cb8 Latest results. 3d63df50b Merge branch 'master' of github.com:NREL/OpenStudio-HPXML into update_utility_rates 3710e2b34 Merge branch 'update_utility_rates' of github.com:NREL/OpenStudio-HPXML into update_utility_rates 73f89ea50 Update docs 170ec3982 exclude 2024 electricity rates 02a7a1cca Latest results. 061093dac Update test_utility_bills c18dfa28b run update_measures 2fd4aac71 Update changelog a6bcc13ec Add 2023 util rates and 2024 elec rates aa7f14320 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os311 a563562e7 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os311 a946227ce Update to rc2 c5261411d Latest results. 221773d37 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os311 5b2a51e89 Latest results. 1e5f86e36 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os311 a17e6116f Use NREL/OpenStudio#5551 to address hardcoded outlet node name. [ci skip] e85f5a91a Merge branch 'os311' of https://github.com/NREL/OpenStudio-HPXML into hpwh_exhaust_ducting dc4bc5a2e Latest results. 5ee433e11 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os311 8b56d8445 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hpwh_exhaust_ducting bf94d1695 Address ducted water heaters in unconditioned space. c50317759 Latest results. 682698213 Only adjust infiltration when HPWH is in conditioned space. Update airflow rate to 200 cfm, a better average value. b05ddaea2 Latest results. 5dab3700c Temporarily skip 10x test for new sample file 63fdeb359 Add tests for warnings and minor cleanup. ec1af6a3d First pass on allowing HPWH exhaust air to be ducted to the outside. ccb85e058 Latest results. d9d1e1fc8 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os311 37a0268f6 Update docs [ci skip] 6a0595463 Merge pull request #2115 from NREL/os311_os_cli_on_ci 693925da4 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os311_os_cli_on_ci 7dd760b5f Latest results. 2b7840bc3 Merge branch 'os_cli_on_ci' of https://github.com/NREL/OpenStudio-HPXML into os311_os_cli_on_ci 5fdbe41cb Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os311 a674a906a Merge pull request #2112 from NREL/os311_tmyx cadc32371 Merge branch 'os311_tmyx' of https://github.com/NREL/OpenStudio-HPXML into os311_tmyx 9341f775a Update Changelog.md [ci skip] 53d4f526f Latest results. 7145848c8 Add test for TMYx EPW. 52d05ddaf Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os311 30559406f A little cleanup 43b8c2943 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os311 a2093af4d Latest results. d96c61f25 Update HPXML cf5c3f81e Fix CI? 6c8ae2b4e Merge branch 'option_cleanup' of https://github.com/NREL/OpenStudio-HPXML into os311 e9ae6e3bd Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os311 75947ea34 Merge pull request #1983 from NREL/mains_temps d6792c31a Merge branch 'mains_temps' of https://github.com/NREL/OpenStudio-HPXML into mains_temps 002d1d967 Update tests. (Unrelated: Remove unused battery lifetime code.) 1742cf62e Latest results. 0d5fc7c57 Merge branch 'os311' of https://github.com/NREL/OpenStudio-HPXML into mains_temps 1dec9e5ff No longer need this code 5f7f65926 Merge pull request #2094 from NREL/os311_fixmes 6bb52779f Latest results. 02099e80f Update comment 1aac02b96 Merge branch 'os311' of https://github.com/NREL/OpenStudio-HPXML into mains_temps 1324a3545 update xmls 6774fdf5c Merge branch 'os311' of https://github.com/NREL/OpenStudio-HPXML into os311_fixmes 54d47281a Latest results. bfbc36449 Update tests b9bba0362 Shouldn't need this exception anymore. 31fe289b7 Try new docker container on CI 144790b72 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os311 167022895 Relax tol a bit [ci skip] c702f0001 Revert FIXMEs due to OpenStudio 3.11 updates [ci skip] 693489892 More progress [ci skip] 4b35aee67 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os311 a70261a4a Temporary workaround 3d0a1971e Skip warnings for now dd9610eb7 Temporarily ignore this warning. a7c4e39d0 Revert this part too [ci skip] de0cce16c Not worth it, reverting some things [ci skip] 66efbcea4 Another fix 115700d0f Fix yaml 1684ccc79 Bump OS version & ubuntu version. 85e4a966a First pass on using the E+ built-in correlation for mains temperature. Will need NREL/EnergyPlus#11037 for DWHR systems. git-subtree-dir: src/OpenStudio-HPXML git-subtree-split: d64c6c94ea5698eda7570b38457a2212323279dd
shorowit
added a commit
to NREL/OpenStudio-HPXML-Calibration
that referenced
this pull request
Jan 16, 2026
* Squashed 'src/OpenStudio-HPXML/' changes from 985598073..33adc1402 33adc1402 Merge pull request #2125 from NREL/fix-storm-window-ids cb7fb4545 Add interior and exterior shading and storm window skylight id attributes. 21508dc6e Latest results. 46b0dde04 Add insect screen and storm window id attributes. 795ab5710 Merge pull request #2124 from NREL/dsh_with_experimental_ghp 4c931e1a8 Latest results. 2c1474c67 Merge branch 'dsh_with_experimental_ghp' of https://github.com/NREL/OpenStudio-HPXML into dsh_with_experimental_ghp 475e1ad71 Unrelated: round defaulted crankcase power. bcb0cee25 Latest results. c00a14d50 Allow desuperheater w/ experimental GHP. 74966fcb5 Merge pull request #2123 from NREL/whole_mf_sim_validation 288368eb5 Might as well still allow schema validation. b44c2222c Fix CI tests. 7735564fd Adds error-checking to make sure WholeSFAorMFBuildingSimulation isn't true for a SFD/MH model. 5dc8847f0 update alliance name [ci skip] edddfc755 Update BEopt link [ci skip] 0b5b62656 Merge pull request #2122 from NREL/fix_grg_slab_ins f1ba35249 Don't apply slab insulation to the garage slab. Impact on results is very small since the garage is not conditioned. 22dbf37c2 Merge pull request #2121 from NREL/fix_interzonal_grg_wall_siding ded63ef51 Latest results. 2d234c530 Exclude siding from assembly R-value for interzonal walls (e.g., wall between conditioned space and garage). 8c1f26f57 Merge pull request #2113 from NREL/vehicles-whole-building2 0c950084e Fix and update some method descriptions. 842c2b5ad Update the changelog. 699c46c42 Update reporting measure to retrieve unmet driving hours program. 4b13e2384 Separate EMS programs for charging/discharging power and calculating unmet driving hours. cfd581eaf Merge branch 'vehicles-whole-building2' of https://github.com/NREL/OpenStudio-HPXML into vehicles-whole-building2 449bfd9f4 Minor fix and cleanup. [ci skip] 81316cf7e Latest results. 4c4801b6a Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into vehicles-whole-building2 7fb77cfaf Merge pull request #1850 from NREL/whole_building_common_spaces ee0b73891 Latest results. aa46de49d Update electric panel test for new sample file. b79501ed3 Oops. 987ba59e4 Ignore @sameas when it's not a whole SFA/MF building simulation. Add sample file for testing. Add sameas_id to all HPXML classes. 93bafb14f Simplify SoftwareInfo references in schematron by using absolute references. 4c386fb92 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into whole_building_common_spaces 4bcca63be Minor code cleanup. 905b77f1a Latest results. 75d512ca7 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into whole_building_common_spaces 97d269c84 schematron a9e8feb91 Merge branch 'master' into vehicles-whole-building2 0c206e37e Latest results. eff72948b Merge pull request #2110 from NREL/os_cli_on_ci 5777c07fe Only write vehicle EMS program if at least one vehicle and charger, and only select modeled vehicles to include in vehicle EMS program. 61c265bb2 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os_cli_on_ci e64d554c0 Add missing tests (e.g., test_ashrae_140.rb). Ensure merged results includes unit test results. f6f826485 Remove fixme comment, and refactor a bit. b587075f2 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into whole_building_common_spaces 87338ad63 Merge branch 'master' into vehicles-whole-building2 d7af86ef7 Merge pull request #2116 from NREL/nrel_to_nlr b3b045b97 Rename NREL to NLR 14adadf08 Latest results. 824213f47 Revert one more test failure f6af3d5ff Return from vehicle ems program method if no vehicles. a4915f8f1 Revert test failures 0f7631d9e Add more output [ci skip] ee3a631f2 Add actuators to unit models before merge. e7d818eaa This is it 9cc77fd30 Remove obsolete validation test and update docs. 246d66d31 Move vehicle ems from vehicle resource file to output resource file. 0b00cf353 Add sample file for whole building with vehicles. 885139dff Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os_cli_on_ci db42a4261 This should work, right?! cd994fd22 Merge pull request #2111 from NREL/output_rb_cleanup2 2109be462 Ensure all tests run when there's a failure 9729f1342 Check that CI catches errors. 46d2efb7e Fix test. b16635a04 Merge branch 'os_cli_on_ci' of https://github.com/NREL/OpenStudio-HPXML into os_cli_on_ci 042118c14 Exclude workflow tests from measure unit tests. c926c8791 Add pool pump and heater to existing electric panel test. c67326080 Latest results. a0b8de1b7 Set URL once 81fee72e1 First attempt to switch to running tests using the OS CLI on the CI. 3ac83ca98 Fix for handling schedule file with no electric_vehicle column. 859aca5fb Add validation test for whole building with vehicles. 189a8baac Add the check for whole building with vehicles. bbd8823c4 Break code out into a separate method; minor cleanup. 1e8d74173 Merge pull request #2105 from NREL/whole_building_common_spaces_simplify 09aa2add5 Bugfix. 8c3b7a20b Merge branch 'whole_building_common_spaces' of https://github.com/NREL/OpenStudio-HPXML into whole_building_common_spaces_simplify dad228fae Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into whole_building_common_spaces 3510bf89c Misc cleanup. f9a9cb59f Merge pull request #2107 from NREL/unit_test_validation2 dc95d5f41 Bugfix. 927dbc9e0 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into unit_test_validation2 046246014 Merge pull request #2106 from NREL/output_rb_cleanup ada17521d Further reduce validation for a few longer tests. 0c694c5dc Apply pattern to get_total_hvac_capacities and get_total_hvac_airflows too. 870129ccb Be more selective about when we perform in.xml validation during unit tests. 8623d336d Some cleanup/refactor of output.rb. 9acdd5888 Latest results. 0b21abf70 Fix component loads. c4ebc9fef Revert more changes [ci skip] 1a5098c74 Bugfix. a27c6698d Attempt to simplify the code. 6ddeeb898 Latest results. 5cea9d5a2 make a copy of original object when processing sameas objects, and no unused schedule warning after cleanups 446465708 update hpxmls 9f87a2366 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into whole_building_common_spaces 92f1b65cd Merge branch 'whole_building_common_spaces' of https://github.com/NREL/OpenStudio-HPXML into whole_building_common_spaces 645abdaac fix measure.xml 1b28d5226 address comments 59c865672 Merge pull request #2099 from NREL/option_cleanup 93968a868 Remove InfiltrationVolume too. f713af64e Rename options for consistency [ci skip] d1b4d4f9e Latest results. 83c62db53 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into option_cleanup 18eb1c40b Apply same logic from walls to rim joists. 3a5ba8994 A few tweaks. 973b96204 Better description of the source of the humidity capacity multiplier. 54ad0db00 Latest results. 5959dd850 Latest results. d031dcd92 process sameas at hpxml.rb, and use the info at hvac sizing to treat them as adiabatic 03ac0bd7c Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into whole_building_common_spaces 4d9bdbb8a Add carpet to MF unit sample files. 8b864c1e7 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into option_cleanup 0690c06d3 Merge pull request #2102 from NREL/unit_test_validation f1c6d62e5 Merge pull request #2101 from NREL/panel-spaces-fix f3458b64d Minor updates to docs [ci skip] b3602cd23 Set rated total spaces as a defaulted value [ci skip] f20e3ae2b Update another panel test after pulling in defaulted HPXML validation. d02e92cef Update panel tests after pulling in defaulted HPXML validation. 6ffaefb41 Merge branch 'unit_test_validation' into panel-spaces-fix b01fabd9f Revert this change. 2201a0f5b Fix test_defaults.rb a25a7ba32 Latest results. 579bd6c86 Remove Breaker Spaces note altogether. [ci skip] 05fecf974 Validate the `in.xml` files created during unit tests. 624d2e7e2 Update workflow outputs docs. ebcb5061c Update panel and validation tests. dc94dcaa9 Check that HeadroomSpaces is not negative. f82ee871a Found some more things to clean up. 439c765f5 Update measure 2f96a7594 Merge branch 'option_cleanup' of https://github.com/NREL/OpenStudio-HPXML into option_cleanup d299a143b Some more cleanup. 5a4d287d2 Latest results. 864ef82f3 Add carpet input to BuildResidentialHPXML measure. bb4449976 Update a couple tests; revert roof color change in base.xml. a39cabc6e A bit more cleanup. d7cfe76a0 Cleanup 728a74da9 Some more option updates. Simplify sample files further. Remove a bunch of unnecessary logic in BuildResidentialHPXML measure. 2252833d7 Rename some of the options for clarity. 9c5d4247e Merge pull request #2098 from NREL/materials_rb 06a4f7d40 Add Pearl [ci skip] be15e3533 Latest results. d14d1553f Relax tol slightly 8314e076b Latest results. cd1d47bf9 add referenced_by_sameas attribute and error-checkings 10a8f1432 Update some more names for clarity. Update outside coefficient. c6782527f Rename inside/outside to interior/exterior. 53fea54c1 Bugfix. 791a1b817 Document materials and some code refactor. 0ad82f801 Trying a fix for @yzhou601's issue. Will revert if it causes problems. 376f0b8fb fixes a few bugs that will kill simulation with weird error messages 1c6bca909 fix wrong reference object type 9461438ea Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into whole_building_common_spaces 862c702fe Merge pull request #2093 from NREL/change_zerh_to_denh 4a5249019 Revert Changelog.md [ci skip] bd1b5b099 Update changelog c0dd9e29e run update_measures 4b90e8b2e Rename ZERHCalculation to DENHCalculation in HPXML class 573a64ede Merge pull request #2092 from NREL/gshp_sizing_error 97a18c496 Latest results. 269b899c3 Improve the docs a bit [ci skip] 37a8258a0 Fix CI 285997fee Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into whole_building_common_spaces 19c1c9ddb Minor cleanup. [ci skip] a451b1832 Merge branch 'gshp_sizing_error' of https://github.com/NREL/OpenStudio-HPXML into gshp_sizing_error 107de13bd Update test. 3ed31906d Latest results. c44d74678 Convert var to snake_case c98cf463e Fixes possible ground-source heat pump sizing error if the heating or cooling design temperature differences are zero. 8724df25d Merge pull request #2086 from NREL/hpwh_adjustment_confined_space f14b34256 Minor improvement to schematron f4424e21d Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hpwh_adjustment_confined_space 34535d1f3 Merge pull request #2091 from NREL/panel-outputs fcca4eb00 Revert zone load adjustment. f63523cb4 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hpwh_adjustment_confined_space f5d6b8311 Move method for returning number of occupied spaces to hpxml class. fd149fd54 Merge branch 'master' into panel-outputs 8d416d244 update measures, one more sameas wall in the inter-unit-heat-transfer configuration 644d25676 Merge branch 'master', test file configuration 053cceecf reconfigure test files 1b1ba1b5a Merge pull request #1928 from NREL/buildresidentialhpxml-options-based-args 1f0f5f0ec Update changelog [ci skip] 2f4da2f51 Latest results. efd0a4075 bugfix 6e92e9571 add regression for load fractions 4d816c79e Merge branch 'hpwh_adjustment_confined_space' of https://github.com/NREL/OpenStudio-HPXML into hpwh_adjustment_confined_space fd7ca987b address comments e56582f10 Update tests after headroom and total changes. 67eb96547 Move headroom and total from Outputs to main schema. c86ed444d Minor updates to docs/schematron. c161ffb23 Tweak room AC option. 3c018f4e2 Merge branch 'hpwh_adjustment_confined_space' of https://github.com/NREL/OpenStudio-HPXML into hpwh_adjustment_confined_space 247539f34 address comments, rename inputs, docs, etc. 4eaf7ddfe Add a lower efficiency MSHP option for existing homes. [ci skip] 10bdff317 Add some units [ci skip] a84a7819f Remove options.rb dependency on openstudio. Rename get_comment_rows to get_property_descriptions and return a hash. 4073886aa Fix HPXML references in docs. [ci skip] 5141bcd2f Latest results. 7a6951602 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hpwh_adjustment_confined_space 9e0a49dae not to adjust capacities; docs, changelog, warnings. 107ecde6f Update documentation/changelog. Revert sample file name change. 3a58bdc40 Rename sample file. 645c8cefb Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into whole_building_common_spaces e349aff5e Latest results. 079212bf1 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into buildresidentialhpxml-options-based-args 9546361fe Merge pull request #2083 from NREL/RESNET_defrost 7ce7c32bb Latest results. 83318e62b Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into RESNET_defrost 3f0aa0023 Merge pull request #2088 from NREL/seer2_hspf2 85a7b0fed add parenthesis 8aa53f411 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into RESNET_defrost d23e7d145 Merge branch 'seer2_hspf2' of https://github.com/NREL/OpenStudio-HPXML into buildresidentialhpxml-options-based-args 106417880 Move some additional test files/OSWs to SEER2 & HSPF2. e3175d698 Latest results. 88613bb63 Move some additional test files/OSWs to SEER2 & HSPF2. 6af0937d0 Add method to get property units. 0de5b71f0 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into buildresidentialhpxml-options-based-args 2a4196079 Latest results. f1eb1e51b Improve IDs for multi-unit HPXMLs. b45c1aa63 Reduce scope of changes 7f95a40a8 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into whole_building_common_spaces 798709532 Latest results. f545ae21b Add boolean inputs, error-checking, unit tests, etc. 3fb973071 Latest results. 2bcb652b6 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hpwh_adjustment_confined_space 441a216fc Merge pull request #2082 from NREL/storm_window_limit 51ca33852 Update log message check a7f09ad26 Update HPXMLs. 1ab8b7533 Merge branch 'storm_window_limit' of https://github.com/NREL/OpenStudio-HPXML into whole_building_common_spaces df8ac9008 Tiny tweaks. b2b9aa695 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into storm_window_limit d7105c639 Add room AC option. 4ecb9610e Merge pull request #2087 from NREL/calibration 944514669 Adds links to OS-HPXML calibration tool. c9978966d Add user [ci skip] 31f529e5f Latest results. 85712a6d9 first cut adding adjustment 3b29f037b Latest results. 4092d21aa Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into buildresidentialhpxml-options-based-args c8774af59 Merge pull request #2076 from NREL/GHP_E+_error 84b0f210a Update changelog [ci skip] fef6ff83b tasks.rb update_measures 79acc44fc Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into GHP_E+_error acebe738c Latest results. 016d38790 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into RESNET_defrost 9938dac4a Merge pull request #2085 from NREL/default_heating_capacity_17f 724b7d2ef Latest results. 8ec47ccec Fix measure.xml 6e653bff1 Updates HP default heating capacities at 17F per RESNET HERS Addendum 82 and NEEP database. a6f89e262 Use min n_colors of 2 for colorscales list. 92f3a6828 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into buildresidentialhpxml-options-based-args dd8c9161f Bugfix. e0a154667 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into RESNET_defrost 6222af6ab Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into storm_window_limit 6f54d78ec fix tests 9e087490e Merge pull request #2081 from NREL/adjust-garage-dimensions a7b258571 update Changelog.md [ci skip] ad2b8cbb1 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into buildresidentialhpxml-options-based-args 2831cda35 Add a couple HVAC options. c8978ce81 remove limit, add warning 51db48b8d Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into storm_window_limit 7ac9ff023 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into RESNET_defrost 27b3868cb Clarify changelog item [ci skip] 5dbe9581b Update changelog for final HPXML v4.2 [ci skip] fe3149b44 docs 9c686e6c8 changelog, update measures ccd0cd9a4 Latest results. c3fd3de30 Merge branch 'RESNET_defrost' of https://github.com/NREL/OpenStudio-HPXML into RESNET_defrost 64204e368 implement reduced capacity 1abca144e Latest results. f0fac76c8 revert adjusting RTF to see impact c8c969996 Try new continuous color scale again. 8dfe12b8c Try a new continuous color scale approach in the compare script. 7bcbd4fff docs 20a3b30a7 docs and fix test 84a51ffe3 change limit to 0.3 7e45f20e8 Typo. d6f216fe6 Clean up. aa019ef00 Merge branch 'master' into adjust-garage-dimensions 26a9392a7 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into storm_window_limit 24d66e129 relax window ufactor limit 777545347 Merge pull request #2075 from NREL/Defrost_EMS_bugfix fe9c7265f Add a couple water heater options. [ci skip] be84a81cd Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into Defrost_EMS_bugfix d1df19acd Changelog.md 76e8bd852 Clean up the garage error checking. 897672d12 Merge branch 'master' into adjust-garage-dimensions f87eede3d Merge branch 'master' into adjust-garage-dimensions 396dfb96b Bit of organization and commenting. ba1541f8f Add build measure tests for garage adjustments. 48e48fe51 Incrementally reduce garage width or depth if footprint too small. 29c06967b remove unnecessary @min 102f9159f Latest results. 4a9281416 Avoid small water flow rate which causes E+ errors, applies to variable speed GHP with experimental models ae0c5f366 Latest results. e89970eb2 min instead of max 5cf23c11d Latest results. 1931e000b Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into whole_building_common_spaces c820ed5aa Latest results. e6930f05e Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into whole_building_common_spaces 71e0e0de5 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into whole_building_common_spaces ebf8f18d2 Latest results. 0b4c0feaa Merge branch 'fix_default_solar_screens_films' of https://github.com/NREL/OpenStudio-HPXML into whole_building_common_spaces 2dc8a4b73 Latest results. c466bf043 Update new code merged in. 2517ffb54 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into whole_building_common_spaces 8b631ae5d Merge branch 'whole_building_common_spaces' of https://github.com/NREL/OpenStudio-HPXML into whole_building_common_spaces 6a0e79c59 add EPvalidator check for wholebuildingsimulation fc657625a Latest results. 98d4b67d4 add reverse surface description test file 9373f6101 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into whole_building_common_spaces 57e65fe08 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into whole_building_common_spaces c995c2e4c Latest results. 3f6a38096 Merge branch 'whole-mf-bldg-zero-occupants' of https://github.com/NREL/OpenStudio-HPXML into whole_building_common_spaces 944bd458c Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into whole_building_common_spaces 19ecece35 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into whole_building_common_spaces 97682d9b1 Merge branch 'whole_building_common_spaces' of https://github.com/NREL/OpenStudio-HPXML into whole_building_common_spaces faf101c8e fix typos 136c5692b Latest results. 08725231d change the approach to create surfaces at unit models to avoid component load error (not sum to total delivered) due to missing surfaces. Increase heating capacity to avoid unmet load 5d6080a62 fix ci c250a6ac6 Merge branch 'whole_building_common_spaces' of https://github.com/NREL/OpenStudio-HPXML into whole_building_common_spaces cf686ccf7 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into whole_building_common_spaces 0e2fe3d18 fix foundation wall attachment, reconfigure test files to include attics 45a9415af Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into whole_building_common_spaces 60feccc0b Latest results. 388025e13 fixed util.rb, relax the unused schedule check for common spaces(may resolve later) a8a6c50cb test validations 774b737a7 more fix 4f0e0dd82 Oops, forgot to add the generated test file 6cad724f5 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into whole_building_common_spaces 6c065d67c Add test file to include unconditioned common spaces and shared surfaces a1126ef2e simplified the approach further more: store adjacent surface id in space, store hpxml id in all surfaces, removed one more method in hpxml.rb, code cleanup 11f013f27 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into whole_building_common_spaces c1f0dd359 update measures bb5e641e4 simplify EPvalidator.xml c31f15dfd bugfix and some cleanups ad4c8a084 change to only use sameas in one element instead of both elements edd9aee4f Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into whole_building_common_spaces c96242e77 bugfix, name change 5ee2c836a Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into whole_building_common_spaces e0979da14 skipped creating duplicate surfaces, addressed default and hvac sizing 4ea65c625 oops db9794d63 simplify implementation with additional properties 37aac018b update measures 8edc86076 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into whole_building_common_spaces 57e268c60 same as adjacency first cut git-subtree-dir: src/OpenStudio-HPXML git-subtree-split: 33adc140291843f582361f01b50774e3fe85a7f0 * Update tests. * Squashed 'src/OpenStudio-HPXML/' changes from 33adc1402..acd443c2d acd443c2d Add R-3 wall insulation per user request. b8fe5f25e Merge pull request #2128 from NREL/hpxml_v5_rc1 169ad81ef Latest results. baa9af750 Merge branch 'hpxml_v5_rc1' of https://github.com/NREL/OpenStudio-HPXML into hpxml_v5_rc1 bdaec34c5 Add siding/roof material to 140 test files. 802165dc8 Latest results. eac0c155a Relax tolerance a bit 6bf8b8e86 Update test. bee6b17c8 Re-add schedule CSVs. 23ed9817f Allow SLA for infiltration c10cb9604 Merge branch 'hpxml_v5_rc1' of https://github.com/NREL/OpenStudio-HPXML into hpxml_v5_rc1 4bed99877 First pass on stone veneer and medium light color. 1d155c399 Merge pull request #2126 from NREL/not_present ba4decc38 Merge pull request #2108 from NREL/panel-spaces-fix2 72ea7c403 Merge branch 'not_present' of https://github.com/NREL/OpenStudio-HPXML into panel-spaces-fix2 0516c97ee Latest results. efca045a5 Merge branch 'hpxml_v5_rc1' of https://github.com/NREL/OpenStudio-HPXML into not_present 97a9ce1a6 Initial scaffolding [ci skip] 90131fe26 Address reviewer comments. Simplify code a tiny bit. 7b50baf16 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into panel-spaces-fix2 8e7c220ab Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into not_present 09e2e67e8 Missed one f262206ed First pass on pulling in hpxmlwg/hpxml#451 bd04e12d2 Remove one more test. ca24a821f Follow-up to #2101. Makes use of proposed change in hpxmlwg/hpxml#456. git-subtree-dir: src/OpenStudio-HPXML git-subtree-split: acd443c2d79009e980602d0a71a64ea70fa6abed * Update HPXMLs. * Squashed 'src/OpenStudio-HPXML/' changes from acd443c2d..fe64f8fcf fe64f8fcf Merge pull request #2135 from NREL/osw_suppress_log_messages 0b2ccb078 Latest results. c2f1a60fd Add new output to changelog [ci skip] eb102d826 Suppress log messages when running e.g. template-build-hpxml.osw. 2337062fc Update to 2026 [ci skip] db4fca236 Merge pull request #2131 from NREL/hp_17f_error_checking 3071e78b5 Throw an error if HeatingCapacity17F is provided but HeatingCapacity is not. git-subtree-dir: src/OpenStudio-HPXML git-subtree-split: fe64f8fcf12cb0824a458461feea912cca44ec25 * Squashed 'src/OpenStudio-HPXML/' changes from fe64f8fcf..d64c6c94e d64c6c94e Merge pull request #2145 from NREL/os311final fdd95b20d Update to final build 650d319e0 Merge pull request #2144 from NREL/pan_heater_controls 9883ce133 Latest results. cec3f319d Minor cleanup [ci skip] a4d2e0c5c Adds PanHeaterControlType choice of "heat pump mode", in which the pan heater will run whenever the HP is running (and the outdoor temperature is below 32F). Updates PanHeaterControlType choice of "continuous" to avoid pan heater operation when the outdoor temperature is below the minimum compressor temperature. bfcf02289 Merge pull request #2143 from NREL/duct_lto_error_msg d8264838e Merge branch 'duct_lto_error_msg' of https://github.com/NREL/OpenStudio-HPXML into duct_lto_error_msg 8a85cf4ac Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into duct_lto_error_msg 6ae6d4e9f Latest results. f946cb50f Adds error-checking for when the sum of supply/return duct leakage to outside values is too high. 24df99f16 Merge pull request #2141 from NREL/attic_ctf_workaround 7f512cecb Latest results. e531c0f03 Update Changelog.md [ci skip] ee62e4c9f Revert to previous thickness to accommodate lower roof assembly R-values. 2e41b098f Prevent thin rigid insulation layers too. 8d25b313c Fix combined cp calculation. See if we no longer get an attic warning from E+. 76fe55a38 A little cleanup. 61859b1fa Combines the roof material and OSB layers into a single layer for the roof to help avoid attic temperature out of bounds errors. Also moves construction-related code from geometry.rb to constructions.rb. 058d86511 Add software user, clean up IRA reference [ci skip] 168dbb2cf Merge pull request #2132 from NREL/update_utility_rates c3dee04ab Latest results. e3d863c80 Update a couple links [ci skip] 24686ab11 Merge pull request #2139 from NREL/os311-rc3 2315b67cb Merge branch 'update_utility_rates' of github.com:NREL/OpenStudio-HPXML into update_utility_rates a5a8dbc1f update inputs doc f5963b964 Merge branch 'master' of github.com:NREL/OpenStudio-HPXML into update_utility_rates 8853cd943 Fix sha eb6958764 Bump to rc3 37fc494c8 Merge pull request #2089 from NREL/os311 4622ed776 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os311 8e9cf5d34 Remove temp code [ci skip] a635029d3 Merge pull request #2136 from NREL/hers_sizing_bugfix 2230eb677 Merge pull request #2117 from NREL/hpwh_exhaust_ducting aafd0a6dd Latest results. 36d0568ad Merge branch 'hers_sizing_bugfix' of https://github.com/NREL/OpenStudio-HPXML into hers_sizing_bugfix 4b0861fa7 Add test. bc52124be Latest results. 02484fcda Update new HPXML 2b3508444 Merge branch 'os311' of https://github.com/NREL/OpenStudio-HPXML into hpwh_exhaust_ducting 6841c15d3 Latest results. 405e7deb0 Exclude fan heat too. b579d9669 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into update_utility_rates 5556a2642 Got it backwards [ci skip] 20bf7e5f8 Fixes HERS sizing methodology when compressor lockout temperature is below heating design temperature. f61c8f095 Latest results. 3f6998113 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os311 545e2e05d Update HPXML 1791d0f1e Widen tolerance for peak loads. 3a43390ec Exclude HVAC installation quality files from unmet hours check. a37e0bff9 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os311 6cf928367 Update sha c65bb6cb8 Latest results. 3d63df50b Merge branch 'master' of github.com:NREL/OpenStudio-HPXML into update_utility_rates 3710e2b34 Merge branch 'update_utility_rates' of github.com:NREL/OpenStudio-HPXML into update_utility_rates 73f89ea50 Update docs 170ec3982 exclude 2024 electricity rates 02a7a1cca Latest results. 061093dac Update test_utility_bills c18dfa28b run update_measures 2fd4aac71 Update changelog a6bcc13ec Add 2023 util rates and 2024 elec rates aa7f14320 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os311 a563562e7 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os311 a946227ce Update to rc2 c5261411d Latest results. 221773d37 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os311 5b2a51e89 Latest results. 1e5f86e36 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os311 a17e6116f Use NREL/OpenStudio#5551 to address hardcoded outlet node name. [ci skip] e85f5a91a Merge branch 'os311' of https://github.com/NREL/OpenStudio-HPXML into hpwh_exhaust_ducting dc4bc5a2e Latest results. 5ee433e11 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os311 8b56d8445 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hpwh_exhaust_ducting bf94d1695 Address ducted water heaters in unconditioned space. c50317759 Latest results. 682698213 Only adjust infiltration when HPWH is in conditioned space. Update airflow rate to 200 cfm, a better average value. b05ddaea2 Latest results. 5dab3700c Temporarily skip 10x test for new sample file 63fdeb359 Add tests for warnings and minor cleanup. ec1af6a3d First pass on allowing HPWH exhaust air to be ducted to the outside. ccb85e058 Latest results. d9d1e1fc8 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os311 37a0268f6 Update docs [ci skip] 6a0595463 Merge pull request #2115 from NREL/os311_os_cli_on_ci 693925da4 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os311_os_cli_on_ci 7dd760b5f Latest results. 2b7840bc3 Merge branch 'os_cli_on_ci' of https://github.com/NREL/OpenStudio-HPXML into os311_os_cli_on_ci 5fdbe41cb Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os311 a674a906a Merge pull request #2112 from NREL/os311_tmyx cadc32371 Merge branch 'os311_tmyx' of https://github.com/NREL/OpenStudio-HPXML into os311_tmyx 9341f775a Update Changelog.md [ci skip] 53d4f526f Latest results. 7145848c8 Add test for TMYx EPW. 52d05ddaf Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os311 30559406f A little cleanup 43b8c2943 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os311 a2093af4d Latest results. d96c61f25 Update HPXML cf5c3f81e Fix CI? 6c8ae2b4e Merge branch 'option_cleanup' of https://github.com/NREL/OpenStudio-HPXML into os311 e9ae6e3bd Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os311 75947ea34 Merge pull request #1983 from NREL/mains_temps d6792c31a Merge branch 'mains_temps' of https://github.com/NREL/OpenStudio-HPXML into mains_temps 002d1d967 Update tests. (Unrelated: Remove unused battery lifetime code.) 1742cf62e Latest results. 0d5fc7c57 Merge branch 'os311' of https://github.com/NREL/OpenStudio-HPXML into mains_temps 1dec9e5ff No longer need this code 5f7f65926 Merge pull request #2094 from NREL/os311_fixmes 6bb52779f Latest results. 02099e80f Update comment 1aac02b96 Merge branch 'os311' of https://github.com/NREL/OpenStudio-HPXML into mains_temps 1324a3545 update xmls 6774fdf5c Merge branch 'os311' of https://github.com/NREL/OpenStudio-HPXML into os311_fixmes 54d47281a Latest results. bfbc36449 Update tests b9bba0362 Shouldn't need this exception anymore. 31fe289b7 Try new docker container on CI 144790b72 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os311 167022895 Relax tol a bit [ci skip] c702f0001 Revert FIXMEs due to OpenStudio 3.11 updates [ci skip] 693489892 More progress [ci skip] 4b35aee67 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os311 a70261a4a Temporary workaround 3d0a1971e Skip warnings for now dd9610eb7 Temporarily ignore this warning. a7c4e39d0 Revert this part too [ci skip] de0cce16c Not worth it, reverting some things [ci skip] 66efbcea4 Another fix 115700d0f Fix yaml 1684ccc79 Bump OS version & ubuntu version. 85e4a966a First pass on using the E+ built-in correlation for mains temperature. Will need NREL/EnergyPlus#11037 for DWHR systems. git-subtree-dir: src/OpenStudio-HPXML git-subtree-split: d64c6c94ea5698eda7570b38457a2212323279dd * Bump OS version * Move ducts to unconditioned space given the high duct leakage.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Pull request overview
Adds two additional optional fields to the
Site:WaterMainsTemperatureobject that allows the user to adjust the amplitude and offset of the temperature correlation. The implementation is general so that users can make adjustments for a variety of purposes.This allows us to apply the Drain Water Heat Recovery adjustments to the correlation as prescribed by ANSI/RESNET/ICC 301. Currently we have to do the entire calculation ourselves and provide a
Schedule:Compactobject in our IDF that is ~1500 lines long (15-20% of the total IDF).Example:
Here are results for the above object (compared to results when there was no multiplier or offset):
No diffs are expected and no transition is required.
Pull Request Author
Reviewer