Merged
Conversation
9e90411978 Merge pull request #2163 from NatLabRockies/ext-lights-elec-equip 2dd5c01b9e Add comments [ci skip] 25dce013bc Use zone level meter for interior lights. e8468dabdc Remove unit multiplier since exterior lights now how a thermal zone. a9fec90d1d Remove a debug line. 00f4eed502 Update reporting measure for new exterior lights meters. 574d9e44b7 Update unit tests for exterior lights. dc5f5f64b5 Model exterior lights using electric equipment objects instead of exterior lights objects. 2b59c689a6 Merge pull request #2162 from NatLabRockies/ems_debug 7f76952f23 Adds a `run_simulation.rb --ems-debug` argument to generate the EnergyPlus EDD file for debugging EMS programs. git-subtree-dir: hpxml-measures git-subtree-split: 9e90411978fd9d7eae35ba03fe0b3cf31dc51d08
83a91a3118 Latest results. 75def8ac30 bugfix REVERT: 9e90411978 Merge pull request #2163 from NatLabRockies/ext-lights-elec-equip REVERT: 2dd5c01b9e Add comments [ci skip] REVERT: 25dce013bc Use zone level meter for interior lights. REVERT: e8468dabdc Remove unit multiplier since exterior lights now how a thermal zone. REVERT: a9fec90d1d Remove a debug line. REVERT: 00f4eed502 Update reporting measure for new exterior lights meters. REVERT: 574d9e44b7 Update unit tests for exterior lights. REVERT: dc5f5f64b5 Model exterior lights using electric equipment objects instead of exterior lights objects. git-subtree-dir: hpxml-measures git-subtree-split: 83a91a3118227a0be45e406986d82747fa979494
53de43f8b1 Merge branch 'master' of https://github.com/NatLabRockies/OpenStudio-HPXML into performance_curve_bugfix 9e90411978 Merge pull request #2163 from NatLabRockies/ext-lights-elec-equip 2dd5c01b9e Add comments [ci skip] 25dce013bc Use zone level meter for interior lights. e8468dabdc Remove unit multiplier since exterior lights now how a thermal zone. a9fec90d1d Remove a debug line. 00f4eed502 Update reporting measure for new exterior lights meters. 574d9e44b7 Update unit tests for exterior lights. dc5f5f64b5 Model exterior lights using electric equipment objects instead of exterior lights objects. git-subtree-dir: hpxml-measures git-subtree-split: 53de43f8b14f05f7b4d35f2a5625c8544cf192a6
fae2701be9 Merge pull request #2164 from NatLabRockies/performance_curve_bugfix 6f405981ef Update Changelog.md [ci skip] 4847592511 changelog 34a96b9f7b Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into performance_curve_bugfix 5d6a151cd4 unit tests b739f6746f Merge pull request #2166 from NatLabRockies/remove_sizing_objects 6630c301d4 Remove the sizing objects from the model since we don't use them. Currently only removing them when using run_simulation.rb since the OS SDK does not support their removal. b222100f47 Merge pull request #2138 from NatLabRockies/unit-fuel-meters 0311b1f177 Update Changelog.md [ci skip] 9cce8759cc Merge branch 'performance_curve_bugfix' of https://github.com/NREL/OpenStudio-HPXML into performance_curve_bugfix 7c34495c16 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into performance_curve_bugfix 12d4e4e996 Small tweak to warning message [ci skip] eb5875502d Register a reporting measure warning if dwelling unit timeseries requested but neither total or fuel consumption timeseries requested. 569031f910 Base new whole building with fuels sample file off of whole building sample file. 4301605aec Misc comments, changelog, docs, argument description updates. 5aa5d8814a Update new reporting tests to use whole building file with fuels. f2da7659f1 Update the changelog. [ci skip] 1cc6fa3827 Merge branch 'master' into unit-fuel-meters a44799b0d8 Clean up and refactor updates for custom meter objects. 23d6a230f8 Simplify the approach for avoiding the multiple meter reference warning. ccbf8023ea Remove the output variable workaround for interior and exterior lights. 6e6828b2e8 Merge branch 'ext-lights-elec-equip' into unit-fuel-meters 27c569b2dd Merge branch 'ext-lights-elec-equip' into unit-fuel-meters 6572afb552 Revisit special key_vars and simplify; provide more explanation. ac550d3c4e Remove next line for Electric Storage Charge Energy; it is already covered. a561b813c2 Replace Fan Electricity Energy with EMS output variables. 7f63b5ef65 Merge branch 'master' into unit-fuel-meters e1bfa3a02a Latest results. fbb33a97bb Add check on totals, and clean up error message. 46b2e3f50c Add new whole MF building sample file that is not all-electric. 79ccee089b Minor updates in reporting measure test file. 543961b3e3 Unify all erb files, including vertical choices and default values (even if false). da3b6ab22a More section rename updates in tests. bed9c449f4 Rename create_custom_meters to create_custom_electricity_meters. d8d481ec7c Updates in util.rb for section renames. 7537fa1496 Address first round of review, including docs, argument descriptions, comments, additional properties, output section names. c83dbaad39 Merge branch 'master' of https://github.com/NatLabRockies/OpenStudio-HPXML into unit-fuel-meters f29c44e460 Avoid adding new sections to docs. 99e89295b8 Minor cleanup in reporting measure. 940eacbb8a Merge branch 'master' into unit-fuel-meters 18cd9d4bc7 Update reporting measure tests for changed arguments and outputs. 88645dfc56 Update template osw files with argument changes. 1989500eb5 Generalize workflow docs for dwelling unit outputs. 1aa9f70031 Update workflow tests to deal with energy use outputs by unit. d0bde5a473 Report out energy use by dwelling unit. eb2c496d72 Revise reporting measure arguments for dwelling unit outputs. bdd9863439 Fix new workflow outputs table. 2afba3c528 Typo in reporting measure test updates. 63ec7b781f Update the workflow outputs docs. 338c2b2808 Update the template osw files with new reporting measure arguments. f2a9708a3f Add whole-building reporting measure tests. d813778b2a Merge branch 'battery-resilience-refactor' into unit-fuel-meters 45b93fb448 Latest results. 2c17215399 Initialize the unit_fuel_data array. ea635ce68a Update run_simulation.rb for new arguments. 70ee94d181 Add unit fuel arguments, and updates for timeseries outputs. 46ffdcf5ed Avoid writing every unit fuel use to results_simulations_energy.csv. f056a88625 Merge branch 'master' into unit-fuel-meters 4332686402 Latest results. 693bb13e69 Apply DSE multiplier to unit fuel meters. cd7879882c Avoid the referenced multiple times warning altogether. 27a2fad9ae Merge branch 'master' into unit-fuel-meters a0cc74bc70 Use only output variables in PV custom meter. ca4064ff7a Use custom meter as source meter on MeterCustomDecrement. 8306c05863 Call create_custom_meters from create_custom_unit_meters so we get Total and Net for each unit. 34b9d0d841 Merge branch 'master' into unit-fuel-meters 567b17744b Latest results. f9ad57422d Account for differences in vehicle end use vs electric produced meter. 5fcbe2d2af Account for differences in vehicle end use vs electric storage meter. 069f693e1a Add unit meters and checks for all remaining fuel types. c410d63650 Latest results. b51a8665bb Add log exceptions to workflow tests util.rb file. 53ef0f30b4 Update and refactor translator and reporting measures for creating unit electricity meters. git-subtree-dir: hpxml-measures git-subtree-split: fae2701be986b64b999c8ae7793c878b494bf07a
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