Run update_measures on the master branch #431
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
afontani
approved these changes
Mar 25, 2020
joseph-robertson
added a commit
that referenced
this pull request
Jun 26, 2020
947481a7c Merge branch 'master' into build-res-hpxml-v3 a0464a7f1 Merge pull request #424 from NREL/ideal-system 1758bc7ed Clean up some argument descriptions. 092322600 Switch to a single heating system efficiency arg. b1d2db658 Update docs. [ci skip] db048d552 Merge branch 'ideal-system' of https://github.com/NREL/OpenStudio-HPXML into ideal-system 8cc7249f5 resolve report test issue 294bb45b8 Updates for coal fuel type. bfec5cdc9 Found a few more places to use the new hpxml methods. 284a6e25a Merge branch 'master' into build-res-hpxml-v3 650d71d63 update_measures b0dee0c59 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into ideal-system ce8f5d66e total check no longer applicable 8e8a864b5 Merge pull request #428 from NREL/skylight-ufactor-fix cb8299a29 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into skylight-ufactor-fix 22425cb7c Merge pull request #431 from NREL/more-fuel-types 3e20fcae8 Rename FuelTypeWood to FuelTypeWoodCord and some small code refactoring in the reporting measure. 949fd9caa ideal system unmet load test not applicable d76ba3d5d report only residual ideal system unmet load 1631ac67e Add energyplus.rb resource w/ a few constants and methods to simplify code. a5fb4c4c2 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into ideal-system ac119d2af Prevent coal from being an option for some heating systems in EPvalidator, rather than catching it in hvac.rb. cfcb1644e Oops. ef423877c Merge pull request #429 from NREL/load-warnings 82937fdfb Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into load-warnings 326ddd0a2 Allow additional HPXML fuel types for HVAC systems, water heating systems, and appliances. (Coal and similar fuel types are only allowed for boilers, not other heating system types, due to a limitation in the E+ Coil:Heating:Fuel object.) bc842481a Revert some unexpected changes, and bugfix.. 9b9833a92 bugfix 96564091f Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into ideal-system d132da8c9 Update docs and minor updates to defaults. c3d4362f1 Add warnings for plug/fuel loads that are not modeled. f5b85eb49 Merge pull request #427 from NREL/other-heated-space-is-thermal-boundary 2244b940c Converts skylight NFRC U-factor (at 20-degree slope) to SimpleGlazingSystem model input (vertical position). 6ac3f6446 Treat HPXML::LocationOtherHeatedSpace as a conditioned space for HPXML::is_thermal_boundary methods. 96e2a4040 Merge pull request #426 from NREL/eri-end-uses 5fce3a8e3 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into ideal-system e5db62006 Exclude unused end uses for ERI outputs. 5391b8814 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into ideal-system 77ef1e190 bugfix 863ee94a9 two ideal systems git-subtree-dir: resources/hpxml-measures git-subtree-split: 947481a7c3447c2712015848354ca943b6288b10
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.
Addresses #[issue number here].
Pull Request Description
[description here]
Checklist
Not all may apply:
project_testingproject_testingruns without any failuresFor more information on how to perform these checklist items, see the documentation's Advanced Tutorial.