Merge pull request #1125 from NREL/ll/water_heater_location

Add water heater location

.github/pull_request_template.md

@@ -9,7 +9,6 @@ Not all may apply:
 - [ ] Tests (and test files) have been updated
 - [ ] Documentation has been updated
  - [ ] If related to resstock-estimation, checklist includes [data dictionary](https://github.com/NREL/resstock/tree/develop/resources/data/dictionary), [source report](https://github.com/NREL/resstock/tree/develop/project_national/resources/source_report.csv), [options saturation](https://github.com/NREL/resstock/tree/develop/project_national/resources/options_saturations.csv), [options_lookup](https://github.com/NREL/resstock/blob/develop/resources/options_lookup.tsv).
- - [ ] If changes to project_testing tsvs, checklist includes [yml_precomputed](https://github.com/NREL/resstock/tree/develop/test/tests_yml_files/yml_precomputed), [yml_precomputed_outdated](https://github.com/NREL/resstock/tree/develop/test/tests_yml_files/yml_precomputed_outdated), [yml_precomputed_weight](https://github.com/NREL/resstock/tree/develop/test/tests_yml_files/yml_precomputed_weight)
 - [ ] Changelog has been updated
 - [ ] `openstudio tasks.rb update_measures` has been run
 - [ ] No unexpected regression test changes on CI (checked comparison artifacts)

.github/workflows/config.yml

@@ -46,7 +46,7 @@ jobs:
  with:
  path: resources
  name: options_lookup
-
+ 
  - name: Run integrity checks for all projects
  run: |
  bundle exec rake unit_tests:project_integrity_checks
@@ -73,7 +73,7 @@ jobs:
 
  analysis-tests:
  runs-on: ubuntu-latest
- needs: [format-files]
+ needs: [unit-tests]
  container:
  image: docker://nrel/openstudio:3.6.1
  steps:
@@ -84,17 +84,39 @@ jobs:
  - name: Install gems
  run: |
  rm -f Gemfile.lock && bundle install
+ 
+ - name: Install python
+ shell: bash
+ run: |
+ export DEBIAN_FRONTEND=noninteractive
+ sudo apt update
+ sudo -E apt-get install -y python3-pip
+
+ - name: Install python dependencies
+ run : |
+ python3 -m pip install --progress-bar off --upgrade pip
+ pip3 install --progress-bar off pandas pyyaml
 
  - name: Download formatted options_lookup
  uses: actions/download-artifact@v3
  with:
  path: resources
  name: options_lookup
 
+ - name: Generate precomputed buildstocks
+ run: |
+ python3 test/update_yml_precomputed_files.py
+
  - name: Run run_analysis.rb
  run: |
  bundle exec rake workflow:analysis_tests
 
+ - name: Upload precomputed buildstocks
+ uses: actions/upload-artifact@v3
+ with:
+ path: test/tests_yml_files/yml_precomputed*/buildstock*.csv
+ name: precomputed_buildstocks
+
  - name: Upload run_analysis.rb results
  uses: actions/upload-artifact@v3
  with:
@@ -107,7 +129,7 @@ jobs:
 
  integration-tests:
  runs-on: ubuntu-latest
- needs: [format-files]
+ needs: [unit-tests]
  steps:
  - uses: actions/checkout@v3
  with:
@@ -153,7 +175,6 @@ jobs:
  - name: Process results
  run: |
  pip install plotly
- 
  python test/process_bsb_analysis.py
 
  - name: Run tests
@@ -322,6 +343,12 @@ jobs:
  path: resources
  name: options_lookup
 
+ - name: Download precomputed buildstocks
+ uses: actions/download-artifact@v3
+ with:
+ path: test/tests_yml_files
+ name: precomputed_buildstocks
+
  - name: Commit latest results
  shell: bash 
  run: |
@@ -335,6 +362,7 @@ jobs:
  git add test/base_results
  git add docs
  git add resources/options_lookup.tsv
+ git add test/tests_yml_files
  git status
  if [[ $(git diff --cached --exit-code) ]]; then
  git config --global user.email "github-action@users.noreply.github.com"

CHANGELOG.md

@@ -7,6 +7,7 @@ Features
 - For heat pump upgrades, adds the ability to set the existing primary (non-shared) heating system as the backup system using only a single option from the lookup ([#1074](https://github.com/NREL/resstock/pull/1074))
 - options_saturations.csv is added to project_*/resources/ folder ([#1132](https://github.com/NREL/resstock/pull/1132))
 - Update `run_analysis.rb` to map datapoints to run folder names when the `-k` argument is supplied ([#1138](https://github.com/NREL/resstock/pull/1138))
+- Add Water Heater Location and Geometry Space Combination, update Geometry Garage and Geometry Floor Area Bin to RECS2020, update RECS2020 microdata from v2 to v4, auto-generate buildstocks for yml_precomputed tests ([#1125](https://github.com/NREL/resstock/pull/1125))
 
 Fixes
 - Set standard format for options_lookup ([#962](https://github.com/NREL/resstock/pull/962))

project_national/housing_characteristics/Duct Leakage and Insulation.tsv

@@ -1,31 +1,31 @@
-Dependency=Duct Location Dependency=Vintage Option=0% Leakage, Uninsulated Option=10% Leakage, R-4 Option=10% Leakage, R-6 Option=10% Leakage, R-8 Option=10% Leakage, Uninsulated Option=20% Leakage, R-4 Option=20% Leakage, R-6 Option=20% Leakage, R-8 Option=20% Leakage, Uninsulated Option=30% Leakage, R-4 Option=30% Leakage, R-6 Option=30% Leakage, R-8 Option=30% Leakage, Uninsulated Option=None sampling_probability
-Garage <1940 0 0.26 0 0 0 0.47 0 0 0 0.27 0 0 0 0 0.000330212
-Garage 1940s 0 0.26 0 0 0 0.47 0 0 0 0.27 0 0 0 0 0.000686286
-Garage 1950s 0 0.26 0 0 0 0.47 0 0 0 0.27 0 0 0 0 0.00252339
-Garage 1960s 0 0.26 0 0 0 0.47 0 0 0 0.27 0 0 0 0 0.00445986
-Garage 1970s 0 0.26 0 0 0 0.47 0 0 0 0.27 0 0 0 0 0.00604545
-Garage 1980s 0 0.26 0 0 0 0.47 0 0 0 0.27 0 0 0 0 0.00612074
-Garage 1990s 0 0.26 0 0 0 0.47 0 0 0 0.27 0 0 0 0 0.00709953
-Garage 2000s 0 0 0 0.26 0 0 0 0.47 0 0 0 0.27 0 0 0.0102489
-Garage 2010s 0 0 0 0.26 0 0 0 0.47 0 0 0 0.27 0 0 0.00323595
+Dependency=Duct Location Dependency=Vintage Option=0% Leakage to Outside, Uninsulated Option=10% Leakage to Outside, R-4 Option=10% Leakage to Outside, R-6 Option=10% Leakage to Outside, R-8 Option=10% Leakage to Outside, Uninsulated Option=20% Leakage to Outside, R-4 Option=20% Leakage to Outside, R-6 Option=20% Leakage to Outside, R-8 Option=20% Leakage to Outside, Uninsulated Option=30% Leakage to Outside, R-4 Option=30% Leakage to Outside, R-6 Option=30% Leakage to Outside, R-8 Option=30% Leakage to Outside, Uninsulated Option=None sampling_probability
+Garage <1940 0 0.26 0 0 0 0.47 0 0 0 0.27 0 0 0 0 0.00075272
+Garage 1940s 0 0.26 0 0 0 0.47 0 0 0 0.27 0 0 0 0 0.00113032
+Garage 1950s 0 0.26 0 0 0 0.47 0 0 0 0.27 0 0 0 0 0.00283827
+Garage 1960s 0 0.26 0 0 0 0.47 0 0 0 0.27 0 0 0 0 0.00487706
+Garage 1970s 0 0.26 0 0 0 0.47 0 0 0 0.27 0 0 0 0 0.00626345
+Garage 1980s 0 0.26 0 0 0 0.47 0 0 0 0.27 0 0 0 0 0.00675924
+Garage 1990s 0 0.26 0 0 0 0.47 0 0 0 0.27 0 0 0 0 0.00770859
+Garage 2000s 0 0 0 0.26 0 0 0 0.47 0 0 0 0.27 0 0 0.0114911
+Garage 2010s 0 0 0 0.26 0 0 0 0.47 0 0 0 0.27 0 0 0.00351737
 Heated Basement <1940 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0.0130456
-Heated Basement 1940s 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0.00699022
+Heated Basement 1940s 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0.00699023
 Heated Basement 1950s 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0.0162687
 Heated Basement 1960s 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0.0125387
 Heated Basement 1970s 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0.014702
 Heated Basement 1980s 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0.0115802
 Heated Basement 1990s 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0.0142111
 Heated Basement 2000s 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0.013389
 Heated Basement 2010s 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0.00392685
-Living Space <1940 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0.00972023
-Living Space 1940s 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0.00544694
-Living Space 1950s 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0.0111479
-Living Space 1960s 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0.0179951
-Living Space 1970s 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0.0372989
-Living Space 1980s 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0.0376897
-Living Space 1990s 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0.0377422
-Living Space 2000s 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0.0331732
-Living Space 2010s 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0.0134787
+Living Space <1940 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0.00929772
+Living Space 1940s 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0.00500291
+Living Space 1950s 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0.010833
+Living Space 1960s 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0.0175778
+Living Space 1970s 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0.0370809
+Living Space 1980s 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0.0370511
+Living Space 1990s 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0.0371331
+Living Space 2000s 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0.0319309
+Living Space 2010s 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0.0131972
 None <1940 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0.0514666
 None 1940s 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0.0162025
 None 1950s 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0.0261588
@@ -36,50 +36,32 @@ None 1990s 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0.0226111
 None 2000s 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0.0148904
 None 2010s 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0.00854894
 Unheated Basement <1940 0 0 0 0 0.26 0 0 0 0.47 0 0 0 0.27 0 0.0275207
-Unheated Basement 1940s 0 0 0 0 0.26 0 0 0 0.47 0 0 0 0.27 0 0.00531834
+Unheated Basement 1940s 0 0 0 0 0.26 0 0 0 0.47 0 0 0 0.27 0 0.00531833
 Unheated Basement 1950s 0 0 0 0 0.26 0 0 0 0.47 0 0 0 0.27 0 0.0121735
-Unheated Basement 1960s 0 0 0 0 0.26 0 0 0 0.47 0 0 0 0.27 0 0.00810462
-Unheated Basement 1970s 0 0 0 0 0.26 0 0 0 0.47 0 0 0 0.27 0 0.00950424
+Unheated Basement 1960s 0 0 0 0 0.26 0 0 0 0.47 0 0 0 0.27 0 0.00810461
+Unheated Basement 1970s 0 0 0 0 0.26 0 0 0 0.47 0 0 0 0.27 0 0.00950423
 Unheated Basement 1980s 0 0 0 0 0.26 0 0 0 0.47 0 0 0 0.27 0 0.00693004
 Unheated Basement 1990s 0 0 0 0 0.26 0 0 0 0.47 0 0 0 0.27 0 0.00822665
-Unheated Basement 2000s 0 0 0.26 0 0 0 0.47 0 0 0 0.27 0 0 0 0.00930419
+Unheated Basement 2000s 0 0 0.26 0 0 0 0.47 0 0 0 0.27 0 0 0 0.0093042
 Unheated Basement 2010s 0 0 0.26 0 0 0 0.47 0 0 0 0.27 0 0 0 0.00299098
-Unvented Attic <1940 0 0.26 0 0 0 0.47 0 0 0 0.27 0 0 0 0 0.000526475
-Unvented Attic 1940s 0 0.26 0 0 0 0.47 0 0 0 0.27 0 0 0 0 0.000504865
-Unvented Attic 1950s 0 0.26 0 0 0 0.47 0 0 0 0.27 0 0 0 0 0.00128323
-Unvented Attic 1960s 0 0.26 0 0 0 0.47 0 0 0 0.27 0 0 0 0 0.00109253
-Unvented Attic 1970s 0 0.26 0 0 0 0.47 0 0 0 0.27 0 0 0 0 0.00146199
-Unvented Attic 1980s 0 0.26 0 0 0 0.47 0 0 0 0.27 0 0 0 0 0.00218898
-Unvented Attic 1990s 0 0.26 0 0 0 0.47 0 0 0 0.27 0 0 0 0 0.00220789
-Unvented Attic 2000s 0 0 0 0.26 0 0 0 0.47 0 0 0 0.27 0 0 0.00293582
-Unvented Attic 2010s 0 0 0 0.26 0 0 0 0.47 0 0 0 0.27 0 0 0.00109907
-Unvented Crawlspace <1940 0 0 0 0 0.26 0 0 0 0.47 0 0 0 0.27 0 0
-Unvented Crawlspace 1940s 0 0 0 0 0.26 0 0 0 0.47 0 0 0 0.27 0 0
-Unvented Crawlspace 1950s 0 0 0 0 0.26 0 0 0 0.47 0 0 0 0.27 0 0
-Unvented Crawlspace 1960s 0 0 0 0 0.26 0 0 0 0.47 0 0 0 0.27 0 0
-Unvented Crawlspace 1970s 0 0 0 0 0.26 0 0 0 0.47 0 0 0 0.27 0 0
-Unvented Crawlspace 1980s 0 0 0 0 0.26 0 0 0 0.47 0 0 0 0.27 0 0.00377893
-Unvented Crawlspace 1990s 0 0 0 0 0.26 0 0 0 0.47 0 0 0 0.27 0 0.00433997
-Unvented Crawlspace 2000s 0 0 0.26 0 0 0 0.47 0 0 0 0.27 0 0 0 0.0033795
-Unvented Crawlspace 2010s 0 0 0.26 0 0 0 0.47 0 0 0 0.27 0 0 0 0.00113085
-Vented Attic <1940 0 0.26 0 0 0 0.47 0 0 0 0.27 0 0 0 0 0.00467473
-Vented Attic 1940s 0 0.26 0 0 0 0.47 0 0 0 0.27 0 0 0 0 0.00486351
-Vented Attic 1950s 0 0.26 0 0 0 0.47 0 0 0 0.27 0 0 0 0 0.012169
-Vented Attic 1960s 0 0.26 0 0 0 0.47 0 0 0 0.27 0 0 0 0 0.0164433
-Vented Attic 1970s 0 0.26 0 0 0 0.47 0 0 0 0.27 0 0 0 0 0.0216035
-Vented Attic 1980s 0 0.26 0 0 0 0.47 0 0 0 0.27 0 0 0 0 0.0231398
-Vented Attic 1990s 0 0.26 0 0 0 0.47 0 0 0 0.27 0 0 0 0 0.0247919
-Vented Attic 2000s 0 0 0 0.26 0 0 0 0.47 0 0 0 0.27 0 0 0.0370506
-Vented Attic 2010s 0 0 0 0.26 0 0 0 0.47 0 0 0 0.27 0 0 0.0118452
-Vented Crawlspace <1940 0 0 0 0 0.26 0 0 0 0.47 0 0 0 0.27 0 0.0201107
-Vented Crawlspace 1940s 0 0 0 0 0.26 0 0 0 0.47 0 0 0 0.27 0 0.00939403
-Vented Crawlspace 1950s 0 0 0 0 0.26 0 0 0 0.47 0 0 0 0.27 0 0.0221166
-Vented Crawlspace 1960s 0 0 0 0 0.26 0 0 0 0.47 0 0 0 0.27 0 0.0174584
-Vented Crawlspace 1970s 0 0 0 0 0.26 0 0 0 0.47 0 0 0 0.27 0 0.0232042
-Vented Crawlspace 1980s 0 0 0 0 0.26 0 0 0 0.47 0 0 0 0.27 0 0.015199
-Vented Crawlspace 1990s 0 0 0 0 0.26 0 0 0 0.47 0 0 0 0.27 0 0.0166722
-Vented Crawlspace 2000s 0 0 0.26 0 0 0 0.47 0 0 0 0.27 0 0 0 0.0130519
-Vented Crawlspace 2010s 0 0 0.26 0 0 0 0.47 0 0 0 0.27 0 0 0 0.00447859
+Attic <1940 0 0.26 0 0 0 0.47 0 0 0 0.27 0 0 0 0 0.00520121
+Attic 1940s 0 0.26 0 0 0 0.47 0 0 0 0.27 0 0 0 0 0.00536837
+Attic 1950s 0 0.26 0 0 0 0.47 0 0 0 0.27 0 0 0 0 0.0134522
+Attic 1960s 0 0.26 0 0 0 0.47 0 0 0 0.27 0 0 0 0 0.0175358
+Attic 1970s 0 0.26 0 0 0 0.47 0 0 0 0.27 0 0 0 0 0.0230655
+Attic 1980s 0 0.26 0 0 0 0.47 0 0 0 0.27 0 0 0 0 0.0253288
+Attic 1990s 0 0.26 0 0 0 0.47 0 0 0 0.27 0 0 0 0 0.0269998
+Attic 2000s 0 0 0 0.26 0 0 0 0.47 0 0 0 0.27 0 0 0.0399864
+Attic 2010s 0 0 0 0.26 0 0 0 0.47 0 0 0 0.27 0 0 0.0129443
+Crawlspace <1940 0 0 0 0 0.26 0 0 0 0.47 0 0 0 0.27 0 0.0201107
+Crawlspace 1940s 0 0 0 0 0.26 0 0 0 0.47 0 0 0 0.27 0 0.00939403
+Crawlspace 1950s 0 0 0 0 0.26 0 0 0 0.47 0 0 0 0.27 0 0.0221166
+Crawlspace 1960s 0 0 0 0 0.26 0 0 0 0.47 0 0 0 0.27 0 0.0174584
+Crawlspace 1970s 0 0 0 0 0.26 0 0 0 0.47 0 0 0 0.27 0 0.0232042
+Crawlspace 1980s 0 0 0 0 0.26 0 0 0 0.47 0 0 0 0.27 0 0.0189779
+Crawlspace 1990s 0 0 0 0 0.26 0 0 0 0.47 0 0 0 0.27 0 0.0210122
+Crawlspace 2000s 0 0 0.26 0 0 0 0.47 0 0 0 0.27 0 0 0 0.0164314
+Crawlspace 2010s 0 0 0.26 0 0 0 0.47 0 0 0 0.27 0 0 0 0.00560944
 # Created by: sources\other\tsv_maker.py
 # Description: Duct insulation and leakage to outside from the portion of ducts in unconditioned spaces
 # Source: Duct insulation as a function of location: IECC 2009