Major appliance sat #420
Merged
Major appliance sat #420
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
…ad data. In the transferability study for the enduse load profiles project, end use load data was obtained from submetered homes in Florida, Massachusetts, Texas, and the Pacific Northwest. It was found that the daily probability schedules did not vary a lot between these data sources. The average daily probability schedules from each data source were averaged to construct a new daily probability schedule. The daily probability schedules separated out weekdays and weekends. These values are used to update the measure arguments for the National Average option in the Cooking Range Schedule.tsv.
…ate none fractions.
Isn't it shipment-weighted efficiency by year and not sales share from HES?
|
|
@ejhw You are correct. I will make the changes. |
ejhw
approved these changes
Mar 5, 2020
| High 0.000000 0.000000 0.000000 0.360000 0.000000 0.000000 0.640000 | ||
| Average 0.000000 0.000000 0.360000 0.000000 0.000000 0.640000 0.000000 | ||
| Dependency=Geometry Building Type RECS Dependency=Location Region Dependency=Usage Level Option=290 Rated kWh, 100% Usage Option=290 Rated kWh, 120% Usage Option=290 Rated kWh, 80% Usage Option=318 Rated kWh, 100% Usage Option=318 Rated kWh, 120% Usage Option=318 Rated kWh, 80% Usage Option=None sample_count sample_weight | ||
| Mobile Home CR02 Average 0.060507 0.000000 0.000000 0.213799 0.000000 0.000000 0.725693 7.250000 63468.816406 |
There was a problem hiding this comment.
Side note: Not necessary for this PR, but we can remove Average. It hasn't been used in a long time and is functionally the same as Medium.
There was a problem hiding this comment.
Thank you, I always wanted to do this.
resources/options_lookup.tsv
Outdated
| @@ -1668,7 +1668,7 @@ Cooking Range "Electric, 100% Usage" ResidentialApplianceCookingRange fuel_type= | |||
| Cooking Range "Electric, 120% Usage" ResidentialApplianceCookingRange fuel_type=electric cooktop_ef=0.74 oven_ef=0.11 has_elec_ignition=true mult=1.2 location=auto | |||
| Cooking Range "Electric, Induction" ResidentialApplianceCookingRange fuel_type=electric cooktop_ef=0.84 oven_ef=0.11 has_elec_ignition=true mult=1.0 location=auto | |||
| Cooking Range None | |||
| Cooking Range Schedule National Average ResidentialApplianceCookingRange "weekday_sch=0.007, 0.007, 0.004, 0.004, 0.007, 0.011, 0.025, 0.042, 0.046, 0.048, 0.042, 0.050, 0.057, 0.046, 0.057, 0.044, 0.092, 0.150, 0.117, 0.060, 0.035, 0.025, 0.016, 0.011" "weekend_sch=0.007, 0.007, 0.004, 0.004, 0.007, 0.011, 0.025, 0.042, 0.046, 0.048, 0.042, 0.050, 0.057, 0.046, 0.057, 0.044, 0.092, 0.150, 0.117, 0.060, 0.035, 0.025, 0.016, 0.011" "monthly_sch=1.097, 1.097, 0.991, 0.987, 0.991, 0.890, 0.896, 0.896, 0.890, 1.085, 1.085, 1.097" | |||
| Cooking Range Schedule National Average ResidentialApplianceCookingRange "weekday_sch=0.01490, 0.0120, 0.0102, 0.0096, 0.0107, 0.0187, 0.0306, 0.0355, 0.0356, 0.0341, 0.0378, 0.0438, 0.0451, 0.0413, 0.0413, 0.0586, 0.0942, 0.1252, 0.1162, 0.0802, 0.0448, 0.0239, 0.0191, 0.0166" "weekend_sch=0.01320, 0.0109, 0.0091, 0.0083, 0.0085, 0.0109, 0.0213, 0.0368, 0.0493, 0.0497, 0.0522, 0.0564, 0.0568, 0.0520, 0.0513, 0.0631, 0.0862, 0.1070, 0.0979, 0.0685, 0.0395, 0.0212, 0.0167, 0.0132" "monthly_sch=1.097, 1.097, 0.991, 0.987, 0.991, 0.890, 0.896, 0.896, 0.890, 1.085, 1.085, 1.097" | |||
There was a problem hiding this comment.
This was in response to the Diversify cooking schedules analysis JIRA LP-548 (https://agile.nrel.gov/browse/LP-548). We decided to use schedules informed by the submeter data and the transferability study. At least until the stochastic occupant model is pulled into master.
|
@joseph-robertson @ejhw @JLReyna Let me know if there are any comments about this PR. |
Codecov Report
@@ Coverage Diff @@
## master #420 +/- ##
=======================================
Coverage 93.41% 93.41%
=======================================
Files 168 168
Lines 49389 49389
=======================================
Hits 46138 46138
Misses 3251 3251 Continue to review full report at Codecov.
|
joseph-robertson
added a commit
that referenced
this pull request
Sep 9, 2020
…311ab d34323311ab Update some args and regenerate test osws. c1aca7bd41d Merge branch 'master' into build-res-hpxml-v3 246f976dcb9 Merge pull request #482 from NREL/require-plug-loads 55ea6f5d859 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into require-plug-loads edb5a7e402c Merge pull request #420 from NREL/schematron_validation 0e632a6ed7d Can also simplify validator.rb a bit now. e41ab528a99 Update pull_request_template.md. [ci skip] 3f6af831792 Missed one more code cleanup. 80fb9e7195e Improve context of root rule. Break out BuildingDetails into a separate rule. Other minor stuff. 15a524a3b33 Minor bugfix. 9483ef7aa4c Bugfixes for optional distribution systems in previous commit. 9c9ac23722f Simplify EPvalidator.xml xpath expressions to eliminate the need for exceptions in test_validation.rb. e09616abdf6 Update HPXML file. a9b013b5b2c Change Schematron to have every `sch:rule` in its own `sch:pattern`. Update measure.xml. c3aff92485f Require 'other' and 'TV other' plug loads to represent the typical home. Ensures that they are not accidentally left out of the model. They can be assigned zero kWh/yr if they need to be excluded for some reason. b818608a7c6 Merge branch 'master' into build-res-hpxml-v3 09523f58e61 Update docs. [ci skip] 12fbdfe98a3 Fix test based on @bpark1327 recommendation and minor cleanup. 79e98620e45 Run all tests on CI even if test_validation.rb fails. b3fc4c77537 Fix test. Add test_validation.rb to CI. 554e9980f9b Merge commit '6f574a9193e2ccfbc8ccc2f39d706447e344f48e' into schematron_validation 77c9af6cff9 Merge branch 'master' of https://github.com/NREL/OpenStudio-ERI into schematron_validation c7b7c0169cc Forgot to add new files. 12d1ed20958 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into schematron_validation 45cd303c6ee Update sample HPXML files and EPvalidator.xml to simplify test_validation.rb. b83e5380112 Merge pull request #481 from NREL/other-heated-space 926ae252be2 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into other-heated-space 81bd3fcb15a Merge branch 'schematron_validation' of https://github.com/NREL/OpenStudio-HPXML into schematron_validation 7944d419db0 Treat other heated space as unconditioned space. Affects Reference Home U-factors. 8aa44ab0b5d Change a comment in test_validation.rb 85923256244 change test_validation.rb to cover all assert tests in EPvalidator.xml 4eff784d68c Fix a test attribute in 301validator.xml 31080bb769e Bugfix. Update measure.rb fab2699618d Replace EPvalidator.rb and 301validator.rb with validator.rb Update test_validation.rb cc0d0835bb6 pass the location of the schematron file to validator.rb as an argument. 7d167d552f8 Change test_validation.rb so that there can be both element addition and deletion tests. 1fa4e352651 Update documentation. [ci skip] 54a2519d035 Change method names. Fix some weird xpath syntax. 5c8e46dc07e Update measure.xml 8aacf2c85a2 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into schematron_validation b476db65dca Simplify EPvalidator.rb a bit (e.g., remove extra nested loop, add error-handling around xpath execution). a29a6e62df8 Merge branch 'master' of https://github.com/NREL/OpenStudio-ERI into schematron_validation 25c36ea5a61 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into schematron_validation 0a3f6b71403 Update Schematron file. 0b57f7f0fa4 Update measure.xml and run Rubocop. 8d4da6dfead Ruby validator parses the Schematron file, gets the list of elements in the HPXML file that match a given sch:rule context, and then run the sch:assert test xpath expression in the context. (This removes the hashes from Ruby validator.) Change some sch:assert test xpath expressions so that they can be used in Ruby validator. f8f1d603243 Oops, forgot to save file first. 2784f43cecb Bugfix for schema validation where the xml argument was not provided. 68020b8ea32 Update test_invalid error messages for invalid-facility-type.xml ef4b1c908d2 Update 301validator.xml and test_validation.rb Merge branch 'master' of https://github.com/NREL/OpenStudio-ERI into schematron_validation afef65de212 Update EPvalidator.xml and test_validation.rb Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into schematron_validation bb786c3e526 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into schematron_validation 9a5202767cb run tasks.rb 54a834457f3 Dynamically determine HPXML file to use for automated tests; replaces hard-coded file names. Adds caching of HPXML objects. Moves HPXML schema validation from hpxml_translator_test.rb to test_validation.rb. bab8ce9a72b Another code clean up. b3a75d262a5 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into schematron_validation 8d4547615ca Code clean up and speed up test_validation.rb 13c7cf8c6ae changed code to allow "fuel oil 5/6" to be used 2f69ed509bd Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into schematron_validation f25f9809312 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into schematron_validation a8a84cf36fd Code simplification. 3e3a50ac51f Update expected error messages for test_invalid in hpxml_translator_test.rb 9f54c5db390 Add TODO comments f33683c9859 Update test_validation.rb 237cabe2c00 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into schematron_validation 56a05845200 Remove expected_error_message hashes adf80a09e83 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into schematron_validation 6571cf75d0f Only use bundle exec when running the new validation test (which requires schematron-nokogiri). 56c85ecce80 Call rake w/ bundle exec. 722458c9443 Update EPvalidator.xml w/ latest changes. Other minor changes. d5b43a5203a update_measures 5de94fa3c2d Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into schematron_validation 54d2373aa1a Change Gemfile.lock 3f4c809460d Roll back the previous commit. (Add require 'bundler/setup') 5270f52ac09 Remove require 'bundler/setup' 7d5c5b44d0d Bugfix. 6c143132bbc Require gem from a github fork 58b89ced4e4 update schematron/EPvalidator.rb error messages 21d820d851d Accommodate changes to EPvalidator.rb 23b83102400 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into schematron_validation e9e2556bf3c Update Schematron validation files 456b956ba74 Update test_validation.rb and EPvalidator.xml fa8c41a6487 Update FIXME comments. fbdb12c1d9a Update EPvalidator.xml and test_validation.rb. 889889a7f80 Update EPvalidator.xml and test_validation.rb 6672fb70ebd Expand EPvalidator.xml Add more validation test cases. e0033bcc6c6 Check only the error message of interest. ea48b8cc0f1 Code update. 91b8c976e45 Code update. 22d07d16214 Update EPvalidator.xml and test_schematron.rb db6c86ae896 Code update. 47c441b0bf1 Update EPvalidator.stron a92d592958f Add Schematron validator git-subtree-dir: resources/hpxml-measures git-subtree-split: d34323311ab51f988908572e0a833898a208a9b6
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.
Companion PR: https://github.com/NREL/resstock-estimation/pull/15
Pull Request Description
The purpose of this pull request is to reduce the number of appliances in multifamily units. The current assumption is that all units have Dishwashers and Clothes Washers. However multifamily units should have a lower probability of having laundry facilities (in unit) and extra refrigerators and stand-alone freezers. As a result, building type dependency was added to these characteristics and the fraction of units without the appliances is adjusted.
Adding a building type dependency
A dependency to Geometry Building Type RECS is added to the following housing characteristics:
Updating Refrigeration Efficiency Levels
A combination of RECS 2009 and shipment-weighted efficiencies by year is used to map the age of the refrigerators to efficiency levels. The following housing characteristics were updated with these two data sources.
New use of the American Housing Survey (AHS)
American Housing Survey (AHS) data was used to create saturations for the following housing characteristics. The benefit of using AHS is the saturation can be specified by Census Division.
AHS Region spatial field
This new field uses geographic regions specified by AHS. The field uses the Top 15 CBSAs in U.S.
Each of these CBSA are defined by county according to the February 2013 delineation file (https://www.census.gov/geographies/reference-files/time-series/demo/metro-micro/delineation-files.html). For counties not in these defined CBSAs, they are assigned their associated Census Division.
TSV Specific Sources Tagging
The current workflow of the tsv_maker.py created for different data sources had the same Created by line in each tsv the maker writes. Since different TSVs may use different data sources for each file, the methods were updated to write a set of sources for a specific file in the following form.
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.