Skip to content

Commit afd73e5

Browse files
authored
Merge branch 'master' into afforestation_PR
2 parents b8ecfe3 + 6a322be commit afd73e5

28 files changed

+15354
-14918
lines changed

.github/workflows/ci.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525

2626
steps:
2727
- name: Checkout code
28-
uses: actions/checkout@v5
28+
uses: actions/checkout@v6
2929

3030
- name: Setup micromamba
3131
uses: mamba-org/setup-micromamba@v2
@@ -46,7 +46,7 @@ jobs:
4646
make test
4747
4848
- name: Upload artifacts
49-
uses: actions/upload-artifact@v5
49+
uses: actions/upload-artifact@v7
5050
with:
5151
name: technology-data
5252
path: outputs/

Snakefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ configfile: "config.yaml"
1111

1212
rule compile_cost_assumptions:
1313
input:
14-
inflation_rate="inputs/Eurostat_inflation_rates.xlsx",
14+
inflation_rate="inputs/prc_hicp_aind__custom_20097956_spreadsheet.xlsx",
1515
pypsa_costs="inputs/costs_PyPSA.csv",
1616
fraunhofer_costs="inputs/Fraunhofer_ISE_costs.csv",
1717
fraunhofer_energy_prices="inputs/Fraunhofer_ISE_energy_prices.csv",
@@ -49,7 +49,7 @@ rule compile_cost_assumptions_usa:
4949
year=config["nrel_atb"]["nrel_atb_input_years"],
5050
),
5151
nrel_atb_manual_input_usa="inputs/US/manual_input_usa.csv",
52-
inflation_rate="inputs/Eurostat_inflation_rates.xlsx",
52+
inflation_rate="inputs/prc_hicp_aind__custom_20097956_spreadsheet.xlsx",
5353
nrel_atb_input_discount_rate="inputs/US/discount_rates_usa.csv",
5454
nrel_atb_input_fuel_costs="inputs/US/fuel_costs_usa.csv",
5555
output:

config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ nrel_atb:
1515
expectation: "" # tech data uncertainty, possible options [None, "optimist", "pessimist"]
1616

1717
#year for EUR outputs
18-
eur_year: 2020
18+
eur_year: 2025
1919

2020
# add solar from different source
2121
solar_utility_from_vartiaien: false

docs/release_notes.rst

Lines changed: 26 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,39 @@ Upcoming Release
1616
.. The features listed below are not released yet, but will be part of the next release!
1717
.. To use the features already you have to use the ``master`` branch.
1818
19-
* Adding `grey methanol synthesis`.
19+
`v0.14.0 <https://github.com/PyPSA/technology-data/releases/tag/v0.14.0>`__ (13th February 2026)
20+
================================================================================================
2021

21-
* Align cost units for NREL battery data with PyPSA modeling, fetching investment cost and FOM for both `battery storage` and `battery inverter` instead of a single value for `battery storage`, which was instead representative of the full plant (battery storage + battery inverter).
22+
* Changed currency year from 2020 to 2025 for all cost assumptions using updated Eurostat inflation rates. (https://github.com/PyPSA/technology-data/pull/263)
2223

23-
* Add excess heat output rates for Fischer-Tropsch and Haber-Bosch processes.
24+
* Updated electricity transmission and offshore wind connection costs based on latest DEA data (https://ens.dk/en/analyses-and-statistics/technology-data-transport-energy, July 2025).
25+
Aligned unit costs of offshore wind connection and general transmission. For offshore wind connections, included missing FOM. (https://github.com/PyPSA/technology-data/pull/262)
2426

25-
* Updated indexing of DEA Excel data for PTES and revised capital cost and FOM assumptions for 2045 and 2050.
27+
* Updated fossil fuel (gas, oil, lignite) and nuclear fuel (nuclear, uranium) costs based on TYNDP 2024 scenarios data. (https://github.com/PyPSA/technology-data/pull/259)
2628

29+
* Changed to DEA assumptions for Fischer-Tropsch and methanolisation. (https://github.com/PyPSA/technology-data/pull/251)
2730

28-
* Corrected units for standing losses of TES technologies from per unit to %/hour and changed parameter names from "Energy losses during storage" to "standing losses" as well as "Temperature difference" to "temperature difference" for naming consistency.
31+
* Fixed coal consumption of blast furnace steelmaking. (https://github.com/PyPSA/technology-data/pull/246)
2932

33+
* Added grey methanol synthesis. (https://github.com/PyPSA/technology-data/pull/248)
3034

31-
* Add standing losses as parameters for LTES
35+
* Aligned cost units for NREL battery data with PyPSA modeling, fetching investment cost and FOM for both `battery storage` and `battery inverter` instead of a single value for `battery storage`, which was instead representative of the full plant (battery storage + battery inverter). (https://github.com/PyPSA/technology-data/pull/239)
3236

33-
* Corrected CO2 content in biogas
37+
`v0.13.4 <https://github.com/PyPSA/technology-data/releases/tag/v0.13.4>`__ (20th October 2025)
38+
===============================================================================================
39+
40+
* Corrected CO2 content in biogas. (https://github.com/PyPSA/technology-data/pull/236)
41+
42+
* Fixed indexing for PTES and revised capital cost and FOM assumptions for 2045 and 2050. (https://github.com/PyPSA/technology-data/pull/234)
43+
44+
* Added excess heat output rates for Fischer-Tropsch and Haber-Bosch processes. (https://github.com/PyPSA/technology-data/pull/241)
45+
46+
`v0.13.3 <https://github.com/PyPSA/technology-data/releases/tag/v0.13.3>`__ (1st July 2025)
47+
===========================================================================================
48+
49+
* Corrected units for standing losses of TES technologies from per unit to %/hour and changed parameter names from "Energy losses during storage" to "standing losses" as well as "Temperature difference" to "temperature difference" for naming consistency. (https://github.com/PyPSA/technology-data/pull/230)
50+
51+
* Added standing losses as parameters for LTES. (https://github.com/PyPSA/technology-data/pull/229)
3452

3553
`v0.13.2 <https://github.com/PyPSA/technology-data/releases/tag/v0.13.2>`__ (13th June 2025)
3654
=======================================================================================
@@ -45,6 +63,7 @@ Upcoming Release
4563
`v0.13.0 <https://github.com/PyPSA/technology-data/releases/tag/v0.13.0>`__ (11th June 2025)
4664
=======================================================================================
4765

66+
4867
* Add several H2 production technologies (generic cost assumptions), fix FOM values and rename of efficiency to electricity-input in US cost assumptions for US-specific electrolyzer costs (https://github.com/PyPSA/technology-data/pull/222)
4968

5069
`v0.12.0 <https://github.com/PyPSA/technology-data/releases/tag/v0.12.0>`__ (19th May 2025)

environment.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ channels:
77
- conda-forge
88
- bioconda
99
dependencies:
10-
- python>=3.8
10+
- python>=3.10
1111
- pip
1212
# for running the package
13-
- snakemake-minimal>=8.5,<8.25 # See https://github.com/snakemake/snakemake/issues/3202
14-
- pandas>=2.1
13+
- snakemake-minimal>=8.5
14+
- pandas>=2.1,<3
1515
- pypsa
1616
- pyarrow
1717
- numpy
-21.7 KB
Binary file not shown.

inputs/costs_PyPSA.csv

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ oil,2030,VOM,3,EUR/MWhel,DIW DataDoc http://hdl.handle.net/10419/80348
4848
biomass,2030,fuel,7,EUR/MWhth,IEA2011b
4949
biogas,2030,fuel,59,EUR/MWhth,JRC and Zappa
5050
solid biomass,2030,fuel,25.2,EUR/MWhth,JRC and Zappa
51-
oil,2030,fuel,50,EUR/MWhth,IEA WEM2017 97USD/boe = http://www.iea.org/media/weowebsite/2017/WEM_Documentation_WEO2017.pdf
5251
PHS,2030,efficiency,0.75,per unit,DIW DataDoc http://hdl.handle.net/10419/80348
5352
hydro,2030,efficiency,0.9,per unit,DIW DataDoc http://hdl.handle.net/10419/80348
5453
ror,2030,efficiency,0.9,per unit,DIW DataDoc http://hdl.handle.net/10419/80348
@@ -190,10 +189,4 @@ electricity grid connection,2030,FOM,2,%/year,TODO
190189
decentral oil boiler,2030,investment,156.0140915953699,EUR/kWth,Palzer thesis (https://energiesysteme-zukunft.de/fileadmin/user_upload/Publikationen/PDFs/ESYS_Materialien_Optimierungsmodell_REMod-D.pdf) (+eigene Berechnung)
191190
decentral oil boiler,2030,lifetime,20.0,years,Palzer thesis (https://energiesysteme-zukunft.de/fileadmin/user_upload/Publikationen/PDFs/ESYS_Materialien_Optimierungsmodell_REMod-D.pdf)
192191
decentral oil boiler,2030,FOM,2.0,%/year,Palzer thesis (https://energiesysteme-zukunft.de/fileadmin/user_upload/Publikationen/PDFs/ESYS_Materialien_Optimierungsmodell_REMod-D.pdf)
193-
decentral oil boiler,2030,efficiency,0.9,per unit,Palzer thesis (https://energiesysteme-zukunft.de/fileadmin/user_upload/Publikationen/PDFs/ESYS_Materialien_Optimierungsmodell_REMod-D.pdf)
194-
offwind-ac-station,2030,investment,250,EUR/kWel,DEA https://ens.dk/en/our-services/projections-and-models/technology-data
195-
offwind-ac-connection-submarine,2030,investment,2685,EUR/MW/km,DEA https://ens.dk/en/our-services/projections-and-models/technology-data
196-
offwind-ac-connection-underground,2030,investment,1342,EUR/MW/km,DEA https://ens.dk/en/our-services/projections-and-models/technology-data
197-
offwind-dc-station,2030,investment,400,EUR/kWel,Haertel 2017; assuming one onshore and one offshore node + 13% learning reduction
198-
offwind-dc-connection-submarine,2030,investment,2000,EUR/MW/km,DTU report based on Fig 34 of https://ec.europa.eu/energy/sites/ener/files/documents/2014_nsog_report.pdf
199-
offwind-dc-connection-underground,2030,investment,1000,EUR/MW/km,Haertel 2017; average + 13% learning reduction
192+
decentral oil boiler,2030,efficiency,0.9,per unit,Palzer thesis (https://energiesysteme-zukunft.de/fileadmin/user_upload/Publikationen/PDFs/ESYS_Materialien_Optimierungsmodell_REMod-D.pdf)

0 commit comments

Comments
 (0)