Skip to content

Commit

Permalink
Merge pull request #982 from NREL/ll/join_subtsv_fix
Browse files Browse the repository at this point in the history 
Update join_tsv to use raw source_count
  • Loading branch information
@afontani
afontani committed Aug 26, 2022
2 parents 3c64ceb + 7eac2b5 commit 3b05e71
Show file tree
Hide file tree
Showing 38 changed files with 195,630 additions and 208,962 deletions.
2 changes: 2 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
/testing_baseline
/testing_upgrades
/resources/buildstock.csv
/project_*/**/*.csv
/project_*/**/*.log
/weather
.vscode/
.DS_Store
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ Fixes
- Rename sources subfolders so all tsv_makers can be imported as packages ([#959](https://github.com/NREL/resstock/pull/959))
- Fix heating and cooling auto-season inputs ([#975](https://github.com/NREL/resstock/pull/975))
- Remove Void from dependency columns in TSVs and update tests.([#981](https://github.com/NREL/resstock/pull/981))
- Update low-sample downscaling logic to use raw source_weight, which leads to minor changes to Geometry Floor Area and HVAC Partial Sapce Conditioning ([#982](https://github.com/NREL/resstock/pull/982))

## ResStock v2.5.0
###### February 9, 2022 - [Diff](https://github.com/NREL/OpenStudio-BuildStock/compare/v2.4.0...v2.5.0)
Expand Down
90 changes: 45 additions & 45 deletions project_national/housing_characteristics/Bedrooms.tsv
View file
Original file line number Diff line number Diff line change
@@ -1,49 +1,49 @@
Dependency=Geometry Building Type RECS Dependency=Geometry Floor Area Option=1 Option=2 Option=3 Option=4 Option=5 source_count source_weight sampling_probability
Mobile Home 0-499 0.630169 0.369831 0 0 0 220 558950 0.00240241
Mobile Home 1000-1499 0.0209499 0.302903 0.631983 0.0412781 0.00288595 1769 4.66461e+06 0.0245081
Mobile Home 1500-1999 0.00399406 0.164487 0.706272 0.119235 0.00601222 837 2.1641e+06 0.0104504
Mobile Home 2000-2499 0 0.0881289 0.458602 0.425439 0.0278304 273 726477 0.00357162
Mobile Home 2500-2999 0 0.148239 0.311439 0.453182 0.0871404 59 167978 0.000572964
Mobile Home 3000-3999 0 0.00761554 0.749206 0.22846 0.0147183 25 63107.6 0.00035049
Mobile Home 4000+ 0.0741595 0.0924272 0.347017 0.486397 0 23 53611.1 0.000289147
Mobile Home 500-749 0.166077 0.575511 0.229202 0.0245012 0.00470876 447 1.1764e+06 0.0060608
Mobile Home 750-999 0.0440384 0.565478 0.371527 0.0166042 0.00235264 958 2.6838e+06 0.0145499
Multi-Family with 2 - 4 Units 0-499 0.664869 0.335131 0 0 0 394 836776 0.00518968
Multi-Family with 2 - 4 Units 1000-1499 0.0725321 0.598607 0.305548 0.0184065 0.00490581 2060 4.19909e+06 0.0243101
Multi-Family with 2 - 4 Units 1500-1999 0.0563012 0.408861 0.433889 0.0886407 0.012308 489 1.07988e+06 0.00528436
Multi-Family with 2 - 4 Units 2000-2499 0.0676017 0.327398 0.432214 0.13311 0.0396761 175 382249 0.00222434
Multi-Family with 2 - 4 Units 2500-2999 0.0915872 0.247252 0.563962 0.0796848 0.0175145 55 126394 0.000626599
Multi-Family with 2 - 4 Units 3000-3999 0.127924 0.261753 0.384748 0.203616 0.0219592 46 96093 0.000599545
Multi-Family with 2 - 4 Units 4000+ 0.087157 0.493655 0.34831 0.0311876 0.0396906 49 121138 0.000788478
Multi-Family with 2 - 4 Units 500-749 0.556499 0.393044 0.0444016 0.00605469 0 1327 2.62086e+06 0.0154747
Multi-Family with 2 - 4 Units 750-999 0.225491 0.636316 0.128004 0.00944097 0.000748376 2112 4.33614e+06 0.0254412
Multi-Family with 5+ Units 0-499 0.860687 0.139313 0 0 0 1893 3.43847e+06 0.0171994
Multi-Family with 5+ Units 1000-1499 0.125435 0.700338 0.159023 0.0141549 0.00104875 5090 9.5006e+06 0.0479274
Multi-Family with 5+ Units 1500-1999 0.104707 0.520276 0.332368 0.0370698 0.00557824 801 1.60205e+06 0.00872231
Multi-Family with 5+ Units 2000-2499 0.0532022 0.498489 0.38065 0.0654961 0.00216231 178 351636 0.00177347
Multi-Family with 5+ Units 2500-2999 0.160695 0.196802 0.451835 0.170755 0.0199134 64 134345 0.000718454
Multi-Family with 5+ Units 3000-3999 0.170613 0.254717 0.417888 0.156782 0 47 94679.4 0.000455081
Multi-Family with 5+ Units 4000+ 0.389007 0.416531 0.151314 0.0431489 0 69 140784 0.000774409
Multi-Family with 5+ Units 500-749 0.779456 0.200061 0.016971 0.00281276 0.000699654 5532 9.51504e+06 0.0463075
Multi-Family with 5+ Units 750-999 0.436496 0.528509 0.0291099 0.00578938 9.61451e-05 6754 1.20562e+07 0.05999
Single-Family Attached 0-499 0.445382 0.554618 0 0 0 118 205857 0.000623027
Single-Family Attached 1000-1499 0.022636 0.497976 0.434543 0.0373574 0.00748779 2623 5.01192e+06 0.0214928
Single-Family Attached 1500-1999 0.00842645 0.285863 0.613944 0.078837 0.0129292 1763 3.28467e+06 0.0144471
Single-Family Attached 2000-2499 0.00538577 0.213178 0.562562 0.190358 0.0285164 835 1.54952e+06 0.00684935
Single-Family Attached 2500-2999 0.015475 0.12449 0.472147 0.311759 0.0761291 324 601346 0.002692
Single-Family Attached 3000-3999 0.0024149 0.146319 0.43142 0.327305 0.0925414 207 387537 0.00146872
Single-Family Attached 4000+ 0 0.091256 0.297235 0.210202 0.401308 111 221612 0.000909135
Single-Family Attached 500-749 0.442899 0.434288 0.116151 0.0066618 0 411 709616 0.00297218
Single-Family Attached 750-999 0.157606 0.629873 0.193703 0.0185282 0.000289923 878 1.62073e+06 0.00694044
Single-Family Detached 0-499 0.643643 0.356357 0 0 0 291 679274 0.00281662
Single-Family Detached 1000-1499 0.016486 0.231991 0.645199 0.0939264 0.0123975 14082 3.3626e+07 0.149607
Single-Family Detached 1500-1999 0.00664408 0.102578 0.654561 0.215055 0.0211622 15809 3.70881e+07 0.157053
Single-Family Detached 2000-2499 0.00436262 0.0601605 0.474383 0.40091 0.0601839 11469 2.6837e+07 0.112106
Single-Family Detached 2500-2999 0.00197004 0.0394393 0.355174 0.477099 0.126318 6571 1.50358e+07 0.0617468
Single-Family Detached 3000-3999 0.00130304 0.0278865 0.224333 0.498839 0.247638 6531 1.43755e+07 0.0592928
Single-Family Detached 4000+ 0.00413655 0.0203934 0.18168 0.37878 0.41501 3194 6.94979e+06 0.0269243
Single-Family Detached 500-749 0.307755 0.480801 0.161232 0.034887 0.0153251 755 1.76026e+06 0.00827544
Single-Family Detached 750-999 0.0910471 0.492679 0.364592 0.0439682 0.00771344 3213 7.80604e+06 0.0372207
Mobile Home 0-499 0.630169 0.369831 0 0 0 220 558950 0.00264076
Mobile Home 1000-1499 0.0209499 0.302903 0.631983 0.0412781 0.00288595 1769 4.66461e+06 0.0242097
Mobile Home 1500-1999 0.00399406 0.164487 0.706272 0.119235 0.00601222 837 2.1641e+06 0.0107357
Mobile Home 2000-2499 0 0.0881289 0.458602 0.425439 0.0278304 273 726477 0.00367598
Mobile Home 2500-2999 0 0.148239 0.311439 0.453182 0.0871404 59 167978 0.000658574
Mobile Home 3000-3999 0 0.00761554 0.749206 0.22846 0.0147183 25 63107.6 0.000307327
Mobile Home 4000+ 0.0741595 0.0924272 0.347017 0.486397 0 23 53611.1 0.000241063
Mobile Home 500-749 0.166077 0.575511 0.229202 0.0245012 0.00470876 447 1.1764e+06 0.00606498
Mobile Home 750-999 0.0440384 0.565478 0.371527 0.0166042 0.00235264 958 2.6838e+06 0.0142218
Multi-Family with 2 - 4 Units 0-499 0.664869 0.335131 0 0 0 394 836776 0.00500849
Multi-Family with 2 - 4 Units 1000-1499 0.0725321 0.598607 0.305548 0.0184065 0.00490581 2060 4.19909e+06 0.0248634
Multi-Family with 2 - 4 Units 1500-1999 0.0563012 0.408861 0.433889 0.0886407 0.012308 489 1.07988e+06 0.00604587
Multi-Family with 2 - 4 Units 2000-2499 0.0676017 0.327398 0.432214 0.13311 0.0396761 175 382249 0.00207533
Multi-Family with 2 - 4 Units 2500-2999 0.0915872 0.247252 0.563962 0.0796848 0.0175145 55 126394 0.000676219
Multi-Family with 2 - 4 Units 3000-3999 0.127924 0.261753 0.384748 0.203616 0.0219592 46 96093 0.00063783
Multi-Family with 2 - 4 Units 4000+ 0.087157 0.493655 0.34831 0.0311876 0.0396906 49 121138 0.000727539
Multi-Family with 2 - 4 Units 500-749 0.556499 0.393044 0.0444016 0.00605469 0 1327 2.62086e+06 0.0146453
Multi-Family with 2 - 4 Units 750-999 0.225491 0.636316 0.128004 0.00944097 0.000748376 2112 4.33614e+06 0.025259
Multi-Family with 5+ Units 0-499 0.860687 0.139313 0 0 0 1893 3.43847e+06 0.0168438
Multi-Family with 5+ Units 1000-1499 0.125435 0.700338 0.159023 0.0141549 0.00104875 5090 9.5006e+06 0.0482134
Multi-Family with 5+ Units 1500-1999 0.104707 0.520276 0.332368 0.0370698 0.00557824 801 1.60205e+06 0.00910834
Multi-Family with 5+ Units 2000-2499 0.0532022 0.498489 0.38065 0.0654961 0.00216231 178 351636 0.00189237
Multi-Family with 5+ Units 2500-2999 0.160695 0.196802 0.451835 0.170755 0.0199134 64 134345 0.000739085
Multi-Family with 5+ Units 3000-3999 0.170613 0.254717 0.417888 0.156782 0 47 94679.4 0.000450861
Multi-Family with 5+ Units 4000+ 0.389007 0.416531 0.151314 0.0431489 0 69 140784 0.000669924
Multi-Family with 5+ Units 500-749 0.779456 0.200061 0.016971 0.00281276 0.000699654 5532 9.51504e+06 0.0459787
Multi-Family with 5+ Units 750-999 0.436496 0.528509 0.0291099 0.00578938 9.61451e-05 6754 1.20562e+07 0.0599715
Single-Family Attached 0-499 0.445382 0.554618 0 0 0 118 205857 0.000680434
Single-Family Attached 1000-1499 0.022636 0.497976 0.434543 0.0373574 0.00748779 2623 5.01192e+06 0.0212429
Single-Family Attached 1500-1999 0.00842645 0.285863 0.613944 0.078837 0.0129292 1763 3.28467e+06 0.0148366
Single-Family Attached 2000-2499 0.00538577 0.213178 0.562562 0.190358 0.0285164 835 1.54952e+06 0.00704771
Single-Family Attached 2500-2999 0.015475 0.12449 0.472147 0.311759 0.0761291 324 601346 0.00260975
Single-Family Attached 3000-3999 0.0024149 0.146319 0.43142 0.327305 0.0925414 207 387537 0.00155583
Single-Family Attached 4000+ 0 0.091256 0.297235 0.210202 0.401308 111 221612 0.000867838
Single-Family Attached 500-749 0.442899 0.434288 0.116151 0.0066618 0 411 709616 0.00288342
Single-Family Attached 750-999 0.157606 0.629873 0.193703 0.0185282 0.000289923 878 1.62073e+06 0.00667023
Single-Family Detached 0-499 0.643643 0.356357 0 0 0 291 679274 0.00278121
Single-Family Detached 1000-1499 0.016486 0.231991 0.645199 0.0939264 0.0123975 14082 3.3626e+07 0.149345
Single-Family Detached 1500-1999 0.00664408 0.102578 0.654561 0.215055 0.0211622 15809 3.70881e+07 0.157097
Single-Family Detached 2000-2499 0.00436262 0.0601605 0.474383 0.40091 0.0601839 11469 2.6837e+07 0.112294
Single-Family Detached 2500-2999 0.00197004 0.0394393 0.355174 0.477099 0.126318 6571 1.50358e+07 0.0619608
Single-Family Detached 3000-3999 0.00130304 0.0278865 0.224333 0.498839 0.247638 6531 1.43755e+07 0.0594189
Single-Family Detached 4000+ 0.00413655 0.0203934 0.18168 0.37878 0.41501 3194 6.94979e+06 0.0269101
Single-Family Detached 500-749 0.307755 0.480801 0.161232 0.034887 0.0153251 755 1.76026e+06 0.00821481
Single-Family Detached 750-999 0.0910471 0.492679 0.364592 0.0439682 0.00771344 3213 7.80604e+06 0.0370203
# Created by: sources\ahs\ahs2017_2019\tsv_maker.py
# Source: Constructed using 2017 and 2019 American Housing Survey (AHS) microdata.
# Source: Building type categorization based on U.S. EIA 2009 Residential Energy Consumption Survey (RECS).
Expand Down

0 comments on commit 3b05e71

Please sign in to comment.