Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add NREL/ATB electricity costs for the US #1

Open
wants to merge 105 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
105 commits
Select commit Hold shift + click to select a range
f6cbd31
code: re-locate imports
finozzifa Oct 7, 2024
7d00b0f
data: add ATB electricity inputs for 2022 and 2024
finozzifa Oct 7, 2024
33c76ce
code: introduce new script compile_cost_assumptions_nrel.py
finozzifa Oct 7, 2024
38bc4cb
code: fix imports in _helpers.py
finozzifa Oct 7, 2024
5212661
code: filter columns and core_metric_parameter
finozzifa Oct 8, 2024
0609459
code: new changes dropping duplicates
finozzifa Oct 8, 2024
c5fa441
code: add additional OCC as core_metric_parameter
finozzifa Oct 8, 2024
11a9024
code: %-yr
finozzifa Oct 8, 2024
2825720
code: newest changes to nrel
finozzifa Oct 9, 2024
2b15339
code: filter and rename technologies
finozzifa Oct 10, 2024
dd105e6
Merge branch 'master' of https://github.com/open-energy-transition/te…
finozzifa Oct 10, 2024
49c81b3
code-config: update config and compile_cost_assumptions_nrel.py
finozzifa Oct 11, 2024
8d4c3a9
code: rename columns
finozzifa Oct 11, 2024
8f8957e
code: add unit tests read_atb_input_file
finozzifa Oct 14, 2024
550e4a8
code: re-factor
finozzifa Oct 14, 2024
939cbd5
code: unit test calculate_fom_percentage
finozzifa Oct 14, 2024
52cfe50
code: new progress
finozzifa Oct 15, 2024
a66faf5
code: add unit tests for repeat_values
finozzifa Oct 15, 2024
b11b17a
code: add unit tests for fom_percentage
finozzifa Oct 15, 2024
ffae8b0
code: modify unit test for fom percentage
finozzifa Oct 15, 2024
416e24e
code: update documentation
finozzifa Oct 15, 2024
7b86aa5
code: modify code
finozzifa Oct 16, 2024
ac07486
code: re-work code
finozzifa Oct 16, 2024
bc32e52
code: remove unnecessary print from unit test file
finozzifa Oct 16, 2024
80b3fb5
data: add technical data for CCS-equipped power plants and update coa…
danielelerede-oet Oct 17, 2024
96bb1fd
data: coal and gas retrofits
danielelerede-oet Oct 17, 2024
474e161
data: pypsa battery changed to 'Utility-Scale_Battery_Storage_6Hr_Bat…
danielelerede-oet Oct 17, 2024
bd6a2fd
data: updated technology names to displayname ATB, added discount rates
danielelerede-oet Oct 17, 2024
af11cb0
code: remove WACC_Real
finozzifa Oct 17, 2024
7afd160
code: merge
finozzifa Oct 17, 2024
d19acfa
code: update scripts/compile_cost_assumptions_nrel.py
finozzifa Oct 17, 2024
bc98ca2
code: updated NREL ATB nomenclature according to 'displayname'
danielelerede-oet Oct 18, 2024
832085b
data: removed unnecessary data for future years
danielelerede-oet Oct 18, 2024
61a6b7d
data: added hydrogen production technologies
danielelerede-oet Oct 18, 2024
a73e7ad
code: update on including atb costs into existing costs
finozzifa Oct 18, 2024
b3ae99c
Merge branch 'nrel_atb_usa_costs' of https://github.com/open-energy-t…
finozzifa Oct 18, 2024
3d8f27f
code: atb costs included in existing costs
finozzifa Oct 18, 2024
5624d7c
data: updated header column 'financial_case'
danielelerede-oet Oct 18, 2024
c6cabd1
code: change in query
finozzifa Oct 18, 2024
400ad79
Merge branch 'nrel_atb_usa_costs' of https://github.com/open-energy-t…
finozzifa Oct 18, 2024
e9ab018
data: updated nomenclature 'further description' in 'discount_rates_u…
danielelerede-oet Oct 18, 2024
8aa0377
code: include discount rate
finozzifa Oct 18, 2024
3cc133f
Merge branch 'nrel_atb_usa_costs' of https://github.com/open-energy-t…
finozzifa Oct 18, 2024
cc09ac8
code: separate add discount rate as external function
finozzifa Oct 18, 2024
c8f0b02
code: remove unnecessary outputs
finozzifa Oct 18, 2024
6c5fa69
data: modify_input.csv
Oct 21, 2024
317ae51
data: add output US
finozzifa Oct 21, 2024
c1575c5
doc: update release_notes
finozzifa Oct 21, 2024
09baf9a
config: remove unnecessary configs
finozzifa Oct 21, 2024
6c6ef94
code: remove pypsa dependency
finozzifa Oct 21, 2024
74057c7
code: add get_query_string
finozzifa Oct 22, 2024
ece9481
doc: solve typo
finozzifa Oct 22, 2024
cea3e16
code: change comment
finozzifa Oct 22, 2024
1332b33
docu: update documentation
finozzifa Oct 24, 2024
a9183e4
code: merge from main
finozzifa Nov 4, 2024
10b9a89
code:merge from master
finozzifa Nov 8, 2024
9b856c8
data: correct mistake in manual_input.csv
danielelerede-oet Nov 18, 2024
f825939
doc: replace PyPSA-Eur-sec with PyPSA-Earth in README.md
danielelerede-oet Nov 21, 2024
050ec9c
code: substitute from pypsa.descriptors import Dict with Dict=dict in…
danielelerede-oet Nov 21, 2024
c9a4b31
data: added missing currency year for hydrogen production technologies
danielelerede-oet Nov 21, 2024
21bca37
code: remove index from NREL output files
danielelerede-oet Dec 2, 2024
3f5a626
code: add units for CF and modify unit for FOM
danielelerede-oet Dec 2, 2024
e6f49d6
code: modify from $ and € to USD and EUR
danielelerede-oet Dec 3, 2024
0ba4f91
data: modified € to EUR
danielelerede-oet Dec 3, 2024
eca0bc0
data: add efficiency for Coal-IGCC-90%-CCS and modify efficiency for …
danielelerede-oet Dec 3, 2024
174dd8a
code: merge
finozzifa Dec 3, 2024
c6b0ea2
Merge branch 'nrel_atb_usa_costs' of https://github.com/open-energy-t…
finozzifa Dec 3, 2024
3734f55
data: add ICCT data for hydrogen production & storage, FT and DAC
danielelerede-oet Dec 5, 2024
63ae9e2
doc: update release notes
danielelerede-oet Dec 5, 2024
6a73027
code: fix bug in queries
finozzifa Dec 5, 2024
6bef996
data: add US-specific fuel costs for coal, gas and oil
danielelerede-oet Dec 6, 2024
f5babda
code: remove tax_credit_case
finozzifa Dec 6, 2024
c6cf1ba
code: update __init__
finozzifa Dec 6, 2024
dffa512
Merge remote-tracking branch 'origin/nrel_atb_usa_costs' into nrel_at…
finozzifa Dec 6, 2024
4fc5ac5
code: Nuclear - AP1000 to Nuclear - AP100
finozzifa Dec 6, 2024
a541e5b
code: match technology names from ATB2022 to those in ATB2024
danielelerede-oet Dec 6, 2024
dc33c2f
data: add US-specific discount rate for 2020
danielelerede-oet Dec 6, 2024
59463c2
data: remove scenario and financial_case from fuel_costs_usa.csv
danielelerede-oet Dec 6, 2024
d1d196a
data: simplify names for hydrogen production technologies
danielelerede-oet Dec 6, 2024
8aeed76
code: remove unnecessary technologies from atb_e_2022
finozzifa Dec 10, 2024
44a7717
data: modify structure of discount rates and fuel costs files
danielelerede-oet Dec 10, 2024
c83b875
code: add fuel costs
finozzifa Dec 10, 2024
643e081
Merge branch 'nrel_atb_usa_costs' of https://github.com/open-energy-t…
finozzifa Dec 10, 2024
d6c1b4f
data: include newest values from fuel_costs
finozzifa Dec 10, 2024
8fd50ba
data: correct source for gas fuel cost
danielelerede-oet Dec 10, 2024
e94a536
docstring: add docstring to the functions
finozzifa Dec 10, 2024
ed018c1
Merge branch 'nrel_atb_usa_costs' of https://github.com/open-energy-t…
finozzifa Dec 10, 2024
1916a93
code: revert back to x instead of row
finozzifa Dec 11, 2024
11c6fef
doc: update doc strings
finozzifa Dec 11, 2024
44256b6
doc: updated documentation
danielelerede-oet Dec 11, 2024
545fbd0
code: update unit tests
finozzifa Dec 11, 2024
a78b7b7
code: update docu
finozzifa Dec 11, 2024
5abba01
code: final touches
finozzifa Dec 11, 2024
3c9dc10
data: fix currency years
danielelerede-oet Dec 11, 2024
49f3ca1
data: remove duplicates from discount_rates_usa
danielelerede-oet Dec 12, 2024
89d6f6d
code: remove uncessary file and spaces
finozzifa Dec 12, 2024
397b7da
code: change fixture scope
finozzifa Dec 12, 2024
0abf81f
Ltes mod (#159)
TomKae00 Dec 13, 2024
10562bf
code: merge commit
finozzifa Dec 13, 2024
d2b734b
data: add outputs folder
finozzifa Dec 13, 2024
e000512
remove unnecessary file
finozzifa Dec 13, 2024
629163a
code: remove duplicated before concat with discount_rates and fuel_co…
finozzifa Dec 20, 2024
683d7b9
code: modify .gitignore
finozzifa Dec 20, 2024
05341fc
remove .DS_Store
finozzifa Dec 20, 2024
46608ae
code: cast value to float
finozzifa Dec 20, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@


.DS_Store
.snakemake
_build
.idea
Expand Down
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@ standardized cost years, technology names, units and source information. For fur


The outputs are used in
[PyPSA-Eur](https://github.com/PyPSA/pypsa-eur) and
[PyPSA-Eur-Sec](https://github.com/PyPSA/pypsa-eur-sec).
[PyPSA-Eur](https://github.com/PyPSA/pypsa-eur) and [PyPSA-Earth](https://github.com/pypsa-meets-earth/pypsa-earth).


## Licence
Expand Down
13 changes: 13 additions & 0 deletions Snakefile
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,19 @@ rule compile_cost_assumptions:
conda: "environment.yaml"
script: "scripts/compile_cost_assumptions.py"

rule compile_cost_assumptions_usa:
input:
cost_files_to_modify=expand("outputs/costs_{year}.csv", year = config["years"]),
nrel_atb_input_files=expand("inputs/atb_e_{year}.parquet", year = config["nrel_atb"]["nrel_atb_input_years"]),
nrel_atb_input_discount_rate="inputs/discount_rates_usa.csv",
nrel_atb_input_fuel_costs="inputs/fuel_costs_usa.csv"
output:
expand("outputs/US/costs_{year}.csv", year = config["years"])
threads: 1
resources: mem=500
conda: "environment.yaml"
script: "scripts/compile_cost_assumptions_usa.py"


# rule convert_fraunhofer:
# input:
Expand Down
7 changes: 7 additions & 0 deletions config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,13 @@ version: 0.9.2
# considered years for output data
years : [2020, 2025, 2030, 2035, 2040, 2045, 2050]

nrel_atb:
nrel_atb_input_years : [2022, 2024]
nrel_atb_columns_to_keep : ["atb_year", "core_metric_parameter", "core_metric_case", "core_metric_variable", "technology", "technology_alias", "display_name", "scenario", "units", "value"]
nrel_atb_core_metric_parameter_to_keep : ["CAPEX", "CF", "Fixed O&M", "Variable O&M", "Fuel", "Additional OCC"]
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"]
nrel_atb_source_link : "NREL/ATB-https://data.openei.org/s3_viewer?bucket=oedi-data-lake&prefix=ATB%2Felectricity%2Fcsv%2F2022%2F"

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

#year for EUR outputs
Expand Down
13 changes: 11 additions & 2 deletions docs/release_notes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,22 @@ Release Notes

* fixed DEA technology data sheet name for central water tank storage to point to actual PTES data

* Fix minor issues in the code
* added geothermal district heating as `central geothermal-sourced heat pump` based on DEA technology catalogue ("45.1.a Geothermal DH, 1200m, E")

* fix minor issues in the code

* added iron-air battery cost data from Form Energy

* added energy to power ratio for central water pit storage and central water tank storage
* update decentral water tank storage data from PyPSA to DEA sources

* added energy to power ratio for central water pit storage and central/decentral water tank storage

* include NREL/ATB costs for electricity generation technologies in a dedicated US cost outputs

* include ICCT techno-economic parameters for electrolyzers, hydrogen storage, Fischer-Tropsch, Direct air capture

* include JRC data for fossil- and biomass-based hydrogen production technologies (with and without CCS)


Technology-Data 0.9.2 (30 August 2024)
======================================
Expand Down
2 changes: 2 additions & 0 deletions environment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ dependencies:
- pip
# for running the package
- snakemake-minimal>=8.5
- pyarrow
- fastparquet
- pandas>=2.1
- pypsa
- numpy
Expand Down
Binary file added inputs/atb_e_2019.parquet
Binary file not shown.
Binary file added inputs/atb_e_2022.parquet
Binary file not shown.
Binary file added inputs/atb_e_2024.parquet
Binary file not shown.
835 changes: 835 additions & 0 deletions inputs/discount_rates_usa.csv

Large diffs are not rendered by default.

9 changes: 9 additions & 0 deletions inputs/fuel_costs_usa.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
technology,parameter,year,value,unit,currency_year,financial_case,scenario,source,further description
coal,fuel,2020,5.03,EUR/MWh_th,2023,,,"EIA, Annual Coal Report, https://www.eia.gov/coal/annual/#:~:text=The%20electric%20power%20sector%20accounted,a%206.1%25%20increase%20from%202022.",36.14 USD/short ton of bituminous coal
coal,fuel,2025,6.54,EUR/MWh_th,2023,,,"EIA, Annual Coal Report, https://www.eia.gov/coal/annual/#:~:text=The%20electric%20power%20sector%20accounted,a%206.1%25%20increase%20from%202022.",46.97 USD/short ton of bituminous coal
gas,fuel,2020,7.65,EUR/MWh_th,2010,,,World Bank https://www.worldbank.org/en/research/commodity-markets,
gas,fuel,2025,12.91,EUR/MWh_th,2010,,,World Bank https://www.worldbank.org/en/research/commodity-markets,
gas,fuel,2030,14.05,EUR/MWh_th,2010,,,World Bank https://www.worldbank.org/en/research/commodity-markets,
oil,fuel,2020,25.98,EUR/MWh_th,2010,,,World Bank https://www.worldbank.org/en/research/commodity-markets,
oil,fuel,2025,44.83,EUR/MWh_th,2010,,,World Bank https://www.worldbank.org/en/research/commodity-markets,
oil,fuel,2030,44.22,EUR/MWh_th,2010,,,World Bank https://www.worldbank.org/en/research/commodity-markets,
Loading