Latest OS-HPXML #738
Open
Latest OS-HPXML #738
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
dd977d6070 Merge pull request #1762 from NREL/more-ruby-docs 54a0b6a0f4 Reduce diffs. 375f04aa89 Document version.rb and xmlvalidator.rb. 17dadb713b Fix CI test 7739334d9a Revert this change 26f6e708a6 more class -> module 615bbddffb A little cleanup. 7f14e3b247 Complete ruby documentation for hpxml_defaults.rb and some other minor refactoring. 91e1ea41b8 Simplify more [ci skip] 8e47f28a63 Merge pull request #1555 from NREL/fix-bills-scheduled-battery2 2a88d87fa9 Simplify changelog description. [ci skip] 62fd9f5b19 Latest results. d8cb50b7cb Merge branch 'master' into fix-bills-scheduled-battery2 45a08e97b4 Latest results. d80111e977 Revert has_battery change. cbb2412a90 Merge branch 'master' into fix-bills-scheduled-battery2 2af2dd502a Latest results. 9f02525434 Make has_battery consistent with has_pv and has_generator. 5885d5d9fa Merge branch 'master' into fix-bills-scheduled-battery2 7477ceeb08 Merge branch 'master' into fix-bills-scheduled-battery2 72892481f0 Update the changelog. a9f6086fcb Merge branch 'master' into fix-bills-scheduled-battery2 c235b29b87 Latest results. d27db69c87 Fix issue in opposite sign for storage and cogeneration production. 4c58736d57 Latest results. da3f177713 Merge branch 'master' into fix-bills-scheduled-battery2 cc40e02bdd Update the changelog. 4f1b58fe6f Move cogeneration meter out of production. 5fe9b56b22 Latest results. f38b82faae Avoid requesting unused meters. a085606e99 Try separating electric storage from produced. Again. c44e462336 Latest results. a82c3ed8f4 Update the changelog. [ci skip] c89def39ba Revert more. 5ce59b40c5 Revert default changes and change has_production bool. 6e69d45f28 Latest results. 43ead271e8 Update the changelog. [ci skip] cd7fdbf4e5 Only default grid connection if PV is present, not other production. 177bea4951 Remove comments and update pvcompensation defaults for batteries and generators. 2fd16f38ac Merge branch 'master' into fix-bills-scheduled-battery2 127187896f Run update_hpxmls on new sample file. a83e9fc580 Merge branch 'master' into fix-bills-scheduled-battery2 39ab9f9410 Merge branch 'master' into fix-bills-scheduled-battery2 96db087799 Revert changes to hpxml_defaults. da40cd4b57 Merge branch 'master' into fix-bills-scheduled-battery2 feb4af6d9c Stub request when generator, add notes, revert defaults changes. 9322a7c212 Latest results. 7303c6e1f8 Add sample file for scheduled battery and detailed rate scenarios. cad0ae90fb Change has_pv to has_production, and always request electricityproduced when battery. c32374404b Allow defaulting pv compensation type when battery only. git-subtree-dir: hpxml-measures git-subtree-split: dd977d607094156734277b32bd7aef36b072bfae
5fa2330716 Merge pull request #1763 from NREL/more-ruby-docs2 d0dc1f1f66 Bugfix and a little renaming/cleanup. 0159e7f4fb Document remaining methods. 87e4e265ef Update unit tests. 6c49b804a8 Fix typos. a1e6b781f6 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into more-ruby-docs2 db77ea1feb A lot more hvac_sizing.rb documentation; eight methods to go. A little refactoring. ba895dcd2b Remove debug statement that was accidentally committed, spotted by @yzhou601 git-subtree-dir: hpxml-measures git-subtree-split: 5fa233071648e765abf16ae3e7d164e6a4e8ec80
f901bc64d6 Merge pull request #1767 from NREL/purge_epw_file 5d8b978b92 Pull logic into a method and some misc documentation. 3e8d12e716 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into purge_epw_file b5e5be0d62 Simplify code by using attr_accessor 610d1f56f7 Merge pull request #1660 from NREL/ansi_301_2022_cfis 3bf2d3396a Check for zero airflow. Update Changelog.md. cb1bd15d75 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into ansi_301_2022_cfis 48da532baf More bugfixes. 60f0260e5a Bugfix. e16b164968 Bugfixes. 8e172360d9 Update description. 7195abf1df Purges the `epw_file` object from the code. Now *all* weather-related data can be found on the `weather` object, so you don't have to pass around both objects or decide which one you need. e10e41ebea Merge pull request #1766 from NREL/hpxml_class_bugfix 62cc529322 Fix possible error in HPXML class for edge case. 8d810f9b1f Merge pull request #1764 from NREL/bob_ross_blower_heat 9fc69b744e Latest results. bb19ede93e Adds blower heat deduction to Bob Ross test file. aefb49b0c8 Latest results. 3ba74d1082 Update measure.xml 930bba3f31 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into ansi_301_2022_cfis ea6e3dd4e6 Latest results. a18eeacb60 Update expected mech vent energy consumption. 3705121310 Allow modeling CFIS systems that don't have any strategy to meet additional runtime needs. git-subtree-dir: hpxml-measures git-subtree-split: f901bc64d60b9c6e1f4c496eeff31dddb8a61cf6
f20b724030 Merge pull request #1771 from NREL/ruby-docs d7865a1d2e Simplify hvac_sizing.rb; no longer need to do azimuth-specific wall calcs. 52116bb8eb Latest results. 02050063aa Final changes for hpxml.rb. 5d468e79f8 More progress on hpxml.rb. Down to ~100 TODOs left. 372f5dcf13 More progress on hpxml.rb 8793e8f5ff Progress on hpxml.rb e6a9b70421 Move MathTools class into a separate resource file. ac1a10be49 Add test for when marginal rate provided. 37278886d5 Merge branch 'master' into ruby-docs 234f6385d8 Start filling out some stochastic schedule docs. 8041d11c56 Move the utility_bills resource back over. 5fa25129be Merge pull request #1776 from NREL/manualj_garages 7c487b325f Latest results. a871e9cd46 Handle above-grade garages differently than garages partially below grade. 7eaa9292c9 Require correct path in bills test file. 103d7eee5f Finish up docs in utility_bills. e5bc9429cd Relocate utility_bills to utility bill measure. 2fad7a0f92 Finish up docs in util. ed18d0ffbf A little more cleanup. d7651ea1f6 Add code documentation for weather.rb 64ff0e7afa More helpful description for runner [ci skip] de2d5cd192 Start updates to translator util resource. e9c6b2623b Temp add. 1bf7815f27 Merge branch 'master' into ruby-docs 0e7e609dda Fix order of elements in docs [ci skip] 6863be2db5 Merge pull request #1774 from NREL/clarify_buildreshpxml_slab_inputs 5d6542c8d6 Rename slab arguments in BuildResidentialHPXML measure for clarity. 15bba51290 Move changelog item. 0dda9c8157 Merge pull request #1770 from NREL/stochastic-sch-min-flow-rate 439c4998da Update the min and not the max. 0d3e54e891 Merge pull request #1760 from NREL/leakiness_description 9056339625 Latest results. 37b7c1af84 Address simulation diffs. a5a5bd75ca Remove FIXME [ci skip] e2ca42ca2f Add InfiltrationMethod input to Schematron, move error-checking from ruby to Schematron, fix CI tests. a98d4ce3f1 Update signature of gaussian_rand method. a235bef4bc Merge branch 'master' into stochastic-sch-min-flow-rate 31b8612d2f A little more cleanup, docs, tests. 3f95b569fc More description for unavailable_periods parameter. a445f774a7 Update the changelog. [ci skip] 63eff7e011 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into leakiness_description 1f316a192e Fix a couple class names. 13b23126df Update minimum cw and dw flow rate to 0.1, similar to sink, shower, bath. 1fd2bf6711 Merge pull request #1765 from NREL/ruby-docs 54def63808 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into ruby-docs 95582ecee0 Some more docs progress. 826e28b121 Latest results. 70036d9863 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into leakiness_description 6e74f360c0 Addresses some FIXMEs/questions. Bugfix for MF apartment units, so that Aext is incorporated in the energy model. Some cleanup. e1af40b7c5 Merge pull request #1769 from NREL/hvac_sizing_remove_capacity_ratio ae54c28c50 A little more cleanup. 62ed6a6419 We no longer need to use capacity_ratio in hvac_sizing.rb, it's always 1 at the nominal speed. 79fe6ec484 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into leakiness_description deaab1e6bc Minor updates. 684b11e6e9 Fix a few typos. fcb615899a Remove exclude of hpxml.rb. e7dc15e26b Merge branch 'master' into ruby-docs 96b31f5e59 Merge pull request #1639 from NREL/multistaging_backup 1fdeca9377 Latest results. b15328d39c update measures faacf6e7fa modify unit test, diffs caused by location change which caused the fan_watts_per_cfm changed e7185d9ae2 Merge branch 'multistaging_backup' of https://github.com/NREL/OpenStudio-HPXML into multistaging_backup ac51cb361d reconfigure test files 00a45fa255 Fix CI error. 99a70bbcb6 Latest results. a87ceb9423 one more test file name change 7b6177b25e Merge branch 'leakiness_description' of https://github.com/NREL/OpenStudio-HPXML into leakiness_description 599be93d0c address comments 2288b00a62 Update Changelog.md 873c22c40c one more 9baf40515a Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into multistaging_backup 402775c340 address comments 2405c2b464 Merge pull request #1768 from NREL/relax_ci_measure_xmls 49d4c03622 CI results are good. Reverting so this can be merged. 30202b3929 Check that the CI still catches this. 7cddf168fb Narrow scope of HPXML diff check. f1032b4543 Allow measure.xml diffs on the CI. 48d63aef4e Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into leakiness_description 14f1820b85 Some misc cleanup. 37f8639541 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into multistaging_backup 0b02b49adf Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into leakiness_description 1979a2038d Merge branch 'leakiness_description' of https://github.com/NREL/OpenStudio-HPXML into leakiness_description 9f97ec4867 docs, and a few minor improvements 81bec9dcae Latest results. 5e0cae29a7 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into leakiness_description abcafb5084 fix typo 417fe17072 Merge branch 'master' into ruby-docs 6a4ef177ee Progress on g_functions and schedules. 898ebd2e16 Progress. 793afd0167 Merge branch 'leakiness_description' of https://github.com/NREL/OpenStudio-HPXML into leakiness_description 6c47d53c3b infiltration method tests, other improvements around infiltration d23204773c modified acca tests and added infiltration method input b3f9a14f9e Other misc progress on translator resources. 2a39dd81ea Progress on build measure geometry. ab2af0702d Latest results. dbc9896798 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into multistaging_backup 0955d0dc13 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into leakiness_description 2d1fa1bd11 update measures 8394e16550 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into leakiness_description 9a5b7a5f5d docs and changelog 9c95e7474b Merge branch 'leakiness_description' of https://github.com/NREL/OpenStudio-HPXML into leakiness_description a6b96e1c45 change arguments 5e288ad05b Latest results. 77b162c5b5 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into leakiness_description ae04177927 add unit test from HEScore, added a few test files a890d00724 update measures f7aba08884 Leakiness description first cut d2286342b0 Latest results. d1615c88c3 update measures 6bc3cc2460 so far so good, remove fixme 5b0593a722 update measures fe7cb4796d Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into multistaging_backup b469204c41 bugfix c3685360eb update measures 3bd3afa3b6 fix max power ratio EMS 690cb7f941 method descriptions dae8216979 address a few more comments 6341f0dcb9 Merge branch 'multistaging_backup' of https://github.com/NREL/OpenStudio-HPXML into multistaging_backup 8e4f3840dd remove two error checking covered by EPvalidator 7379cd743c Apply suggestions from code review a4fcef08e9 Merge branch 'multistaging_backup' of https://github.com/NREL/OpenStudio-HPXML into multistaging_backup ca373f00e1 backup increment input name acba539bb3 Update docs/source/workflow_inputs.rst d9c68915ff Update docs/source/workflow_inputs.rst 9b1f401c13 Update docs/source/workflow_inputs.rst d50d28b388 Update docs/source/workflow_inputs.rst e3488c1638 Update BuildResidentialHPXML/measure.rb 350de19ff6 Update BuildResidentialHPXML/measure.rb 10a64025ff These files should not be added. 17e86b21d2 Latest results. 41f29704d1 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into multistaging_backup a033065599 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into multistaging_backup 34f6a8166a Latest results. 6a12d36f56 update measures 2156589e03 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into multistaging_backup 83a2357b6e Latest results. 2e854afe30 fix doc 0419baa947 fix ci, change the EPvalidator.xml to check building level, remove constraint to cooling system type. Probably add a warning later. 37585e1abe hpxml attribute name change, one more 4844bc35fc Merge branch 'multistaging_backup' of https://github.com/NREL/OpenStudio-HPXML into multistaging_backup 4c7290875d more changes e6d7f62031 address most of feedbacks 2ca80dd6cc Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into multistaging_backup cb4ca05534 Latest results. 18d04ebf28 exclude multistaging with unit multiplier dfff565fe0 fix util 881951d17f fix validator 6ab664c55d Merge branch 'multistaging_backup' of https://github.com/NREL/OpenStudio-HPXML into multistaging_backup 57dafffa15 resolve integration with other features 94e24b4d38 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into multistaging_backup 76986e2c9c bring back unit multiplier limitation 7adcb8fc00 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into multistaging_backup 80e0e6a7b9 fix error thrown by epvalidator for only allowing one hvac system in the entire hpxml, now allow one per building instead 69154751ad fixed a few issues d1d4e6846d update measures 105acf4944 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into multistaging_backup c77bfcea12 update measures 48b929faf6 Merge branch 'defrost_improvements' of https://github.com/NREL/OpenStudio-HPXML into multistaging_backup fbe6dea3d8 update measures 6b4bd553d0 Merge branch 'defrost_improvements' of https://github.com/NREL/OpenStudio-HPXML into multistaging_backup 1f2b106fd2 update unit test, resolve a few more conflicts 41a6cb4322 refactor inputs 32859ad451 Merge branch 'defrost_improvements' of https://github.com/NREL/OpenStudio-HPXML into multistaging_backup 39a9826b53 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into multistaging_backup 650400c452 Latest results. c8460292c2 Merge branch 'multistaging_backup' of https://github.com/NREL/OpenStudio-HPXML into multistaging_backup 38218ea732 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into multistaging_backup 421c3441b6 Merge branch 'geb-hvac-2' of https://github.com/NREL/OpenStudio-HPXML into multistaging_backup b4903c02ab Latest results. 806276334c update measures 88a3e19e74 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-2 5887950a7f fix tests/util 7901397317 Merge branch 'geb-hvac-2' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-2 a83ab0bab9 update measures baaf72aac9 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-2 22b39bc278 first cut changing input structure 9c61605f9f Latest results. 5ea0ea4d38 update_measures, changed temp capacity multiplier to 7 fb467e5890 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-2 62c40e8fdb deleted unexpected test results d961f0c55c update measures 3c6f6b3b86 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-2 ba80cb09fe Latest results. b8bffbcba0 update measures e2ef1eadbb added tolerance, changed error to warning for more than 4 stages. modified test file config. e0b020ca34 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into multistaging_backup 4a08f787c2 update_measures 9070c450a8 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-2 35343d1775 Latest results. 2260a17c5c Latest results. 93caaa6d84 Merge branch 'multistaging_backup' of https://github.com/NREL/OpenStudio-HPXML into multistaging_backup a47d156723 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into multistaging_backup 99203ba961 unit tests a8a868beea update measures acd9c1dfec Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-2 7a4dfaceec Latest results. f753106e99 exclude gshp and water loop system for now 43b37ec075 Latest results. e8ca8a0538 revert gshp heating capacity to avoid E+ error that plant gets too cold 08a3db27f4 fix sensor name 84339237c9 Merge branch 'geb-hvac-2' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-2 9811b56220 cleanup, added the relationship between startup curve and time to reach steady state f02e0cb5d0 Latest results. 6cd78309bf update old codes in unit tests 6e1777dada add a comment a50eda3e19 fix test f4a20601aa fix unit test 3f93d7d4f6 revert test change for debugging 98168c34e6 fix a default typo 2591e44d96 fix 16414899fb minor cleanup 4bb7c61391 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-2 a092d86c11 one more conflict 5702851509 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into multistaging_backup fce30c2e8f reconfigured test files, debug EMS program 13dc46b339 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into multistaging_backup a7c08e8b4b Merge branch 'multistaging_backup' of https://github.com/NREL/OpenStudio-HPXML into multistaging_backup d1f544690d first cut EMS staging dab37afc95 Latest results. b1589f0cef unit tests added, wlhp test file added, fixed a bug in fan energy disaggregation program 0bd17c0799 Merge branch 'multistaging_backup' of https://github.com/NREL/OpenStudio-HPXML into multistaging_backup 9447cb80f9 Latest results. c35cc189a7 update measures f8496617d2 docs, validator, cleanups, and allow more heat pump types 469bf5a13c unit multiplier ae2838f386 multistage backup coil first cut 494e910699 Latest results. 8a6a6b5a3f Latest results. 1132c078ff Merge branch 'geb-hvac-onoffthermostat' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-2 52c15cee2f Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-onoffthermostat 785b98e723 bugfix b5ba807064 Latest results. 132da54ee0 revert one unexpected change 02b6326a22 Merge branch 'geb-hvac-onoffthermostat' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-2 19fec71c81 Latest results. cf8b3ea9ac Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-onoffthermostat 3d4e6dfab3 supp coil control EMS added out of supp coil creation method 592242cc6a Merge branch 'geb-hvac-onoffthermostat' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-2 95595de52e Merge branch 'geb-hvac-2' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-2 10828de011 Merge branch 'geb-hvac-onoffthermostat' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-2 63191e30e2 Latest results. 914650a949 add room ac test file, some cleanups 61eb25412d Latest results. d41e24be5c Relate c_d to time to hit full capacity. Docs update on deadband 3fa3971282 Latest results. f08b27df84 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-onoffthermostat 72041bef00 Conflict resolution bugfix. a569e3a6a7 Latest results. ea17faa8ab Merge branch 'geb-hvac-onoffthermostat' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-2 05b5ad93d8 Oops, missed conflicts in this file. b6833a58fe Merge branch 'geb-hvac-onoffthermostat' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-2 574d9a08a1 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-onoffthermostat cb275d6a00 fix validation error checking 8df5f1fe12 ignore ems warning 7a10b29339 Merge branch 'geb-hvac-onoffthermostat' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-2 178cc8fa11 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-onoffthermostat e3240e9960 fix unexpected warning 1e1d8cf213 Latest results. cb0861acc4 Merge branch 'geb-hvac-onoffthermostat' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-2 4acd3187e6 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-onoffthermostat 04ad345d8b fix unit test, update measures 79f6b82c84 revert xml changes d9908fa836 Merge branch 'geb-hvac-onoffthermostat' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-2 ac75298877 log 5 time steps 0fdfbc6c52 update test files f07d31e94f Latest results. 660695e60a Merge branch 'geb-hvac-onoffthermostat' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-2 c9675ab8a4 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-onoffthermostat bda2954c63 Latest results. a197a59882 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-onoffthermostat 966bed4416 update docs bab600b85d update hpxmls bca41d185c Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-onoffthermostat d899d47c19 change use case rules and cleanups 8814d1ecf9 ignore warning more properly 120bab0948 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-onoffthermostat 4373ea1206 address system types 8441276b3a Merge branch 'geb-hvac-onoffthermostat' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-2 5f1d46ab9d Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-onoffthermostat 800a0d1b2b fix docs ed6990d3c5 docs b270f1f8f5 ignore the warning for now 700ad370c1 Updating some Deadband thermostat documentation. Maybe too much detail, trying to be very explicit here. 1dac67d8cb Merge branch 'geb-hvac-onoffthermostat' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-2 a2230f0e5a Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-onoffthermostat 6cc0489f0d refactor the realistic cycling program to eliminate extra warnings c2ef1bb265 unit tests, minor changes and cleanups 338eb085e2 Merge branch 'geb-hvac-onoffthermostat' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-2 2a4e74d510 Minor code cleanup. No diffs expected. 6cd23d455f fix test default b9a4b7974e add a condition 90ecb4b2b9 isdefaulted da7abc274c fix unused schedules 9a935096d7 Merge branch 'geb-hvac-onoffthermostat' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-2 5318e1ed91 fix 200691c2f4 address comments b75a9e7ea5 simplify the way of modifying detailed schedule ff9ccbeb46 fix sensor names 4aff72e818 quick fix 52f77b4a6b Merge branch 'geb-hvac-onoffthermostat' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-2 63668c7e8a Latest results. a37f40182c Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-onoffthermostat 21b1fd410c update hpxmls 3902096243 bugfix e5a9e4ae91 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-onoffthermostat 9506e03009 Merge branch 'geb-hvac-onoffthermostat' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-onoffthermostat 18a4517983 attempt for 8760 detailed schedule and unmet load program 5f849f1ba9 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-onoffthermostat 7791fe8974 Latest results. 1d7e91b0e4 add a comment a976908654 oops 6a6c590c22 fix b1aff2daa9 fix validation error 8136467a6a Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-onoffthermostat a660697034 Merge branch 'geb-hvac-onoffthermostat' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-onoffthermostat 12e5cfa2b9 update test files 506e0a23ad address comments f76ed5a28b Latest results. 0280be4a78 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-onoffthermostat 0e5e3419e9 Merge branch 'geb-hvac-onoffthermostat' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-onoffthermostat aee2ff0311 changelog 5073669092 docs and minor changes 38bbc22e18 Latest results. d985598f30 fixes and updates e707f9bd0d Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-onoffthermostat 98d072aaa6 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-onoffthermostat fdbce1079c Latest results. a4f3093e78 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-onoffthermostat e2e759d30d Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-onoffthermostat 3f74978c05 Merge branch 'geb-hvac-onoffthermostat' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-2 ed8038adcc Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-2 2f1bc7264c Latest results. 6a345e4f65 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-onoffthermostat 60182aab06 log 5 time steps before turning on backup coil 26b4c12410 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-onoffthermostat 0ce12ff00e bugfix 8c4fd03ae2 Merge branch 'geb-hvac-onoffthermostat' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-onoffthermostat c63cfeb514 update test files 1a23b84642 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-onoffthermostat 214710e100 Latest results. a1dfb98902 update hpxmls 7e3a936759 update hpxmls 22a2dda80f Merge branch 'geb-hvac-onoffthermostat' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-2 52083e0588 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-onoffthermostat 013447b4f9 bugfix 04c360489f bugfix 5441df0038 fix bug - remove unnecessary condition 048cfadc4c rerun update hpxmls 1d1701fbf8 Merge branch 'geb-hvac-onoffthermostat' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-2 ebc74fcd55 rerun tasks update hpxmls 83c9a704ca Merge branch 'geb-hvac-onoffthermostat' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-onoffthermostat c8a853bc4b Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-onoffthermostat 464d0f0344 oops, fix test acbf8a7b95 Latest results. 638c3ff750 Merge branch 'geb-hvac-onoffthermostat' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-2 a0d637da8e rerun tasks.rb ea04f32032 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-onoffthermostat 7a9572099a integrate backcoil control to staging EMS, change test file capacities b84bda2c30 fix test f8559a8495 change capacity to be smaller so that more behavior can be observed. 8f8764797a bugfix that need to pass zone to supp ems 7c8142f1e0 Latest results. a19d770ee7 Merge branch 'geb-hvac-onoffthermostat' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-2 3058965d6a Merge branch 'geb-hvac-onoffthermostat' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-onoffthermostat fd0dc04cf6 fix argument bug 6d94e24919 Merge branch 'geb-hvac-onoffthermostat' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-2 76e99068b8 Latest results. 38091fb300 check num_speed existence a709c3cf5e revert messed up changes a1a4e5eb30 revert measure.xmls 2cd4143dc3 format 418f2bd3d5 Merge branch 'geb-hvac-onoffthermostat' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-2 417186b4fa Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-onoffthermostat bb8daa8d41 Merge branch 'os330' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-2 505040a835 progress implementing new actuator bc95f4eb3a Latest results. 3afa36e08a remove invalid test file 3c4e092790 update sample files c4d81475c8 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-onoffthermostat 177d3ca901 revert measure.xml 2d7a104b1f address some issues 2848176e5c Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-2 e8373b835e Latest results. b930c2fdbd oops 8ac8426108 exclude onoff thermostat test out from unmet hour check 5771bcd37f Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-onoffthermostat 367baed8a5 Merge branch 'geb-hvac-onoffthermostat' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-onoffthermostat 377265d277 minor cleanup 32187836e6 Latest results. a534534318 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-onoffthermostat c3ebe7b2d7 Merge branch 'geb-hvac-onoffthermostat' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-onoffthermostat 7adbaa0041 Error check for partially conditioned homes f4edcc3d39 Latest results. 22741b828c bugfix 4504cfcb9d Merge branch 'geb-hvac-onoffthermostat' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-onoffthermostat ff824b0e0a Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-onoffthermostat 656412f292 Latest results. 9553316add Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-onoffthermostat f9955f8122 name changes 88c0e8910c update_measures 9e1dc7822f Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-onoffthermostat 785c698aff backup heater control: keep turning on until reaching upper bound b3007bb8ef Latest results. a98972cb51 simplify 2481d0599d format b6421ceb68 Add supp coil control 14af071629 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-onoffthermostat 1fc358b804 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-onoffthermostat 9e2847727b Latest results. b614ae2acc bugfix 339cc52149 bugfix + Merge branch 'master' 66888d9643 bugfix d62338c1a2 more to revert 4439f11814 Revert a few changes 99847b3783 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-onoffthermostat 33d6caf9de Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-2 0f120bb4e1 progress b06a489ba4 remove changes in hvac.rb for two speed systems 0c03da57b1 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac 25df61da32 update test files 9d65e72049 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac 2f4a21b442 revert exclude new test 48dae8069b oops d8d19dc4a7 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac 0c71b58860 bugfix for duct b928d25d7c handle duct program when there're two fans 88a77db20b fix a bug in rated air flow rates and defrost defaults, cleanup method arguments 7c7309a150 bugfix 6c1991352c Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac d791dd02b6 bugfix c3f6e69142 format, revert measure.xml 7f2b03a9df implement EMS program, bugfix 3cd57df0ab update test files and bugfixes 0e70d6c301 Merge branch 'master', resolved conflicts and restructured a bit 1291fa096f progress c1ce6330ce some progress.. 024ff8aa83 use curve value at middle of timestep, add warning. 318328a7f9 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac 6ed37a1c50 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac ca402ed035 Implemented Jon's curve, set timestep requirement to enable onoff control e014df7798 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac ce252a98d0 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac d4254b75dc Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac 1816115566 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac c2cf6c453d test file for two speed 628d730c3a bugfix 8ad70eff2e Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac 83cbb44690 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac bd862e8167 ignore temperature limit warning 23a109c1bb bugfix b468f0200e bugfix 2e532f7e48 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac 4f9fc24bf6 capacity degradation implementation ee46a89689 component load residual test excluded for on-off thermostat 234bf11853 onoff thermostat deadband git-subtree-dir: hpxml-measures git-subtree-split: f20b7240302f228d707d13b0d3eff9e1d80deddc
0c49d59abd Merge pull request #1789 from NREL/cleanup_whole_mf_docs 29da6f71d7 Address review comments and add timeseries arguments to the workflow outputs table. Other misc cleanup. b229072712 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into cleanup_whole_mf_docs c5fa0c65c9 Merge pull request #1795 from NREL/cleanup_geothermal_loop_docs 89f400791b Merge pull request #1788 from NREL/mj_continued 1eec668a20 Improve confusing docs for geothermal loops' BoreholesOrTrenches/Count. Other misc cleanup. [ci skip] 21c7a66209 More robust solution. 6d66154a24 Latest results. 0f525e3ce2 Add DView example too [ci skip] 0989f2f3a2 Address feedback and a little more cleanup. 8c385d19f8 Update window ISC values -- 1/2 open for blinds means 45-degree slats (as opposed to 90-degree slats for fully open), not that the blinds cover half the window area. c1265042bc One more [ci skip] 706e35fe7f Minor cleanup of the docs related to modeling whole MF buildings [ci skip] 653393887d Latest results. b43ae5fd59 Some more bugfixes. 4d3a17813a Bugfix, update test values. 81b7658c73 A little unrelated cleanup prompted by a @joseph-robertson comment. bc799db4cc Improve handling of above-grade vs below-grade portion of foundation walls. Simplify ACCA test files. Add more tests. c53fe836a2 Merge pull request #1783 from NREL/bob_ross_skylight_curb_area 24497d1850 Latest results. 4e1096c9ea Fix skylight curb area in Bob Ross test file. a9886978fd Merge pull request #1782 from NREL/mj_exhaust_ventilation 496cdf0907 Update Changelog.md [ci skip] c1bdc82c0b Latest results. f1b8c34121 Bugfix. 6a11975c91 Should be supply, not exhaust. cc8af4dcd2 Fixes missing ventilation design load for exhaust only systems. 3ce3e195af Merge pull request #1780 from NREL/negative_elevation b71b057794 Allow negative Elevation values. 1b4accda14 Merge pull request #1779 from NREL/clarify_hot_water_use_outputs dc03eed251 Clarify hot water use outputs and some minor misc stuff. git-subtree-dir: hpxml-measures git-subtree-split: 0c49d59abdce5939b91d740f88948dee94cc5f12
82800f922a Bugfix for a foundation wall that is entirely above-grade. git-subtree-dir: hpxml-measures git-subtree-split: 82800f922a36838f25c3a7b05835f79eee83eea8
1a9c556e73 Merge pull request #1802 from NREL/duct_lto_warning 5e5c3c29ef Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into duct_lto_warning 1fccf43bd7 Merge pull request #1801 from NREL/refactor_airflow_timeseries_outputs b8a56949a8 Update Changelog.md [ci skip] 484692bc53 Add a warning if the sum of supply/return duct LtO values is very high. d00eda9a5b Bugfix for e.g. monthly outputs. 53777ed1c2 Improve arg description e8e3f8b954 Creates a building-level EMS program to report timeseries airflow rates, so that we don't have to request timeseries output for each unit and sum them as part of the reporting measure. Simpler and should be faster. dbb726c004 Merge pull request #1800 from NREL/adiabatic_windows e05ec6d65d Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into adiabatic_windows 675ed809d2 Merge pull request #1798 from NREL/cleanup-create-windows 16b4b6566d Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into cleanup-create-windows e7184df91f Merge pull request #1799 from NREL/ag_fndwall_bugfix 8c9afc8a73 BuildResidentialHPXML: Clarifies that window area inputs are ignored for adiabatic walls. 9ce36094b9 Latest results. 062c42d9f4 Try removing (unused) model.getBuildingUnits loops. git-subtree-dir: hpxml-measures git-subtree-split: 1a9c556e736b807ca4703d192f276ec54ad4982a
187e174229 Stopped trying to be too clever by half. 96858af017 Bugfix. 45c0ddc730 Latest results. c4091863db Simplify code 489c0a5c66 Bugfix and cleanup. 553cae2bd7 Fix 7/8 CZs c721b7a024 Refactor: Combine all the weather station lookups into a single file. 39fe5a9e70 A little more cleanup. 8174151783 Bugfix and made it even faster. f889608b41 Update docs/changelog. Minor cleanup. 787d32df36 Fix tests. c259099da4 Clean up 38d28915b3 Add a couple tests. 8f7c53d69e Allow zipcode to be provided instead of epw file/path, in which case we default to the nearest TMY3 EPW. 7c4d471674 Merge pull request #1823 from NREL/more_bob_ross_cases d74db37a1e Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into more_bob_ross_cases 4c15e99609 Hotfix to address warning [ci skip] a90c9ab5e1 Merge pull request #1824 from NREL/refactor_default_wh_location a2e73a11f3 Latest results. eacd3b5902 Added more Bob Ross test cases. git-subtree-dir: hpxml-measures git-subtree-split: 187e174229dafd9410975918692c7a9c1ea7bbf5
Latest OS-HPXML, branch
75220943c4 Merge pull request #1817 from NREL/ruby-docs 9896e0e2f4 Latest results. c837fdfcf3 Move setpoints code back to the beginning. 7f02231840 Bugfix for CI regression. cf8138c38a Merge branch 'ruby-docs' of https://github.com/NREL/OpenStudio-HPXML into ruby-docs 6db81ef461 Final pass. Reorganized measure.rb into additional methods and some misc cleanup. d4e0b79987 Latest results. 07813e6a4e Bugfix. 0741681d8d Final pass for now (hot water and airflow). 5a5a1ca109 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into ruby-docs 579ff80f2f Merge branch 'ruby-docs' of https://github.com/NREL/OpenStudio-HPXML into ruby-docs cb20947186 Huge pass on moving code out of measure.rb, cleanup. 59b6bd2b7f Merge pull request #1827 from NREL/Bob_Ross_del_4_5 06af1c933c Latest results. 15997847e5 Update 3-19 per ACCA bdfc826393 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into Bob_Ross_del_4_5 f1c9f1d2df Merge branch 'master' into ruby-docs 232ddcdb84 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into ruby-docs 9e3f9e9829 Merge pull request #1833 from NREL/zipcode_tmy3 9a3749e3c1 A little more error-checking and cleanup. 1b01ddb02e Merge branch 'master' into ruby-docs 6d8db39c20 Latest results. 371218136c Latest results. 0ca21dc522 Merge branch 'more_bob_ross_cases' of https://github.com/NREL/OpenStudio-HPXML into Bob_Ross_del_4_5 bbeb5b05b3 added del4&5 test files 6f24420443 More method name updates. 6fb35e54d7 Merge branch 'master' into ruby-docs 30dc01a201 Move translator methods to new internal_gains and model resource files. 7c4729b2f5 Merge branch 'master' into ruby-docs f7858574b5 Relocate airflow related create_ducts method. 38763d5d32 Continue to relocate constructions and geometry related methods. e50348fb38 Must have add_setpoints before enclosure. 08f8c95ff9 Clean up and refactor methods called from create_unit_model. 74264da49d Progress. f640608de8 Merge branch 'master' into ruby-docs 07e436e140 Start relocating translator methods to resource files. git-subtree-dir: hpxml-measures git-subtree-split: 75220943c4e41bcb010703e39123861265ccdaa3
7baddc9a89 Move more methods to hpxml_defaults.rb b0b826c64b Latest results. c79f63f159 Fix DHW loop pump f30506b0f9 Revert name change. 4ebb8b8e2b Bugfix. 88d0a4ac3b Fix edge case. 5d2e33338f Add error-checking code b97a728e04 Update hvac tests, combine lights methods. 061cb373ed Add a few more objects to model.rb, reformat. ce0515c8d8 Bugfix. 7b54a990c2 Move a few more objects to model.rb. a4c37cf1d8 Consolidate Curve and Material object creation. fbc6a6b225 Bugfix. 298dc1f3ee Completed documentation of output.rb. Moved constants to constants.rb. [ci skip] e9f8ec251f Completed documentation for hotwater_appliances.rb [ci skip] a6e432659c Bugfix. f032001923 Bugfix. 421311b6c4 Use EMS-friendly names in more places 9ef0b36b7a Added EMS methods to model.rb. Introduced a method that creates EMS-friendly names. Added code to prevent duplicate sensors. e82a6745a3 Bugfix. 40d31b45bc Fix tests. Use kwargs in new model.rb methods. 59986a8390 Bugfix. Prototype generic add_foo methods in model.rb. 31e7d52abd Bugfix. 71dc6b2cd3 A couple small things 0e0f9415fa Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into ruby-docs 01e6dc7b08 Moved a bunch of HotWaterAndAppliances/WaterHeater/Airflow defaulting methods into HPXMLDefaults and added documentation. 69b9cb7924 Merge pull request #1844 from NREL/avoid_csv_library 7f06505e8c Update comment for consistency [ci skip] e6ab5eabfc Might as well do it here too for consistency. fba96d4069 Speeds up reading/writing/processing detailed schedule files and writing CSV timeseries output by avoiding the CSV library. c9f71f3b69 Merge pull request #1843 from NREL/mj_num_occ_double 69f1aca265 Latest results. e77151ef09 Update test ba479b5ed4 Update HPXMLs daa67c6d09 Adds a test case with a non-integer number of residents. Converts Manual J Num Occupants inputs from integer to double to fix a possible error. 990df159de Merge pull request #1842 from NREL/mj_default_num_occupants cb81e54ff8 Latest results. 7f691f6b73 Fixes #1841. 36f1dccd62 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into ruby-docs 4d80de2835 Some documentation for geometry.rb 845b6ab238 Merge pull request #1826 from NREL/exterior_shading_type 1188edd421 Final cleanup. e8e3a7c2c5 Latest results. 7abe0eeb0e Docs bugfix c570c031b7 Bugfix. 5fe0bbb9d8 Simplify things. ca62509039 Latest results. e63fddf68d Allow interior shading type=none. Allow exterior shading coverage fractions. de7b116ff9 Latest results. 74dee378c3 Add warnings and tests. 6da575f8e4 Latest results. 57546ff677 Update expected test values. 51e898be96 Merge branch 'exterior_shading_type' of https://github.com/NREL/OpenStudio-HPXML into exterior_shading_type 1c4b872f4e Allow more decimal places to reduce diffs. b45a5f56f4 Revert measures hash not supporting lists of arguments. 50dc076c2f Merge branch 'master' into ruby-docs 0484abbd14 Latest results. 94f1959a91 Fix test c3903e4866 Update ACCA test files. 522b711cfb Merge branch 'exterior_shading_type' of https://github.com/NREL/OpenStudio-HPXML into exterior_shading_type a1c7142156 Add new BuildResHPXML measure arguments. Update defaults for blinds. Expand sample files. cc68cc78d1 Latest results. c845338cf6 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into exterior_shading_type 4143ec9d9a Merge pull request #1707 from NREL/adp_bf_method_design_shr 57c3c6776e Update tasks after hash change. 8a18e3b85f Remove list of args hashes in measures hash. 16a4b844f2 Latest results. d315784200 Cleanup comments. 5efcc61504 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into adp_bf_method_design_shr 52b5a11060 Bugfix, cleanup. e8e0deac95 Progress in geometry and meta_measure. 76192028fa Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into exterior_shading_type 3ad40c9405 First big pass on interior shading inputs. 6485ac2cfd Merge branch 'master' into ruby-docs fe2e4d2db6 More TODOs in geometry resource file. 623f63c39e Merge pull request #1825 from NREL/fix_advanced_defrost_small_capacity 58bb02bbcd Update HPXMLtoOpenStudio/resources/hvac.rb 5baaee81eb update_measures 7243322727 Merge branch 'fix_advanced_defrost_small_capacity' of https://github.com/NREL/OpenStudio-HPXML into fix_advanced_defrost_small_capacity aab9cdb48e address comments 29218311e3 Update HPXMLtoOpenStudio/resources/hvac.rb 5cdc6b0642 Starting filling TODOs in meta_measure resource file. 8d3eb04884 rerun update measures 9fef7e18f4 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into fix_advanced_defrost_small_capacity 88e256c9f0 Merge pull request #1838 from NREL/update_openei_rates 27c68d0269 Cleanup. [ci skip] a85a4be98b Update Changelog.md 54a064d57d Pulls the latest residential URDB rates. 7a073c9259 Merge pull request #1837 from NREL/airflow_cleanup c19643c0c6 Some additional cleanup of hpxml_defaults.rb. 89db6c2867 Airflow.rb cleanup: remove globals, simplify passed arguments, etc. 56a871350a Latest results. 50c9c7d181 Unrelated code cleanup c6435fab6e Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into adp_bf_method_design_shr 0d8be0fe07 Merge pull request #1836 from NREL/fix_partial_outputs 3f8efb3bea Bugfix. 260f10fdcb Bugfix. d4bd5e0047 Reorganizes code so that output files are written last in the HPXMLtoOpenStudio measure. 11bb6ec169 Merge pull request #1829 from NREL/no-hvac-season 5614d3aeba Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into no-hvac-season 12dbaf5e0f Bugfix 12fee34156 measure.xml updated after running RuboCop. no offenses detected, measure.xml gets overwritten by CI anyway 66e2c72c3a update measures bdfa6edec4 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into fix_advanced_defrost_small_capacity 4779ada0bd changed variable name from hvac_cooling_shr to hvac_cooling_shr_rated in apply_hvac_equipment_adjustments; cosmetic change only 340ddfe2ba add unit test 26e99e6f12 Make code consistent with recent refactored code. 640cc1009a Merge pull request #1834 from NREL/lixi_docs e7196628f6 Merge branch 'master' into no-hvac-season 70b071968a Make natvent availability argument optional. 27ebe4e8d7 Minor updates. 488e01ba03 Merge branch 'master' into no-hvac-season a71a1165d6 accepting incoming master to get adp branch up to date d779bddf28 Merge branch 'master' into no-hvac-season 1e599dc4b7 Latest results. 5e74300cce Update the changelog. [ci skip] 78eb642079 Revert previous approach and update sample files. 963f14b2f8 A bit more explanation [ci skip] 2016d15b0d Clarify some docs based on comments from @lixilui. adff70b2ab Update measures and sample files. 443e7cf6e5 Change unavailable period arguments. e924f92f9f Latest results. 9d6fb6fa15 Latest results. 0916e18529 Update tests. cdcb1b0424 Update new sample file and workflow test. 3067f718ce Add inputs for insect screen shading coefficients. Tweaks some defaults to be more conservative. 531843bff9 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into exterior_shading_type d77027c5ad Add a sample file that demonstrates the change. dfe659637f Update get_daily_season calendar resource method. 67bd7a8da7 Update build measure season argument descriptions. fc3ed5feea Latest results. 7cf294647a Fix docs. c656f967e6 Update new HPXMLs a476ce591e Merge branch 'Bob_Ross_del_4_5' of https://github.com/NREL/OpenStudio-HPXML into exterior_shading_type 2141d55abb Fix error, clean up docs. 5152fb6ac3 First pass on allowing Window/InsectScreen. b0b91e4df7 Latest results. 0bb2248724 Update file names. f6915b02fd Use ref in docs. a263002e3c First pass on allowing Window/ExteriorShading/Type. 2473921122 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into fix_advanced_defrost_small_capacity ef3a5bd985 update measures 81b24a01b7 update source code docs related to advanced defrost 1c61091eaf propose a solution to avoid negative p_dot when cooling capacity is too small 1c418dc882 succesfully ran Rubocop 5df10ebe08 pulling in master after addressing adp_bf review comments 9c683e7fd8 running Rubocop 40f3831b3a adding comments re a_o_rated to address Jon Winkler review comment 2 cb5e1d1f0e adding informative messages to design airflow calculation for central cooling equipment 0692d10ae5 concluded merge from diverging local and origin adp_bf_branches 178f5da6b6 addressing first Jon W. comment re adp_bf review 18cf4138d8 Latest results. 49372e7ac8 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into adp_bf_method_design_shr 0a7b1f3a41 fixes to get_hvac_size_limits to ensure adp_bf_branch runs without error 18f106b82c descriptive comments on get_hvac_size_limits ce0994b905 / \ line extension + divisor in hvac_sizing.rb 50bb97246a Latest results. a7d7e4158f Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into adp_bf_method_design_shr 8b94164910 successful? merge of latest master into adp_bf_method_design_shr to update changes re. negative elevation fix. looking thru modified files shows no merge conflict indicators (<<<, >>>). 237309723f updating comments on HVACSizingValues attributes to match master. No attributes added, only changes were in the comments next to each attribute 1d3a43a518 changing comments on get_nominal_speed method to match remote master 547cf7f838 removing :Design_SHR property from HVACSizingValues class definition, since it is no longer used c07cb17356 refactor to rename hvac_sizings.Design_SHR object property to local variable design_shr d373f6eb0c Latest results. 776661a963 manually resolved merge conflicts in results.csv 599ec246d4 resolved merge conflicts in measure.xml ba79c8ab1b adp_bf_method branch up to date w/ master, merge conflicts resolved manually, final commit before submitting PR for review 2de64ea1d7 last explanatory comment before marking adp_bf_method PR for review 14f36ebf42 removing puts statements before PR review 1edc822502 Latest results. 49fd105224 Re-enable test, remove files. 0b0cc26ee9 Merge branch 'master' into adp_bf_method_design_shr f598241990 correct hvac_sizing and removing duplicated HPXMLtoOpenStudio directory that was incorrectly copied to docs folder 83d3094c38 hvac_sizing.rb, measure.xml, and docs updates after running RuboCop 4d5cecab82 remove unit test for Psychrometrics.CalculateSHR(), since test_error.xml is now running without error f660286106 test_error.xml running without failure. haven't inspected annual or timeseries results yet. change was to calculated A_o at rated conditions (using class variables in hvac.rb for IDB, IWB, and using psychrometrics.rb helper function for rated indoor clg humidity ratio at sea level barometric pressure (not sure pressure is correct, confirm w/ Jon?), and pass this into CoilAoFactor. CoilAoFactor should stay constant throughout the iteration for design airflow. 38cb97108a added files after git restore HPXMLtoOpenStudio to recover HPXMLtoOpenStudio folder lost on local 487c702b85 defined test_calculate_SHR() in hvac_sizing_test.rb 315916fa70 Latest results. 400a43f629 Temporarily disable test to get CI results. a887009ac1 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into adp_bf_method_design_shr 8f4b83daa6 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into adp_bf_method_design_shr 308c1f7544 Fix error and minor refactoring. 3f8f26d77a confident in ADP/BF 1ca7c4a356 finished writing code for ADP/BF implementation. ADP/BF method is a better approach to calculating the design SHR and design airflow through the cooling coil for the following OS-HPXML equipment types: Central AC, A2A HP used for cooling, Mini-Split AC, and ducted MSHP used for cooling b177cb9866 more work on iteration for design airflow f0d925c051 more comments c721a0185b iteration for ADP/BF 26a55b36c6 fixed unit conversion on cool_cap_rated so that Psychrometrics.rb doesn't numerically fail. hvac_cooling_ap.rated_shr and hvac_cooling_shr showing 0.05 discrepancy. ask team if this is a problem? d37f8c146a using pre-existing coil ao factor stored in cooling additional properties to calculate design SHR. Cool Cap Design throwing undefined variable error in Psychrometrics.CalculateSHR 85b2e27f70 work on implementing ADP/BF. coil a_o factor already calculated in hvac.rb? 0391906f9b Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into adp_bf_method_design_shr 74bb5facff removing pesky return 1.0 that shouldn't be there, preventing it from screwing things up when running OS CLI f9ed1b8a5f fixed typo in descriptive comments of psychrometrics.rb 79053154fe fixed typo in comments of CoilAoFactor method in psychrometrics.rb 1e3ef9a3b1 refactor add_cooling_system function variable input order convention to match add_heating_system function variable input order convention 2cdde89a4b renamed A_o from A_o rated because A_o is not a function of design vs. rated conditions c1a78271fd calculating A_o_rated with correct unit conversions and methods in psychometrics.rb af58345529 Translating E+ coil bypass factor method to recalculate cool_cap_design 6861e467a6 Merge branch 'master' into adp_bf_method_design_shr 2aca92f616 Committing comments for ADP/BF 49e998de65 hvac_sizing.rb af484e8b5a adding explanatory comments 82e23b660b Merge remote-tracking branch 'origin/master' into acca_manual_s 1ac11a24d6 adding comment on apply_equipment_adjustments 698aaf46a3 Committing pseudo_code_heat_pump_sizing.txt to branch OS_ACCA_Man_S_update git-subtree-dir: hpxml-measures git-subtree-split: 7baddc9a89bed4fa2cccad2afd99097336a386bd
1e8e3c66a7 Move a few more defaulting methods. git-subtree-dir: hpxml-measures git-subtree-split: 1e8e3c66a7abb7c6eeb8dc8bc640cbc28a337f42
a65b979bb6 Update refs git-subtree-dir: hpxml-measures git-subtree-split: a65b979bb6fc3856dbd3c01ebc7e3d709108a520
…s-hpxml # Conflicts: # hpxml-measures/HPXMLtoOpenStudio/resources/hpxml_defaults.rb
c002e94607 Rename method 8b6614ef65 Found more defaulting methods to move. git-subtree-dir: hpxml-measures git-subtree-split: c002e9460749ff3f4a8b975d86281414efab708a
a0fc0ad26c Need this for OS-ERI git-subtree-dir: hpxml-measures git-subtree-split: a0fc0ad26c32e6068b24fd791062c9ac2300a1d5
68b468c955 Need a different approach for OS-ERI git-subtree-dir: hpxml-measures git-subtree-split: 68b468c955dcd89f883602f3c16c8ad33434458a
5db17e71f4 Missed one. 9983541d34 Allow tank volume to be defaulted for any water heater type. Replaces HPXMLDefaults_get_default_foo with Defaults.get_foo. Renames hpxml_defaults.rb to defaults.rb. git-subtree-dir: hpxml-measures git-subtree-split: 5db17e71f4291a9f5d2b2e5294176d2cffc6643e
f0f502e249 Bugfix. f8a569bed4 Bugfix. git-subtree-dir: hpxml-measures git-subtree-split: f0f502e2494314ea867bfe1008715f0d67b65670
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
[description here]
Checklist
Not all may apply:
openstudio tasks.rb update_hpxmls)rulesets\testsand/orworkflow/tests/*_test.rb)openstudio tasks.rb update_measureshas been run