Skip to content

Commit

Permalink
Merge pull request #1132 from NREL/fix_prune_rules_companion
Browse files Browse the repository at this point in the history
  • Loading branch information
rajeee committed Sep 7, 2023
2 parents 1348def + 609227e commit 00c5dbd
Show file tree
Hide file tree
Showing 9 changed files with 14,315 additions and 972 deletions.
2 changes: 1 addition & 1 deletion .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ 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_lookup](https://github.com/NREL/resstock/blob/develop/resources/options_lookup.tsv).
- [ ] 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
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
/resources/buildstock.csv
/project_*/**/*.csv
!/project_*/resources/source_report.csv
!/project_*/resources/options_saturations.csv
/project_*/**/*.log
/weather
.vscode/
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ Features
- Update characteristics to use EIA 2020 RECS ([#1031](https://github.com/NREL/resstock/pull/1031))
- Include HVAC secondary heating capabilities for project_testing ([#1090](https://github.com/NREL/resstock/pull/1090))
- 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.

Fixes
- Set standard format for options_lookup ([#962](https://github.com/NREL/resstock/pull/962))
Expand All @@ -13,6 +14,7 @@ Fixes
- Fix square footage for a MF dwelling unit in the "3000-3999" CFA bin (from 33171 to 3171) ([#1115](https://github.com/NREL/resstock/pull/1115))
- Fix/clarify duct location assignment by defining Duct Location.tsv, making Duct Leakage and Insulation (formerly Duct) depend on Duct Location, and making HVAC Has Ducts depend on HVAC Has Shared Systems. Includes fixes on standalone and shared heating system assignment for Other Fuel. ([#1104](https://github.com/NREL/resstock/pull/1104), [#1112](https://github.com/NREL/resstock/pull/1112))
- Correct refrigerator rated annual kWh based on EF and an assumed volume of 20.9cft. ([#1118](https://github.com/NREL/resstock/pull/1118))
- Minor changes to heating and cooling setpoint TSV due to refactoring of prune_rules handling in resstock-estimation ([#1132](https://github.com/NREL/resstock/pull/1132))

## ResStock v3.1.0
###### May 25, 2023 - [Diff](https://github.com/NREL/resstock/compare/v3.0.0...v3.1.0)
Expand Down
510 changes: 255 additions & 255 deletions project_national/housing_characteristics/Cooling Setpoint.tsv

Large diffs are not rendered by default.

1,020 changes: 510 additions & 510 deletions project_national/housing_characteristics/Heating Setpoint.tsv

Large diffs are not rendered by default.

12,381 changes: 12,381 additions & 0 deletions project_national/resources/options_saturations.csv

Large diffs are not rendered by default.

0 comments on commit 00c5dbd

Please sign in to comment.