Skip to content

Commit 8dc5787

Browse files
Dedicated us inputs scenarios (#181)
* code: introduce dedicated inputs and folders for the US * code: add manual input usa * code: latest changes to compile_cost_assumptions_usa.py * code: latest changes to compile_cost_assumptions_usa.py - 2 * code: relocate adjust_for_inflation to _helpers.py * code: update costs in manual_input.csv * code: next step on compile_cost_assumptions_usa.py * code: updates * code: add docstring * code: pre-commit * code: new updates to docstring * code: docstring * code: docstring in _helpers.py * docu: update the release notes * code: add unit tests * code: add pre-commit * code: sort outputs * code: add pre-commit * doc: add docstring * code: re-import numpy and pandas in _helpers.py * add scenarios for H2 and DAC (US only) + apply inflation rate to EUR only * doc: update release notes * code: fix unit tests * data: modify manual_input_usa.csv specifying financial_case R&D for rows where scenario is defined * add missing scenarios for electrolyzers * pre-commit changes * reorder manual_input_usa.csv * add new files * fix financial case for ICCT technologies * ensure that financial case is correctly reported in output files * update unit test * modify representative NREL technologies * include description of scenario and financial case * code: resolve FutureWarning from set_specify_assumptions --------- Co-authored-by: Fabrizio Finozzi <[email protected]> Co-authored-by: Fabrizio Finozzi <[email protected]>
1 parent e4ab832 commit 8dc5787

15 files changed

+24654
-24175
lines changed

config.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ nrel_atb:
1313
nrel_atb_core_metric_parameter_to_keep: ["CAPEX", "CF", "Fixed O&M", "Variable O&M", "Fuel", "Additional OCC"]
1414
nrel_atb_technology_to_remove: ["Coal-CCS-95% -> Transformational Tech", "Coal-Max-CCS -> Transformational Tech", "Coal-new -> Transformational Tech", "NG combined cycle 95% CCS (F-frame basis -> Transformational Tech)", "NG combined cycle 95% CCS (H-frame basis -> Transformational Tech)", "NG combined cycle Max CCS (F-frame basis -> Transformational Tech)", "NG combined cycle Max CCS (H-frame basis -> Transformational Tech)", "AEO"]
1515
nrel_atb_source_link: "NREL/ATB-https://data.openei.org/s3_viewer?bucket=oedi-data-lake&prefix=ATB%2Felectricity%2Fcsv%2F2022%2F"
16+
nrel_atb_further_description: "Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios"
1617

1718
expectation: "" # tech data uncertainty, possible options [None, "optimist", "pessimist"]
1819

docs/release_notes.rst

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,11 @@ Upcoming Release
2424

2525
* Align `snakemake` version and the related `mock_snakemake` to PyPSA-Eur (https://github.com/PyPSA/technology-data/pull/177)
2626

27+
* Improve filename consistency in the sources (https://github.com/PyPSA/technology-data/pull/178)
28+
2729
* Improve assumptions for iron-air batteries (https://github.com/PyPSA/technology-data/pull/179)
2830

29-
* Improve filename consistency in the sources (https://github.com/PyPSA/technology-data/pull/178)
31+
* US-specific scenarios for electrolyzers and DAC + adjustment for inflation removed as already considered in input data (https://github.com/PyPSA/technology-data/pull/181)
3032

3133
* Include further unit tests for compile_cost_assumptions_usa.py (https://github.com/PyPSA/technology-data/pull/182)
3234

docs/structure.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ This repository has the following structure:
4949
* nrel_atb_core_metric_parameter_to_keep : list of parameters to use from the NREL/ATB source files
5050
* nrel_atb_technology_to_remove : list of technologies that should be excluded from NREL/ATB
5151
* nrel_atb_source_link : source url for the NREL/ATB data used
52+
* nrel_atb_further_description : Meaning of "scenario" and "financial case"
5253
* expectation : tech data uncertainty, possible options [None, "optimist", "pessimist"]
5354
* eur_year : year for EUR outputs
5455
* solar_utility_from_vartiaien : Bool (True/False) if solar utility data is taken from DEA or Vartiaien

inputs/US/discount_rates_usa.csv

Lines changed: 834 additions & 834 deletions
Large diffs are not rendered by default.

inputs/US/manual_input_usa.csv

Lines changed: 245 additions & 134 deletions
Large diffs are not rendered by default.

outputs/US/costs_2020.csv

Lines changed: 3138 additions & 3098 deletions
Large diffs are not rendered by default.

outputs/US/costs_2025.csv

Lines changed: 3208 additions & 3168 deletions
Large diffs are not rendered by default.

outputs/US/costs_2030.csv

Lines changed: 3400 additions & 3360 deletions
Large diffs are not rendered by default.

outputs/US/costs_2035.csv

Lines changed: 3424 additions & 3384 deletions
Large diffs are not rendered by default.

outputs/US/costs_2040.csv

Lines changed: 3424 additions & 3384 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)