Skip to content

Commit

Permalink
Merge pull request #1195 from NREL/data-reorg
Browse files Browse the repository at this point in the history
Reorganize emissions and utility bills data folders
  • Loading branch information
joseph-robertson committed Jan 22, 2024
2 parents c0f6d23 + caf0c54 commit 0666a3a
Show file tree
Hide file tree
Showing 1,121 changed files with 386 additions and 371 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ Features

Fixes
- Remove old HPWH options from options_lookup ([#1190](https://github.com/NREL/resstock/pull/1190))
- Reorganize the emissions and utility rates data folders such that their sources and functions are more clear ([#1195](https://github.com/NREL/resstock/pull/1195))

## ResStock v3.2.0
###### December 19, 2023 - [Diff](https://github.com/NREL/resstock/compare/v3.1.1...v3.2.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/2022/LRMER_MidCase_15
elec_folder: data/emissions/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/2022/LRMER_MidCase_15
elec_folder: data/emissions/cambium/2022/LRMER_MidCase_15

utility_bills:
- scenario_name: Bills
Expand Down
6 changes: 3 additions & 3 deletions 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/2022/LRMER_MidCase_15
elec_folder: data/emissions/cambium/2022/LRMER_MidCase_15
gas_value: 147.3
propane_value: 177.8
oil_value: 195.9
Expand All @@ -57,10 +57,10 @@ workflow_generator:
pv_monthly_grid_connection_fee: 2.5

- scenario_name: Bills2
simple_filepath: data/simple_rates/State.tsv
simple_filepath: data/utility_bills/test_simple_rates/State.tsv

- scenario_name: Bills3
detailed_filepath: data/detailed_rates/County.tsv
detailed_filepath: data/utility_bills/test_detailed_rates/County.tsv

simulation_output_report:
timeseries_frequency: hourly
Expand Down
6 changes: 3 additions & 3 deletions 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/2022/LRMER_MidCase_15
elec_folder: data/emissions/cambium/2022/LRMER_MidCase_15
gas_value: 147.3
propane_value: 177.8
oil_value: 195.9
Expand All @@ -57,10 +57,10 @@ workflow_generator:
pv_monthly_grid_connection_fee: 2.5

- scenario_name: Bills2
simple_filepath: data/simple_rates/State.tsv
simple_filepath: data/utility_bills/test_simple_rates/State.tsv

- scenario_name: Bills3
detailed_filepath: data/detailed_rates/County.tsv
detailed_filepath: data/utility_bills/test_detailed_rates/County.tsv

simulation_output_report:
timeseries_frequency: hourly
Expand Down
7 changes: 0 additions & 7 deletions resources/data/detailed_rates/README.md

This file was deleted.

5 changes: 5 additions & 0 deletions resources/data/emissions/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
In the YML file's "elec_folder" field for emissions scenario definitions, enter a relative file path to a folder (e.g., "data/emissions/cambium/2022/LRMER_MidCase_15") containing schedule files with hourly electricity emissions factors values.

See OpenStudio-HPXML's documentation for [HPXML Emissions Scenarios](https://openstudio-hpxml.readthedocs.io/en/latest/workflow_inputs.html#hpxml-emissions-scenarios) for more information about arguments fuel types, units, and values.

Refer to BuildStockBatch's documentation for [Residential HPXML Workflow Generator](https://buildstockbatch.readthedocs.io/en/stable/workflow_generators/residential_hpxml.html) for more information about YML file emissions-related arguments.

0 comments on commit 0666a3a

Please sign in to comment.