PyPSA · lkstrp · Jan 20, 2025 · Oct 7, 2024 · Oct 7, 2024 · Oct 7, 2024
diff --git a/.gitignore b/.gitignore
@@ -2,6 +2,7 @@
 #
 # SPDX-License-Identifier: GPL-3.0-only
 
+.DS_Store
 .snakemake
 _build
 .idea

diff --git a/README.md b/README.md
@@ -21,8 +21,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

diff --git a/Snakefile b/Snakefile
@@ -36,6 +36,26 @@ rule compile_cost_assumptions:
         "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:
 #         fraunhofer = "docu/Anhang-Studie-Wege-zu-einem-klimaneutralen-Energiesystem.pdf"

diff --git a/config.yaml b/config.yaml
@@ -7,6 +7,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

diff --git a/docs/release_notes.rst b/docs/release_notes.rst
@@ -23,7 +23,7 @@ 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
 
@@ -35,6 +35,13 @@ Release Notes
 
 * add pre-commit
 
+* 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)
 ======================================
 

diff --git a/environment.yaml b/environment.yaml
@@ -13,12 +13,14 @@ dependencies:
 - snakemake-minimal>=8.5
 - pandas>=2.1
 - pypsa
+- pyarrow
 - numpy
 - beautifulsoup4
 - xlrd
 - scipy
 - openpyxl>=3.1.2
 - packaging
+- pytest
 
 # Development dependencies
 - pre-commit

diff --git a/inputs/atb_e_2019.parquet b/inputs/atb_e_2019.parquet
diff --git a/inputs/atb_e_2022.parquet b/inputs/atb_e_2022.parquet
diff --git a/inputs/atb_e_2024.parquet b/inputs/atb_e_2024.parquet
diff --git a/inputs/discount_rates_usa.csv b/inputs/discount_rates_usa.csv
diff --git a/inputs/fuel_costs_usa.csv b/inputs/fuel_costs_usa.csv
@@ -0,0 +1,9 @@
+technology,parameter,year,value,unit,currency_year,financial_case,scenario,source,further description
+coal,fuel,2020,6.25,USD/MWh_th,2023,,,"EIA, https://www.eia.gov/coal/annual/",36.14 USD/short ton of bituminous coal with energy content = 19.73 million BTU/short ton
+coal,fuel,2025,8.12,USD/MWh_th,2023,,,"EIA, https://www.eia.gov/coal/annual/",46.97 USD/short ton of bituminous coal with energy content = 19.73 million BTU/short ton
+gas,fuel,2020,7.65,USD/MWh_th,2010,,,World Bank https://www.worldbank.org/en/research/commodity-markets,
+gas,fuel,2025,12.91,USD/MWh_th,2010,,,World Bank https://www.worldbank.org/en/research/commodity-markets,
+gas,fuel,2030,14.05,USD/MWh_th,2010,,,World Bank https://www.worldbank.org/en/research/commodity-markets,
+oil,fuel,2020,25.98,USD/MWh_th,2010,,,World Bank https://www.worldbank.org/en/research/commodity-markets,
+oil,fuel,2025,44.83,USD/MWh_th,2010,,,World Bank https://www.worldbank.org/en/research/commodity-markets,
+oil,fuel,2030,44.22,USD/MWh_th,2010,,,World Bank https://www.worldbank.org/en/research/commodity-markets,
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,6 +2,7 @@ @@
     #
     # SPDX-License-Identifier: GPL-3.0-only
+    .DS_Store
     .snakemake
     _build
     .idea
@@ Expand Down @@