Skip to content

Commit

Permalink
Merge branch 'master' into relicence-reuse
Browse files Browse the repository at this point in the history
  • Loading branch information
lisazeyen authored Nov 7, 2023
2 parents 657b95b + 1e6e79a commit dac74c3
Show file tree
Hide file tree
Showing 26 changed files with 4,876 additions and 2,088 deletions.
17 changes: 12 additions & 5 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,20 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: conda-incubator/setup-miniconda@v2.1.1
- uses: mamba-org/setup-micromamba@v1
with:
python-version: 3.8
environment-file: environment.yaml
activate-environment: technology-data
auto-activate-base: false
micromamba-version: latest
environment-file: environment.yaml
log-level: debug
init-shell: bash
cache-environment: true
cache-downloads: true
- name: Test snakemake workflow
shell: bash -l {0}
run: |
snakemake --cores all -f compile_cost_assumptions
- name: Upload artifacts
uses: actions/upload-artifact@v3
with:
name: technology-data
path: outputs/
11 changes: 11 additions & 0 deletions .readthedocs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
version: 2

build:
os: ubuntu-22.04
tools:
python: "3.11"

python:
install:
- requirements: docs/requirements.txt
system_packages: false
3 changes: 3 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"esbonio.sphinx.confDir": ""
}
2 changes: 2 additions & 0 deletions Snakefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ rule compile_cost_assumptions:
pypsa_costs = "inputs/costs_PyPSA.csv",
fraunhofer_costs = "inputs/Fraunhofer_ISE_costs.csv",
fraunhofer_energy_prices = "inputs/Fraunhofer_ISE_energy_prices.csv",
fraunhofer_vehicles_costs = "inputs/Fraunhofer_ISE_vehicles_costs.csv",
EWG_costs = "inputs/EWG_costs.csv",
dea_transport = "inputs/energy_transport_data_sheet_dec_2017.xlsx",
dea_renewable_fuels = "inputs/data_sheets_for_renewable_fuels.xlsx",
Expand All @@ -18,6 +19,7 @@ rule compile_cost_assumptions:
dea_heating = "inputs/technologydatafor_heating_installations_marts_2018.xlsx",
dea_industrial = "inputs/technology_data_for_industrial_process_heat.xlsx",
dea_ccts = "inputs/technology_data_for_carbon_capture_transport_storage.xlsx",
pnnl_energy_storage = "inputs/pnnl-energy-storage-database.xlsx",
manual_input = "inputs/manual_input.csv"
output:
expand("outputs/costs_{year}.csv", year = config["years"])
Expand Down
13 changes: 9 additions & 4 deletions config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
#
# SPDX-License-Identifier: CC0-1.0

version: 0.4.0
version: 0.6.2


# considered years for output data
years : [2020, 2025, 2030, 2035, 2040, 2045, 2050]
Expand All @@ -21,8 +22,12 @@ eur_year : 2015
solar_utility_from_vartiaien : false
solar_rooftop_from_etip : false

# add fuel cell/electrolysis efficiencies from Budischak (DEA assumptions very conservative)
h2_from_budischak : false
energy_storage_database:
h2_from_budischak: false # add fuel cell/electrolysis efficiencies from Budischak (DEA assumptions very conservative)
ewg_home_battery: true # add home battery data derived from DEA data and EWG study
pnnl_energy_storage:
add_data: true # add storage data mainly from PNNL
approx_beyond_2030: ["same_as_2030"] # ["geometric_series"] or ["same_as_2030"]

# remove grid connection costs from DEA for offwind because they are calculated
# seperately in pypsa-eur
Expand All @@ -31,4 +36,4 @@ offwind_no_gridcosts : true
desalination:
salinity: 35 # in PSU (Practical Salinity Unit) = kg/m^3

ndigits: 2
ndigits: 4
16 changes: 8 additions & 8 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,18 +67,18 @@
# -- Project information -----------------------------------------------------

project = u'technology-data'
copyright = u'2020, Marta Victoria (Aarhus University), Kun Zhu (Aarhus University), Elisabeth Zeyen (KIT), Tom Brown (KIT)'
author = u'2020 Marta Victoria (Aarhus University), Kun Zhu (Aarhus University), Elisabeth Zeyen (KIT), Tom Brown (KIT)'
copyright = u'2020-2023, Marta Victoria (Aarhus University), Kun Zhu (Aarhus University), Elisabeth Zeyen (TUB, KIT), Tom Brown (TUB, KIT)'
author = u'2020-2023 Marta Victoria (Aarhus University), Kun Zhu (Aarhus University), Elisabeth Zeyen (TUB, KIT), Tom Brown (TUB, KIT)'


# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
# built documents.
#
# The short X.Y version.
version = u'0.3'
version = u'0.6'
# The full version, including alpha/beta/rc tags.
release = u'0.3.0'
release = u'0.6.2'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down Expand Up @@ -129,17 +129,17 @@

# The theme to use for HTML and HTML Help pages. See the documentation for
# a list of builtin themes.
html_theme = 'sphinx_rtd_theme'
html_theme = 'sphinx_book_theme'

# Theme options are theme-specific and customize the look and feel of a theme
# further. For a list of options available for each theme, see the
# documentation.
html_theme_options = {
'display_version': True,
'sticky_navigation': True,
"repository_url": "https://github.com/pypsa/technology-data",
"use_repository_button": True,
"show_navbar_depth": 1,
}


# Add any paths that contain custom themes here, relative to this directory.
#html_theme_path = []

Expand Down
67 changes: 62 additions & 5 deletions docs/release_notes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,77 @@ Release Notes
Upcoming Release
================

Updated technologies
- updated cost assumptions for 'digestible biomass to hydrogen' and "solid biomass to hydrogen"
- Fix: Unit for methanation investment costs is now correctly displayed as "EUR/kW_CH4" (`#82 <https://github.com/PyPSA/technology-data/issues/82#event-8638160137>`_)
* Add floating wind cost data

* Add biomass-to-methanol route from DEA.

* Add electric compression losses for hydrogen and gas pipelines from DEA.

* Add methanol-to-kerosene from `Concawe report <https://www.concawe.eu/wp-content/uploads/Rpt_22-17.pdf>`_.

* Add methanol-to-olefins/aromatics and steam cracker mostly from `DECHEMA report <https://dechema.de/dechema_media/Downloads/Positionspapiere/Technology_study_Low_carbon_energy_and_feedstock_for_the_European_chemical_industry.pdf>`_.

* Added FOM for enhanced geothermal systems.

Technology-Data 0.6.2 (7 August 2023)
=====================================

* Use DEA electrolysis and fuel cell assumptions by default.

* Add steam generation of methanolisation process.

* Use HVDC submarine cable cost from Härtel et al. (2017).

Technology-Data 0.6.1 (4 August 2023)
===========================================

* New technologies
- direct iron ore reduction (cost assumptions, conversion efficiencies)
- dry bulk carrier Capesize (cost assumptions)
- electric arc furnace (cost assumptions, conversion efficiencies)
- shipping fuel methanol (cost assumptions, emission intensity)
- iron ore DRI-ready (cost assumptions)

Technology-Data 0.6.0 (24 May 2023)
===========================================

* General:
- Fix 'further_description' column from 'manual_inputs.csv' not being correctly parsed by the workflow
- Adjust electrolysis currency year to 2015

* Updated technologies
- updated cost assumptions for 'digestible biomass to hydrogen' and "solid biomass to hydrogen"
- Fix: Unit for methanation investment costs is now correctly displayed as "EUR/kW_CH4" (`#82 <https://github.com/PyPSA/technology-data/issues/82#event-8638160137>`_)
- Fix source and description for 'solar' and 'solar-rooftop' to correctly indicate how they are calculated

* New technologies
- new biomass technologies ('biogas CC', 'central gas CHP CC', 'central hydrogen CHP', 'central solid biomass CHP CC', 'central solid biomass CHP powerboost CC',
- 17 new energy storage technologies
- new biomass technologies ('biogas CC', 'central gas CHP CC', 'central hydrogen CHP', 'central solid biomass CHP CC', 'central solid biomass CHP powerboost CC',
'direct firing gas', 'direct firing gas CC', 'direct firing solid fuels', 'direct firing solid fuels CC', 'electrobiofuels', 'solid biomass boiler steam CC', 'waste CHP', 'waste CHP CC',
pelletizing cost for pellets from solid biomass residues)
- "utility-scale single-axis tracking" PV (cost assumptions)
- H2 liquefaction (Conversion efficiency)
- CH4 liquefaction (Conversion efficiency)
- CO2 liquefaction (Conversion efficiency)
- LOHC hydrogenation (Conversion efficiency)
- Ammonia crackier (Conversion efficiency)
- Steam methane reforming (Conversion efficiency)
- Methanol steam reforming (Conversion efficiency)
- Fischer-Tropsch (Conversion efficiency)
- seawater RO desalination (Conversion efficiency)
- Haber-Bosch (Conversion efficiency)
- air separation unit (Conversion efficiency)
- direct air capture (Conversion efficiency)
- Added data for Enhanced Geothermal Systems, as given by Aghahosseini, Breyer 2020

* Changed technologies
-
- methanation (Conversion efficiency)
- methanolisation (Conversion efficiency)

* Features
- energy penalties for biomass usages, biogas and gas boilers with carbon capture (calculations will be provided in an upcoming paper
* Bug fixes
- Fixed a bug that ommited 'further description' from manually added data

Technology-Data 0.5.0 (08 Februrary 2023)
===========================================
Expand All @@ -36,6 +92,7 @@ Technology-Data 0.5.0 (08 Februrary 2023)
- new biomass technologies (BioSNG, BtL, biogas, biogas plus hydrogen, digestible biomass,digestible biomass to hydrogen, electric boiler steam, gas boiler steam, industrial heat pump high temperature, solid biomass boiler steam, solid bioass to hydrogen, biomass boiler for decentral heating
- hydrogen storage tank type 1: Low pressure hydrogen tank storage (up to 200 bar)
- hydrogen storage compressor: Compressor for filling hydrogen storage tanks (compression from 30 to 250 bar)
- 18 new energy storage technologies from PNNL "Energy Storage Grand Challenge Cost and Performance Assessment 2022"

* Enable easy debugging of scripts by allowing python execution/ debugging in scripts

Expand Down
4 changes: 4 additions & 0 deletions docs/requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
sphinx
sphinx-book-theme
sphinxcontrib-bibtex
myst-parser
Binary file not shown.
Binary file not shown.
4 changes: 3 additions & 1 deletion environment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,17 @@ channels:
- conda-forge
- bioconda
dependencies:
- python
- python>=3.9
- pip
- snakemake-minimal
- pandas>=1.1.0,<1.3
- numpy
- beautifulsoup4
- xlrd
- scipy
- openpyxl<=3.0.9
- packaging

- pip:
- tabula-py
- currencyconverter
38 changes: 38 additions & 0 deletions inputs/Fraunhofer_ISE_vehicles_costs.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
Komponente,Gr��e,Einheit,2020,2025,2030,2035,2040,2045,2050
LKW H2- Brennstoffzelle,Investition,EUR/LKW,151574,122291,116497,117600,120177,122939,125710
LKW H2- Brennstoffzelle,Lebensdauer,a,15,15,15,15,15,15,15
LKW H2- Brennstoffzelle,M/O-Kosten,% Invest,10.1,12.5,13.1,13,12.7,12.4,12.2
LKW H2- Brennstoffzelle,Wirkungsgrad*,%,56,56,56,56,56,56,56
LKW ICE- Fl�ssigtreibstoff,Investition,EUR/LKW,99772,102543,105315,108086,110858,113629,116401
LKW ICE- Fl�ssigtreibstoff,Lebensdauer,a,15,15,15,15,15,15,15
LKW ICE- Fl�ssigtreibstoff,M/O-Kosten,% Invest,18,17.5,17.1,16.6,16.2,15.8,15.5
LKW ICE- Fl�ssigtreibstoff,Wirkungsgrad*,%,37.3,37.3,37.3,37.3,37.3,37.3,37.3
LKW Ladeinfrastruktur Brennstoffzellen Fahrzeuge * LKW,Investition,EUR/Lades�ule,2243051,2000991,1787894,1787894,1787894,1787894,1787894
LKW Ladeinfrastruktur Brennstoffzellen Fahrzeuge * LKW,Lebensdauer,a,30,30,30,30,30,30,30
LKW Ladeinfrastruktur Brennstoffzellen Fahrzeuge * LKW,M/O-Kosten,% Invest,2.2,2.2,2.2,2.2,2.2,2.2,2.2
PKW H2- Brennstoffzelle,Investition,EUR/PKW,55000,43500,33226,30720,29440,28160,26880
PKW H2- Brennstoffzelle,Lebensdauer,a,15,15,15,15,15,15,15
PKW H2- Brennstoffzelle,M/O-Kosten,% Invest,1.1,1.1,1.1,1.1,1.2,1.2,1.2
PKW H2- Brennstoffzelle,Wirkungsgrad*,%,48,48,48,48,48,48,48
PKW ICE- Fl�ssigtreibstoff,Investition,EUR/PKW,23561,24309,24999,25622,26167,26610,26880
PKW ICE- Fl�ssigtreibstoff,Lebensdauer,a,15,15,15,15,15,15,15
PKW ICE- Fl�ssigtreibstoff,M/O-Kosten,% Invest,1.6,1.6,1.6,1.6,1.6,1.6,1.6
PKW ICE- Fl�ssigtreibstoff,Wirkungsgrad*,%,21.5,21.5,21.5,21.5,21.5,21.5,21.5
PKW Ladeinfrastruktur Brennstoffzellen Fahrzeuge * PKW,Investition,EUR/Lades�ule,2243051,2000991,1787894,1788360,1788360,1788360,1788360
PKW Ladeinfrastruktur Brennstoffzellen Fahrzeuge * PKW,Lebensdauer,a,30,30,30,30,30,30,30
PKW Ladeinfrastruktur Brennstoffzellen Fahrzeuge * PKW,M/O-Kosten,% Invest,2.2,2.2,2.2,2.2,2.2,2.2,2.2
PKW Ladeinfrastruktur schnell (reine) Batteriefahrzeuge*,Investition,EUR/Lades�ule,629102,527507,448894,448894,448894,448894,448894
PKW Ladeinfrastruktur schnell (reine) Batteriefahrzeuge*,Lebensdauer,a,30,30,30,30,30,30,30
PKW Ladeinfrastruktur schnell (reine) Batteriefahrzeuge*,M/O-Kosten,% Invest,1.6,1.6,1.6,1.6,1.6,1.6,1.6
Ladeinfrastruktur langsam (reine) Batteriefahrzeuge*,Investition,EUR/Lades�ule,1283,1126,1005,1005,1005,1005,1005
Ladeinfrastruktur langsam (reine) Batteriefahrzeuge*,Lebensdauer,a,30,30,30,30,30,30,30
Ladeinfrastruktur langsam (reine) Batteriefahrzeuge*,M/O-Kosten,% Invest,1.8,1.8,1.8,1.8,1.8,1.8,1.8
NT,Wirkungsgrad el.,%,62.9,63.4,63.9,64.4,64.9,65.4,65.9
NT,Wirkungsgrad th.,%,27.9,28.1,28.3,28.5,28.7,28.9,29.1
PKW Batterie-Elektromotor,Investition,EUR/PKW,33000,28812,24624,24358,24092,23827,23561
PKW Batterie-Elektromotor,Lebensdauer,a,15,15,15,15,15,15,15
PKW Batterie-Elektromotor,M/O-Kosten,% Invest,0.9,0.9,0.9,0.9,0.9,0.9,0.9
PKW Batterie-Elektromotor,Wirkungsgrad*,%,68,68,68,68,68,68,68
LKW Batterie-Elektromotor,Investition,EUR/LKW,204067,165765,136400,134700,133000,131200,129400
LKW Batterie-Elektromotor,Lebensdauer,a,15,15,15,15,15,15,15
LKW Batterie-Elektromotor,M/O-Kosten,% Invest,14,14,15,16,16,16,16
2 changes: 1 addition & 1 deletion inputs/costs_PyPSA.csv
Original file line number Diff line number Diff line change
Expand Up @@ -217,4 +217,4 @@ offwind-ac-connection-submarine,2030,investment,2685,EUR/MW/km,DEA https://ens.d
offwind-ac-connection-underground,2030,investment,1342,EUR/MW/km,DEA https://ens.dk/en/our-services/projections-and-models/technology-data
offwind-dc-station,2030,investment,400,EUR/kWel,Haertel 2017; assuming one onshore and one offshore node + 13% learning reduction
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
offwind-dc-connection-underground,2030,investment,1000,EUR/MW/km,Haertel 2017; average + 13% learning reduction
offwind-dc-connection-underground,2030,investment,1000,EUR/MW/km,Haertel 2017; average + 13% learning reduction
Loading

0 comments on commit dac74c3

Please sign in to comment.