Point to buildstockbatch develop branch #845
Merged
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
joseph-robertson
added a commit
that referenced
this pull request
May 12, 2022
…5b19d d9a2b05b19d Merge pull request #845 from NREL/wh-geb f19df1cafbc Remove thermostat setpoints from base-misc-defaults.xml. Add setpoint tests to test_defaults.rb. Some additional documentation. f3c47f1ae3e Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into wh-geb cec38c9d4e0 Merge pull request #1074 from NREL/default_asset 23efecb2c6a Remove default value in BuildResHPXML measure; update sample files. 8c6f803f8bc Changes the new Occupancy Calculation Type input to be optional; defaults to asset. 71ae5f820ea Use backup default wh tset correctly. 84d586288f8 Merge branch 'master' into wh-geb dcd0bc54cdf Fix 0 and 1 check. d4c3d507cf8 Merge branch 'master' into wh-geb 07901fe5af0 Update docs for hvac setpoints not required and default values. 08d77c454bd Some refactoring around constants and schedule validation. ac15b8ec620 Latest results. 426e2ad672c Remove debug line. e6efe6d924b Update tasks and sample files. bd555498884 Update HVAC setpoints defaults and epvalidator requirements. 3139ca82fc1 Use variables for repeated references. 503b22bda35 Refactor create_new_heater method a bit. 7d97b3ccf1f Remove wh setpoint temp from new sample files. edc9c2419ec Finish changes for catching simple and detailed schedules. 6e12e457a10 Stub changes for throwing warning when both simple and detailed schedules are provided. ebdd21d8173 Revert debug. 8b5d786df7b Error check for non 0 or 1. 13e7591bb48 Support detailed schedules for tankless and combi types. 5db55738fc1 Merge branch 'master' into wh-geb ce847f63328 Respond to some review comments. 303d849d64d Merge branch 'master' into wh-geb f0235408c65 Use cut-in exception only for outside hpwhs. a009e601901 Update the changelog. 8bb34f188e0 Add cut-in temperature exception back in. da0ff8c46e5 Clean up translator test error catching. ae58b0846c0 Clean up docs. 934e62684b4 Set limits for heat pump setpoint and operating mode schedules. 80650737835 Latest results. 17865d51a78 Update example schedule csv files. 16b026be46e Update tasks and sample files. a5b5887e58e Updates to schedules file class. f9b4fbc7696 Remove new args from schedule file measure. 95585dbaf5d Merge branch 'master' into wh-geb 1a9dc76dfd6 Latest results. 933c28b4254 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into wh-geb a35fdde341e Latest results. 63f9383b56e Allow a warning about tank setpoint temperature higher than HP cut-in temp. Occurs if HPWH is installed outside and EMS program forces the HP off 0edd36ac7c2 Revert last commit, we're going to not use the availability manager for HPWH but instead ignore warnings we're sure aren't a problem. 5dfc0e45a6d Attempt 1 at avoiding errors when HPWH is outside. I'm expecting this to fail on the CI but I want to see what errors it throws. 806efcb10dd Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into wh-geb c0daece7abe Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into wh-geb ed5ea430c9a Updates to schedule file measure and tests. 1291563444f Fix when stratified tank with stochastic schedules. bd4a3064262 Fixes for scheduled setpoints a0b3a10894a Nuke extra schedule files, change setpoint units from F to C 96523183e8b Adding HPWH operating mode EMS logic. Still need to test scheduled operating modes, but "HP only" mode for the whole year does work. 02239328e3d Latest results. 31c3d7d1810 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into wh-geb c7a4d4c7bca Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into wh-geb 5247480cab3 Merge branch 'master' into wh-geb a96142fbcad Update build tests. cc30cb72687 Update hpxml resource. ffab2c6658a Add default tests. 3818c2483f6 Update docs for new fields. 90b7fd0a807 Latest results. 08a134b5779 Merge branch 'master' into wh-geb 4196c51646b Merge branch 'schedules-files' into wh-geb 27d602146ff Merge branch 'master' into wh-geb 2b49b0bb928 Latest results. 88a6ee94f78 Fix water heater test xml names. 7c57811da23 Some renaming and cleanup. e7674309be3 Update docs. 4f3c007c2b8 Fix merge conflict in hotwater appliances resource. a92dfbf1f5b Bugfix. 0abf4592641 Refactor schedules element and class. dbd6f4d18c8 Check if nil. 2f88ecbe691 Merge branch 'master' into wh-geb 972db762c33 Merge branch 'wh-geb' of github.com:NREL/OpenStudio-HPXML into wh-geb 61965bb88f5 Update docs. 32ec819df80 Code cleanup. 0e782f7a934 Latest results. 0649376ab83 Remove debug line. c4c88fe93a4 Latest results. 6862a6ee411 Revert water heater resource and start over; too many merge conflicts. 5fa3c7ae234 Fix merge conflicts in resource files. c89e0542ea7 Merge branch 'master' into wh-geb 9e674f926c8 Refactor schedules file class a bit. b180201ee55 Update var name in validation test file. 1a9fda5892e Updates for merge. 747317648b3 Merge branch 'master' into wh-geb b226f2cf09c Update measures, resources, and tests. 46627680245 Nil method for schedules file class. 254f3150064 Merge branch 'master' into wh-geb 1db5a5773f8 Start refactoring SchedulesFile class. 14b9431ea3e Syntax fix. 9d7068d8079 Add build schedule file measure tests. 4aa25900e99 Update resources and build schedule file measure. b0829d53d73 Update sample files. aeadde8c2c3 Bugfix in water heater resource. 150a918ea9d Update tank model arg and default. 9177ca9778b Merge branch 'master' into wh-geb cdc2aef0281 Differentiate GE vs. AO Smith tanks for condenser height and element height. Still need to add GE control logic (if we're going to preserve that going forward). 818e4c37e53 Merge branch 'wh-geb' of https://github.com/NREL/OpenStudio-HPXML into wh-geb 74434904344 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into wh-geb 65b1ce09266 Update built test and regenerate hpxmls. 3d72bdc983c Merge branch 'master' into wh-geb ace28e04e24 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into wh-geb 742282a43c9 Latest results. 657f65081ec Catch more warnings. 3819bf03839 Merge branch 'master' into wh-geb ddb86056781 Add dummy lines to ems program. d68ac4c9bbc Merge branch 'master' into wh-geb 45b06fc144e Regenerate test xml files. 6ca3059c6d1 Update tasks and sample xml files. 19137450c88 Stub use of operating mode inputs. b4ae88c3792 Update descriptions, test files, and tests. f4c94545168 Merge branch 'master' into wh-geb ab2ae029604 Stub test for operating mode. 3645a4bd5e9 Fix typos and organize a bit. 2f7a09daa5a Add test xml for hp operating mode. f75ce7caa56 Add args for hp operating mode. be35ebd4af8 Latest results. 14904d94ae9 Catch warnings. 870ba4d49b1 Make max sch value variable. c76501839dc Stub tests for setpoint scheduled hpwh. 8965d345b23 Stub setpoint schedule option. 0f6fcbb8dc0 Merge branch 'master' into wh-geb 7c317a0316e Get stratified tank working. 5826d2c7913 Stub a few new water heater tests. f43ad556164 Stub a few new test xml files. ad6ad8328e5 Stub more resources. 165008156bf Add setpoint type and tank model type args to hpxml resource. git-subtree-dir: resources/hpxml-measures git-subtree-split: d9a2b05b19d7b94239aaf2e7ab255f19021ab6f4
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
Now that NREL/buildstockbatch#208 has been merged, change from
restructure-v3todevelopin config.yml.Checklist
Not all may apply:
openstudio tasks.rb update_measureshas been run