-
Notifications
You must be signed in to change notification settings - Fork 57
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Ehale ignore measures #310
Conversation
…xclusive with original method that creates a schedule based on a start time and duration. New method has randomized signal with minimum and maximum holds of 20 and 180 minutes, respectively. Each of the two schedule creation methods are applied half the time. Do to randomization, no distribution is applied to the PRBS case.
…odification code that writes out EDD files. Those files are too large to write out for a ResStock run. Now passes integrity check
…aned up PRBS file path
…uleFixedInterval to avoid ExternalFile. Schedule data is now embedded in the OSM. Also updated setpoint modification measure to look for new schedule type.
Will screen out our project-specific measures to better isolate the feature I am requesting to pull in. |
…ng ScheduleFixedInterval to avoid ExternalFile. Schedule data is now embedded in the OSM. Also updated setpoint modification measure to look for new schedule type." This reverts commit 7618aaf.
… and cleaned up PRBS file path" This reverts commit 7cc3064.
…e truncation issue" This reverts commit 698392f.
…hedule modification code that writes out EDD files. Those files are too large to write out for a ResStock run." This reverts commit 4e5ceed.
This reverts commit 7c85e1c.
This reverts commit b5e078e.
…tually exclusive with original method that creates a schedule based on a start time and duration. New method has randomized signal with minimum and maximum holds of 20 and 180 minutes, respectively. Each of the two schedule creation methods are applied half the time. Do to randomization, no distribution is applied to the PRBS case." This reverts commit 7789de2.
This reverts commit 7c3e984.
@elainethale What is the example for which you want to exclude a given measure? |
The reason I ask is that it can be dangerous to remove measures from the residential workflow. Maybe there is a better way to accomplish your goal? |
Our use case is doing flexibility estimation. We have DR measures that we add to the workflow. Those measures have attributes whose values we want to randomly sample with the standard ResStock process, but then we want to run both a baseline and perturbed case. measures_to_ignore lets us list our added DR measures to run the baseline; running the full model produces the perturbed case. We are not proposing to ignore the main ResStock measures. (We've been discussing with @ejhw, @nmerket and @rHorsey.) |
@shorowit, I believe the circleci checks are not running because my branch is on a fork. I was able to push my analogous buildstockbatch branch over to the NREL/buildstockbatch repo, which let the circleci tests run there. Would you like to give me permissions to do the same here? |
Codecov Report
@@ Coverage Diff @@
## master #310 +/- ##
=======================================
Coverage 93.12% 93.12%
=======================================
Files 168 168
Lines 48926 48926
=======================================
Hits 45560 45560
Misses 3366 3366
Continue to review full report at Codecov.
|
Codecov Report
@@ Coverage Diff @@
## master #310 +/- ##
==========================================
- Coverage 93.12% 93.11% -0.01%
==========================================
Files 168 168
Lines 48926 48931 +5
==========================================
+ Hits 45560 45561 +1
- Misses 3366 3370 +4
Continue to review full report at Codecov.
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Since you're not intending to ignore any of the main ResStock measures, I guess this seems fine. However, I'm a little concerned this leaves the door open for other users to try to ignore main ResStock measures, which could be problematic.
Perhaps users shouldn't be permitted to ignore any measures found in https://github.com/NREL/OpenStudio-BuildStock/blob/master/resources/measure-info.json (the main ResStock measures)? Though it looks like this would probably break some of your buildstockbatch tests...
@@ -77,7 +85,7 @@ def run(model, runner, user_arguments) | |||
number_of_buildings_represented = runner.getOptionalIntegerArgumentValue("number_of_buildings_represented", user_arguments) | |||
sample_weight = runner.getOptionalDoubleArgumentValue("sample_weight", user_arguments) | |||
downselect_logic = runner.getOptionalStringArgumentValue("downselect_logic", user_arguments) | |||
sample_weight = runner.getOptionalDoubleArgumentValue("sample_weight", user_arguments) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good catch.
@@ -106,22 +114,23 @@ def run(model, runner, user_arguments) | |||
# Retrieve order of parameters to run | |||
parameters_ordered = get_parameters_ordered_from_options_lookup_tsv(lookup_file, characteristics_dir) | |||
|
|||
# Obtain measures and arguments to be called | |||
measures = {} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Another good catch. Move this down where it's actually used.
I understand your concern about people ignoring the main ResStock measures. Some ideas:
On the pythonic principle of expecting people to act responsibly, I suggest implementing the first two bullets. What would you prefer? |
I have to admit that I'm not convinced this is needed. It seems trivial to handle the needed DR workflows via TSV files without adding this capability (that can be misused). For example, create an Enable DR.tsv with options Yes and No. Set all other DR TSVs to use the Enable DR.tsv as a dependency. Then you just have to set the probability to 1.0 for Yes or No to achieve the desired output. My two cents. |
I haven't been following this closely, but I had a similar thought to Scott's example. Is there a reason that won't work? |
We used a similar approach to what Scott is mentioning for @jonwinkler's installation quality project: https://github.com/NREL/OpenStudio-BuildStock/blob/install-qual_both_fault/project_singlefamilydetached/housing_characteristics/HVAC%20Airflow%20Is%20Faulted.tsv. |
@shorowit and @ejhw - This will also be useful for us in commercial. We don't have the same measure workflow dependence that y'all do and we don't use TSV files in the same way as you do analytically. For us, being able to turn on and off measures in the build existing model will be both useful and reasonable, and not having it right now leads to me doing stupid things manually with a high risk of transcription-type error introduction. If people turn off measures (particularly if the first two bullets in @elainethale's suggestion are implemented) they are making an affirmative decision that they will need to be responsible for, and so long as @elainethale makes sure that the documentation of the feature warns in red bolded text I don't see any issue. Again, if this was just a residential workflow issue I'd defer, but this will be useful for commercial usage and a reasonable and appropriate feature for us to use in the future. |
Steps to prevent feature misuse:
|
Example output when you try to ignore a core ResStock measure (from
Also, |
…tudio-BuildStock into ehale-ignore-measures
@joseph-robertson @nmerket -- I just resolved the conflict that showed up in NREL/buildstockbatch#102. Once the checks are re-run there, assuming that comes out well, who should pull both of these code changes in? |
I'll merge NREL/buildstockbatch#102. @joseph-robertson can do this one. |
Looks like NREL/buildstockbatch#102 is good now, except for having lost its "approved review" status. |
Thanks @joseph-robertson! |
e9333aabb Change range location argument name. 966e02122 Add location arguments for dw and range. 6c0944dd5 Merge branch 'master' into build-res-hpxml-v3 58373423d Merge pull request #310 from NREL/outside-boundary-conditions c73454270 bugfix, collapse other housing unit schedules, fix hardcoding living space name e4af0c4cd remove base-misc-locations-other.xml, fixed rh/hr issue 44322a232 Merge branch 'outside-boundary-conditions' of https://github.com/NREL/OpenStudio-HPXML into outside-boundary-conditions d9d8ba28a some small issues b722b28b2 Merge branch 'master' into build-res-hpxml-v3 ce8e83bc1 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into outside-boundary-conditions ec4db5bd6 Revert the part of the HPWH ducting program that was related to internal gains. c195a7e6f Merge pull request #382 from NREL/hpxml_datatype_conversions e2a371e3d Relax test tolerance. 57649b906 Also handle 1/0 (integer) conversion to boolean. e1d6d1e50 Update documentation. [ci skip] 9be79f874 other housing unit surface changed to use sch 199846419 Merge branch 'outside-boundary-conditions' of https://github.com/NREL/OpenStudio-HPXML into outside-boundary-conditions 532da3817 minor changes b98e91185 Improve datatype conversions used by HPXML class. In particular, prevents automatically converting non-integer values to integers. ec6be234d Oops. Bugfix. 67c580886 Remove unnecessary @mf_temp_sch_map variable and other minor code cleanup. Also removed some HPWH code (ducting, etc.) that isn't being used. Should be functionally the same. 8af5cae9a Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into outside-boundary-conditions e12e1f335 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into outside-boundary-conditions bf90de843 minor changes 24339bdcd remove window location error checking b1d213959 accommodate new report arg ededf86d2 merge conflict bugfix 9aeb4d5d4 update_measures 9af8bb38f Merge branch 'os_v3' of https://github.com/NREL/OpenStudio-HPXML into outside-boundary-conditions b9d8d01d3 combined coefficient assumption d92f4c82e update_measures 6b9e30881 Merge branch 'os_v3' of https://github.com/NREL/OpenStudio-HPXML into outside-boundary-conditions 0f7c405cc report test accommodation column name 53ee01125 v3.0 othersidecoefficient schedule d18a6cab1 Merge branch 'os_v3' of https://github.com/NREL/OpenStudio-HPXML into outside-boundary-conditions ac46e80b5 revert base* e0c2b70cc changes to corresponding tests ceff63ec1 some changes to test files 6fc3c83c7 test base-miscs-locations-other.xml added d89da3018 new test files for mf spaces b2c540d21 bugfix ad6e1b87c duct bugfixes and cleanup(somehow) c54595ab7 changes to first batch of suggestions f67623496 some changes after merging master 6bb69608a rake 5f54ffdff Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into outside-boundary-conditions 698592b83 added a "Surface" outside boundary condition subsurface to verify previous implementation bug was fixed e20411be4 ran update_measures 10ed69e8b Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into outside-boundary-conditions b53264d9d fix a bug in assigning outside boundary condition to subsurfaces 30c5e9d1f default dishwasher and cooking range locations c36cc8d04 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into outside-boundary-conditions 2ea13f695 invalid d22772623 merge 1ceebc35a Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into outside-boundary-conditions 0ab037a62 bugfix, new warning resolved f0de0eefc one more fix... 7a3e191bf bugfix f6a775d64 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into outside-boundary-conditions 450b6d3a5 cleanup and minor changes 9cddaa86d revert test bbae3f637 cleanup be90fb9dd dishwasher test bugfix 51d2f8f7d Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into outside-boundary-conditions 6df50bf38 fixed some merge and ci failure issues 0416fb61c Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into outside-boundary-conditions b73a20457 surface hvac_sizing and appliance progresses 5f4977166 current appliance location init 96560fb88 Unnecessary line a175069a0 duct location 0e480802d Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into outside-boundary-conditions 178ba2550 one remaining issue of merging new hpxml class ef81d7033 rubocop beb4cac4d conflicts and issues fd13012cc pulled in masters 81d8a85cf oops, removed the wrong line 81d1add00 remove diagnostic puts e6e5494fe waterheater sharing obc schedule with surfaces a5c4f1c61 progress on water heater location bfff94d5e ran rake + conflicts resolved ba6de136b Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into outside-boundary-conditions fff4145aa Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into outside-boundary-conditions 7ac14a3bc subsurface on foundation wall 09e957c60 hpxml schema changes, new enumerations 9cd567460 addressed subsurfaces 400dbd0c2 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into outside-boundary-conditions fbf4cb261 fixme comment c962c5f00 MES program to read conditioned zone temperature a3eee53b2 something left from previous commit, added report tests. 538a7581c new space type test files combined. b3016f3f2 remove diagnostic print 28dbe99a3 Other side coefficient, 0 convection first for debugging git-subtree-dir: resources/hpxml-measures git-subtree-split: e9333aabbae4bf42684be9e6dc62c79283f3d7a3
…517d262 96232517d262 Merge pull request #1575 from NREL/test-schedules c5cd9b776212 Latest results. 526f4afb8cb8 Some minor cleanup. 1d9921002d23 Merge branch 'master' into test-schedules 16f1d1193c9c Update stochastic schedule tests to use new method. 87ebb787cdfd Add new period_equivalent_full_load_hrs method. 0ffa08694829 Merge pull request #1579 from NREL/n_units_in_bldg 6eea9f16fa2e Remove unused import. 53a4ecd49c55 Hardcode expected values for stochastic schedule tests. b5e6ad3fc07c Update Changelog.md [ci skip] 56dee0bb9d0f Merge branch 'master' into test-schedules 783dd0601f76 update hpxmls 45041fdad345 Merge remote-tracking branch 'origin/master' into n_units_in_bldg 75581a521ae2 change to optional input 6f5faeaa3aa8 fixing merge conflict, update measures be760fd7c283 Merge remote-tracking branch 'origin/master' into n_units_in_bldg 76512bc4d9f2 update measures 45d54adaa4d6 Merge remote-tracking branch 'origin/master' into hes_translator a33b98656310 Simplify stochastic schedule tests. 491c8085532a Tighten tol and update tests in stochastic test file. c5fe1d55f96c Set tolerances and update schedule tests. 0851b2380201 Support constant schedule in flh simple schedule method. feac36d746f3 Use interior lighting obj name with get_schedule. 531518c901d6 Need to map new lighting interior multipliers to floats. abcf19b4de58 Try a more accurate method for comparing equiv full load hrs. b4f9ed49df9b Merge commit '2e2e8a1c26d45d6e916b6d476470a05394dc93b8' into os_hpxml_v170 a0d58871ac9c Merge commit 'd000744440a779bada23d2b3eedfd5118fb1ed5d' into os_hpxml_v170 5927e912821e Merge commit '4fcb8d755577e9edcd8ac5fc5bf28f7e6d1ef7b9' into os_hpxml_v170 74eea631ebf1 Merge commit '793a455c21d8c42bab1a646ac4d3c4353849a677' into os_hpxml_v170 f8d5a1d92549 Merge commit '075f7f014f1c47dcc89659453d749ceebcef30b2' into os_hpxml_v170 370234988cb1 Merge commit 'a697ad813d4298a5d88a6b70ee796ed84de24f6d' into os_hpxml_v170 e652a9065730 Merge commit 'c3a60431d780e5ce39ee91d5404681ec760a6819' into os_hpxml_v170 8dbcc13f708a Merge commit 'e5124cb5df2be6fb7a05f7945da5468743d29fd8' into os_hpxml_v170 1925691738ba Merge commit '72906f74cc4a10423b86b824a6b91185ff308c48' into os_hpxml_v170 d17d47cd1865 adding NumberofUnitsInBuilding to generated HPXML file for HEScore translator 493256168e0a flake8 linting c203801c87e6 Merge remote-tracking branch 'origin/master' into hes_translator d1a82e4e8b2f Merge commit '8b888325c38d3ca233c509816bb889ef8145cd40' into mobile_home_belly_ducts 504d7044c12a Merge commit '1d8b333b681cd1ef9ed46ba232540866b1c061ff' into mobile_home_belly_ducts 87bad73bee06 Merge commit 'bef79cc7526058de9c2b135a247ca9e9a1e48ff2' into mobile_home_belly_ducts e0de9cf00da9 Merge commit '52ac1c10565bba7d2c147b848e2b6121fd57bdad' ac3ce0adbbc3 Merge commit 'f1de0ca1dd5c8209a678811ee843edda9321a9c3' into os350 847867f88ddd Merge commit '02ea46a15703e08fa7b532a9acd722801f35c1c0' into os350 dad6a23f62b2 Merge commit '9b8cb11fbaa8dac9290e87a0ec9c2263e5456342' into os350 aaa7a77e3475 Merge commit '761272701a19e1d34316d8adc8fb000cbfad06f4' into os350 72e9b93e7158 Merge commit '86b0d1b07ce572b8604305632a48171abe9062e2' into os350 18ff395c00b4 Merge commit '9b0aca6b71f23bc7edce5c29dded1455289a8028' into os350 d46e85abab91 Merge commit 'ad5d51709461402afa322bbfe3493593da4b5238' into os350 08c4f7c7cd25 Merge commit 'ccce0a13e4b4d26a7bdee527c5dda1704e43e4c8' into os350 c5cc82071593 Merge commit 'c6ebbe06d7cd06c342419cd57af94065d4ca0aaa' into os350 143e70037c85 Merge commit '04aa51b1bef7733ad275db9f89070831e12f4d09' into os350 a3fac0d92efa Merge commit '758b66540420e898626cb047b4986e96e56e1052' into os350 5d4959742763 Merge commit '3e82e6d9ecfe6692b761dc9fd0f1b1627d573973' into os350 e8d35b5a3ba1 Merge commit '02f8d99ddc2086655c0a69a7b2065db42dc8f996' into os350 82f266d83576 Merge branch 'master' of https://github.com/NREL/OpenStudio-HEScore into os350 8efa065adaf7 Merge commit 'd588224825b420d5518a11676e26939e9c4adeec' into os350 4fb9772fed03 Merge commit '79e3614006dd6e32a198bd03f3d78cc2c9878dbb' into os350 02dabd2b04a5 Renames "total_{fuel}" to "utility_{fuel}". Removes PV generation from total_site_energy. Disaggregates "utility_generated" from "utility_electric". f4ce9758df5b Increase annual output sig figs. b39f632b4219 updating measures bf1ade141063 Merge branch 'master' into os350 ee538ec47021 Merge commit 'aec8822bfc1aba570ecf373719eef836ae5e51c9' into os350 bff888448464 Update unit tests to use HPXML class. 8d34f58d3c6c address comments 17840a205715 add new json regression file to auto generation, update jsons and update measures cf2fe9024ab0 hvac replacement applied to both heating and cooling. CI test changed to only run upgrades to three regression files d3509679288e Merge commit 'e8f8cad4e5fe738e5a72932234f8185b7c73c659' into os350 3d7015e73112 Merge branch 'master' of https://github.com/NREL/OpenStudio-HEScore into os350 6d8c421a7134 Merge commit '834f7a6c620b841bd8fed995e423a5f4e068ee51' into os350 ec7441a21d64 Merge branch 'master' of https://github.com/NREL/OpenStudio-HEScore into upgrades 114454d9961f Revert "Revert "OpenStudio 3.5.0 (EnergyPlus 22.2)"" 47da78d3c41e Revert "OpenStudio 3.5.0 (EnergyPlus 22.2)" 18ffdc9dcb3f Merge remote-tracking branch 'origin/os340' into hes_translator 681e8efda9f5 Merge commit '1b3a8a4ba3f9db0db339a6c8c17b485ab49b3af8' into os340 f4c8f5c9dff3 Merge commit 'ab427db88d961b8446e2d25ee46958595d3c495c' into os340 758497e74843 Merge branch 'master' of https://github.com/NREL/OpenStudio-HEScore into upgrades d6041283d6f5 Merge remote-tracking branch 'origin/os340' into hes_translator 940fe3c7aca9 Merge commit '67e7b97d71e9f635230d978c07553f7a6b8a50cf' into hes_translator 6f7d36654973 Merge branch 'master' of https://github.com/NREL/OpenStudio-HEScore into os340 61f5c0daf5cb Merge commit 'd88c7a8e72c55680c8686b8f5611baca2fb38209' into os340 01e367fa62ca Merge commit '379215b331e74a9d0dcf4c76e6e21a6dcd7a827b' into os340 018029999514 Merge commit 'c45440f74cb2cc30d526c0af9412c5fc23ecaf3c' into os340 6bc07ffc2126 Use new Ducts ID based on https://github.com/hpxmlwg/hpxml/pull/350. 53eca3ba5710 Merge commit 'f1ff834185ec58ed8028b0e3094c189283981cef' into os340 b9db311c2895 Some bugfixes and code refactoring. d386c52518dc First pass. e41f7ae2e988 Merge commit '76e0554c33172b53558cb98c4322c2525726e2e7' into os340 2cd1f0aeed7c Merge commit 'e49ab2992b700271c0de187699494a7203ed5809' into os340 4e14f3fbfc8e Merge commit '4130980aada4a4a3c04e68a39800c236f25a4976' into os340 3510f86fd826 Merge commit '8cc8c6444afabc5ab14c53f9c42726ea23aa99fd' into os340 1a7057c03b7f Merge commit '15360aeb0c25ebafd5c55e24ef34cafb17976e99' into os340 4cdf53100bbd Merge branch 'reporting_measure' of https://github.com/NREL/OpenStudio-HEScore into hes_translator 0f9e6b0bc00f Merge commit '0dc4c95b51d94b976a918ebf77e764bfa7f430fa' into os340 3ec6646ee791 Merge commit '5d78b800ae2e4a9d825e71ce8eea00d56a26d6e6' into os340 a8e07c1c8bfe Merge branch 'master' of https://github.com/NREL/OpenStudio-HEScore into os340 e3b290f45e29 Merge commit 'a54b70ce331406277a9ea498c4133a565cd5ec19' into os340 3e6c5fd38639 Merge commit '03e12780581da0d521ce2b87a0de79a1d29bb12f' into os340 ed3051cff4a2 Merge commit '6b116b879009c6c7ef4a0ae6b4f6d05987260209' into os340 8adc986bf94f run update_measures 33b815f58b3a Merge branch 'master' of https://github.com/NREL/OpenStudio-HEScore into os340 4a73d15a815e Backport a couple HVAC model changes from OS-HPXML v1.4. c4120fe600f5 Merge commit 'cbf7d1987068ebb997ff4df0350cb77538986bb4' into os340 5852a6976515 Merge commit '1b08e5bef17e4a6fc16a17d9e49e75ed59d889b5' into os340 143149d83a52 Merge commit '8211f2a99b0f2067127b8a1604d5af300ec511d5' into real_homes_mrt d1cc979f45c2 Merge commit '0ea856d3f451096a6f80d553fa0f107bab2683ad' into real_homes_mrt 5987ebcb8298 Merge commit '94c65f0014581b4c6256deaa79ab7f6cb0c110d6' into os340 5314015dd6a1 Merge commit '05f26b54c61e1bb700cab7ad53ff2bdc340c67f0' into os340 faecbe105b29 Bump to 3.4.0-rc1. Incorporate new Heat Pump Backup end use output. cce13fee95cf Merge commit 'b4897bb978b5157dc05ed9215013855eaaae93af' into os340 042cf642ff92 Merge commit 'e5c57a58c007b5bf1d9fcac7ea0f6c25bc27a8c9' into hes_translator e5c57a58c007 Squashed 'hescore-hpxml/' changes from bfd035ddc..70a557974 15a239b38cbd Squashed 'hescore-hpxml/' changes from 644f8f8c..bfd035dd 8fe6bffa8554 Squashed 'hescore-hpxml/' changes from 681cd58d..644f8f8c 5a03ea206555 Squashed 'hescore-hpxml/' changes from 8cb53554..681cd58d 31a8bf532153 Revert "revert call to translator" 2e4480923369 fix incorrect class name 0b547ab05771 revert call to translator 3b9c8ca70712 Merge commit 'ffcc96f0d73399c4a4b2562e9c57fbff43816ae7' into os340 87cb9c452285 test translate measure using only resstock-generated hpxmls 910f4519a758 Merge commit '1627c0289e7c7cd0f8459556d6f3b98d6962cf2c' into hes_translator 1627c0289e7c Squashed 'hescore-hpxml/' changes from e6625ab31..258df06ea aaae4517d5b0 Merge branch 'hes_translator' of https://github.com/NREL/OpenStudio-HEScore into hes_translator 13bb8efcb96c new test for HPXMLtoHEScore translator measure b1670fd7239a Merge commit '366d1685deacbfd3550fcec95831d4e7fc529947' into os340 a8550bb92688 Merge commit '474cccf5e57f61bc5628d79eb7095dc55d648236' into os340 688269c2ebba Merge commit 'ec7467433319897a18a916d09abed3e46fc52d2f' into os340 8b7995fd04f7 adding resstock hescore reporting measure a990e8dde475 adding dockerfile for resstock-hescore c036d233916f Merge remote-tracking branch 'origin/master' into hes_translator 28f984a369cc Squashed 'hescore-hpxml/' changes from 07f55e92..e6625ab3 ba659db67430 Merge commit '28f984a369cc3d2107b057cc7a043dc5ca622443' into hes_translator c8d4c3e649d9 Merge pull request #340 from NREL/update_waterheater_ef_range 9a49da0b2109 Merge commit 'e5cafccb91707044d3f45b701d933e6fe334d1db' into update_waterheater_ef_range e5cafccb9170 Squashed 'hescore-hpxml/' changes from 1f1d9bc9..8cb53554 ddb3004f2cc1 calling python3.9 032f3c21fed3 Merge pull request #320 from NREL/knee_walls 128c4c64c836 Latest results. 3c8028f92e72 Merge commit '05c46f1d85a4cebc811f57f740c1273da5a36766' into knee_walls 05c46f1d85a4 Squashed 'hescore-hpxml/' changes from d554be8db..1f1d9bc94 d0dcee8f5c04 Merge commit '78c99c68b9dc15716cbad717eae5da41d3a94dfd' into hes_translator 78c99c68b9dc Squashed 'hescore-hpxml/' changes from 693a2344a..07f55e922 da4658b11f67 Merge remote-tracking branch 'origin/master' into hes_translator f60eb3002272 Latest results. b3fd66259c42 redeleting roof area d771bced7491 moving script to make knee wall R-values ec565963c33b Merge remote-tracking branch 'origin/master' into knee_walls 500ed204fb64 Merge commit '5431674354df91d8265eea02dd5bd49d117daf1b' into knee_walls 5431674354df Squashed 'hescore-hpxml/' changes from 191807ab2..d554be8db 9e4b20875683 Merge pull request #335 from NREL/increase_granularity_of_const_codes 47862d429faf Squashed 'hescore-hpxml/' changes from 6a0dacd51..693a2344a 49909cb3579b Merge commit '47862d429fafba261e786c242fd1173567a51937' into increase_granularity_of_const_codes 672672ddf50f Merge commit '047791ba962a032a8ee352294b06e485417b96e5' into hes_translator 047791ba962a Squashed 'hescore-hpxml/' changes from 7cdc7e67f..16fc24cae 47a25a3f2904 update_measures 9c71e10c9bc4 update_measures 01a5feaa746d update call to the translator 6f9757161fa6 Latest results. 291a6e3bc8c2 Merge branch 'increase_granularity_of_const_codes' of github.com:NREL/OpenStudio-HEScore into increase_granularity_of_const_codes 8d8874306ae6 Merge commit '0d5ed2acda53473a9d9e465d757d4ad7148074e4' into increase_granularity_of_const_codes 0d5ed2acda53 Squashed 'hescore-hpxml/' changes from ab5cd3a9..6a0dacd5 468f1cc37c69 Merge commit '375d052cdfdc30674c313c0564a7f853814cea1b' into increase_granularity_of_const_codes 375d052cdfdc Squashed 'hescore-hpxml/' changes from b1d0bf58..ab5cd3a9 7f16ce19cbf9 Latest results. 2cdba322ccee Merge commit '4b3244c2d83ab2a1a56940be7dfe1c5266e12fd1' into increase_granularity_of_const_codes 4b3244c2d83a Squashed 'hescore-hpxml/' changes from ac1b4d42..b1d0bf58 db4df5ea62e8 Squashed 'hescore-hpxml/' changes from 5f69767a2..7cdc7e67f 6798c336c2de Merge commit 'db4df5ea62e8cec96e6510961c03e4b6d5ddd49a' into hes_translator dc938c440a60 Merge branch 'increase_granularity_of_const_codes' of github.com:NREL/OpenStudio-HEScore into increase_granularity_of_const_codes 3998255204f6 Squashed 'hescore-hpxml/' changes from 48b54c6a..ac1b4d42 35b129c0592c Merge commit '3998255204f6cef4a8cbb155f8715faf55bc90ae' into increase_granularity_of_const_codes 2b9304d25b0e Latest results. 87fa515ceb89 Make use of lookups in hescore-hpxml e71dbde292e4 Merge branch 'master' of github.com:NREL/OpenStudio-HEScore into increase_granularity_of_const_codes e05f65b2adf7 Merge remote-tracking branch 'origin/master' into hes_translator 0f31410b5bfc Merge remote-tracking branch 'origin/master' into hes_translator 9caad9b3ef34 new HPXML to HEScore translator measure 4a7fc2b1eddd merge fix 3d802dad4984 merge fix d8949e7c636d Merge commit '115eef5ca05a34acb7430ab28e38f1d94e0bc434' into hes_translator d3e12067d80c Merge commit '115eef5ca05a34acb7430ab28e38f1d94e0bc434' into hes_translator 115eef5ca05a Squashed 'hpxml-measures/' changes from efb013fc6..85529c53a 72d213b1f052 Merge remote-tracking branch 'origin/master' into knee_walls 919f97dda127 Merge pull request #336 from NREL/pr_template af7c32147b78 Revert "updating PR template" 4d21a2a9ac3c updating PR template bc5c8fa01b7a update measures c4275c163ab4 Updates the PR template. bd26060b5afc Merge branch 'knee_walls' of github.com:NREL/OpenStudio-HEScore into knee_walls 1d339f093a90 updating test to also test knee wall assembly R-value lookup 9fb22c273761 Squashed 'hescore-hpxml/' changes from a8b1ffd35..191807ab2 f916c38cb7a4 Merge commit '9fb22c27376166945265e4ef6a2706d171eb5b8f' into knee_walls e58cd329a9dd removing references to cond_attic in tests 6af25535f5e4 Latest results. 2f442cb6c5bf fixing regression json files 741fdb154110 Merge remote-tracking branch 'origin/master' into knee_walls 6db7beab9319 Squashed 'hescore-hpxml/' changes from 5d2512af7..a8b1ffd35 a203a31bf064 Merge commit '6db7beab93191e1dfc2c10b240ecf6a4d302dab9' into knee_walls b24eb5de5dd0 Merge commit 'b40595439fc91049928b0ea35c792f3fc4f625d5' into increase_granularity_of_const_codes b40595439fc9 Squashed 'hescore-hpxml/' changes from 5f69767a..48b54c6a a50fa7e9a7da Merge pull request #334 from NREL/latest-os-hpxml 2e0b7f9cd97d Latest results. 9bce08df7620 Update location of HPXML schema. c43c2100890a Update location of HPXML schema. f98744fddcea Update measure xmls ca7677079d81 Update for new measure arg. aeccd5c4ec1c Merge commit 'f8f838834d0259d1c3214cbd60d46f7d98eaea07' into latest-os-hpxml a1d84a210f43 Merge commit 'f8f838834d0259d1c3214cbd60d46f7d98eaea07' into latest-os-hpxml f8f838834d02 Squashed 'hpxml-measures/' changes from efb013fc6..89ab5898e dbda415c7c60 a few changes to knee wall assembly R-values 733e48dba273 adding R-13 to knee wall assemblies de6dd03d984f Merge commit '7868fc24455328b643cef1c7585871d34daef934' into knee_walls 7868fc244553 Squashed 'hescore-hpxml/' changes from 5f69767a2..5d2512af7 29c6cae55c6c Merge remote-tracking branch 'origin/master' into knee_walls b2d4d6a1e2b2 Merge pull request #327 from NREL/high-efficiency-heat-pump 244bceb18a66 Latest results. 17f6e5c49c39 fix 3fed6958acae Merge branch 'high-efficiency-heat-pump' of https://github.com/NREL/OpenStudio-HEScore into high-efficiency-heat-pump 8df107792590 simplify 6c31eb2bae13 add test files fe46de5756f4 Merge branch 'master' of https://github.com/NREL/OpenStudio-HEScore into high-efficiency-heat-pump c42400486d0e Merge pull request #331 from NREL/latest-hescore-hpxml d11bb5cb9438 Latest results. fb92996655bb Squashed 'hescore-hpxml/' changes from d24f18e4..5f69767a 7a206714b403 Merge commit 'fb92996655bb9dd827585101c72076b580e13222' into latest-hescore-hpxml d89a0db1a705 Latest results. 9a6c0b1ccb78 Transition new Skylight_storm.json and Window_storm.json test files. e9f0b872b8a4 Merge branch 'master' of https://github.com/NREL/OpenStudio-HEScore into knee_walls 891d901f8a84 Merge branch 'master' of https://github.com/NREL/OpenStudio-HEScore into high-efficiency-heat-pump a15e52de13c4 Add USA_WA_Seattle-Boeing.Field.727935_TMY3.epw for new hescore-hpxml examples/house9.json 50c0c695ef0c Merge commit 'ebd561d4a655f7f36d7e4655922d72f7b907caad' into high-efficiency-heat-pump ebd561d4a655 Squashed 'hescore-hpxml/' changes from 3bd9a14f..8e422bc5 529a68c3aee0 Merge commit 'bc8fbd8578574250a0850cc9307aac8e19045f9d' into high-efficiency-heat-pump bc8fbd857857 Squashed 'hescore-hpxml/' changes from 51c7928f..3bd9a14f 94074bc2661b Merge branch 'master' of https://github.com/NREL/OpenStudio-HEScore into high-efficiency-heat-pump a6c6f4a76400 add test files and unit tests 49e5a98c87a3 add test files and unit tests cf841c03822c add cee regions, change to lookup table 5d7ae0684643 Merge pull request #319 from NREL/low_e_storms aed70f29dcec Throw an error when the base windows u-factor is less than 0.45 eec8619e72e5 Merge branch 'low_e_storms' of github.com:NREL/OpenStudio-HEScore into low_e_storms 11c74a98265f Change 'get method' for storms to return adjusted ufactor/shgc 6d56bd6d4250 Latest results. f46cadb3740c Latest results. e7ae97dbe2e7 Merge branch 'master' of github.com:NREL/OpenStudio-HEScore into low_e_storms 6dfecb568f8b Run tasks.rb ecd7b7450d9c Remove air leakage effect 2c42fcbef7fb Merge pull request #323 from NREL/energystar_equip_update_rebase 029b27dbc0c6 Merge commit 'fdb0ff2d50aa93c2383243fd8084037cf834a662' into high-efficiency-heat-pump fdb0ff2d50aa Squashed 'hescore-hpxml/' changes from d24f18e4..51c7928f 909cba55e0d5 add efficiencies 9040d1761e5d Latest results. b46128ca886e Fixes #325. 047e70358c55 Merge commit '9a66b11a4a908d896943cf4507387c421142d38a' into knee_walls 9a66b11a4a90 Squashed 'hescore-hpxml/' changes from 521abdff5..5f69767a2 28c379961c52 Merge remote-tracking branch 'origin/master' into knee_walls c3c9a3736457 Latest results. 25731db7be27 Merge pull request #326 from NREL/fix_hp_mixed_efficiencies d72e92f13352 Merge branch 'low_e_storms' of github.com:NREL/OpenStudio-HEScore into low_e_storms 4e46b420f99d Bugfix 69cf9de7e9ef Latest results. 6759036f438a Code cleanup 3630ea10717a Merge branch 'low_e_storms' of github.com:NREL/OpenStudio-HEScore into low_e_storms 8f30523c6339 Fix ufactor and sghc adjustment with storm windows 3fee8ba92d90 Latest results. d850671bbf6e Update regression files with storm windows d11c4499d189 Update U-factor and SHGC reduction by storm windows 5b5ceb7de20c Fixes #325. ea72dd419430 setting maximum knee wall area to 5000 f65b60efe9db adding knee wall regression test 92f312c3a436 updating knee wall assembly R-value calcs f78040b28db5 Latest results. 229e996099e8 fix test 56868cb1a384 using LF instead of CRLF for line endings 9b76fa1e0893 changing mini splits to SEER 15 f6bb504590cd updating energy star equipment to latest 43ee11e58825 Latest results. bfab0330db79 removing temporary script to generate jsons 48f98945193b updates hescore-hpxml example files cd31f8b63ee8 adding script to convert jsons to the new format c36fd1a42f1d addressing a few bug that caused testing to fail d12e4e2533b1 fixing syntax error 4bffbd1aee97 updating historical and regression files e45b453ee289 adding knee wall lookup and hpxml generation 1255459c514e adding validation rules for knee walls and roofs d5e49513bdb8 adding new zone_roof elements deb937998f40 Merge branch 'master' of github.com:NREL/OpenStudio-HEScore into low_e_storms 37d3d72247ea Merge commit '1a1fbdb9d8acdd9f69559e6adec02f75642ec3ba' into knee_walls 1a1fbdb9d8ac Squashed 'hescore-hpxml/' changes from d24f18e40..521abdff5 6bac592528d5 Merge remote-tracking branch 'origin/master' into knee_walls 5383de0c4b9e Revert "adding knee walls and reorganizing json schema for attics/roofs" d52e416204db Merge pull request #280 from NREL/duct_blaster_measurements d87e9895b36c Update new JSON test files from merge. b620b37ae164 Merge branch 'master' of https://github.com/NREL/OpenStudio-HEScore into duct_blaster_measurements 1cb7ea32deef Squashed 'hescore-hpxml/' changes from 1e4b5b2a..d24f18e4 4b551670314d Merge commit '1cb7ea32deefeca30db58611042dc11a52775141' into duct_blaster_measurements 3190798b95c0 adding knee walls and reorganizing json schema for attics/roofs 9cec110369bc updating devcontainer stuff 8bf881bed61f Merge pull request #315 from NREL/addtl_duct_locations 30a079a4c87b Merge commit '66362784f619f12505e929480239f6353b726917' into addtl_duct_locations 66362784f619 Squashed 'hescore-hpxml/' changes from fc9596cc..d43ac56c 277775de1c91 Merge branch 'master' of https://github.com/NREL/OpenStudio-HEScore into addtl_duct_locations b7cf5a0d3418 Latest results. 0d297feab810 Merge commit 'ef2866ac835b9b8ac06c0f6c33c90df3abd69edd' into low_e_storms ef2866ac835b Squashed 'hescore-hpxml/' changes from b1cb372d..30016f87 0f74b4c7896e Merge commit '091de221919f6c564f78a6351c04e4699a1e4166' into low_e_storms 091de221919f Squashed 'hescore-hpxml/' changes from 72e5137b..b1cb372d af986dccbe75 First pass; add a modeling capability for storm windows; add sample jsons 65c4357ad675 Update README.md 354e3dd769a1 Fix a couple JSON test files. 734cc80fc573 Squashed 'hescore-hpxml/' changes from 72e5137b..1e4b5b2a 76e12854d974 Merge commit '734cc80fc573514af3179780c307e3e3457d1e1d' into duct_blaster_measurements 673ed36a2077 Merge branch 'master' of https://github.com/NREL/OpenStudio-HEScore into duct_blaster_measurements 9fe085063556 Merge commit '09c3e52c7206dff44f4aec49bd37cc7c55d9c8d9' into addtl_duct_locations 09c3e52c7206 Squashed 'hescore-hpxml/' changes from 72e5137b..fc9596cc 78d389015816 Merge branch 'master' of https://github.com/NREL/OpenStudio-HEScore into addtl_duct_locations 5e7016c2d6b8 Merge pull request #318 from NREL/hescore-hpxml 877b85bb5112 Merge pull request #313 from NREL/pv_tilt f6e21d2e181f Squashed 'hescore-hpxml/' changes from ce3f6dfc..72e5137b cdd3437fe216 Merge commit 'f6e21d2e181f5f39e5a04faf39641f9f91bb8664' into hescore-hpxml 92274a632f2d Fix ES_mini_split_electric.json and update PR template c1439398ca5f Merge branch 'pv_tilt' of https://github.com/NREL/OpenStudio-HEScore into hescore-hpxml 94adabf86b04 Update a bunch of JSON file to pass validation ba716e80146f Fix path f4935fabb706 Use a different job cc372b682917 pip install jsonschema 91abf423f330 Try JSON validation on CI. 015e850d32c4 Latest results. b38f31f2d6f2 Add EPWs. 2926e7a2bab2 Test d17587559fef Test 404c9ea156a0 Add CI test/artifacts. 4091baf88bb0 Squashed 'hescore-hpxml/' content from commit ce3f6dfc8 80333def0795 Merge commit '4091baf88bb078c33adeee0b2d3ff1a28441e732' as 'hescore-hpxml' 20223691bb1b Merge pull request #317 from NREL/regression_jsons_v9_0_211202.zip b8f0683cd5f9 Official files from LBL. 90b4f3b24fe8 Latest results. 73deeb8ad46b First pass. 711cfc57a1ab Latest results. 17ecb9e9a9c9 Merge branch 'master' of https://github.com/NREL/OpenStudio-HEScore into duct_blaster_measurements db75b785a652 Merge branch 'master' of https://github.com/NREL/OpenStudio-HEScore into duct_blaster_measurements 1820cd5e4f4f Latest results. adffd073efa7 7:12, not 6:12 f052dbfedc5f Allows "array_tilt" input for PV; adds 3 new regression test files. 6f427190e4d2 Merge pull request #312 from NREL/rubyzip 515ac4029274 Replaces OpenStudio::UnzipFile with rubyzip when extracting weather files for performance reasons. 3844775f4bcd Merge pull request #310 from NREL/issue_templates 5940399f869a Merge pull request #309 from NREL/hourly_output e77539688e5f Update issue templates 1fac84f14e54 Latest results. ca3187d607c8 Update water heater type in one historic audit to be tankless given the EF. b3964f072951 Adds an optional `--hourly` argument to request an hourly output CSV. 9828782c2c36 Merge commit 'c47db4c103226e4e577725b4301f5ce3609e8fe5' into hourly_output c261fa1cc4d9 Merge commit 'c47db4c103226e4e577725b4301f5ce3609e8fe5' into hourly_output c47db4c10322 Squashed 'hpxml-measures/' changes from 8f8a627b2..efb013fc6 bb4212826396 Merge pull request #293 from NREL/reduce-output-warnings 3ed8926a52f5 Merge commit 'ecdd72dd4819304e510c89c4fb925cf33c0aadde' into reduce-output-warnings ecdd72dd4819 Squashed 'hpxml-measures/' changes from ec2ce405c..8f8a627b2 f2245161bba6 Merge commit 'ecdd72dd4819304e510c89c4fb925cf33c0aadde' into reduce-output-warnings cc13e243047e Sync. b22ce192bbe6 Merge commit '3983a6187bd12b3ca9a8b8e930779090cfe8d87d' into reduce-output-warnings 3983a6187bd1 Squashed 'hpxml-measures/' changes from 5ab5b74a8..ec2ce405c ad0bf7f94562 Merge commit '3983a6187bd12b3ca9a8b8e930779090cfe8d87d' into reduce-output-warnings 35e991df956e Update ruleset. 13992503293f Bump to official os330 070114d1741f Merge commit '16f19531e8c497e828d31a4eec87fa20557353c9' into reduce-output-warnings 384ebc69a3ba Merge commit '16f19531e8c497e828d31a4eec87fa20557353c9' into reduce-output-warnings 16f19531e8c4 Squashed 'hpxml-measures/' changes from 2d0f5bd45..5ab5b74a8 9453fd061443 Merge commit '1275718f1261945d6f3b2805ea884541b28c0030' into reduce-output-warnings d372b1a94ada Merge commit '1275718f1261945d6f3b2805ea884541b28c0030' into reduce-output-warnings 1275718f1261 Squashed 'hpxml-measures/' changes from 654a86dab..2d0f5bd45 6881efc57cc2 Merge branch 'reduce-output-warnings' of https://github.com/NREL/OpenStudio-HEScore into reduce-output-warnings 6b6172433825 Merge commit '6fba21ac69c52f95816ef6e4391013da0835a19d' into reduce-output-warnings 6fba21ac69c5 Squashed 'hpxml-measures/' changes from 641f5a9bf..654a86dab fe18a0ba88a6 Merge commit '6fba21ac69c52f95816ef6e4391013da0835a19d' into reduce-output-warnings 54889a5a4a84 Latest results. 743b4ed0c650 Bump to OS 3.3.0-rc2 6473a8814238 Merge branch 'reduce-output-warnings' of https://github.com/NREL/OpenStudio-HEScore into reduce-output-warnings b69becbe39e0 Merge commit '0beb734e79138dee6a57cb0779c1f2c41967364a' into reduce-output-warnings 0beb734e7913 Squashed 'hpxml-measures/' changes from 0a3662b4b..641f5a9bf 4fae9c3a2cc6 Merge commit '0beb734e79138dee6a57cb0779c1f2c41967364a' into reduce-output-warnings ebc46f3dd954 Latest results. 8b18814ffb45 Merge commit '7f1370692b1a7ea299ee5041ae5079ac7f05eaf6' into reduce-output-warnings 7f1370692b1a Squashed 'hpxml-measures/' changes from 32f7a3f62..0a3662b4b 2475ec84b4be Merge commit '7f1370692b1a7ea299ee5041ae5079ac7f05eaf6' into reduce-output-warnings c14a6f3166af Merge commit 'e6a8cf9ed85c645715dbedbfc0d1a73c54a2a584' into reduce-output-warnings e6a8cf9ed85c Squashed 'hpxml-measures/' changes from a8886ae8b..32f7a3f62 c2d0518f21c0 Merge commit 'e6a8cf9ed85c645715dbedbfc0d1a73c54a2a584' into reduce-output-warnings bffbab394aed Merge branch 'reduce-output-warnings' of https://github.com/NREL/OpenStudio-HEScore into reduce-output-warnings dbdafc7ef727 Merge commit '9a39a8fb7975ce29d7a6a4b240e6e808ed21cb6f' into reduce-output-warnings 9a39a8fb7975 Squashed 'hpxml-measures/' changes from 0b74cd621..a8886ae8b 76866d5ee512 Merge commit '9a39a8fb7975ce29d7a6a4b240e6e808ed21cb6f' into reduce-output-warnings a9d822e8cbf0 Latest results. eb8c8dcaadc9 Apparently one of the historic files has no window area. 96888ecaa46f Merge branch 'master' of https://github.com/NREL/OpenStudio-HEScore into reduce-output-warnings df7b8d7ec6ed Merge pull request #300 from NREL/wall-furnace-min-afue a2440c3d8a4d Latest results. 9bf0463e9c45 Increase minimum wall furnace AFUEs for consistency with the minimum value allowed by HEScore. d194eda9f240 Fix CI dcbd8cb47351 Merge branch 'reduce-output-warnings' of https://github.com/NREL/OpenStudio-HEScore into reduce-output-warnings c5885d628479 Update measure name. 7889b0ef7993 Merge commit 'baae0c1ebbaeb8761e9dd2f1cc6514fe0b6c506a' into reduce-output-warnings c9c4d838ea86 Merge commit 'baae0c1ebbaeb8761e9dd2f1cc6514fe0b6c506a' into reduce-output-warnings baae0c1ebbae Squashed 'hpxml-measures/' changes from 7b2f57b4f..0b74cd621 493716ef05a6 Merge branch 'master' of https://github.com/NREL/OpenStudio-HEScore into reduce-output-warnings 58336b573f1b Scrub addresses. 206f56e0186f Merge branch 'duct_blaster_measurements' of https://github.com/NREL/OpenStudio-HEScore into duct_blaster_measurements 2493cf583dd1 Remove `hvac_distribution` elements entirely when they don't apply. db7b4c7c25ef Latest results. 25c9829b95e3 Merge branch 'duct_blaster_measurements' of https://github.com/NREL/OpenStudio-HEScore into duct_blaster_measurements 9b8e71834043 Bugfix. 8d49a3db0def Latest results. a8d5c4988b12 Add example file back in, update ruleset. 1c975dd95a7c Update JSON files to new schema. bc9c842acbd2 Merge branch 'master' of https://github.com/NREL/OpenStudio-HEScore into duct_blaster_measurements 106fda8a5fd5 Merge branch 'master' of https://github.com/NREL/OpenStudio-HEScore into duct_blaster_measurements 083edd0f230a Bump OS version used. 3bdb5f04e16f Latest results. 927a7b2f54b8 Merge branch 'reduce-output-warnings' of https://github.com/NREL/OpenStudio-HEScore into reduce-output-warnings 1f134fb3d3a9 Merge branch 'master' of https://github.com/NREL/OpenStudio-HEScore into reduce-output-warnings c9c42c794bc9 Merge branch 'master' of https://github.com/NREL/OpenStudio-HEScore into reduce-output-warnings 9b418f60fb69 Merge pull request #279 from NREL/uef_model 3b364c500a8d Latest results. db8d827b0449 Bugfix. 2ee745e13884 Merge branch 'master' of https://github.com/NREL/OpenStudio-HEScore into uef_model 46757b401894 Merge branch 'master' of https://github.com/NREL/OpenStudio-HEScore into uef_model 1e7e26582627 Merge pull request #261 from NREL/allow_for_passing_json_only 841aa838c82a Latest results. 717506d021ce Revert temp name change 8dae146b4e5f tasks.rb update_measures 0ec3fe664d1e Merge branch 'allow_for_passing_json_only' of github.com:NREL/OpenStudio-HEScore into allow_for_passing_json_only e0b89fe70412 Split is_ducted_system -- one for heating and one for cooling; use them to specify distribution system idref acfc4a3e6c1f Latest results. 5a2ea68eda9d Merge branch 'allow_for_passing_json_only' of github.com:NREL/OpenStudio-HEScore into allow_for_passing_json_only 6d0c2f9f666b Use a common logic for identifying ducted systems; Change distribution_system_idref logic for heat pumps to be consistent with other system types 7ea666de9f2f Rather than loop through all HVAC systems and add code (&& related_hvac_idref.nil?), break when we find the first one of interest e70d984ccfde Latest results. 0123f52b1fb4 Latest results. 02efa1d33b39 Drop Floor_area_250.json, Roof_area_250.json, and Roof_color_medium.json 56fc1db0f971 Remove duct location check for heat pumps fa2b232c94d7 Make use of ht_types array rather than calling out every HP type in many different places 59cdb1a370c3 Remove regex in zipcode distance calculation df89b0d6f460 Bugfix on the zipcode distance calculation b1ca3053a168 Apply rubocop 512d073df7f2 Add a lookup on zipcode, within a zip3 47b1536b6d13 Apply rubocop c0e03601426a Address multiple review comments 6ab65ad46f30 Use the entire zip_code string 5900c4b4bf46 Latest results. f7109780f799 Fix CI. 7363d9543553 Latest results. 9e476a2d69c7 Merge branch 'allow_for_passing_json_only' of github.com:NREL/OpenStudio-HEScore into allow_for_passing_json_only f08e0f5ec486 Revert the commit 8cacc24 so that the CI can generate comparison plots. Will need to be change names in result CSVs before the merge; Apply rubocop 3fbf338c8a90 Latest results. 8cacc24eee89 Revert name changes in result CSVs e21191aba2a3 Cleanup hescore_test.rb c661e35587fd Another bugfix on heat pump distribution system idref 0aab70e7ec5f Merge branch 'allow_for_passing_json_only' of github.com:NREL/OpenStudio-HEScore into allow_for_passing_json_only d21a1c04ad5d Remove FIXMEs; change air distribution system ids 4d225e61ffe4 Fix heat pump distribution system idref 745c314367dd Latest results. cb990df5d979 Latest results. 86d5c93ef820 Drop in the new set of historical JSON files after fixing wall translation and water heater EF rounding 99b8c62b66e0 Merge branch 'allow_for_passing_json_only' of github.com:NREL/OpenStudio-HEScore into allow_for_passing_json_only 850586a3f5c4 Latest results. b18ceb2ccf19 Merge branch 'master' of https://github.com/NREL/OpenStudio-HEScore into reduce-output-warnings 08f8818b76d9 Merge branch 'master' of https://github.com/NREL/OpenStudio-HEScore into reduce-output-warnings 4008eec72896 Squashed 'hpxml-measures/' changes from d6e093c93..7b2f57b4f 9daf3f34f1eb Merge commit '4008eec728963947ca1d4d7ba16239f19b64266e' into reduce-output-warnings a8e3220cb14e Merge commit '4008eec728963947ca1d4d7ba16239f19b64266e' into reduce-output-warnings bfd887cfeecb Reorder the HVAC systems in JSON files to match the corresponding HPXMLs 98712aafb674 Latest results. 9656e3f2bcf9 Merge branch 'allow_for_passing_json_only' of github.com:NREL/OpenStudio-HEScore into allow_for_passing_json_only 3fc1c8d2d53a Upload the new set of JSON files where the duct insulation has fixed bd2ebf9e211d Latest results. dcb7d8f8ff58 Temporarily change names in results CSVs to match master branch so that the CI can generate comparison plots. Will need to be reverted before the merge. 14f2219734cc Latest results. 31a19715f228 Merge branch 'allow_for_passing_json_only' of github.com:NREL/OpenStudio-HEScore into allow_for_passing_json_only 3af83beb9003 Merge branch 'master' of https://github.com/NREL/OpenStudio-HEScore into allow_for_passing_json_only a91b2aa3d642 Remove old file. 67d1d7d2abf7 Drop in the new set of JSON files 899a862beff8 Latest results. 5d91cfb8f72e Remove old file. 173dd756682c Merge branch 'master' of https://github.com/NREL/OpenStudio-HEScore into allow_for_passing_json_only a95d729cd210 Merge branch 'historical_regression' of https://github.com/NREL/OpenStudio-HEScore into allow_for_passing_json_only 9e5462c80b86 Merge branch 'historical_regression' of https://github.com/NREL/OpenStudio-HEScore into allow_for_passing_json_only 89597c523380 Merge pull request #291 from NREL/historical_regression f5d56c4078a9 Latest results. 41d049bc1824 Fix command. 2c354aa93664 Renames sample files to regression files. 5e044439b133 Merge branch 'historical_regression' of https://github.com/NREL/OpenStudio-HEScore into historical_regression ad782f766147 Re-enable all tests. e1bfc81e9e70 Latest results. 357a93f34d1d Add missing weather files. Renamed "regression" to "historic" so they are not confused with the regression sample files. a95e6a31c6d8 Test CI 0254eebec422 Manually fix HPXMLs that are not valid per the schema. Attempt to fix CI. ee05dce0744e Manually fix HPXMLs that are not valid per the schema. Attempt to fix CI. b0126e929207 Bugfix cb5336405277 Replace the historical homes JSON files with ones converted from HPXMLs 1b254ef21b2a Map climate zone 7A and 7B to 7 77b86abfa242 Merge branch 'reduce-output-warnings' of https://github.com/NREL/OpenStudio-HEScore into reduce-output-warnings 0d60d72d2ee6 Squashed 'hpxml-measures/' changes from f6498aa35..d6e093c93 1a954a14d6af Merge commit '0d60d72d2ee6557e0af3ab7ebcf3f48d5332c6ee' into reduce-output-warnings 5f8313f0f201 Merge commit '0d60d72d2ee6557e0af3ab7ebcf3f48d5332c6ee' into reduce-output-warnings 6a0a0312af90 Latest results. f0b03d2e2e6c Update tests. c4ced70d8507 Merge branch 'reduce-output-warnings' of https://github.com/NREL/OpenStudio-HEScore into reduce-output-warnings 938f17a335c4 Sync. ddf140e6bbaa Squashed 'hpxml-measures/' changes from ed2c94668..f6498aa35 31b2ecfea1e6 Merge commit 'ddf140e6bbaa89edd56befda6984037d4097ee09' into reduce-output-warnings 3379190884e7 Merge commit 'ddf140e6bbaa89edd56befda6984037d4097ee09' into reduce-output-warnings 41b178ca82c8 Latest results. aa83cf43edb8 Add require. 58165e4bacd7 Squashed 'hpxml-measures/' changes from 082743c5a..ed2c94668 f3ff79f357c8 Merge commit '58165e4bacd7cec545d8b88be297449caafb07e6' into reduce-output-warnings 40aafb9a2e19 Merge commit '58165e4bacd7cec545d8b88be297449caafb07e6' into reduce-output-warnings 6ce895e94b68 add a test 26da36ce90ce Add ~100 historical homes e3c5228bea13 add test_historical_homes e961ebe581f1 fix get_ducts_details f7c2cedc080f allow for the ducted mini-split 38f201582d49 add hpxmls 9cbfda6ef5c4 Fix typo b8a68b537818 Fix the ruleset to ignore windows with 0 area d1a7c6448f7e add test files ef7c1e2332f7 Merge branch 'allow_for_passing_json_only' of github.com:NREL/OpenStudio-HEScore into allow_for_passing_json_only 53919d3e8cc1 Fix skylight azimuth and window properties when has_same_window_const is true 60ec29f09bc4 Latest results. 51c5206f67a6 Merge branch 'allow_for_passing_json_only' of github.com:NREL/OpenStudio-HEScore into allow_for_passing_json_only 0c07e0a6dff3 Fix duct fractions 9dd2e63d0304 Latest results. 2d3e18a5a02e Merge branch 'allow_for_passing_json_only' of github.com:NREL/OpenStudio-HEScore into allow_for_passing_json_only 23e8fcd1a1d2 Remove the code that specifies hvac distribution for mini-split; use 0-1 duct fractions in regression json files c1836ba636b6 Latest results. a71d2d7aa586 bugfix for the related hvac system identifier a36a92713693 Merge branch 'allow_for_passing_json_only' of github.com:NREL/OpenStudio-HEScore into allow_for_passing_json_only 54827605da84 change the system identifier naming convention ee635819ac1f Latest results. 2ec7fda204d4 apply rubocop de3cb1431935 bugfix 1cb983a8ccf2 drop in a new set of ES files cd07f7b61ae3 Add ES json files. 82e65ef39aa0 Apply rubocop (openstudio tasks.rb update_measures) 3a131f4969fc Optimize code related to zipcode info; replaces two CSV lookups (one of which always read the entire CSV even after the row of interest was found) with one lookup that breaks once the info is found. Ruleset runtime is now identical to previous HPXML-based runtime. da396d9f1e52 Remove old HPXML files. fd6657926c52 Merge branch 'allow_for_passing_json_only' of github.com:NREL/OpenStudio-HEScore into allow_for_passing_json_only af136c45bdde skip the front window with the area of 1 34ac88da96b6 intensionally set the front window area to 1 as an HPXML file with no windows does not pass validation c91bbd14cd6d Latest results. 4fdd36ec61d5 fix bug in hescore_test b95dfd1baf6d Merge branch 'allow_for_passing_json_only' of github.com:NREL/OpenStudio-HEScore into allow_for_passing_json_only 520b09f62f49 remove the window on the front wall bab6d8e91853 Latest results. b4c5a8df33da Merge branch 'master' of github.com:NREL/OpenStudio-HEScore into allow_for_passing_json_only 309cb8ae81de Merge branch 'allow_for_passing_json_only' of github.com:NREL/OpenStudio-HEScore into allow_for_passing_json_only da5124061ea7 Merge pull request #288 from NREL/dpeaw bb20e797c026 make use of the correct datatype 609718c081f9 Latest results. c1b148ab6e12 Fix window gas fill for dpeaw. 8307b08a7a34 Latest results. 31d797f35787 Merge branch 'allow_for_passing_json_only' of github.com:NREL/OpenStudio-HEScore into allow_for_passing_json_only afc4cf140708 update the townhouse sample files e7849b82d3db Latest results. 902bf2961ec2 Merge branch 'allow_for_passing_json_only' of github.com:NREL/OpenStudio-HEScore into allow_for_passing_json_only 80b2bd2c5883 duct should be uninsulated ff545012fc86 Latest results. 4b77f5ffa57f Merge branch 'allow_for_passing_json_only' of github.com:NREL/OpenStudio-HEScore into allow_for_passing_json_only a529bc40aca3 fix the duct fraction calculation 018e66498758 upload a new set of json files 348275d50896 Latest results. 3b6e93b14e92 Merge branch 'allow_for_passing_json_only' of github.com:NREL/OpenStudio-HEScore into allow_for_passing_json_only 30cd2529c405 change hvac fractions in Multiple_system_indirect.json to be consistent with Multiple_system_indirect_hpxml.xml da87a5b79b5e change hvac fractions in Multiple_boiler_indirect.json to be consistent with Multiple_boiler_indirect_hpxml.xml; change the related hvac idref logic 12a08e4b42c0 Latest results. 1a84432bafc4 Merge branch 'allow_for_passing_json_only' of github.com:NREL/OpenStudio-HEScore into allow_for_passing_json_only 283060301330 bugfix on get_ducts_details 93236317fe34 Latest results. a11fc3e15b92 fix the bug on the pv system max power 3512f0d48812 Merge branch 'allow_for_passing_json_only' of github.com:NREL/OpenStudio-HEScore into allow_for_passing_json_only 8b8364028755 fix roof absorptance if roof_color is cool_color d040813af362 remove diagnostic puts d93a9fd57ee4 add conditions to get_ducts_details f683e24ff25f fix hvac fractions in HVAC2.json 83e140fc00e9 make "duct1" uninsulated 0fc7f9145563 Latest results. 59f18646803b Merge branch 'allow_for_passing_json_only' of github.com:NREL/OpenStudio-HEScore into allow_for_passing_json_only b880b6b67acc fix the unit of PV max power output d8218ddc598a Latest results. a53d0714c733 revert the changes made to HVAC_mini_split.json ed9f06d8ffe2 Merge branch 'allow_for_passing_json_only' of github.com:NREL/OpenStudio-HEScore into allow_for_passing_json_only 367bf30631b0 connect mini-split heat pump with the hvac distribution system only if the distribution system exists b6d34edcb6ea Latest results. 54e41a3cec6e add distribution system idref for mini-split 9d1c4534d1dc bugfixes b37db2ec2773 Latest results. 361aaa1a90f0 convert floor area into float 5ac0dd6cdffd bugfixes and upload json files received from LBL a61d7a1b5b98 enable energy_star entry 5cf7905dcbb6 Merge branch 'allow_for_passing_json_only' of https://github.com/NREL/OpenStudio-HEScore into allow_for_passing_json_only aa1db5fe684d Merge branch 'master' of https://github.com/NREL/OpenStudio-HEScore into allow_for_passing_json_only d4c61565e3b4 Merge branch 'master' of https://github.com/NREL/OpenStudio-HEScore into allow_for_passing_json_only 214592013d6c Latest results. bedf5d760801 change test filenames f2e7c8ce4d58 Forgot to update it 25a934cc0071 Another bugfixes a4bc6aa69990 add json files for the CI test. These files will be replaced when Leo provides the updated ones. e6bd93a998e9 bugfixes and additional updates to hescore_test.rb b50d364d9c59 more updates on hescore_test c8e8c7a148e0 update hescore_test.rb 3be751e4c0e7 bugfix and update test_hescore_ruleset 4b6490430d3c add calc_ef_from_uef function c958c21e3b29 bugfix 595069e6df94 handles solar_screen on windows and skylights e0fa6ae257f3 update test_infiltration afac2ea2583f bugfix on skylight area 238f0dd13b8a bugfix on hesruleset 8d796fbb0edf update set_systems_hvac 329ce2db294c update set_systems_hvac d7eacafcfd1a Merge branch 'master' of https://github.com/NREL/OpenStudio-HEScore into uef_model 244ceee91607 Merge branch 'master' of https://github.com/NREL/OpenStudio-HEScore into uef_model b71ba2b49f70 Merge branch 'duct_blaster_measurements' of https://github.com/NREL/OpenStudio-HEScore into duct_blaster_measurements 592daf51b358 Merge branch 'master' of https://github.com/NREL/OpenStudio-HEScore into duct_blaster_measurements 710185753ba3 Merge branch 'master' of https://github.com/NREL/OpenStudio-HEScore into duct_blaster_measurements 3a60a66ec7d8 Merge commit '422dd3466722723583c61ff9137da48305583d9f' 422dd3466722 Squashed 'hpxml-measures/' changes from dccbc2918..082743c5a 4634e660569e Merge commit '422dd3466722723583c61ff9137da48305583d9f' 07daae4afc16 Latest results. 3094f15b1f88 Latest results. 7a7268c96b0f Merge branch 'master' of https://github.com/NREL/OpenStudio-HEScore into duct_blaster_measurements 0a8e03655261 Merge branch 'master' of https://github.com/NREL/OpenStudio-HEScore into duct_blaster_measurements 9be3a651212f Merge branch 'uef_model' of https://github.com/NREL/OpenStudio-HEScore into uef_model 4cc4824142e5 Merge branch 'master' of https://github.com/NREL/OpenStudio-HEScore into uef_model 967e664ad89a Merge branch 'master' of https://github.com/NREL/OpenStudio-HEScore into uef_model 2f5911e5b084 Merge pull request #283 from NREL/comparisons 7e60c90b5b6a Merge branch 'comparisons' of https://github.com/NREL/OpenStudio-HEScore into comparisons d38f578d80d5 Merge commit 'd54e375af7172ce59dca4f395eb7f7e7854ef01d' into comparisons d54e375af717 Squashed 'hpxml-measures/' changes from 2b8be6ec4..dccbc2918 07a41a499a84 Merge commit 'd54e375af7172ce59dca4f395eb7f7e7854ef01d' into comparisons 467db0c7f9ba remove the unused function cae0132f4235 uncomment set functions for appliances, lighting, misc loads 04be7fce6297 update functions that set water heater, water heating use, and pv f1e4db5f6105 bugfix in set_enclosure_doors e007eb6f867c update functions that set frame floors, slabs, windows, skylights, and doors b288ac52f4e9 Typo. d55b766df79c Add script args to config. 59963fa471be Python, not ruby dd023b21bbb2 Merge branch 'master' of https://github.com/NREL/OpenStudio-HEScore into comparisons cb71787f8ff9 Merge branch 'master' of https://github.com/NREL/OpenStudio-HEScore into comparisons 668d4d3e018a Squashed 'hpxml-measures/' changes from 060c30862..2b8be6ec4 a38e76ceeada Merge commit '668d4d3e018a5539edfa319f39e0cdd8def609dd' into comparisons 820df70b9c44 Merge commit '668d4d3e018a5539edfa319f39e0cdd8def609dd' into comparisons 02a9e0f7421b Merge commit 'c9a1ae2092c53c086c96fb63f9931bcc0c86a2c0' into comparisons 4fad530763d3 Merge commit 'c9a1ae2092c53c086c96fb63f9931bcc0c86a2c0' into comparisons c9a1ae2092c5 Squashed 'hpxml-measures/' changes from f34a377db..060c30862 617132cc7845 remove unused functions cc9484202d39 remove resolved fixmes 1fdd4c67bffd Merge branch 'master' of https://github.com/NREL/OpenStudio-HEScore into allow_for_passing_json_only 5d7dd9d9adce update functions that set roofs, walls, and foundation walls 743b16589dfc remove diagnostic puts in measure.rb 8d496fd8e12d Merge pull request #284 from NREL/latest-os-hpxml dbcfd48f216a Latest results. 980c7d33da44 A little cleanup. 1fe6e51c6e95 Fix measure.xml a6b3eea8e800 New cops edbd60bf146c Bump CI to OS 3.2.1 0dd3096c4e21 Merge commit 'd3358ac40dee3e55199da31181f535fe68d4d521' into latest-os-hpxml 955301ceb72a Merge commit 'd3358ac40dee3e55199da31181f535fe68d4d521' into latest-os-hpxml d3358ac40dee Squashed 'hpxml-measures/' changes from 896a53ea5..bad277e18 4d560f6c1da7 Latest results. 27ec4681ae4e Merge branch 'duct_blaster_measurements' of https://github.com/NREL/OpenStudio-HEScore into duct_blaster_measurements 2adc0bfc0e76 Switch to using a single cfm25 input (supply + return). 7ed87e717d63 use @iecc_zone instead of hard-coded iecc_zone for calc_ach50 71cad280cc56 Merge commit '7fa58b7612a2366fe94336d0e605b4e297c9e2ee' into comparisons 7cc0382a9468 Merge commit '7fa58b7612a2366fe94336d0e605b4e297c9e2ee' into comparisons 7fa58b7612a2 Squashed 'hpxml-measures/' changes from 896a53ea5..f34a377db f7e230df4901 Update config. 11e57a981155 update set_enclosure_roofs 62390a4a31f4 update set_climate 5765e4d8a3bd Merge branch 'master' of https://github.com/NREL/OpenStudio-HEScore into allow_for_passing_json_only e598be09b33b fix typo f773d813dc73 Latest results. b2b250b7c8a0 Merge branch 'uef_model' of https://github.com/NREL/OpenStudio-HEScore into uef_model 9d359636e39c Merge branch 'master' of https://github.com/NREL/OpenStudio-HEScore into uef_model 6fffe2de95e7 Merge pull request #282 from NREL/sort_ci_tests 4393013d8fd2 Latest results. 6563a7d22046 Sort results.csv files so they align with the comparison csv. 0ac47d4b10e6 Latest results. 6d14797e44d6 Oops. dcb2191bdd72 A bit more error checking. 8617d590c2ab Initial implementation. Added a manually-created HPXML test file. 529576113cc5 Latest results. 44219c1fe887 When UEF is provided, now use our UEF model (with "medium" usage bin assumption) instead of old EF->UEF regression. 65a926eb7267 Merge pull request #272 from NREL/regression_v9_0 1e8b121c1850 Merge branch 'regression_v9_0' of https://github.com/NREL/OpenStudio-HEScore into regression_v9_0 78f79f092602 Remove DOE2 simulation results and related comparison code. a01d056feb58 Merge pull request #274 from NREL/duct_sum_error 9d189e5fd9ee Latest results. 0425486ccaa8 Fixes possibility of duct sum error ("Unexpected sum of duct fractions: 1.0000000000000002.") due to floating point precision. 2727081367e1 Updated DOE2 results. Temporarily disabling ERI setpoint comparisons. 8d5162b2952e Update to LBL's regression v9.0. Also adds energy star files. 5cb056d53bf2 Merge pull request #271 from NREL/round_results b3ee711176d4 Latest results. 6af962e81ddd Round values in the results.csv to two decimal places. Also a little code simplification related to unmet loads. bd174be10adc Merge pull request #258 from NREL/os320 afbb31affcc7 Merge branch 'master' of https://github.com/NREL/OpenStudio-HEScore into os320 2eba3789ea0b Merge commit 'e3d550d13c53b1e4ead3f002416fc273cb80536e' into os320 e3d550d13c53 Squashed 'hpxml-measures/' changes from 355a40ae7..896a53ea5 077d18619649 Merge commit 'e3d550d13c53b1e4ead3f002416fc273cb80536e' into os320 1a1456297e13 Merge branch 'os320' of https://github.com/NREL/OpenStudio-HEScore into os320 b8d7c067e563 Merge commit '1acedcb81cd1bf087b9973dc7beda40520b7a7f0' into os320 3517fd0e7d6d Merge commit '1acedcb81cd1bf087b9973dc7beda40520b7a7f0' into os320 1acedcb81cd1 Squashed 'hpxml-measures/' changes from 03188d6b5..355a40ae7 6ddc249c3eba allow for passing json and start changing HESruleset d23819a4adca Merge pull request #260 from NREL/revert_json_to_hpxml d0b3b6771e0a revert json_to_hpxml phase 1 48a676e0110b Latest results. 6555ae7b938f Bump to OS 3.2 / E+ 9.5 1be6d9b075e9 Merge commit '962f186b5ce1ed57a09b67df81a4398b161510e1' into os320 962f186b5ce1 Squashed 'hpxml-measures/' changes from ac8f3cb3b..03188d6b5 ccbd915a9f35 Merge commit '962f186b5ce1ed57a09b67df81a4398b161510e1' into os320 4fb7424472e4 Merge pull request #257 from NREL/json_to_hpxml 018001a51751 leave two arguments (-x and -j) in run_simulation.rb 339d1d081198 change the measure argument b91523d74714 Merge pull request #256 from NREL/config-changes 13ff61783d6d first pass 7cb2d0e96961 Same changes as OS-HPXML 24349c227595 Merge pull request #255 from NREL/coverage 0efc0fb5ee54 Merge commit '376872548bf919b4e5a3e5ae396ce90b898ef2c6' into coverage 376872548bf9 Squashed 'hpxml-measures/' changes from 5be6bc7c7..ac8f3cb3b a93005278c55 Merge commit '376872548bf919b4e5a3e5ae396ce90b898ef2c6' into coverage ed0c2561e05f Propagate to OS-HEscore CI e2f8ddaa56f2 Merge commit '84429577bdd408f0d8db9ac005e1cd2ce884b29d' into coverage 9443632d99a5 Merge commit '84429577bdd408f0d8db9ac005e1cd2ce884b29d' into coverage 84429577bdd4 Squashed 'hpxml-measures/' changes from 350ebde85..5be6bc7c7 87d20584ae24 Merge pull request #254 from NREL/config-commit 97a84a2f3c67 Latest results. cce66918294d Latest results. 041555b3402a Apply the second commit. 2128998899b7 Apply the second commit. 53f51b87e5b5 Demonstrate the fix. 60101ff1e992 Demonstrate the fix. 45af388e7c82 Apply the second commit. 3705e803277a Apply the second commit. 82af12e0c8a1 Demonstrate the error. 604f26b75ba7 Demonstrate the error. 2391100e8533 Merge pull request #252 from NREL/compare-script 617e29c0a02e Merge commit '44cd7087099be1c7d1e368c77c1a5652c12a83b0' into compare-script 329cad2526b5 Merge commit '44cd7087099be1c7d1e368c77c1a5652c12a83b0' into compare-script 44cd7087099b Squashed 'hpxml-measures/' changes from a76e00d13..350ebde85 e1a475d47673 Latest results. f3a82c1e92b8 Mod config, try 3. e72e391b204c Mod config, try 2. d401d6de7580 Mod config, try 1. 3c77d2ba32a8 Merge commit '28bce4bd5107a137ea6e0a7ce8bf67561a4b8f73' into compare-script 28bce4bd5107 Squashed 'hpxml-measures/' changes from d88eadda9..a76e00d13 93c12b2274e2 Merge commit '28bce4bd5107a137ea6e0a7ce8bf67561a4b8f73' into compare-script 967684cba3bd Modify compare path in config. 4407e178984d Remove compare script. 247b149bcc2e Merge pull request #250 from NREL/compare-fixes 40e7efdde839 Merge pull request #251 from NREL/compare-fixes-2 0f8d5806fe21 Clean up config. 0deb2d0dff36 Include more fields in diffs. 761ab25790fa Skip first column. 7d525f9e48ca Fix bugs in compare script. bba0c61d0298 Merge pull request #247 from NREL/actions-updates ee19d54b260b Minor update to config. 6ad48494e266 Commit only the results csv file. d74a642327df Latest results. a341131aa693 Merge branch 'master' into actions-updates edff9007f2f1 fix header 725934d120a9 Merge branch 'master' into actions-updates a49136c0df74 Merge pull request #248 from NREL/add-results f5c85cd267ed Remove runtimes. e95d8b28dbf0 Add base results and compare scripts. a334635812ea Update actions config. 14ed829a7991 Add compare script. 8a3db9fdeebe Add latest base results. 17b07b4a7b36 Merge pull request #245 from NREL/ci_reporting 56dfed37cb0a Merge commit '0d42c99514ed4127b99b65388f2843746721c52a' into ci_reporting fe0197171c44 Merge commit '0d42c99514ed4127b99b65388f2843746721c52a' into ci_reporting 0d42c99514ed Squashed 'hpxml-measures/' changes from 57b4afd98..d88eadda9 1bb4721a4ea9 Merge commit '48e6d1d63332783779799e31dbf5ff10b5892fdc' into ci_reporting 016daf708d0d Merge commit '48e6d1d63332783779799e31dbf5ff10b5892fdc' into ci_reporting 48e6d1d63332 Squashed 'hpxml-measures/' changes from c19ba7224..57b4afd98 1a5843cb19b9 And now revert ruleset changes. 3c5d7a12bb3b Oops. d0783b623631 Re-enable minitest-reporters. b95b1207181f Re-enable minitest-reporters. 57fb8de2a756 Force CI errors. 3eb58bf8f25d Merge pull request #244 from NREL/room_ac_curve_bugfix bc1ad65a47cc Merge commit 'e32f26e5d4fd08e092e574342bcf42dbe7d452b3' into room_ac_curve_bugfix 3985bf8f45c0 Merge commit 'e32f26e5d4fd08e092e574342bcf42dbe7d452b3' into room_ac_curve_bugfix e32f26e5d4fd Squashed 'hpxml-measures/' changes from e252084a8..c19ba7224 0bb4bd930c63 Sync. d74cf226f49e Merge commit '1fa407a11bfcc9515bee8bfed2f2a6dcf4b45088' into room_ac_curve_bugfix f33a5393eebe Merge commit '1fa407a11bfcc9515bee8bfed2f2a6dcf4b45088' into room_ac_curve_bugfix 1fa407a11bfc Squashed 'hpxml-measures/' changes from 3dad1cec5..e252084a8 e27677bf5a9b Merge pull request #241 from NREL/remove_codecov 469847986bb1 Revert. 4d88992a9868 Force test failure to make sure CI captures it. 7c084bf9c450 Fix 853e2f80189a Removes codecov e1e85d252535 Removes codecov 31cc49a0d715 Sync. 8d5093ef6616 Squashed 'hpxml-measures/' changes from 04c25978c..3dad1cec5 7ab21b1f03f1 Merge commit '8d5093ef6616739ea52591b7e8456d9961816cbb' 1c7baedf23b4 Merge commit '8d5093ef6616739ea52591b7e8456d9961816cbb' 536cd1ae1a96 Merge pull request #240 from NREL/skip_component_loads ab2d8c78eb7f Fix tests. 750eeadf5575 Enable --skip-component-loads argument. 369ae2be2348 Merge commit '78b655acee1ee3e66a05eeadd6b0b5d0e51d3b97' into skip_component_loads f2b67cd36bef Merge commit '78b655acee1ee3e66a05eeadd6b0b5d0e51d3b97' into skip_component_loads 78b655acee1e Squashed 'hpxml-measures/' changes from 93a780327..04c25978c ec4f63bca52c Merge pull request #237 from NREL/fix_roof_area e464980e33b5 Merge branch 'master' of https://github.com/NREL/OpenStudio-HEScore into fix_roof_area e14fce8522cf Merge pull request #238 from NREL/latest-os-hpxml 06c3e7fa58ed Merge commit 'b60417b51fb2e3fc89d90e986f18fc7e2d2fc25a' into latest-os-hpxml b60417b51fb2 Squashed 'hpxml-measures/' changes from 52d3f3621..93a780327 0cfefba3338b Merge commit 'b60417b51fb2e3fc89d90e986f18fc7e2d2fc25a' into latest-os-hpxml ed70f29b07a7 Update warning messages in tests. 77879cddc46d Sync. c8c771229ad1 Merge commit 'b78f8d2560ce690dd703d3d1541b7daf31143c34' into latest-os-hpxml 6a09fc058e92 Merge commit 'b78f8d2560ce690dd703d3d1541b7daf31143c34' into latest-os-hpxml b78f8d2560ce Squashed 'hpxml-measures/' changes from d63243d6f..52d3f3621 46f1bde85140 Roof are was half of what it was supposed to be. f4d0e84e44be Merge pull request #236 from NREL/boiler-pump-bugfix2 faf5a1631a82 Merge commit 'a6dea57ffd1de97e34601f43a933562293b9264d' into boiler-pump-bugfix2 c6b521b08148 Merge commit 'a6dea57ffd1de97e34601f43a933562293b9264d' into boiler-pump-bugfix2 a6dea57ffd1d Squashed 'hpxml-measures/' changes from c149386ed..d63243d6f 52b9e89f532b Sync ruleset w/ latest HPXML class changes. 67e2859584fc Merge commit '44ae0cc6cd9b67fa269c9bb875897502336441ea' into boiler-pump-bugfix2 44ae0cc6cd9b Squashed 'hpxml-measures/' changes from c38e0a3c0..c149386ed eefd75addbcd Merge commit '44ae0cc6cd9b67fa269c9bb875897502336441ea' into boiler-pump-bugfix2 87e45201f0b8 Merge pull request #232 from NREL/hpxml_defaults3 dc3daba955bb Merge commit 'fad09e5b2190950d089a6e1331146908b962e8e0' into hpxml_defaults3 fad09e5b2190 Squashed 'hpxml-measures/' changes from 4a06621f3..c38e0a3c0 998ad437eb1c Merge commit 'fad09e5b2190950d089a6e1331146908b962e8e0' into hpxml_defaults3 5607d2b2a967 Merge commit '5ff34702157e601e4ee8185733c3c5063396b526' into hpxml_defaults3 5ff34702157e Squashed 'hpxml-measures/' changes from f1b7b538a..4a06621f3 aeb56f6fa4c3 Merge commit '5ff34702157e601e4ee8185733c3c5063396b526' into hpxml_defaults3 43d1efd1ec58 Merge commit 'f3e9cf4e0ff05639443e01419cd410fd3c9fe0d5' into hpxml_defaults3 f3e9cf4e0ff0 Squashed 'hpxml-measures/' changes from db0259a03..f1b7b538a 5538103283de Merge commit 'f3e9cf4e0ff05639443e01419cd410fd3c9fe0d5' into hpxml_defaults3 31fc459ede08 Merge commit '4628dcf0f927bf345c290b19fa9323eb35bcd885' into hpxml_defaults3 4628dcf0f927 Squashed 'hpxml-measures/' changes from 5e4233284..db0259a03 a47676cd71d2 Merge commit '4628dcf0f927bf345c290b19fa9323eb35bcd885' into hpxml_defaults3 4ba85de269aa Merge commit 'e42c9954a4182a012382d9da116aa9d739102ea6' into hpxml_defaults3 e42c9954a418 Squashed 'hpxml-measures/' changes from 8639119cc..5e4233284 c7be1e3d3e4a Merge commit 'e42c9954a4182a012382d9da116aa9d739102ea6' into hpxml_defaults3 36acd63df96f Simplifies how HPXML defaults are added. d12703e542bd Merge commit 'cfb5f177493e2bf0c7ce62fbb0b246c9ef974e1d' into hpxml_defaults3 cfb5f177493e Squashed 'hpxml-measures/' changes from 70edc200a..8639119cc bfcfd7aa8363 Merge commit 'cfb5f177493e2bf0c7ce62fbb0b246c9ef974e1d' into hpxml_defaults3 e49100753996 Merge pull request #227 from NREL/latest-os-hpxml2 fb7f98d2e0c2 Merge commit 'ae2737d94fcf78e5c44b8dad6992ec34af634fd2' into latest-os-hpxml2 ae2737d94fcf Squashed 'hpxml-measures/' changes from 9d6c60aa0..70edc200a 6d120ff6822d Merge commit 'ae2737d94fcf78e5c44b8dad6992ec34af634fd2' into latest-os-hpxml2 a3eda2191e20 Merge commit 'd9b506573412fe8159716fbbac3b104dde322735' into latest-os-hpxml2 f4e11ca62911 Merge commit 'd9b506573412fe8159716fbbac3b104dde322735' into latest-os-hpxml2 d9b506573412 Squashed 'hpxml-measures/' changes from 7ff812876..9d6c60aa0 88f8b679a5fc Merge commit 'b255a941800e2428ce26c96d65e3cefc6d3ee7ad' into latest-os-hpxml2 c7d76540ca00 Merge commit 'b255a941800e2428ce26c96d65e3cefc6d3ee7ad' into latest-os-hpxml2 b255a941800e Squashed 'hpxml-measures/' changes from f74686d5d..7ff812876 cda1e10552e3 Merge commit '063d8a3465a7882f6ccee04ee11a088e026ba610' into latest-os-hpxml2 9d271227d7b1 Merge commit '063d8a3465a7882f6ccee04ee11a088e026ba610' into latest-os-hpxml2 063d8a3465a7 Squashed 'hpxml-measures/' changes from a3d73fd05..f74686d5d 544384eb7b87 Merge branch 'master' of https://github.com/NREL/OpenStudio-HEScore into latest-os-hpxml2 32b2e90e0699 Merge pull request #231 from NREL/issue230 e8001ee86646 Closes #230. c81b0074f3c0 Merge commit 'e88112e95b2c0f5e78b123154367a51c19ef060c' into latest-os-hpxml2 e88112e95b2c Squashed 'hpxml-measures/' changes from 435cd5ed5..a3d73fd05 647d9336391e Merge commit 'e88112e95b2c0f5e78b123154367a51c19ef060c' into latest-os-hpxml2 83a615a1fc04 Merge branch 'master' of https://github.com/NREL/OpenStudio-HEScore into latest-os-hpxml2 5f1ddab0a4d6 Merge branch 'master' of https://github.com/NREL/OpenStudio-HEScore into latest-os-hpxml2 2986aba1859d Squashed 'hpxml-measures/' changes from 5cfb0142a..435cd5ed5 4d216d48de45 Merge commit '2986aba1859d9ae93f67aaf484c45c6935f19f65' into latest-os-hpxml2 fa12f801b740 Merge commit '2986aba1859d9ae93f67aaf484c45c6935f19f65' into latest-os-hpxml2 8fe747e1b50d Merge pull request #229 from NREL/hpxml_defaults2 e0460bdbbf74 Adds HPXML defaults to HEScoreDesign.xml. b9b078cb55be Merge commit '8d4f339dad27718a248f97a911d85a92a1e2ce94' into hpxml_defaults2 bdc6a84dcb5c Merge commit '8d4f339dad27718a248f97a911d85a92a1e2ce94' into hpxml_defaults2 8d4f339dad27 Squashed 'hpxml-measures/' changes from 698f6439f..2a672e6dc 81371f2c2385 Squashed 'hpxml-measures/' changes from 666892b04..5cfb0142a 5975239fdd30 Merge commit '81371f2c23852464f896abd15979100abed162d6' into latest-os-hpxml2 a73d1ca86282 Merge commit '81371f2c23852464f896abd15979100abed162d6' into latest-os-hpxml2 b6ef7888bfa8 Merge commit '48f2de1f6dfabff517ba7d7aff4b4fde84363fcd' into latest-os-hpxml2 32c6aa9f5b6f Merge commit '48f2de1f6dfabff517ba7d7aff4b4fde84363fcd' into latest-os-hpxml2 48f2de1f6dfa Squashed 'hpxml-measures/' changes from 5cfb0142a..666892b04 bcd440d31cc0 Merge commit '266d9b276c5c515bcc814e77f5450c2c3b0cd3bb' into latest-os-hpxml2 e034bb3132ee Merge commit '266d9b276c5c515bcc814e77f5450c2c3b0cd3bb' into latest-os-hpxml2 266d9b276c5c Squashed 'hpxml-measures/' changes from 73cbc0bb9..5cfb0142a 1a74d84eff41 Merge commit '8e2b660e60305eee694841135a8e4bf63f683213' into latest-os-hpxml2 e70721ac584b Merge commit '8e2b660e60305eee694841135a8e4bf63f683213' into latest-os-hpxml2 8e2b660e6030 Squashed 'hpxml-measures/' changes from 719fa447e..73cbc0bb9 8be46c73256f Merge commit '0da9c17bfa16fc85bc7928769ad2e98aeb9dc7d7' into latest-os-hpxml2 486de948da5e Merge commit '0da9c17bfa16fc85bc7928769ad2e98aeb9dc7d7' into latest-os-hpxml2 0da9c17bfa16 Squashed 'hpxml-measures/' changes from 36c875d51..719fa447e aacc2b3792c3 Merge commit '11ccb0a8d1c962935580e3dd365b004f416e1757' into latest-os-hpxml2 d245169d249d Merge commit '11ccb0a8d1c962935580e3dd365b004f416e1757' into latest-os-hpxml2 11ccb0a8d1c9 Squashed 'hpxml-measures/' changes from 180c002c3..36c875d51 0e07bd2892db Merge commit '7c8b783603c308a243f03a45112840e5f36d8b63' into latest-os-hpxml2 e43d94769499 Merge commit '7c8b783603c308a243f03a45112840e5f36d8b63' into latest-os-hpxml2 7c8b783603c3 Squashed 'hpxml-measures/' changes from d6ad4ebb2..180c002c3 ed9efbdebc73 Merge commit '265843e2077106a8c154da469a0e3de83d2448e1' into latest-os-hpxml2 2ac9e3ef6f7f Merge commit '265843e2077106a8c154da469a0e3de83d2448e1' into latest-os-hpxml2 265843e20771 Squashed 'hpxml-measures/' changes from 698f6439f..d6ad4ebb2 a3a8a35d6ed5 Merge pull request #226 from NREL/skip_validation 3821111df52f Update workflow tests. 05faa6807d4c Skips the HPXMLtoOS validation during regular runs; now enabled only when using the debug flag, which is turned on for CI runs. e725c688119d Merge pull request #212 from NREL/infiltration_no_ducts b3c2f2b20aea Merge branch 'master' of https://github.com/NREL/OpenStudio-HEScore into infiltration_no_ducts f4e78a5271e6 Merge pull request #223 from NREL/skylights_windows_screens 0d86631897e4 Move skylight shading effect from SHGC to ExteriorShading. Make all interior/exterior shading values explicit. 6b7568b07510 Merge pull request #222 from NREL/latest-os-hpxml ed0f5e042d17 update_measures 0bbb2dec639e Sync. 08dcc09f2b1d Merge commit 'f228e5996895c3aa9a933035c2bbfc1bd0791b9b' into latest-os-hpxml f228e5996895 Squashed 'hpxml-measures/' changes from 63a4af67e..698f6439f b8623f1cac20 Merge commit 'f228e5996895c3aa9a933035c2bbfc1bd0791b9b' into latest-os-hpxml 169b31a21532 Merge pull request #221 from NREL/parallelize_ci 035fa67e042c Fix schemas_dir? 9fce463187cb Add gem. bad82b121e24 Run simulations in parallel on the CI. 4178a95ec960 Merge pull request #220 from NREL/github_actions 246a9b1a6793 Oops, sync with README CI badge. e0f28d3d36c7 Force another CI run. cf77d9038e2b running all tests again 8780dab56cab removing circleci config b9eaa1440e22 removing branch from badge b930eb454973 fixing upload plots and badge again 86a3094bb735 fixing artifact upload and adding badge 4563a580ced4 adding Base.xml back in so plotting works 3a1ab10baf58 adding plotting 845d348f533a filtering down the tests so they run in a reasonable amount of time 0bd7f6200512 adding artifact upload e945a7358d8e adding first steps in workflow 14e2f2e33efa Merge pull request #218 from NREL/hvac_sizing_improvements 9d9b0656aa3c Merge branch 'master' of https://github.com/NREL/OpenStudio-HEScore into hvac_sizing_improvements c70c030b8955 Merge branch 'master' of https://github.com/NREL/OpenStudio-HEScore into hvac_sizing_improvements 4d1c2ddcb40c Merge commit '66e76fb499a90b01f757eb682b7f043efe614b3a' into hvac_sizing_improvements 4d928b18be87 Merge commit '66e76fb499a90b01f757eb682b7f043efe614b3a' into hvac_sizing_improvements 66e76fb499a9 Squashed 'hpxml-measures/' changes from 8d8ceb99d..63a4af67e 3809cd5c99f0 Merge commit '924af89d9a0a46e8600385ee9476a86dd8104ac5' into hvac_sizing_improvements 6228fe474704 Merge commit '924af89d9a0a46e8600385ee9476a86dd8104ac5' into hvac_sizing_improvements 924af89d9a0a Squashed 'hpxml-measures/' changes from b00cad665..8d8ceb99d 1d7a607430b2 Merge pull request #217 from NREL/json_output c4dfbb209d41 Update output_map. 3b98a7e5bab8 Merge commit '19cf180afbb59648bd4a907fb4a4a04f70f22271' into json_output 83d3faf84357 Merge commit '19cf180afbb59648bd4a907fb4a4a04f70f22271' into json_output 19cf180afbb5 Squashed 'hpxml-measures/' changes from d0b528f98..ad18a1148 1dbfc7012989 Merge commit 'eb56e4e6ce1b39a40f855082c9e0dabdfd03200c' into latest-os-hpxml f75632ba2103 Merge commit 'eb56e4e6ce1b39a40f855082c9e0dabdfd03200c' into latest-os-hpxml eb56e4e6ce1b Squashed 'hpxml-measures/' changes from b00cad665..d0b528f98 2b326481907d Merge pull request #215 from N…
This branch adds the feature of being able to having the ResStock BuildExistingModel ignore measures. There will be a companion pull request to buildstockbatch that passes that argument through the project yml.