Latest OS-HPXML #1209
Merged
Latest OS-HPXML #1209
Conversation
This file contains 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
…3b5a9 0200043b5a9 Merge pull request #1571 from NREL/ansi_301_2022 2ac2179df17 Latest results. 343240a8535 Fix CI tests 1e6c86b10c2 ... and update stochastic schedules too. 2c20f7b6e63 Update docs too 52ea83786ae General water use no longer follows fixtures schedule; remove from BuildResidentialScheduleFile measure. 1b22d8e8ab7 A little EMS program simplification. de05fb4e432 Latest results. ea5d35d8009 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into ansi_301_2022 87b63bfbec9 Merge pull request #1605 from NREL/pipe_lengths d65f73faf87 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into pipe_lengths 1013d3375fb Merge pull request #1608 from NREL/vshp_min_compessor_temp fcd302bda0f Merge pull request #1606 from NREL/ansi_301_2022_freezer a7eb0f84300 Latest results. 4172da621e6 Now defaults to -20F for `CompressorLockoutTemperature` for variable-speed air-to-air heat pumps. Consistent with mini-split heat pumps. 454b045bae4 Update the changelog and docs. cf18be59740 Update existing validation test to include extra fridge and freezer. ac2ac083c29 Fix repeated text in docs, update another spot where pipe length calculation gets called. b4697a5ba34 Latest results. 3f0968e6085 Update the docs. 6188d3b0910 Add sample file for freezer with temperature dependent schedule. 919c62f79db Update defaults test file. 27664f86b9c Support schedule coefficients for freezers. 39ba2b272e7 Missed a spot where standard pipe lengths are calculated 189871c2dfd update Changelog.md, rubocop 1c973d68937 Fix edge cases with both conditioned and unconditioned basements dba11619684 Latest results. de4c1a408da Small tweaks to sensible fractions per ANSI 301-2022 Addendum C. 3e7f85a1f1f Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into ansi_301_2022 9745b5ebf26 Latest results. 54305f7c5a4 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into ansi_301_2022 c61862e491b Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into ansi_301_2022 8045f940542 Merge pull request #1602 from NREL/ansi_301_2022_lighting_appl_2 972648ba7ab Latest results. 52cb5d697e1 Update expected values in miscloads tests. 178a3d9c605 Update the docs. 433829e9af0 Update sample file schedules. 5d2d501174a Avoid updating stochastic schedules. 3a4cc5da5bd Use constant monthly multipliers. 48a1aa5b65f Minor cleanup. 9ca51c0b7ea Merge pull request #1572 from NREL/ansi_301_2022_lighting_appl a69c6bb0f31 Latest results. 685f1afc46f Fix schedule value typo. 98d2ddffd91 Latest results. c780daee270 Revert deleted check in test. 985e647a6c3 Exclude general water use from ASHRAE 140 models. 5e3e529f6ad Oops. Fix greedy find/replace. 681a5f5c21b Update sample file. 51773233527 Merge branch 'ansi_301_2022_lighting_appl' of https://github.com/NREL/OpenStudio-HPXML into ansi_301_2022_lighting_appl 2141a01304c Add a separate usage multiplier input for general water use (i.e., do not use dhw multiplier). c1748018475 Latest results. bce71143233 Fix merge conflict [ci skip] e457a32e7f1 Rename a few things and a little cleanup. 5519d88b083 Merge branch 'ansi_301_2022' of https://github.com/NREL/OpenStudio-HPXML into ansi_301_2022_lighting_appl a647484c3ea Latest results. 1343894197f Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into ansi_301_2022 6a7b46bb760 Latest results. 91af6193407 Fix docs table. 77a451a589c Typo. dddf04eacb8 Fix fixtures multiplier in get_water_gains_sens_lat method. 6a5b0b0a8f6 Replace complex fridge simulation test with simple energy use assert. 4c0a90e635b Replace BA default lighting schedules with ANSI. cedd042adf3 Set up schedule inputs for general water use. 01f61cc6f5c Misc updates to docs and changelog. [ci skip] a94ee2ad45a Fix CI tests 6285b6dac3f Tweak refrigerator assert, update tests. 0855804f729 Update epvalidator and add validation test. 4d48e87ad44 Respond to review comments. e461c632c29 Update default emissions reference [ci skip] e5e03dfc249 Hardcode the new lighting monthly mults and revert lighting tests. b266cfc512e Latest results. 6dbbac11f5a Fix new shared scheduled recirc sample file. 68ed1b47033 Latest results. a09344de23a Add sample files with recirc pump schedules. a2378bec982 Latest results. 6eda466553e Update docs with details about fridge temperature schedule calcs. 210b5a0db31 Split fridge temperature schedule into its own sample file. 41866b77136 Add checks in sim output tests for annual and timeseries sum values. 36d47b08284 Remove unit tests for fridge hrs and kwh_yr. 3f65dbcfff1 Merge branch 'ansi_301_2022' into ansi_301_2022_lighting_appl a5d64ea4c0a Merge pull request #1593 from NREL/ansi_301_2022_shared_boilers e43f79529a4 Latest results. 5d213526782 Fix CI test. 01c4b571fd1 Some code refactor. 7d4bb743304 Remove useless assignment [ci skip] c99d167c2b8 Add calc back in. 66c2c1fce0f Typo [ci skip] 406aecb7f5a Merge branch 'ansi_301_2022' of https://github.com/NREL/OpenStudio-HPXML into ansi_301_2022_shared_boilers e1b7d4dbdf8 Shared boilers require `SharedLoopWatts` (and `FanCoilWatts` if a fan coil system) inputs; removed EAE inputs/defaults. 79191efd74e Update Changelog.md [ci skip] b6022ba8f0f Merge branch 'ansi_301_2022_lighting_appl' of github.com:NREL/OpenStudio-HPXML into ansi_301_2022_lighting_appl 55b80df4705 Few more updates involving refrigerator schedules. ab2c37cff61 Latest results. 3b310e0bc75 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into ansi_301_2022 18124fd17a3 Update measure xml. 231df4f1121 Merge branch 'ansi_301_2022_lighting_appl' of github.com:NREL/OpenStudio-HPXML into ansi_301_2022_lighting_appl 0cd47050750 Comment out interior lighting schedule fraction defaults. 4fd4033abc7 Latest results. 74589ee6c41 Update some TODOs in docs. 17ed468ebad Merge branch 'ansi_301_2022' into ansi_301_2022_lighting_appl fd249285509 Merge pull request #1587 from NREL/ansi_301_2022_batteries ab60313af6f Simplify documentation around NumberofBedroomsServed > NumberofBedrooms. 137d2961faa Merge branch 'ansi_301_2022' of https://github.com/NREL/OpenStudio-HPXML into ansi_301_2022_batteries f863bc4ce40 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into ansi_301_2022 14fb9765887 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into ansi_301_2022 eda4e75b328 Latest results. 05c4b43da72 Update the docs for new schedules. dc20d1534e8 Update fridge defaulting and add a test. b5e24a422d9 Fix docs table. 98bc4a052c2 One less schedule ruleset in test. a3a4b39118a Fix design level calc and use avail sch sensor. 6e9a69dbaaf Merge branch 'ansi_301_2022' into ansi_301_2022_lighting_appl a1db341e677 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into ansi_301_2022 d2191ea01f1 Merge pull request #1577 from NREL/ansi_301_2022_programmable_thermostat a5934e0e093 Remove Changelog.md entry [ci skip] 00f8b387675 Merge branch 'ansi_301_2022_programmable_thermostat' of https://github.com/NREL/OpenStudio-HPXML into ansi_301_2022_programmable_thermostat 287d318baa6 Revert changes in test_defaults [ci skip] a4fdb6476f3 Latest results. 72c5f982f3e Fix default heating/cooling setpoints when there's no HVAC system 4eae84d5f5c Run update_measures [ci skip] 42143ff8b9d Update changelog [ci skip] 5b5b964f952 Fix test_defaults.rb 03173ee8334 Bugfix 0890573caba Simplify getting default setpoints for HVAC control type manual bd4c75beec4 Update HPXMLtoOpenStudio/resources/hpxml_defaults.rb 95c22769407 Wrong component type. 26ea43cb5f4 For now, comment out tests involving fridge full load hrs. 73054d24d60 Update epvalidator and validation tests. 68d36455ac1 Update refrigerator defaults tests. a54b1559d52 Move space_or_schedule methods so refrigerator can use them. 0f8d0c69007 Get outage working on actuated ems program. 042643eea41 Latest results. f93fb1da3dc Exclude appliance schema changes for this branch. 231e0b2ae33 Add references for prorating. [ci skip] fae910bf799 Allows shared batteries (batteries serving multiple dwelling units). Battery charging/discharging will be apportioned to the dwelling unit using its number of bedrooms divided by the total number of bedrooms served by the battery. 1c8e486c13b Bit of reorganization. 9fb96818d80 Latest results. c2598cc89bb Merge branch 'ansi_301_2022' of https://github.com/NREL/OpenStudio-HPXML into ansi_301_2022_programmable_thermostat 78ad1113795 Use 24-hr weekday/weekend setpoints for older ERI versions df814be0796 Set fridge coefficients in hpxml_defaults. 65ffb02df38 Merge branch 'ansi_301_2022' into ansi_301_2022_lighting_appl ef228a79688 Fix merge conflict. c102844ee29 Oops. e6fa688b449 Merge branch 'ansi_301_2022' into ansi_301_2022_lighting_appl 47ef6ed4818 Take a first cut at actuating the fridge schedule. d6d594c8e8a Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into ansi_301_2022 36ae0b26cfb Update lighting tests. 5def01ef860 Merge branch 'ansi_301_2022' into ansi_301_2022_lighting_appl 2b65c3ae769 Update schedule tests and some sample files. 513acded4f1 Latest results. 97abce2230e Merge branch 'ansi_301_2022' into ansi_301_2022_lighting_appl ce3851566e5 Merge branch 'master' into ansi_301_2022 62bd067917c Another constants update. b6c28b9778d Merge branch 'ansi_301_2022' into ansi_301_2022_lighting_appl bdbf9cd0de0 Latest results. 67848fe81e8 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into ansi_301_2022 a9d0011a126 Latest results. cb3775f586a Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into ansi_301_2022 3f5105ea249 Run update_measures 6696a7e5b64 Support 301-2022 programmable thermostat schedules 34d1a3de37c Update epvalidator. 338685c8624 Update test_defaults with recirc pump schedule tests. ec1064fefcb Move recirc pump schedules in docs up to first level. 3cebd4565db Change recir to recirc spelling. 57eb478207a Move recirc schedules up a level, and apply to shared recirc as well. 45417de882b Tighten epsilon and fix some tests in schedules test file. 8d20ce9307f Tighten epsilon and fix tests in build schedules test file. 7daf9839b4a Update the docs with recirc pump schedule fields. 41dcab49b7c Update sample files and regenerate. b512c65156b Update hpxml_defaults and epvalidator. 443b15d53c8 Update schedule and sample files, docs, tasks. dd53d638686 Use interior lighting fractions and multipliers instead of location based. 127bf47222e Start to support recirc pump schedules. 241f0d1d01d Update several weekday, weekend monthly schedules. 25cade37034 Latest results. 6a137735c6f Remove natural ventilation RH constraint to comply with ANSI 301-2022; HR constraint is still in place. fe3dc91a5c7 Update default CFIS fan power. Fix ANSI 301 links in docs. 85b40864fe0 Update Qinf=f(NL) equation. bddcef9920b Prep for ANSI 301-2022. git-subtree-dir: resources/hpxml-measures git-subtree-split: 0200043b5a9ceeb266837fed4e0fd56e2cdb60ad
…ca6c1 c675adca6c1 Merge pull request #1621 from NREL/revert_ansi_301_2022_shared_boilers 5d17d3b046e Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into revert_ansi_301_2022_shared_boilers 66a3859f9e1 Merge pull request #1615 from NREL/other-heated-space-hvac-none bfb98150898 Update Changelog.md [ci skip] 88b349e94bb Merge branch 'master' into other-heated-space-hvac-none 54b4843c03c Update the docs hpxml locations table. 10bea477c25 Merge pull request #1609 from NREL/ceiling-fan-watts 8f2a53db1b9 Latest results. 8f4dc711e50 Revert PR #1593. 6c42aed0cdf Remove old code in tasks.rb. 184b427b00e Add ceiling fan setpoint offset test to hvac test file. fa2aa94084f Add ceiling fan test to lighting test file. ab02425c791 Clean up default tests. 5b9f30311d1 Update schematron. 62ea12a0744 Merge pull request #1620 from NREL/docs_vacancy_outage c5470871220 Remove outdated columns in docs. [ci skip] 39fe7e39571 Copy in ceiling fan schema changes and update sample file, schematron, docs, etc. 138a3c329c8 Latest results. 2fef0c19870 Use average of default htg and clg setpoints for sensor_ia. 41e57de6aa6 Change sample file to be multiple MF space types with no HVAC. e5988f23abe Latest results. ac8b20eb419 Update for when to use default htg spt. 4962c4724c6 Merge branch 'other-heated-space-hvac-none' of github.com:NREL/OpenStudio-HPXML into other-heated-space-hvac-none 69e8f337bf0 Merge branch 'master' into other-heated-space-hvac-none 1e0f667c340 Use default htg setpoint for min temp and cond zone temp. cb963705b5b Latest results. 3c4c8fa4eac Merge branch 'master' into ceiling-fan-watts ff99d251f8c Merge pull request #1573 from NREL/misc_mj8 fe7c313c9af Update Changelog.md [ci skip] 5d0e200eb03 Merge branch 'misc_mj8' of https://github.com/NREL/OpenStudio-HPXML into misc_mj8 8598ab5a33a Update Schematron and docs for electric resistance distribution. c753ad88b4c Latest results. 1346f1fbd89 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into misc_mj8 20b50ce3cca Latest results. bbe444d5103 Merge branch 'master' into other-heated-space-hvac-none 9b134b3ea18 Replace hvac control defaults with default setpoints in ems program. 34f3db059e2 Merge pull request #1597 from NREL/hp_backup_sizing_methodology 3519adc1768 Latest results. 6bf54f0104c Fix CI tests, some code cleanup. Use mini-split ACs in house047 and house049. ec6e10bf6e7 Update docs [ci skip] 296e4088b41 Fix sample file. Ensure autosizing methodologies don't override hardsized backup capacity. b7bd0ee8584 Add sample file, update docs a bit. b75c7eab0be Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hp_backup_sizing_methodology 3de83c9e060 Latest results. 70bb351a172 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into misc_mj8 ccb68406302 Try defaulting hvac control. 599f858ff3f Add failing sample file. dbfe08d957a Typo in measure descriptions. 467dec1e013 Allow both efficiency and energy use, but prioritize energy use. a3782ba3f17 Latest results. ffa4bcc261f Merge branch 'master' into ceiling-fan-watts 182eeecb200 Fix ceiling fan default test. 3e8d1b61b29 Update schematron and add a test. c3f2877a84f Update the docs. [ci skip] 1077102dbf5 Latest results. ea119e1367d Slight change to the name of the new input. fc18d078629 Update schematron to allow either efficiency or watts or both. 7f356eb3567 Update the changelog. d94236db745 Add new default ceiling fan tests. 254b29fd458 Latest results. 59bf29582d9 Update the docs. f997c93986f Add a new sample file with the new field. db8f35cc50e Add new optional argument to build measure. 38a75920eef Add a new ceiling fan input for energy use in watts. 241cae4b472 Latest results. 3f0ee960c54 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into misc_mj8 25872676e21 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hp_backup_sizing_methodology 5bd975c77ce Latest results. a9ce2fd7c20 Handle heat pump backup of type "separate". 808261cbbe1 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hp_backup_sizing_methodology f929a0a2278 Latest results. 7b3eef0f6e8 First pass. 9efc1d5e966 Latest results. f8526e82ca0 Move code (assignments of HVAC sizing outputs to HPXML objects) from hpxml_defaults.rb to hvac_sizing.rb. d160840579e Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into misc_mj8 74afa6791a2 Latest results. 8705c59563b Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into misc_mj8 09be7b9f4dc Merge branch 'misc_mj8' of https://github.com/NREL/OpenStudio-HPXML into misc_mj8 e3112956d94 Minor refactoring. 3b04b89022d Latest results. a0281a65dc1 Merge branch 'misc_mj8' of https://github.com/NREL/OpenStudio-HPXML into misc_mj8 9a533d61aaf Use UA approach for garage. Revert CLTD_corr. d598aa39848 Latest results. 56bdfbddcd6 Completed the UA calculation for slabs. Switched from ASHRAE-based solar calculations to strictly using MJ8 guidance (e.g., use of SLM tables). Misc cleanup. 60810ab0e8f Latest results. 50e16f1a6ac Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into misc_mj8 9ddd74f4d71 Latest results. 8c6e35dc32f Add new weather file. 1084ffbcc87 Fix tests. 562270c9f71 Bugfix and minor cleanup. 9c0c27f102d CI bugfix ecb9dea4346 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into misc_mj8 1d1347b3d9e Misc Manual J improvements. Add a bunch more tests, including for advanced residence examples. git-subtree-dir: resources/hpxml-measures git-subtree-split: c675adca6c198c8ecfac9646258e1088bb589f52
shorowit
reviewed
Feb 22, 2024
…34857 a839c634857 Merge pull request #1622 from NREL/build-multiple-unavailable-periods 9e2644234ae Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into build-multiple-unavailable-periods 8327cc40c3f Simplify changelog entry. cf71976b87e Forgot to call out one of the new unavailable periods error tests. 157582677f6 Merge branch 'master' into build-multiple-unavailable-periods aeff9c6fd48 Merge branch 'master' into build-multiple-unavailable-periods 284648f1862 Update the changelog. 7cb30497ed0 Add a few new tests in build measure test file. eb9079f1a8c Update arg names in hpxml_inputs.json. 07136d31767 Update build unavailable period args to be comma-separated. git-subtree-dir: resources/hpxml-measures git-subtree-split: a839c6348570655dc80e73ad1f3eb9444d6b17e7
…aaa73 b92583aaa73 Merge pull request #1626 from NREL/avg_ceiling_height 1c962055cfc Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into avg_ceiling_height 1085ab35849 Merge pull request #1625 from NREL/recirc-pump-unavailable-periods 54a62c25cc0 Latest results. 8a9d45c672d Update changelog, revert default. caa62e00dee Latest results. 55c5404bd6f Merge mistake. 9f6af66a496 Merge branch 'master' into recirc-pump-unavailable-periods 3d9cb6c21c0 Update measure.xml 8f6ed425839 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into avg_ceiling_height cd7fce3dccb Update tests. 8b86de03e3b Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into avg_ceiling_height 5cc97b7e92c Latest results. 3aa08fd5eb2 Bugfix. 0216f3318d0 Add recirc pump expected output to a reporting test. 3a7c9b49763 AverageCeilingHeight now defaults to 8.2 when it is not provided (and ConditionedBuildingVolume is also not provided). AverageCeilingHeight now used in some infiltration calculations. Light code refactoring. 0ac370fe20e Merge branch 'recirc-pump-unavailable-periods' of github.com:NREL/OpenStudio-HPXML into recirc-pump-unavailable-periods cf4cc232294 Add recirc pump to base-schedules-simple files so we can test schedules. aa59c3771e5 Latest results. 4924a66033b Add schedule tests for general water use, and change to unaffected by power outage. 6bce10daaf1 Merge branch 'master' into recirc-pump-unavailable-periods 52c71852ca4 Add hot_water_recirculation_pump to unavailable_periods.csv. git-subtree-dir: resources/hpxml-measures git-subtree-split: b92583aaa736e834677f62fbd331c285d8b4dcaf
…c4a71 26fdf9c4a71 Merge pull request #1627 from NREL/refactor_schedule_file_columns 464e49afaa9 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into refactor_schedule_file_columns 968ad0b3bd7 Bugfix for batteries. 03e23ae9efa Refactors code related to schedule file columns. git-subtree-dir: resources/hpxml-measures git-subtree-split: 26fdf9c4a715a31fae19b1f40a127077d0cfcfb6
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 Description
Pulls in:
battery_num_bedrooms_served = geometry_unit_num_bedroomsgeneral_water_use_usage_multiplier=autoheat_pump_backup_sizing_methodology=autoceiling_fan_label_energy_use=autoschedules_vacancy_periodsschedules_power_outage_periodsschedules_power_outage_periods_window_natvent_availabilityAverageCeilingHeightin natural ACH/CFM calculations OpenStudio-HPXML#1626Checked means that something in resstock was changed or updated as a result of pulling in.
Checklist
Not all may apply:
If related to resstock-estimation, checklist includes data dictionary, source report, options saturation, options_lookup.openstudio tasks.rb update_measureshas been run