Skip to content

Commit

Permalink
Merge pull request #1038 from NREL/cambium2022
Browse files Browse the repository at this point in the history
Update to 2022 Cambium release
  • Loading branch information
joseph-robertson committed Jun 7, 2023
2 parents e65c23e + 8635e38 commit 0dedb64
Show file tree
Hide file tree
Showing 925 changed files with 5,326,953 additions and 71,017 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
## ResStock v3.2.0 (pending)

Features
- Add 2022 Cambium emissions data ([#1038](https://github.com/NREL/resstock/pull/1038))

Fixes

## ResStock v3.1.0
###### May 25, 2023 - [Diff](https://github.com/NREL/resstock/compare/v3.0.0...v3.1.0)

Expand Down
2 changes: 1 addition & 1 deletion project_national/national_baseline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ workflow_generator:
emissions:
- scenario_name: LRMER_MidCase_15
type: CO2e
elec_folder: data/cambium/LRMER_MidCase_15
elec_folder: data/cambium/2022/LRMER_MidCase_15

utility_bills:
- scenario_name: Bills
Expand Down
2 changes: 1 addition & 1 deletion project_national/national_upgrades.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ workflow_generator:
emissions:
- scenario_name: LRMER_MidCase_15
type: CO2e
elec_folder: data/cambium/LRMER_MidCase_15
elec_folder: data/cambium/2022/LRMER_MidCase_15

utility_bills:
- scenario_name: Bills
Expand Down
2 changes: 1 addition & 1 deletion project_testing/testing_baseline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ workflow_generator:
emissions:
- scenario_name: LRMER_MidCase_15
type: CO2e
elec_folder: data/cambium/LRMER_MidCase_15
elec_folder: data/cambium/2022/LRMER_MidCase_15
gas_value: 147.3
propane_value: 177.8
oil_value: 195.9
Expand Down
2 changes: 1 addition & 1 deletion project_testing/testing_upgrades.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ workflow_generator:
emissions:
- scenario_name: LRMER_MidCase_15
type: CO2e
elec_folder: data/cambium/LRMER_MidCase_15
elec_folder: data/cambium/2022/LRMER_MidCase_15
gas_value: 147.3
propane_value: 177.8
oil_value: 195.9
Expand Down

0 comments on commit 0dedb64

Please sign in to comment.