Skip to content

Commit

Permalink
Merge pull request #964 from NREL/af/partial_ac_conditioning
Browse files Browse the repository at this point in the history
Introduce cooling partial space conditioning
  • Loading branch information
afontani committed Jul 15, 2022
2 parents d4be06d + 23fb7c1 commit 9f973dc
Show file tree
Hide file tree
Showing 11 changed files with 46,926 additions and 45,712 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ Features
- Improve distributions of heat pumps in the southeast U.S. by spliting IECC zone 2A into two zones: 2A (FL, GA, AL, MS) and 2A (TX, LA) ([#913](https://github.com/NREL/resstock/pull/913))
- Add Income and Tenure tsv, update PUMS tsvs from 2017 5-yrs to 2019 5-yrs, update dependencies and fix encoding error in Occupants.tsv ([#900](https://github.com/NREL/resstock/pull/900))
- Add Income and Tenure into Geometry Floor Area ([#949](https://github.com/NREL/resstock/pull/949))
- Add distributions for partial space cooling ([#964](https://github.com/NREL/resstock/pull/964))

Fixes
- Clean up option names for natural ventilation and hot water distribution ([#828](https://github.com/NREL/resstock/pull/828))
Expand Down
20 changes: 10 additions & 10 deletions project_national/housing_characteristics/Federal Poverty Level.tsv
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Dependency=Income Dependency=Occupants Option=0-100% Option=100-150% Option=150-
10000-14999 8 1 0 0 0 0 0 254 5821 5.62726e-05
10000-14999 9 1 0 0 0 0 0 97 2144 2.24814e-05
100000-119999 1 0 0 0 0 0 1 52798 1.05344e+06 0.00865944
100000-119999 10+ 0 1 0 0 0 0 871 17178 0.00014821
100000-119999 10+ 0 0.0232856 0.525556 0.451158 0 0 871 17178 0.00014821
100000-119999 2 0 0 0 0 0 1 194086 3.45373e+06 0.0282363
100000-119999 3 0 0 0 0 0 1 93358 1.7966e+06 0.0145567
100000-119999 4 0 0 0 0 0.161823 0.838177 79332 1.58672e+06 0.0128191
Expand All @@ -20,7 +20,7 @@ Dependency=Income Dependency=Occupants Option=0-100% Option=100-150% Option=150-
100000-119999 8 0 0 0 1 0 0 1959 41548 0.000344596
100000-119999 9 0 0 0 1 0 0 864 17784 0.000149037
120000-139999 1 0 0 0 0 0 1 29889 591519 0.00497587
120000-139999 10+ 0 1 0 0 0 0 747 14699 0.000112468
120000-139999 10+ 0 0.00401388 0.0859242 0.910062 0 0 747 14699 0.000112468
120000-139999 2 0 0 0 0 0 1 134127 2.39583e+06 0.0197851
120000-139999 3 0 0 0 0 0 1 69556 1.32586e+06 0.0106707
120000-139999 4 0 0 0 0 0 1 62697 1.25533e+06 0.00986219
Expand All @@ -30,7 +30,7 @@ Dependency=Income Dependency=Occupants Option=0-100% Option=100-150% Option=150-
120000-139999 8 0 0 0 0.548555 0.451445 0 1485 31047 0.0002385
120000-139999 9 0 0 0 1 0 0 659 13617 0.000105597
140000-159999 1 0 0 0 0 0 1 18864 369020 0.00312144
140000-159999 10+ 0 0.230002 0.769998 0 0 0 566 11226 9.34125e-05
140000-159999 10+ 0 0.00302868 0.0156779 0.888473 0.0928202 0 566 11226 9.34125e-05
140000-159999 2 0 0 0 0 0 1 94684 1.69316e+06 0.0143707
140000-159999 3 0 0 0 0 0 1 51521 980153 0.00762159
140000-159999 4 0 0 0 0 0 1 48595 966170 0.0074801
Expand All @@ -50,7 +50,7 @@ Dependency=Income Dependency=Occupants Option=0-100% Option=100-150% Option=150-
15000-19999 8 1 0 0 0 0 0 337 7650 5.82295e-05
15000-19999 9 1 0 0 0 0 0 140 3239 2.31797e-05
160000-179999 1 0 0 0 0 0 1 12475 243418 0.0021109
160000-179999 10+ 0 0 1 0 0 0 457 8610 7.18534e-05
160000-179999 10+ 0 0 0.0111498 0.386411 0.602439 0 457 8610 7.18534e-05
160000-179999 2 0 0 0 0 0 1 68220 1.22142e+06 0.0101011
160000-179999 3 0 0 0 0 0 1 37727 718768 0.00552669
160000-179999 4 0 0 0 0 0 1 36525 716651 0.0055788
Expand All @@ -60,7 +60,7 @@ Dependency=Income Dependency=Occupants Option=0-100% Option=100-150% Option=150-
160000-179999 8 0 0 0 0 0.731457 0.268543 931 19293 0.000133164
160000-179999 9 0 0 0 0 1 0 421 8980 6.07682e-05
180000-199999 1 0 0 0 0 0 1 7630 144947 0.00147234
180000-199999 10+ 0 0 0.609949 0.390051 0 0 372 7217 5.08144e-05
180000-199999 10+ 0 0 0.00304836 0.19842 0.798531 0 372 7217 5.08144e-05
180000-199999 2 0 0 0 0 0 1 48902 868688 0.00714368
180000-199999 3 0 0 0 0 0 1 27024 511626 0.00394192
180000-199999 4 0 0 0 0 0 1 27013 530661 0.00399285
Expand All @@ -80,7 +80,7 @@ Dependency=Income Dependency=Occupants Option=0-100% Option=100-150% Option=150-
20000-24999 8 1 0 0 0 0 0 447 10907 0.000112035
20000-24999 9 1 0 0 0 0 0 149 3339 3.75539e-05
200000+ 1 0 0 0 0 0 1 38621 721705 0.0059175
200000+ 10+ 0 0 0 0.570731 0.226269 0.203 1609 28665 0.000195427
200000+ 10+ 0 0 0 0.01528 0.217687 0.767033 1609 28665 0.000195427
200000+ 2 0 0 0 0 0 1 201787 3.47071e+06 0.0281597
200000+ 3 0 0 0 0 0 1 102693 1.88619e+06 0.015471
200000+ 4 0 0 0 0 0 1 109063 2.05883e+06 0.0156726
Expand Down Expand Up @@ -140,7 +140,7 @@ Dependency=Income Dependency=Occupants Option=0-100% Option=100-150% Option=150-
45000-49999 8 0 1 0 0 0 0 665 15118 0.00012815
45000-49999 9 0.534006 0.465994 0 0 0 0 246 5352 4.60632e-05
50000-59999 1 0 0 0 0 0 1 128694 2.52372e+06 0.0223528
50000-59999 10+ 1 0 0 0 0 0 486 9536 7.54055e-05
50000-59999 10+ 0.514052 0.485948 0 0 0 0 486 9536 7.54055e-05
50000-59999 2 0 0 0 0.0829544 0.917046 0 192302 3.41121e+06 0.0282388
50000-59999 3 0 0 0 1 0 0 64080 1.31849e+06 0.0106502
50000-59999 4 0 0 0.136796 0.863204 0 0 44146 947636 0.00768946
Expand All @@ -150,7 +150,7 @@ Dependency=Income Dependency=Occupants Option=0-100% Option=100-150% Option=150-
50000-59999 8 0 1 0 0 0 0 1343 30138 0.000247744
50000-59999 9 0 1 0 0 0 0 498 10799 8.91551e-05
60000-69999 1 0 0 0 0 0 1 94438 1.85736e+06 0.0140448
60000-69999 10+ 1 0 0 0 0 0 474 9982 9.36509e-05
60000-69999 10+ 0.0832498 0.91675 0 0 0 0 474 9982 9.36509e-05
60000-69999 2 0 0 0 0 0.784661 0.215339 177984 3.15556e+06 0.0263616
60000-69999 3 0 0 0 0.409151 0.590849 0 63681 1.27814e+06 0.0111289
60000-69999 4 0 0 0 1 0 0 44965 948208 0.00842352
Expand All @@ -160,7 +160,7 @@ Dependency=Income Dependency=Occupants Option=0-100% Option=100-150% Option=150-
60000-69999 8 0 0.526733 0.473267 0 0 0 1272 27401 0.000259106
60000-69999 9 0 1 0 0 0 0 509 10223 0.000100912
70000-79999 1 0 0 0 0 0 1 69025 1.36313e+06 0.0122015
70000-79999 10+ 1 0 0 0 0 0 457 9654 8.33999e-05
70000-79999 10+ 0.0138803 0.925109 0.061011 0 0 0 457 9654 8.33999e-05
70000-79999 2 0 0 0 0 0 1 159641 2.82991e+06 0.0233003
70000-79999 3 0 0 0 0 1 0 61464 1.21718e+06 0.00975304
70000-79999 4 0 0 0 0.721637 0.278363 0 44494 924686 0.0074125
Expand All @@ -170,7 +170,7 @@ Dependency=Income Dependency=Occupants Option=0-100% Option=100-150% Option=150-
70000-79999 8 0 0 1 0 0 0 1261 27332 0.000229374
70000-79999 9 0 0.202763 0.797237 0 0 0 513 10569 8.98982e-05
80000-99999 1 0 0 0 0 0 1 89650 1.7679e+06 0.0147246
80000-99999 10+ 0.842675 0.157325 0 0 0 0 898 17645 0.000146967
80000-99999 10+ 0.00215358 0.179541 0.818305 0 0 0 898 17645 0.000146967
80000-99999 2 0 0 0 0 0 1 260692 4.62972e+06 0.0384166
80000-99999 3 0 0 0 0 0.280225 0.719775 111002 2.17935e+06 0.0178555
80000-99999 4 0 0 0 0 1 0 86204 1.74118e+06 0.0141352
Expand Down

0 comments on commit 9f973dc

Please sign in to comment.