Latest OS-HPXML, ANSI 301-2022 #700
Draft
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
ANSI 301-2022
…lts.csv that better reflects the current ERI calculation components; additional fields (e.g., PEfrac) added and a few renamed/removed. Adds documentation for all fields.
…ERI_Results.csv that better reflects the current ERI calculation components; additional fields (e.g., PEfrac) added and a few renamed/removed. Adds documentation for all fields." This reverts commit 6c2ed1e.
…lts.csv that better reflects the current ERI calculation components; additional fields (e.g., PEfrac) added and a few renamed/removed. Adds documentation for all fields.
Combine ERI output files
Combine ERI output files, follow-up
ff99d251f8 Merge pull request #1573 from NREL/misc_mj8 fe7c313c9a Update Changelog.md [ci skip] 5d0e200eb0 Merge branch 'misc_mj8' of https://github.com/NREL/OpenStudio-HPXML into misc_mj8 8598ab5a33 Update Schematron and docs for electric resistance distribution. c753ad88b4 Latest results. 1346f1fbd8 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into misc_mj8 34f3db059e Merge pull request #1597 from NREL/hp_backup_sizing_methodology 3519adc176 Latest results. 6bf54f0104 Fix CI tests, some code cleanup. Use mini-split ACs in house047 and house049. ec6e10bf6e Update docs [ci skip] 296e4088b4 Fix sample file. Ensure autosizing methodologies don't override hardsized backup capacity. b7bd0ee858 Add sample file, update docs a bit. b75c7eab0b Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hp_backup_sizing_methodology 3de83c9e06 Latest results. 70bb351a17 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into misc_mj8 241cae4b47 Latest results. 3f0ee960c5 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into misc_mj8 25872676e2 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hp_backup_sizing_methodology 5bd975c77c Latest results. a9ce2fd7c2 Handle heat pump backup of type "separate". 808261cbbe Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hp_backup_sizing_methodology f929a0a227 Latest results. 7b3eef0f6e First pass. 9efc1d5e96 Latest results. f8526e82ca Move code (assignments of HVAC sizing outputs to HPXML objects) from hpxml_defaults.rb to hvac_sizing.rb. d160840579 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into misc_mj8 74afa6791a Latest results. 8705c59563 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into misc_mj8 09be7b9f4d Merge branch 'misc_mj8' of https://github.com/NREL/OpenStudio-HPXML into misc_mj8 e3112956d9 Minor refactoring. 3b04b89022 Latest results. a0281a65dc Merge branch 'misc_mj8' of https://github.com/NREL/OpenStudio-HPXML into misc_mj8 9a533d61aa Use UA approach for garage. Revert CLTD_corr. d598aa3984 Latest results. 56bdfbddcd 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. 60810ab0e8 Latest results. 50e16f1a6a Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into misc_mj8 9ddd74f4d7 Latest results. 8c6e35dc32 Add new weather file. 1084ffbcc8 Fix tests. 562270c9f7 Bugfix and minor cleanup. 9c0c27f102 CI bugfix ecb9dea434 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into misc_mj8 1d1347b3d9 Misc Manual J improvements. Add a bunch more tests, including for advanced residence examples. git-subtree-dir: hpxml-measures git-subtree-split: ff99d251f8c0c03a37174f3b730a0ab5fa2a6f2f
into ansi_301_2022_airflow # Conflicts: # hpxml-measures/Changelog.md # hpxml-measures/HPXMLtoOpenStudio/measure.xml # hpxml-measures/workflow/tests/base_results/results_sizing.csv # hpxml-measures/workflow/tests/base_results/results_workflow_simulations1.csv # hpxml-measures/workflow/tests/base_results/results_workflow_simulations1_bills.csv # hpxml-measures/workflow/tests/base_results/results_workflow_simulations2.csv # hpxml-measures/workflow/tests/base_results/results_workflow_simulations2_bills.csv # workflow/tests/base_results/EPA_Tests.csv # workflow/tests/base_results/RESNET_Test_4.6_Hot_Water.csv # workflow/tests/base_results/real_homes.csv # workflow/tests/base_results/sample_files.csv
5ff6774afa Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into ansi_301_2022_airflow 45cdd444fd Latest results. 6d6d0177e0 Merge branch 'ansi_301_2022' of https://github.com/NREL/OpenStudio-HPXML into ansi_301_2022_airflow dc687d155e Merge branch 'ansi_301_2022' of https://github.com/NREL/OpenStudio-HPXML into ansi_301_2022_airflow 6be89690f6 Expose WithinInfiltrationVolume inputs for some attic/foundation types. d42c040f55 Minor refactoring. 46fe162b76 Merge branch 'ansi_301_2022_airflow' of https://github.com/NREL/OpenStudio-HPXML into ansi_301_2022_airflow 1092b38dee Handle case where Qinf > Qtot. 8db9c4dd9c Latest results. fbf067fdcb Fix assert_in_epsilon tests. c3c95819d2 Simplify code. 9dabadd9b4 Update Changelog.md [ci skip] 1115e941ee Fix typo in docs. b704b1968c Merge branch 'ansi_301_2022' of https://github.com/NREL/OpenStudio-HPXML into ansi_301_2022_airflow d60d17e34b Updates equations for Qfan and hourly combining of infiltration/ventilation. git-subtree-dir: hpxml-measures git-subtree-split: 5ff6774afa4c4836087c3ea0288657e588101ef5
…_2022_airflow # Conflicts: # hpxml-measures/Changelog.md # hpxml-measures/HPXMLtoOpenStudio/measure.xml # hpxml-measures/workflow/tests/base_results/results_workflow_simulations1.csv # hpxml-measures/workflow/tests/base_results/results_workflow_simulations1_bills.csv
…udio-ERI into latest-os-hpxml-mf_aext_infiltration # Conflicts: # rulesets/resources/301ruleset.rb # rulesets/tests/test_ventilation.rb # workflow/tests/base_results/EPA_Tests.csv # workflow/tests/base_results/real_homes.csv # workflow/tests/base_results/sample_files1.csv
26fdf9c4a7 Merge pull request #1627 from NREL/refactor_schedule_file_columns 464e49afaa Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into refactor_schedule_file_columns b92583aaa7 Merge pull request #1626 from NREL/avg_ceiling_height 968ad0b3bd Bugfix for batteries. 1c962055cf Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into avg_ceiling_height 03e23ae9ef Refactors code related to schedule file columns. 1085ab3584 Merge pull request #1625 from NREL/recirc-pump-unavailable-periods 54a62c25cc Latest results. 8a9d45c672 Update changelog, revert default. caa62e00de Latest results. 55c5404bd6 Merge mistake. 9f6af66a49 Merge branch 'master' into recirc-pump-unavailable-periods 3d9cb6c21c Update measure.xml 8f6ed42583 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into avg_ceiling_height a839c63485 Merge pull request #1622 from NREL/build-multiple-unavailable-periods cd7fce3dcc Update tests. 8b86de03e3 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into avg_ceiling_height 9e2644234a Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into build-multiple-unavailable-periods 8327cc40c3 Simplify changelog entry. c675adca6c Merge pull request #1621 from NREL/revert_ansi_301_2022_shared_boilers 5cc97b7e92 Latest results. 5d17d3b046 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into revert_ansi_301_2022_shared_boilers cf71976b87 Forgot to call out one of the new unavailable periods error tests. 157582677f Merge branch 'master' into build-multiple-unavailable-periods 3aa08fd5eb Bugfix. 0216f3318d Add recirc pump expected output to a reporting test. 3a7c9b4976 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. 0ac370fe20 Merge branch 'recirc-pump-unavailable-periods' of github.com:NREL/OpenStudio-HPXML into recirc-pump-unavailable-periods cf4cc23229 Add recirc pump to base-schedules-simple files so we can test schedules. aa59c3771e Latest results. 4924a66033 Add schedule tests for general water use, and change to unaffected by power outage. 6bce10daaf Merge branch 'master' into recirc-pump-unavailable-periods 66a3859f9e Merge pull request #1615 from NREL/other-heated-space-hvac-none bfb9815089 Update Changelog.md [ci skip] aeff9c6fd4 Merge branch 'master' into build-multiple-unavailable-periods 284648f186 Update the changelog. 88b349e94b Merge branch 'master' into other-heated-space-hvac-none 54b4843c03 Update the docs hpxml locations table. 52c71852ca Add hot_water_recirculation_pump to unavailable_periods.csv. 10bea477c2 Merge pull request #1609 from NREL/ceiling-fan-watts 7cb30497ed Add a few new tests in build measure test file. eb9079f1a8 Update arg names in hpxml_inputs.json. 07136d3176 Update build unavailable period args to be comma-separated. 8f2a53db1b Latest results. 8f4dc711e5 Revert PR #1593. 6c42aed0cd Remove old code in tasks.rb. 184b427b00 Add ceiling fan setpoint offset test to hvac test file. fa2aa94084 Add ceiling fan test to lighting test file. ab02425c79 Clean up default tests. 5b9f30311d Update schematron. 62ea12a074 Merge pull request #1620 from NREL/docs_vacancy_outage c547087122 Remove outdated columns in docs. [ci skip] 39fe7e3957 Copy in ceiling fan schema changes and update sample file, schematron, docs, etc. 138a3c329c Latest results. 2fef0c1987 Use average of default htg and clg setpoints for sensor_ia. 41e57de6aa Change sample file to be multiple MF space types with no HVAC. e5988f23ab Latest results. ac8b20eb41 Update for when to use default htg spt. 4962c4724c Merge branch 'other-heated-space-hvac-none' of github.com:NREL/OpenStudio-HPXML into other-heated-space-hvac-none 69e8f337bf Merge branch 'master' into other-heated-space-hvac-none 1e0f667c34 Use default htg setpoint for min temp and cond zone temp. cb963705b5 Latest results. 3c4c8fa4ea Merge branch 'master' into ceiling-fan-watts 20b50ce3cc Latest results. bbe444d510 Merge branch 'master' into other-heated-space-hvac-none 9b134b3ea1 Replace hvac control defaults with default setpoints in ems program. ccb6840630 Try defaulting hvac control. 599f858ff3 Add failing sample file. dbfe08d957 Typo in measure descriptions. 467dec1e01 Allow both efficiency and energy use, but prioritize energy use. a3782ba3f1 Latest results. ffa4bcc261 Merge branch 'master' into ceiling-fan-watts 182eeecb20 Fix ceiling fan default test. 3e8d1b61b2 Update schematron and add a test. c3f2877a84 Update the docs. [ci skip] 1077102dbf Latest results. ea119e1367 Slight change to the name of the new input. fc18d07862 Update schematron to allow either efficiency or watts or both. 7f356eb356 Update the changelog. d94236db74 Add new default ceiling fan tests. 254b29fd45 Latest results. 59bf29582d Update the docs. f997c93986 Add a new sample file with the new field. db8f35cc50 Add new optional argument to build measure. 38a75920ee Add a new ceiling fan input for energy use in watts. git-subtree-dir: hpxml-measures git-subtree-split: 26fdf9c4a715a31fae19b1f40a127077d0cfcfb6
into ansi_301_2022_airflow # Conflicts: # hpxml-measures/Changelog.md # hpxml-measures/HPXMLtoOpenStudio/measure.xml # hpxml-measures/HPXMLtoOpenStudio/resources/airflow.rb # hpxml-measures/HPXMLtoOpenStudio/resources/hpxml_defaults.rb # hpxml-measures/HPXMLtoOpenStudio/resources/hvac_sizing.rb # hpxml-measures/HPXMLtoOpenStudio/tests/test_defaults.rb # hpxml-measures/workflow/tests/base_results/results_workflow_simulations1.csv # hpxml-measures/workflow/tests/base_results/results_workflow_simulations1_bills.csv # hpxml-measures/workflow/tests/base_results/results_workflow_simulations2.csv # hpxml-measures/workflow/tests/base_results/results_workflow_simulations2_bills.csv # rulesets/resources/301ruleset.rb
…io-ERI into diagnostic_output3
…2e Index calculated.
af5aa8d032 Merge pull request #1729 from NREL/msgpack_num_decimal 3613b3a118 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into msgpack_num_decimal 0464d0f2a1 Merge pull request #1668 from NREL/tcm 92461e0dd8 Allow specifying the number of decimal places in the msgpack timeseries output file if desired. 885ca26636 Update Changelog.md [ci skip] 2aaeea43fe Merge branch 'tcm' of https://github.com/NREL/OpenStudio-HPXML into tcm 84b537c5b6 Address FIXME. cf34e930f4 Latest results. d69047cd47 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into tcm ff7edc6114 Increase cooling setpoint by 1F to avoid NREL/OpenStudio-HPXML#1728. 9a9e161fe7 Merge pull request #1725 from NREL/mshp-ductless-int-backup-adv-defrost c78534179b Latest results. abeec11218 fix advanced defrost backup fuel for integrated ductless systems 4488d4def8 Merge pull request #1724 from NREL/timeseries_ec_adj 718cb03ca8 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into timeseries_ec_adj 63ea849b57 Merge pull request #1722 from NREL/report-monthly-bills e400e5c636 Add failing sample file. e92fbaa92d Latest results. eb50a8eeaa Handle warmup period. 6deaa23444 Update Changelog.md e02ba50e2f Align timeseries EC_adj with hot water energy use. 8f7fb113d6 Merge branch 'master' into report-monthly-bills 6b49fea0be Update measure xml. 2b06defbd9 Merge branch 'master' into report-monthly-bills 410751cef0 Update the changelog. [ci skip] 6c8d607ce9 Additional checks and updates. ea77953b3e Remove the temporary fixme. 8f4950f1ac Update bills tests to check for reported monthly. 66a2a8d205 Add arguments and report monthly bills. 1c8fec2b53 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into tcm e33fd4ab60 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into tcm 3cf79029b5 Latest results. 40cf39be6f Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into tcm 1fde6c94bc Latest results. 8a424ac348 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into tcm 4d683d214e Skip test for now. 65e9873dd0 update measure.xml 1c8a6d382a Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into tcm c5ccab5eb0 Make rubocop happy. 0d4064ecd4 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into tcm a4640da4cc Fix a CI test. c364d15971 Updates default temperature capacitance multiplier to 7. git-subtree-dir: hpxml-measures git-subtree-split: af5aa8d03298b86af8f96317c5303647553a17d3
f325ca0b97 Clean up previous comment. 6cb9db6a4b Update changelog. 1c4df2d0f0 Improve calculation of timeseries loads when there is a dehumidifier. git-subtree-dir: hpxml-measures git-subtree-split: f325ca0b97936c28774c6ddd64c624e0b1bb30c0
…io-ERI into diagnostic_output3
Allow diagnostic output
0b9c63286d Merge pull request #1730 from NREL/loads_dehum 8d946e5ba7 Latest results. git-subtree-dir: hpxml-measures git-subtree-split: 0b9c63286d37517a869c1339ed6bc59c494611f8
2313eb9d1f Merge pull request #1656 from NREL/eia_wood_price_data a826a749a8 Oops, still need these. 5af370b8ea Strip CSV file down to data of interest for smaller file size and faster processing. ab17685a83 Simplify/consolidate code. No reason to have fuel units/conversions defined two different places. 610ddd429d Latest results. 58cb6255dd Merge branch 'eia_wood_price_data' of github.com:NREL/OpenStudio-HPXML into eia_wood_price_data d219e8c9dc Add a unit test d9309ddce0 Use $/kBtu for coal, wood, and wood pellets be4210c8ee Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into eia_wood_price_data 9533acf86e Handle the case where no EIA SEDS rate was found 19ca6ad224 Merge branch 'eia_wood_price_data' of github.com:NREL/OpenStudio-HPXML into eia_wood_price_data 88e9626ff7 Cleanup unit_conversions.rb dea745125e Update HPXMLtoOpenStudio/resources/utility_bills.rb f637639c20 Update HPXMLtoOpenStudio/resources/utility_bills.rb 3c8a187347 Latest results. bc8e510db8 Merge branch 'eia_wood_price_data' of github.com:NREL/OpenStudio-HPXML into eia_wood_price_data 79b721a5f5 Run update_measures 67d10aed6d Merge branch 'master' of github.com:NREL/OpenStudio-HPXML into eia_wood_price_data d7b917a911 Bugfix 25cee62576 Latest results. 20754467c8 bugfix de3c881c87 Merge branch 'eia_wood_price_data' of github.com:NREL/OpenStudio-HPXML into eia_wood_price_data 298fd8ffc9 Update docs/source/workflow_inputs.rst c60c732e78 Merge branch 'master' of github.com:NREL/OpenStudio-HPXML into eia_wood_price_data 4634d89abc use more generic logic for seds_rate 9334c6c935 Use more future-proof logic for coal prices c3b588788b Use UnitConversions 1afd8445f2 Latest results. a288f6ba86 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into eia_wood_price_data f6fe62ef32 Latest results. 6b53cadc37 Update test_defaults 3636543dd9 run tasks.rb update_measures 9f3ee928b9 Merge branch 'master' of github.com:NREL/OpenStudio-HPXML into eia_wood_price_data 76a33f4ef0 Update docs 27c779046d Run tasks.rb update_measures e4bcb1e9a9 Update docs, changelog and a test c1324d069a Latest results. a87c09bea9 Merge branch 'eia_wood_price_data' of https://github.com/NREL/OpenStudio-HPXML into eia_wood_price_data b6404385b9 Use 2007 prices for coal. For 2008 forward, EIA assumes there is zero residential sector coal consumption in the United States, and SEDS does not estimate a price. 6ee918f850 Latest results. c9db11171b Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into eia_wood_price_data 86573501b8 Add coal prices a9641b5695 Adding household consumption back 8609792635 Merge branch 'eia_wood_price_data' of https://github.com/NREL/OpenStudio-HPXML into eia_wood_price_data 093eea6f72 Remove individual EIA files for different fuel types 7b0eaa446d Latest results. 18d809f0c9 update test_defaults 3f122bf45a Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into eia_wood_price_data 96e68d5c8b Merge branch 'eia_wood_price_data' of https://github.com/NREL/OpenStudio-HPXML into eia_wood_price_data bcb055d49c Replace separate EIA files for different fuel types with the SEDS data 0c09342125 Latest results. 43b36c0338 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into eia_wood_price_data ad10462b53 Merge branch 'eia_wood_price_data' of https://github.com/NREL/OpenStudio-HPXML into eia_wood_price_data 08b97ad1cd convert wood usage unit to MMBtu 8d4223fb49 Latest results. f4f107677e Add EIA's price of wood obtrained from State Energy Data System (SEDS) git-subtree-dir: hpxml-measures git-subtree-split: 2313eb9d1f52944a7d8538621b53a514f3db5328
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
Tracks changes to the OS-HPXML master branch.
Checklist
PR Author: Check these when they're done. Not all may apply.
strikethroughand check any that do not apply.PR Reviewer: Verify each has been completed.
openstudio tasks.rb update_measureshas been run