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, OS v3.6.1 #1076

Merged
merged 79 commits into from
May 25, 2023
Merged

Latest OS-HPXML, OS v3.6.1 #1076

merged 79 commits into from
May 25, 2023

Conversation

joseph-robertson
Copy link
Contributor

@joseph-robertson joseph-robertson commented May 17, 2023

Pull Request Description

Pulls in:

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

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)

joseph-robertson and others added 30 commits March 24, 2023 09:14
…718ce

24c3cb718ce Merge pull request #1332 from NREL/system_use_outputs
65793a420ac Latest results.
eeae3e16f27 Clean up docs a bit [ci skip]
16ba01765d9 Prevent dehumidifiers and mech vent preheat/precool systems from showing up.
eea880e5f5f Latest results.
d28e7607553 Replace hardcoded rounding digits for some outputs.
48735e2cd82 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into system_use_outputs
59b0df0f064 ReportSimulationOutput measure: Add annual energy outputs per HVAC and water heating system; allow requesting timeseries output.

git-subtree-dir: resources/hpxml-measures
git-subtree-split: 24c3cb718ce85827f44b45e31c644d3d6037c28d
…a0fbf

e2ee07a0fbf Merge pull request #1333 from NREL/system_use_outputs2
a0db8d53151 Fix test.
674ea3c8107 Merge branch 'system_use_outputs2' of https://github.com/NREL/OpenStudio-HPXML into system_use_outputs2
b7e835b6187 All annual load outputs are now provided as timeseries outputs; previously only "Delivered" loads were available.
b2c3fa799d3 Latest results.
5dd066a2a15 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into system_use_outputs2
4f39a733f64 Merge pull request #1337 from NREL/shading_controls
d64ec239c0f Merge branch 'shading_controls' of https://github.com/NREL/OpenStudio-HPXML into shading_controls
dff2a287930 Fix docs.
1f7167ce96a Latest results.
cbc139c7de5 Fix tests.
7f2fdd541ee Allows summer vs winter shading seasons to be specified for windows and skylights. Revert to monthly average temperature-based defaults.
9a80f39f75c Try to initiate CI run again
3c063803c45 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into system_use_outputs2
86c058c320d Clarify docs [ci skip]
def5a22d7d2 User our own names instead of OS-autogenerated names, to avoid lots of diffs between files just because the autogenerated names were different.
368a98f30eb Merge pull request #1336 from NREL/multiple_buildings_speed
a3833b97c40 Don't need these tests anymore, validation of all sample files is performed as part of workflow/tests/hpxml_translator_test.rb
327bf1904e5 Update Changelog.md
792db7047cc Speed up schematron validation when running a simulation for an HPXML file that has multiple Building elements; now we only do schematron validation on the single Building element of interest. This also means we now get warnings specific to the single Building of interest too.
f806aa07ed8 Latest results.
3da0b90a174 Fix for shared GSHP w/o backup.
87c95b8abc0 Clarify hydronic distribution type documentation for boilers.
c0dd84e5c9b Latest results.
42a5c54058f Update docs for, e.g., heat pump w/ boiler backup scenario
6d627664c68 Merge branch 'system_use_outputs2' of https://github.com/NREL/OpenStudio-HPXML into system_use_outputs2
1820830c58b Handle additional heat pump backup situations.
1b0f6dc8729 Revert fan/pump changes; just add heat pump backup fan/pump end use instead.
3b1a2127876 Latest results.
5fe7f214685 Fix tests
2c6000f3fa8 Cleanup Changelog.md [ci skip]
7a06e92d73b Typo [ci skip]
e2edc1405b5 Update Changelog.md [ci skip]
027bb020993 Major cleanup: - Remove individual fan/pump end use outputs; now aggregated with other parent end uses (e.g., cooling) - Adds "Load: Heating: Heating: Heat Pump Backup" - Remove ERI argument and outputs; everything can now be calculated downstream in OS-ERI - Remove special handling for dual-fuel heat pumps; no longer needed
227cb13c38f Latest results.
5fea7968fe2 Merge branch 'system_use_outputs2' of https://github.com/NREL/OpenStudio-HPXML into system_use_outputs2
2c6f526ef4f Oops, missed one.
3e452edcf21 Latest results.
94decf9d3fd Fix tests.
533df42ac99 Order by system instead of end use.
ea05664d907 For ERI, separate out heating vs cooling for heat pumps and other cleanup/fixes.

git-subtree-dir: resources/hpxml-measures
git-subtree-split: e2ee07a0fbfd4a3e3b64182dba665bd34988415a
…8828d

ecc9a28828d Merge pull request #1342 from NREL/disable_annual_outputs
fbb6c8d0c95 Address review comment
a298bd1cf83 Latest results.
80a24325bd0 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into disable_annual_outputs
f52373d1bcf Merge pull request #1344 from NREL/attached_surfaces_error_checking
80cb23f2f64 Ensure system use outputs are ordered (deterministic).
6b77a20ba53 Latest results.
872a3ad1d15 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into attached_surfaces_error_checking
a460dcd8aae Fix tests.
41bb2f26257 Merge pull request #1343 from NREL/unavailable_periods
cd9e2d13ebd Adds error-checking to ensure that SFA/MF dwelling units have at least one attached wall/ceiling/floor surface. This is particularly important for infiltration adjustment (Aext) calculations.
19a3413bd30 Add test.
5d19886579f Fix a couple tests.
10678c67dcc First pass on combining vacancies & power outages into a single feature, with the possibility of users creating their own unavailable period type.
06221242f48 Merge branch 'disable_annual_outputs' of https://github.com/NREL/OpenStudio-HPXML into disable_annual_outputs
92233a4d6df Update tests.
91f25613e2a Latest results.
edc4a359e09 Small fix.
f96722dc64e Add net emission outputs; total now excludes generation. The three emission output types (total, by fuel, by end use) are now separated in the csv file.
f34ba528453 ReportSimulationOutput measure: Allows disabling individual annual output sections.

git-subtree-dir: resources/hpxml-measures
git-subtree-split: ecc9a28828da3929d0f24e21259ec689eae28895
…2a36b

54eb142a36b Merge pull request #1349 from NREL/hp_vs_backup_fan_disaggregation
6645d4295c9 Latest results.
ecf50b35436 Update comment.
64bda69a2e6 First pass to improve primary vs backup fan/pump disaggregation to handle hours where both HP and backup are operating.
dc3ae4bc175 Merge pull request #1348 from NREL/attached-surfaces-warning
5846ebf6e69 Changes the attached surfaces check from an error to a warning (to accommodate e.g. the ERI IAD home).
ba9222f1c2e Small hotfix.
bbce45a3a29 Merge pull request #1346 from NREL/deterministic_system_uses
427e988948a Latest results.
e734088472b Cleanup.
cfd7f0d9fc9 Make System Use outputs deterministic (and ordered like the HPXML file).
026ba231f2f Merge pull request #1345 from NREL/ci_test
531315099aa CI test

git-subtree-dir: resources/hpxml-measures
git-subtree-split: 54eb142a36b58e8174bfc7a3329b8f064317353c
…3391b

093ad33391b Merge pull request #1358 from NREL/multifamily_infiltration2
d6be0f038cd Bugfixes.
2e81db7d165 Bugfix.
dc8674e9488 Use new HPXML schema proposal.
9164bb0ee68 Some more simplification.
a7a86bc0910 Merge pull request #1357 from NREL/hpxml_inputs_tsv
850fae2e7a6 Latest results.
ede6603433e Merge branch 'hpxml_inputs_tsv' of https://github.com/NREL/OpenStudio-HPXML into hpxml_inputs_tsv
187d94b9ec3 Bugfix.
8f0d1b4c8b4 Latest results.
645709c0f90 Cleanup, bugfixes.
0ced38fe7a0 First pass on replacing ruby code in tasks.rb with a hpxml_inputs.tsv file.
07e44f25863 Suppress OS EpwFile warnings
82f49d1e8d1 Merge pull request #1354 from NREL/weather_unit_tests
aec28c38c10 Fix test.
b72dc274b77 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into weather_unit_tests
4cdd1d23bbf A little more cleanup.
780e7a0d486 Add weather unit tests. Update `foo.select{ ... }[0]` to `foo.find{ ... }`.
5e4cf7036f1 Merge pull request #1282 from NREL/hvac_sizing
6c243830636 Minor code cleanup.
9230aa3ebdd Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hvac_sizing
76347d2a460 Merge pull request #1339 from NREL/remove_weather_cache
77c493fbfe6 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into remove_weather_cache
1af63100152 Latest results.
882cdb79da3 Oops, missed one merge conflict.
e2966b74138 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hvac_sizing
4df8bff5b3c Merge pull request #1351 from NREL/system_uses_with_fuel_type
8bc782ba4fb Latest results.
e603294a073 Bugfix.
640472d4a8b Exclude System Use and Emissions outputs from the CI results csv.
b2c02d82b4a Latest results.
9affb6fbea1 Include fuel type into system use outputs.
ffbd155d75b Latest results.
18983d0dd47 Add sample file.
72d5492b71e Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hvac_sizing
bfaebab3d47 Update Changelog.md [ci skip]
5530b427747 Oops, still need this.
044d6b28236 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into remove_weather_cache
6e97b812951 Bugfix.
36d2f6e244e Updated weather processing so that it only takes 0.2 seconds. That's fast enough that we can just do the weather processing on the fly, remove the use of weather cache files, and simplify our code.
5413990f09e Merge branch 'hvac_sizing' of https://github.com/NREL/OpenStudio-HPXML into hvac_sizing
2b3bd2eb4ac Add EPWs.
0ee72b8ef86 Latest results.
b291262501c Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hvac_sizing
0e17882a533 Fix double-counting an hour in the solar design load calcs.
d4d32327ae6 Windows: DAL bugfix. Conditioned basement slab: Improve consistency w/ Manual J, add insulated slab handling. More test updates.
5ce006bd278 Progress on ACCA residences for testing.
cd5351e7e9e Update measure.xml
a8c0e1a7233 Merge branch 'hvac_sizing' of https://github.com/NREL/OpenStudio-HPXML into hvac_sizing
5ee6521e8f3 Add indoor RH input. If there's a dehumidifier with RH setpoint lower than 50%, use that by default.
2dea9460f58 Latest results.
9950f0d181d Convert pwsat to an equation based on temperature. Update indoor RH assumption from 55% to 50%.
f1c775c09a6 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hvac_sizing
5a500b6d573 Add unit tests. Remove design temperatures from HVACPlant.
714ec3eda96 Latest results.
0cf513ef592 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hvac_sizing
4cf6def0941 Latest results.
2e2cb2aea7c Allow separate sensible/latent inputs for internal loads. Rename ACCASizingInputs to ManualJInputs. Update default internal gains if extra refrigerator or freezer.
a62af9ced1e Oops.
5c79ecf0881 Merge branch 'hvac_sizing' of https://github.com/NREL/OpenStudio-HPXML into hvac_sizing
a372e4ff13d Fix tests.
a7ff0c328f1 Latest results.
48726da3d64 Missed one.
0fd50249771 First pass on additional inputs.

git-subtree-dir: resources/hpxml-measures
git-subtree-split: 093ad33391b2ca5a8773479919c5063758b23828
…0a95d

802ccd0a95d Update other files.
ba692271d5b Test OS 3.6.1
3f8371a13c1 Merge pull request #1397 from NREL/hp-autosized-with-backup-hardsized
e61300d4ff3 Latest results.
3a105e9d8a9 Add test file to demonstrate capability; clarify in changelog.

git-subtree-dir: resources/hpxml-measures
git-subtree-split: 802ccd0a95da5f1613af097b3969bf8037d313b4
@joseph-robertson joseph-robertson self-assigned this May 17, 2023
…4796c

72a73c4796c Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os361
7c43a1d60f3 Fix workflow output docs. [ci skip]
5e2ee74fcd5 Merge pull request #1244 from NREL/mshp_ashp
2bfad9ae1e5 Latest results.
940aa5e4a97 Update changelog, minor changes. [ci skip]
32f4dbef6be Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into mshp_ashp
53f21b95464 Merge pull request #1390 from NREL/no-partial-hvac-loads
dd8fd948a92 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into no-partial-hvac-loads
b03293d36bf Merge pull request #1398 from NREL/power-outage-warnings
2f990a97d72 Latest results.
44074b9eb04 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into mshp_ashp
ee462303164 Narrow warnings so they only occur when HVAC/DHW are disabled (e.g., power outages, not vacancies).
66993d96ef9 remove warning
7e8f34ca40b Merge branch 'mshp_ashp' of https://github.com/NREL/OpenStudio-HPXML into mshp_ashp
8f03bafe756 hardcode humidity ratio
35c9aa63ce0 Latest results.
e7ddfef1040 Add note for zone temperatures. [ci skip]
b3020b876fc Catch unexpected severe (or even fatal) messages in CI tests too. Remove duplicate hard-coded cfm/ton values; fixes MSHP severe messages.
c614594f25b unit test for crankcase heater watts
c6f7b5aeeb8 Merge branch 'mshp_ashp' of https://github.com/NREL/OpenStudio-HPXML into mshp_ashp
09925dd2928 one more rename
1997c7352f5 Latest results.
d9aaa1f75fd rename
ffe1981b928 Latest results.
0bce926e94f Merge branch 'no-partial-hvac-loads' of https://github.com/NREL/OpenStudio-HPXML into no-partial-hvac-loads
afd9d6883d4 Fix ASHRAE 140 tests.
d285c0b75c9 Latest results.
c69e5957c22 Merge branch 'mshp_ashp' of https://github.com/NREL/OpenStudio-HPXML into mshp_ashp
ed8b1a27afb Fix merge.
354fb4b76c8 Latest results.
dc6593e15ef Update Changelog.md
c5d9fac65aa Scale reported loads (including peak loads and component loads) by the total fractions of load served by the HVAC system(s).
16afc98f702 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into mshp_ashp
f7e9148f821 Latest results.
087d34b11e0 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into mshp_ashp
8477529b9b9 parse all error lines for warning
aa730956e66 Latest results.
19b3dbdfd49 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into mshp_ashp
da082aadc82 Latest results.
3284eea5498 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into mshp_ashp
acf98a6da35 Merge branch 'mshp_ashp' of https://github.com/NREL/OpenStudio-HPXML into mshp_ashp
5503c85910a typo
a3248899107 Latest results.
0693022ccf7 test negative crankcase watts
84f3110e3b2 address comments, round 1
a78528f59e9 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into mshp_ashp
7c6b1771a14 Update BuildResidentialHPXML/measure.rb
e1cf8d026f2 Update BuildResidentialHPXML/measure.rb
ab0c7c69e20 Latest results.
24bf1a91803 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into mshp_ashp
d04a5a2f067 Merge branch 'mshp_ashp' of https://github.com/NREL/OpenStudio-HPXML into mshp_ashp
da793d4c674 update measures
287dc90943b Latest results.
26c7d28b221 minor cleanup and doc for crankcase watts
dc89a0fbffb Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into mshp_ashp
207bf5d4f2c Merge branch 'mshp_ashp' of https://github.com/NREL/OpenStudio-HPXML into mshp_ashp
1286f3c62da Latest results.
bbcb863a79a Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into mshp_ashp
8b19cab0f0b Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into mshp_ashp
03bd059ba9a Latest results.
2de122443f9 update test files
b2f4b8e0c03 ignore warning
479004e35de Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into mshp_ashp
003e67ff53b Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into mshp_ashp
41642181477 bugfix
5bb22af103f Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into mshp_ashp
dec5334b1ba ashp shr changed to be the same as mshp
cf1e85080b5 Latest results.
202d18480d2 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into mshp_ashp
e42ffbc8a01 refactor for cfm/ton and fan speed ratios
d417a4c9e99 Latest results.
0355a62b15a Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into mshp_ashp
1f069806863 Merge branch 'mshp_ashp' of https://github.com/NREL/OpenStudio-HPXML into mshp_ashp
b9615137dfb change rated airflow to be 400
a062081407d Latest results.
547f18103e2 Merge branch 'mshp_ashp' of https://github.com/NREL/OpenStudio-HPXML into mshp_ashp
6920410bb4a heating equations
12b0b0a059e Latest results.
ee88886b203 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into mshp_ashp
bf6cfc514fe Latest results.
eeccf105686 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into mshp_ashp
4c142082e4b Merge branch 'mshp_ashp' of https://github.com/NREL/OpenStudio-HPXML into mshp_ashp
05ff6e8b20c implement the same cfm per ton for mshp cooling
004e1df7c6c Latest results.
923e060a585 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into mshp_ashp
7e1099c0540 Merge branch 'mshp_ashp' of https://github.com/NREL/OpenStudio-HPXML into mshp_ashp
4132b6c588d change the cfm/ton to be the same at max speed, keeping mshp approach
c8b77ed2cb8 Latest results.
afd409c665e Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into mshp_ashp
e8b7604d68c Merge branch 'mshp_ashp' of https://github.com/NREL/OpenStudio-HPXML into mshp_ashp
5d24ccca80d allow crankcase watts to be user input
6d200688392 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into mshp_ashp
f9c3c3c1773 Latest results.
b21e1af0287 crankcase assumption and heat_c_d

git-subtree-dir: resources/hpxml-measures
git-subtree-split: 72a73c4796cee950253c428e86c63abc9c6c67cf
joseph-robertson and others added 10 commits May 19, 2023 15:23
…6a8e9

76a4286a8e9 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os361
ecb6eac704c Bump to openstudio:dev-3.6.1
6755a0bc0d3 Merge pull request #1402 from NREL/generator_hpxmls
5debc2f3996 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into generator_hpxmls
3df768d7b4f Merge pull request #1400 from NREL/psychrometric_warnings
ca596c38c28 Latest results.
82f42f65934 Latest results.
916538d1bcf Update tests.
338fcf15691 Unrelated: Use more realistic electricity production in generator files.
6dce9beca02 Use win from E+ in more SHR calcs; remove RH warning.
dd997070b23 Allow new warning.
f880a7b94f8 Fix test.
8a6b85f6d19 Use runner for Psychrometrics warnings rather than printing to stdout.
bd3052b5406 Merge pull request #1394 from NREL/second-ducted-htg-sys
f39bfdc69dd Latest results.
537c1fb421c Minor changes.
0f10bcfbfbf Latest results.
48b44245141 Update the ducted vs ductless heat pump logic.
6cd506ded88 Merge branch 'master' into second-ducted-htg-sys
f1c8459a368 Merge branch 'second-ducted-htg-sys' of github.com:NREL/OpenStudio-HPXML into second-ducted-htg-sys
349929e047e Fix new error catch, and add comments.
73a0aa12f3c Latest results.
c352ee05650 Add build error test for ducted mshp with backup furnace.
9b7e4e5b73f Add sample file for ductless mshp with backup furnace.
a263ba2d4ba Allow second furnace and fixed heater if primary is ductless.

git-subtree-dir: resources/hpxml-measures
git-subtree-split: 76a4286a8e9cff427d5047801e484000ee11d452
…a6fdd

e2f00fa6fdd Merge pull request #1399 from NREL/os361
68791d89b21 Final 3.6.1

git-subtree-dir: resources/hpxml-measures
git-subtree-split: e2f00fa6fdd5bf8f06d47d52c24a3ba419edb60e
@joseph-robertson joseph-robertson marked this pull request as ready for review May 23, 2023 19:38
@joseph-robertson joseph-robertson added this to the ResStock v3.1.0 milestone May 23, 2023
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.

1 participant