Merged
Conversation
41d92b7a83 Merge pull request #2173 from NatLabRockies/peak_load_output_units 05a01c6ddf Latest results. 5ca927a2f1 All Btuh outputs now rounded to zero digits. 330e73a654 Merge branch 'master' of https://github.com/NatLabRockies/OpenStudio-HPXML into peak_load_output_units 3e384054aa Merge pull request #2175 from NatLabRockies/timeseries_mf_bugfix e38dd1987e Latest results. 67041d4241 Bump GHAs 936c3dfd3a Use num decimal places consistent with HVAC capacities and design loads. d359ba0727 Merge branch 'master' of https://github.com/NatLabRockies/OpenStudio-HPXML into peak_load_output_units d43970d61e Bump GHA version 77e71048b2 Merge branch 'master' of https://github.com/NatLabRockies/OpenStudio-HPXML into timeseries_mf_bugfix d2091a3eb6 Fixed inconsistent logic between timeseries column names for zone temperature and zone setpoints when an HPXML is run as a whole SFA/MF building but only has one unit. And removed a method that is no longer needed. 593be3b727 Merge pull request #2129 from NatLabRockies/whole-building-batteries 7d611fb30f Sorry, I really dislike the `...` operator in ruby. It's way too subtle... 1f45f2bb9d Merge branch 'master' of https://github.com/NatLabRockies/OpenStudio-HPXML into whole-building-batteries e841a07f9e Latest results. b0fdd8f600 Merge pull request #2174 from NatLabRockies/dfhp_backup_capacities 37ec53b483 Latest results. 3eadacf7fb Refactor unit_meter_name to Model.make_unit_meter_name; also rename Model.make_variable_name to Model.make_unit_variable_name. 18d4e2fb29 Update the changelog. 4226c0a245 Reduce PV size for new sample file. 6ee3135e38 Fixes the furnace capacity in some of our dual-fuel HP sample files. They were still accidentally using 10 kW as if they were all-electric (backup strip heat). 4902275ca1 Use new unit_meter_name method in one more place. 262b248092 Make another custom electricity meter for facility plus generators; this is what TrackFacilityElectricDemandStoreExcessOnSite follows. 00ba5811bb Latest results. 2958bbce7e Continue to track facility for single units with batteries; relax 10x comparison tolerances. f5b638f4d8 Latest results. 6d40614ef1 **Breaking change**: Annual peak load outputs for heating and cooling now use units of Btu/h instead of kBtu/h for consistency with other outputs. 2195ce9db5 Merge branch 'master' into whole-building-batteries e51e37b344 Update the changelog. [ci skip] a33382e1ad Merge branch 'master' into whole-building-batteries e1b2f15538 Only create unit meters when either whole building or single unit with battery. 90faede90f Merge branch 'unit-fuel-meters' into whole-building-batteries 8529a6966d Latest results. 22c3b5c450 Updates for adding output meters for critical loads. db7a32aca3 Avoid meter duplication by using underscore instead of colon in names. 807ac05143 Merge branch 'unit-fuel-meters' into whole-building-batteries e5917306bf Bit more cleanup. 5d166ab103 Merge branch 'unit-fuel-meters' into whole-building-batteries 04d60c3194 Latest results. e703540467 Update battery and vehicle tests. c888e49449 Create unit meters for single unit models so we can track electricity in ELCD. 3e1cb0ba31 Request output meters for critical load by unit. ada42d3aa4 Update unit tests. 7afce5aec4 Merge branch 'unit-fuel-meters' into whole-building-batteries 555c94ce74 Merge branch 'unit-fuel-meters' into whole-building-batteries 6eaece2196 Merge branch 'master' into whole-building-batteries 112c14eced Actually check batteries and vehicles with unit multipliers. 9189c59b00 Instead just except missing custom meters, for now. c760a6c2c4 Only add production or storage output meters for units with pv/generators or batteries/vehicles. 30dcdef8b5 Update battery and vehicle tests for new storage operation scheme. 44522f9447 Move vehicle charging from electric storage to electricity facility. a7da12857c Exclude resilience output type from unit multiplier check. 26afb20a21 Need upcase on report meter data. 458cdf2d69 Comment out unitary system ancillary output variables due to nuances. 6756f9ae24 More specific warning message exception. 7d6dfd9e2f Let multiple references warning slide for now. a0d20a6668 Remove whole building battery test from ruby error messages test. 7e05cb6fc6 Use model objects instead of workspace objects. 911cc545c9 Merge branch 'master' into whole-building-batteries d8e35051c5 Update resilience calculations to be max across units. 723aa52788 Update the docs. 5d39251969 Create custom fuel meters for electricity, electricity produced, and electric storage. bc5dc74db5 Merge branch 'master' into whole-building-batteries 47b1a3c1fd Share get_object_outputs_by_key so we can use it to set up custom meter objects. e50fe3c803 Stub approach for creating custom meters for each unit. 1ca6991c45 Add sample file for whole building with batteries. git-subtree-dir: hpxml-measures git-subtree-split: 41d92b7a837892fbbbf951fdf9c2a3e5d43d8267
68c38d35d0 Simplify `setup_timeseries_includes` a bit. 7006992343 Updates the water heater EC_adj EMS program to similarly use Outputs.get_object_outputs_for_hpxml_system() in order to dynamically obtain all the relevant energy use sensors. 5c00d690c2 Latest results. 3bd16e204a Bugfix. 1761615d71 Attempted fix/refactor. af9c9a31eb Merge branch 'replace_ep_post_processing' of https://github.com/NatLabRockies/OpenStudio-HPXML into replace_ep_post_processing 79a10728b2 Add HP test file. 73f40bc9bc Latest results. 4a097aefca Avoid EMS program when DSE=1. 0cf0c5fc30 Move code to a separate method in case we want to reuse it for water heater EC adj calculation. Bugfix for HP backup systems. 045d3fe88f Bugfix. f53be16aab Allow DSE for utility bills. e4235d2f40 Fix for multiple dwelling units (credit to @joseph-robertson). e2cc04fd9e Apply unit multiplier. 7f7c40697c Allow DSE for first timestep. 5aef5f8019 Consolidate code. 3ce5fd4da9 Document method. f0e1b85422 Simplify method by applying to only one mode (htg or clg) at a time. 8066d54be1 First cut on using an EMS program to apply DSE instead of E+ post-processing. git-subtree-dir: hpxml-measures git-subtree-split: 68c38d35d0e12926849de8b5fc2af23a70d58c63
c4a9673cb7 Reintroduce warmup check. git-subtree-dir: hpxml-measures git-subtree-split: c4a9673cb7e0d616ebedda0e1750ddc6e220b437
874dc4c1c7 Cleanup Changelog.md [ci skip] 9debff6bfd Merge branch 'replace_ep_post_processing' of https://github.com/NatLabRockies/OpenStudio-HPXML into replace_ep_post_processing 55e79ee283 Final cleanup. 8ef336bad3 Latest results. git-subtree-dir: hpxml-measures git-subtree-split: 874dc4c1c73123148b02fab91de2f9bbe28c6b99
613807f79b Merge branch 'master' of https://github.com/NatLabRockies/OpenStudio-HPXML into schematron_messages 15c937f3d6 Merge pull request #2177 from NatLabRockies/replace_ep_post_processing 91c9753d51 Revert. 99c89d8bb4 A bit more cleanup of error messages. And add some more value checks for extension elements where they didn't exist. df9ea0f312 Switch to human-friendly error messages in schematron validation. git-subtree-dir: hpxml-measures git-subtree-split: 613807f79b6efdb983b7b8acf0181eef18fdc9bf
28b6e7707c A bit more simplification/cleanup. git-subtree-dir: hpxml-measures git-subtree-split: 28b6e7707c72103c59553bd539a783cd7d35d9ea
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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