-
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
Latest OS-HPXML #1215
Merged
Merged
Latest OS-HPXML #1215
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
…69b48 f4727069b48 Merge pull request #1611 from NREL/furnace_oversizing_factor 5b6591f3304 Found one more typo, updated the unit test. 03b6d4b9098 Update HPXMLtoOpenStudio/tests/test_validation.rb 4f412072855 Update HPXMLtoOpenStudio/resources/hpxml_schematron/EPvalidator.xml b2c90c9f0d1 update_measures f05902902bd Latest results. 60defa1c83d fix ci 98e61ebf55d backup system specification updates b6405cc5be7 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into furnace_oversizing_factor 0cf460a032b separate backup system 54df288a935 Merge pull request #1633 from NREL/mj_indoor_rh 57d6e907f7a Latest results. 568adbdebae Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into furnace_oversizing_factor 4b1179bc635 Fixes `ManualJInputs/HumiditySetpoint` not being used in the design load calculation. Incorporates check for a dry climate in how the default is set (and removes dehumidifier check) to better align with the standard. e6fa14e9ee0 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into furnace_oversizing_factor 43c46add0fa Merge branch 'furnace_oversizing_factor' of https://github.com/NREL/OpenStudio-HPXML into furnace_oversizing_factor 5e759ac5b43 address comments c85f1737951 Update docs/source/workflow_inputs.rst 7b6912a28f3 Latest results. 78e0f2747f2 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into furnace_oversizing_factor bf04c99edbd Latest results. 435aba1b62e Merge branch 'furnace_oversizing_factor' of https://github.com/NREL/OpenStudio-HPXML into furnace_oversizing_factor 903d17029a1 scale supp heating cap with heating autosizing factor too 8829f229c81 Latest results. a61b4003e13 added validator rule that factors have to be greater than 0.0 33354548ab5 update measures d62fcadb3ab unit test added 885a472cda1 remove capacities in hpxmls 40607719ac3 first cut applying factors 4c3eb74976c Latest results. 7fb75e49143 docs and validator 5c77db1c913 Merge branch 'furnace_oversizing_factor' of https://github.com/NREL/OpenStudio-HPXML into furnace_oversizing_factor fcdadc829be change to system level inputs 1a73443caaa Latest results. 2c999339d47 buildresidential measure, hpxml class and test file git-subtree-dir: resources/hpxml-measures git-subtree-split: f4727069b48760962c872eb704f7bc0a9b7351b5
…9f7d1 24f0399f7d1 Merge pull request #1636 from NREL/site_inputs 76e16b58f36 Latest results. 552afab52c2 The warning is back. 685619351d2 Move location to Craig, CO so that it shows differences in the stochastic unit test. 16071322dda Address review comments. 5c0e8bc1ddd Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into site_inputs 11ae432be1d Latest results. 0042cc70382 Update docs/changelog f57f51ac1a8 Bugfixes. 993b2ef1095 Merge branch 'site_inputs' of https://github.com/NREL/OpenStudio-HPXML into site_inputs 30fb11ba311 Add latitude/longitude/city inputs. Some code refactor help ensure our code uses the HPXML inputs (or defaults) instead of the EPWFile values. aad315e0fde Latest results. 1335ac6819e Add expected E+ warning for test file. 7634bd8a63f Add a decimal place for default elevation. f1ceba984fe Connect time zone input to stochastic schedule generator. cbae9e084d9 Latest results. e337629ce45 Update schema 7d0347b7d40 Add elevation as an optional input; defaults to EPW file elevation. git-subtree-dir: resources/hpxml-measures git-subtree-split: 24f0399f7d16a6dc21b42d28af4400b628f59813
…900da b651b6900da Merge pull request #1641 from NREL/mj_design_conditions 623055952db Latest results. 825ca778a5f 🤦 51d9e283956 Update sample file and docs. 6a94a5803df Update Changelog.md [ci skip] 5076186e637 Latest results. 0d087a03e29 Fix units. 4ca3c7d28cf Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into mj_design_conditions 4e92c0271db Implement HumidityDifference input. Remove duplicate psychrometric pressure calculations. 4d6a0414d38 Fix typo 88bec0ed3df Remove obsolete file. 234cddb5efb Update unit test. 2a9557d19ab Allow daily temperature range to be provided for Manual J calc. 2095b2aa7e4 Merge pull request #1638 from NREL/docs_readme_capabilities 66824adbb53 Fix typo [ci skip] 7d3494e177e A few changes [ci skip] 46fa5cdf3eb Add a high-level list of capabilities to the README and docs, and some other misc cleanup. [ci skip] 75a10ec5d36 Merge pull request #1637 from NREL/pitch_docs af0a0e06725 Fix roof data type in docs, add clarification. [ci skip] git-subtree-dir: resources/hpxml-measures git-subtree-split: b651b6900da09420440926cde611e2eac9cd0cb4
…b9e6b 02d4d2b9e6b Merge pull request #1644 from NREL/cleanup_acca_hpxmls f9ce81a4d0b Update measures c587c454ff2 Clean up ACCA HPXML test files. 9485f91c650 Merge pull request #1643 from NREL/bugfix_tiny_infiltration fa573d8a261 Use zero. 51918f01c10 Handle tiny infiltration values. 55a199a0ade Merge pull request #1586 from NREL/ansi_301_2022_airflow bfbebabe1fa Update docs [ci skip] 37d501c3229 Clarify garage location. f88480c2995 Latest results. 2e37ac44548 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into ansi_301_2022_airflow b10fd27d1e0 Latest results. 1a02a94d309 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into ansi_301_2022_airflow 60509253498 Latest results. 5ff6774afa4 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into ansi_301_2022_airflow 45cdd444fdc Latest results. 6d6d0177e05 Merge branch 'ansi_301_2022' of https://github.com/NREL/OpenStudio-HPXML into ansi_301_2022_airflow dc687d155e7 Merge branch 'ansi_301_2022' of https://github.com/NREL/OpenStudio-HPXML into ansi_301_2022_airflow 6be89690f61 Expose WithinInfiltrationVolume inputs for some attic/foundation types. d42c040f55f Minor refactoring. 46fe162b765 Merge branch 'ansi_301_2022_airflow' of https://github.com/NREL/OpenStudio-HPXML into ansi_301_2022_airflow 1092b38dee2 Handle case where Qinf > Qtot. 8db9c4dd9c8 Latest results. fbf067fdcbc Fix assert_in_epsilon tests. c3c95819d23 Simplify code. 9dabadd9b4e Update Changelog.md [ci skip] 1115e941ee6 Fix typo in docs. b704b1968c4 Merge branch 'ansi_301_2022' of https://github.com/NREL/OpenStudio-HPXML into ansi_301_2022_airflow d60d17e34bd Updates equations for Qfan and hourly combining of infiltration/ventilation. git-subtree-dir: resources/hpxml-measures git-subtree-split: 02d4d2b9e6bf218d0f4a13cccddafba1c026e16c
…23529 ff718623529 Merge pull request #1646 from NREL/average_ceiling_height_default d0c8adb141e Latest results. e4a03fb770f Merge branch 'average_ceiling_height_default' of https://github.com/NREL/OpenStudio-HPXML into average_ceiling_height_default 024f4d1b3ce Update ASHRAE 140 files. 3b42eaeb1bf Latest results. fc7bec4e8f0 Switch to ASHRAE 62.2 default. 1011d6b37be Clarify description [ci skip] 39f10fcb07c Simplify AverageCeilingHeight default. 18ebd08c15c Merge pull request #1325 from NREL/geb-hvac-var-speed 333268bd3c2 Latest results. d9c0fd28fef Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-var-speed 4024fa48a42 Latest results. 8484518994a some more explanation in the docs f878dfc0c10 two var speed systems 3e790138e4c address comments d2c17943fa8 Revert "Allow daily temperature range to be provided for Manual J calc." 360791e8095 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-var-speed 621526332a4 Allow daily temperature range to be provided for Manual J calc. a69019133b8 A little cleanup while reviewing the PR. b5d60f87441 Latest results. 7c49fa9264e Merge branch 'geb-hvac-var-speed' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-var-speed d1b66641faf update_measures fd6a32f1bc0 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-var-speed 265df5d22ec Latest results. d3e95f56821 fix indent cd19c07ec2b fix simulation error e1b97aa25d4 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-var-speed 794b7ba8931 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-var-speed 2ad08ac5001 More description of the hvac_maximum_power_ratio schedule. Including calling it an "advanced research feature" 62055685ce9 Latest results. b8748a5a8cf Minor cleanup in Changelog.md 7e4909c1f52 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-var-speed a0e14cd04fe address two speed system warning 03d34885625 Minor tweaks to changelog and docs. [ci skip] 4f3209d5808 Latest results. 7ac1ad9fab7 typo cc643f6e7b9 Adds a return before throwing warning. d382172ca96 The fix was not correct, try this. 08f10b4126d Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-var-speed 55599312b85 throw warning only if there's no var speed system 410d5a43c10 Latest results. 38cd6feab43 try directly using path name to exclude maximum power schedule files 18f988ac278 bugfixes fe8942c5f73 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-var-speed c1ad4e2bafd Merge branch 'geb-hvac-var-speed' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-var-speed cccfc19518d address comments 98b0159e6fa Update Changelog.md 294bf1e1f33 Latest results. 74dd1695591 Update HPXMLtoOpenStudio/resources/hvac.rb abca3c47e1f Update HPXMLtoOpenStudio/resources/hvac.rb 4de04ab9336 Update Changelog.md 7e666c18553 Merge branch 'geb-hvac-var-speed' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-var-speed 221ba447408 remove old results 7d242cfa1e3 Latest results. 4205a7eb3dd fix 10x test de3dbfd1186 added cooling/heating checks for EMS statement creation ea3d6b73fe3 fix unit test, added a few additional test files, rename max capacity to max power ratio 99431da4960 added unit test, disallowed multiplier da67f244643 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-var-speed c960918aa3c fix doc 846870b3222 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-var-speed 631d814db1e update measures ce0274e7b50 Approach improvements: 1. add setpoint sensors for cooling and heating individually 2. add plf curves 3. fix cooling power calculation based on total capacity 0423b3b1c89 Merge branch 'geb-hvac-var-speed' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-var-speed c9b0bd0f55b Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-var-speed 51c2075475c Latest results. acf292267bc oops 504d5f1dae4 fix the cooling only test file, fix the current power calculations based on speed ratios d6bb23efd2b update measures e3bbf9163f6 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-var-speed 2d8537de200 approach improvement to use load sensors and new control specifications, and a few cleanups 850d07d5d65 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-var-speed 44ed526c5ec Latest results. c3bf29cb5a2 update measures c98e6256ab8 bugfixes and EMS cleanups 10a8f85da21 one more typo d84c7ee93b5 rename sensors ad0e8e5267b update measures and hpxmls 1fe138de81f fixed typos c0fac755894 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-var-speed 158312a940e update hpxmls and some bugfixes 49f38db1e96 first cut ab0e6129436 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-var-speed 3fcdd58afd9 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-var-speed 28164b61fac Latest results. 13f5cc8b3bf Merge branch 'geb-hvac-var-speed' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-var-speed 9b1126d6564 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-var-speed 527309cd8fd Latest results. fc01ecdd896 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-var-speed 0699bff6918 Latest results. 0c7544fe89f Fix duplicate code. aa642efdd1b Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-var-speed b04fc664fcd Latest results. 697a14e2883 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-var-speed 395e1ca255d changes based on last discussion with jeff 897b8fcd3ee Latest results. 3b4ff8d4bb1 Merge branch 'os360' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-var-speed 2c98b9daa59 Latest results. c3721bba309 Merge branch 'os360' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-var-speed 6ae7e490f6e backup coil control 40b594c11b9 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-var-speed 5f3eac1d16d Merge branch 'geb-hvac-var-speed' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-var-speed 1ff536181e2 Update variable schedule for HVAC GEB d94386206ac Merge branch 'geb-hvac-var-speed' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-var-speed 3232ee33cf6 doc 18a0997eca4 fix unit test 64c3f350c06 Latest results. 767d88b31f9 use varied ratio schedule, minor change to EMS program cda72506f82 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-var-speed f64e57e708e Adding variable schedule for testing out CTA signals for variable speed HVAC. 90d5489d64b Latest results. 9a3fe8778c0 fix EMS program 947036ff650 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-var-speed ef0e84b8c9f Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-var-speed 4d977c910c3 implementation first cut c5561f0a44f Merge branch 'os360' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-var-speed 4d571fd8847 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-var-speed 8d81e907d8f bugfix for method argument e182cbbcafb forgot to commit tasks.rb 05ae60558d8 var speed first cut 978f03ddfc2 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into geb-hvac-var-speed 23e12af59f8 first cut git-subtree-dir: resources/hpxml-measures git-subtree-split: ff7186235298d88148558b73233ac7aa347d6f86
joseph-robertson
added a commit
that referenced
this pull request
May 9, 2024
c38c7df48b Merge pull request #1215 from NREL/comp_load_alternative 81ddf8cb4e Latest results. 4104001210 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into comp_load_alternative a57972291b Merge pull request #1576 from NREL/replace_ec_adj_ems 1969ce8517 Latest results. ccde2e587d Fix tests. b81ff3f034 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into replace_ec_adj_ems fb3b34ad70 Merge pull request #1630 from NREL/os380 7a59fd27a8 Handle negative elevations. f056f1e72e Latest results. 2d551932ac Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into comp_load_alternative cd52b954e0 Remove unused fallback when no HVAC system. 1c89cb2466 Latest results. 4ce3aedb69 Bugfixes. e08552664d Bugfix and simplify code. 883fa861f5 Incorporate HVAC seasons into logic. 84cfc8160c Fix changelog merge. d962fcc9b5 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into comp_load_alternative 58c87aaa94 Minor tweaks for completeness (parasitics, HPWH fan, etc.). 73cdf01776 Latest results. e9ebe90521 Update test values. de71ec5a87 Merge branch 'os380' of https://github.com/NREL/OpenStudio-HPXML into replace_ec_adj_ems 7a575e98bc Merge update [ci skip] 44c68dd49d Merge branch 'os380' of https://github.com/NREL/OpenStudio-HPXML into replace_ec_adj_ems 3c59cdb742 Replaces the ECadj EMS program with an adjustment to the efficiency of the water heater objects. f03e08dfe7 Latest results. 3f54ba3b8c Merge bugfix. 050d1e35b6 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into comp_load_alternative b46426836c Merge branch 'comp_load_alternative' of https://github.com/NREL/OpenStudio-HPXML into comp_load_alternative 0186c3358a update changelog bac00ce687 update measures 087727a3a5 Latest results. ba86b038e3 Merge remote-tracking branch 'origin/master' into comp_load_alternative fb5aaac13f Latest results. a62a99ba88 always assign component loads to cooling when whf is on 2d3627e785 revert inadvertent delete 6eeb1fd00f drop duplicate code added in merge ddb60e0ae7 Merge remote-tracking branch 'origin/master' into comp_load_alternative 76405f0926 Latest results. a2c80b50ff break out lighting from internal gains component loads aef3c5ae41 break out window component loads into conduction and solar c1977ecce3 Merge remote-tracking branch 'origin/master' into comp_load_alternative 4ef38d6207 Revert "enable cooling setpoints to be set without cooling system" d27a5812a2 Revert "allow heating setpoint inputs for homes with no heat load served" ce5d5d3204 Latest results. f24c88b235 Merge remote-tracking branch 'origin/master' into comp_load_alternative 66d1120985 Latest results. 5ea2e808bd Merge remote-tracking branch 'origin/fix_tsp_input' into comp_load_alternative 152db02c1c Merge remote-tracking branch 'origin/master' into fix_tsp_input a0dae6e92b Merge remote-tracking branch 'origin/master' into comp_load_alternative 59eeb0c274 Merge remote-tracking branch 'origin/master' into fix_tsp_input d75229c54c allow heating setpoint inputs for homes with no heat load served 8f57c1a302 enable cooling setpoints to be set without cooling system e3784e9e6f Latest results. 9e0db139e0 Comment out asserts for now. 10a66db83a Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into comp_load_alternative fc6d53ad99 Handle natural ventilation. 4b96887c32 Remove old comment [ci skip] 38f672b24f Alternative approach to component loads for hours where there is no heating/cooling load. git-subtree-dir: resources/hpxml-measures git-subtree-split: c38c7df48b0d10fe3cb299b976dd9fda89f12554
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
Pulls in:
site_city=auto
(no default)site_elevation=auto
(EPW default)site_latitude=auto
(EPW default)site_longitude=auto
(EPW default)Checked means that something in resstock was changed or updated as a result of pulling in.
Checklist
Not all may apply:
If related to resstock-estimation, checklist includes data dictionary, source report, options saturation, options_lookup.openstudio tasks.rb update_measures
has been run