merge master and remove nuclear, some code cleaning

.gitignore

@@ -18,3 +18,5 @@ gurobi.log
 *.cb
 *.cb2
 .*.lb
+.github/*
+.syncignore

README.md

@@ -23,7 +23,7 @@ The outputs are used in
 ## Licence
 
 Copyright 2019-2020 Marta Victoria (Aarhus University), Kun Zhu
-(Aarhus University), Elisabeth Zeyen (KIT), Tom Brown (KIT)
+(Aarhus University), Elisabeth Zeyen (TUB), Tom Brown (TUB)
 
 The code in `scripts/` is released as free software under the
 [GPLv3](http://www.gnu.org/licenses/gpl-3.0.en.html), see LICENSE.txt.

Snakefile

@@ -11,9 +11,10 @@ rule compile_cost_assumptions:
         dea_transport = "inputs/energy_transport_data_sheet_dec_2017.xlsx",
         dea_renewable_fuels = "inputs/data_sheets_for_renewable_fuels.xlsx",
         dea_storage = "inputs/technology_data_catalogue_for_energy_storage.xlsx",
-        dea_generation = "inputs/technology_data_for_el_and_dh_-_0009.xlsx",
+        dea_generation = "inputs/technology_data_for_el_and_dh.xlsx",
         dea_heating = "inputs/technologydatafor_heating_installations_marts_2018.xlsx",
-        dea_industrial = "inputs/technology_data_for_industrial_process_heat_0002.xlsx",
+        dea_industrial = "inputs/technology_data_for_industrial_process_heat.xlsx",
+        dea_ccts = "inputs/technology_data_for_carbon_capture_transport_storage.xlsx",
         manual_input = "inputs/manual_input.csv"
     output:
         expand("outputs/costs_{year}.csv", year = config["years"])
@@ -23,16 +24,16 @@ rule compile_cost_assumptions:
     script: "scripts/compile_cost_assumptions.py"
 
 
-rule convert_fraunhofer:
-    input:
-        fraunhofer = "docu/Anhang-Studie-Wege-zu-einem-klimaneutralen-Energiesystem.pdf"
-    output:
-        costs = "inputs/Fraunhofer_ISE_costs.csv",
-        energy_prices = "inputs/Fraunhofer_ISE_energy_prices.csv"
-    threads: 1
-    resources: mem=500
-    conda: "environment.yaml"
-    script: "scripts/convert_pdf_fraunhofer_to_dataframe.py"
+# rule convert_fraunhofer:
+#     input:
+#         fraunhofer = "docu/Anhang-Studie-Wege-zu-einem-klimaneutralen-Energiesystem.pdf"
+#     output:
+#         costs = "inputs/Fraunhofer_ISE_costs.csv",
+#         energy_prices = "inputs/Fraunhofer_ISE_energy_prices.csv"
+#     threads: 1
+#     resources: mem=500
+#     conda: "environment.yaml"
+#     script: "scripts/convert_pdf_fraunhofer_to_dataframe.py"
 
 
 rule convert_EWG:

config.yaml

@@ -1,4 +1,4 @@
-version: 0.2.0
+version: 0.3.0
 
 # considered years for output data
 years : [2020, 2025, 2030, 2035, 2040, 2045, 2050]
@@ -10,11 +10,12 @@ rate_inflation : 0.02
 #year for EUR outputs
 #NB: 2015 is standard year in DEA, and DEA is NOT yet adjusted
 #if this is changed, only non-DEA
+# DEA takes for solar PV eur_year 2020!
 eur_year : 2015
 
 # add solar from different source
 solar_utility_from_vartiaien : false
-solar_rooftop_from_etip : true
+solar_rooftop_from_etip : false
 
 # add fuel cell/electrolysis efficiencies from Budischak (DEA assumptions very conservative)
 h2_from_budischak : false
@@ -26,4 +27,4 @@ offwind_no_gridcosts : true
 desalination:
     salinity: 35 # in PSU (Practical Salinity Unit) = kg/m^3
 
-ndigits: 5
+ndigits: 2

docs/addnew.rst

@@ -6,8 +6,9 @@ How to add a new technology
 
 Add a new technology from the Danish Energy Agency (DEA)
 ========================================================
+
 You can add a new technology from the Danish Energy Agency database which are
-saved in inputs/*.xlsx . One can add the wished technology name (e.g. "onwind")
+saved in ``inputs/*.xlsx``. One can add the wished technology name (e.g. "onwind")
 as a key and the excel sheet name of the technology in DEA (e.g. '20 Onshore turbines')
 as a value to the dictionary ``sheet_names`` in the ``compile_cost_assumptions.py``.
 For using the technology data uncertainty of DEA, add to the dictionary

docs/conf.py

@@ -41,7 +41,7 @@
     #'sphinx.ext.pngmath',
     #'sphinxcontrib.tikz',
     #'rinoh.frontend.sphinx',
-    'sphinx.ext.imgconverter', # for SVG conversion
+    #'sphinx.ext.imgconverter', # for SVG conversion
 ]
 
 autodoc_default_flags = ['members']
@@ -73,9 +73,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = u'0.2'
+version = u'0.3'
 # The full version, including alpha/beta/rc tags.
-release = u'0.2.0'
+release = u'0.3.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -159,13 +159,13 @@
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['_static']
+# html_static_path = ['_static']
 
-html_context = {
-    'css_files': [
-        '_static/theme_overrides.css',  # override wide tables in RTD theme
-        ],
-}
+# html_context = {
+#     'css_files': [
+#         '_static/theme_overrides.css',  # override wide tables in RTD theme
+#         ],
+# }
 
 # Add any extra paths that contain custom files (such as robots.txt or
 # .htaccess) here, relative to this directory. These files are copied

docs/index.rst

@@ -24,8 +24,7 @@ of sources into CSV files to be read by energy system modelling software. The me
 
 
 This project is maintained by the  `Photovoltaic Solar Energy group <https://eng.au.dk/en/research/mechanical-engineering/energy-systems-and-thermodynamics/photovoltaic-solar-energy/>`_ at the Department of Engineering at
-`Aarhus University <https://international.au.dk/>`_ and the `Energy System Modelling group <https://www.iai.kit.edu/english/2338.php>`_ at the `Institute for Automation and Applied Informatics <https://www.iai.kit.edu/english/index.php>`_ at the `Karlsruhe Institute of Technology <http://www.kit.edu/english/index.php>`_.
-The ESM group is funded by the `Helmholtz Association <https://www.helmholtz.de/en/>`_ until 2024.
+`Aarhus University <https://international.au.dk/>`_ and the `Department of Digital Transformation in Energy Systems <https://www.ensys.tu-berlin.de>`_ at the `Technische Universität Berlin <https://www.tu.berlin>`_.
 
 
 Documentation

docs/release_notes.rst

@@ -2,6 +2,110 @@
 Release Notes
 ##########################################
 
+Upcoming Release
+================
+
+Technology-Data 0.4.0 (22 July 2022)
+===========================================
+
+* **WARNING**: For some technologies the units used were changed. Check for correct usage in automatic workflows.
+* **WARNING**: The technology name "Haber-Bosch synthesis" was changed to "Haber-Bosch" for consistency.
+
+* Updated technology data datasheets from DEA:
+  - Industrial Process Heat (Version 11/2021)
+  - Carbon Capture, Transport and Storage (Version 11/2021)
+  - Renewable Fuels (Version 04/2022)
+
+* Updated technologies (based on reviewer comments and subsequent investigation): (cf.`Pull Request #57 <https://github.com/PyPSA/technology-data/pull/57>`_)
+  - Methanation:
+    + Less optimistic number from report comparing multiple sources (incl. the source of the original number)
+  - Fischer-Tropsch:
+    + Mature technology (Hydrogen + Syngas to FTFs)
+    + Account for economies of scale (previous numbers for very small installations)
+    + Do not take value from DEA which is more focues on integrated Power-To-Liquid plant with low integration TRL
+    + Use same value for Fischer-Tropsch and Methanolisation based on source report
+    + Remove VOM for FTF, not reported in many sources and DEA numbers not reproduceable with original source
+  - Methanolisation:
+    + Mature technology (Hydrogen + CO2 to MeOH)
+    + Account for economies of scale (previous numbers for very small installations)
+    + Do not take value from DEA which is more focues on integrated Power-To-Liquid plant with low integration TRL
+    + Use same value for Fischer-Tropsch and Methanolisation based on source report
+  - Ammonia cracker:
+    + Mixed existing/new technology with existing large plants (for different purpose)
+    + Consider plant size: Higher scale up based on previously considered reference with expected economies of scale
+  - H2 liquefaction:
+    + Consider larger plant sizes based on recent IRENA report leading to economies of scale
+    + added: lower 2050 value
+    + Match plant size to other similar facility sizes (LOHC hydrogenation) in repository
+  - H2 evaporation:
+    + Previous value for very small-scale dispensing station
+    + Consider larger plant sizes based on recent IRENA report leading to economies of scale
+    + added: lower 2050 value
+    + Match plant size to other similar facility sizes (LOHC dehydrogenation) in repository
+  - LOHC hydrogenation:
+    + Small change in investment value due to change in caluclation method
+  - LOHC dehydrogenation:
+    + Same calulcation method as LOHC hydrogenation applied
+    + Larger facility considered with resulting economies of scale
+    + Distinguishing between "LOHC dehydrogenation (small scale)" e.g. a hydrogen refueling station,
+      and "LOHC dehydrogenation" for large scale applications like large scale hydrogen imports
+  - Haber-Bosch:
+    + Use numbers based on DEA
+  - air separation unit:
+    + Use numbers based on DEA from Haber-Bosch ammonia plant for consistency
+  - CH4 liquefaction:
+    + Fix cost, similar to issue already reported in issue #54 and PR #55
+  - HVAC overhead
+    + Add correct source attribution
+  - HVDC overhead:
+    + Add correct source attribution
+  - HVDC inverter pair:
+    + Add correct source attribution
+
+Technology-Data 0.3.0 (1 October 2021)
+===========================================
+
+This release includes several new technologies (see list below), the possibility
+to easily add a new technology via a manual input and an update of the H2
+Electrolysis assumptions.
+
+It is released to coincide with `PyPSA-Eur-Sec <https://github.com/PyPSA/pypsa-eur-sec>`_ Version 0.6.0, and is known to work with this release.
+
+Features in more detail:
+
+**New**:
+  - update offshore wind assumptions according to DEA release in March 2022
+  - update solar PV assumptions according to DEA release in Februrary 2022
+
+* new technologies:
+
+  - solar-rooftop residential
+  - solar-rooftop commercial
+  - seawater desalination (SWRO)
+  - clean water tank storage
+  - industrial heat pump for medium process temperatures
+  - H2 and CH4 pipelines and compressors
+  - shipping of CH4 (l), NH3 (l), LOHC, MeOH and H2 (l), Fischer-Tropsch
+  - H2 liquefaction and evaporation
+  - LOHC liquefication, hydrogenation and dehydrogenation
+  - NH3 production (Haber-Bosch synthesis and air separation unit)
+  - Fischer-Tropsch synthesis
+  - costs for SMR (methane and methanol) and ammonia cracking
+  - home battery storage and
+  - CO2 pipeline
+  - costs for retrofitting CH4 pipelines to H2 pipelines
+* new function to adjust the investment costs according to the inflation. This is based on in the ``config.yaml`` specified rate of inflation and considered year
+* new option to allow manual input via an additional csv file ``inputs/manual_inputs.csv``
+* update of the H2 electrolyser assumptions based on new DEA release
+* rudimentary CI and templates for pull requests and issues
+* update of the latex tables for displaying the technology data
+
+
+**Bugfixes**:
+
+* adjust battery inverter lifetime to DEA footnote
+* unit consistency, typos
+
 Technology-Data 0.2.0 (11th December 2020)
 ===========================================
 

docs/structure.rst

@@ -6,11 +6,9 @@ Structure of the repository
 
 This repository has the following structure:
 
--  **inputs**: 
- input data in format .csv or .xlsx
+-  **inputs**: input data in format .csv or .xlsx
 
--  **outputs**: 
- technology data saved as ``costs_{year}.csv`` format for defined years. In the output ``costs_{year}.csv`` are specified
+-  **outputs**: technology data saved as ``costs_{year}.csv`` format for defined years. In the output ``costs_{year}.csv`` are specified
 
 	* technology (e.g. 'onwind')
 	* parameter (e.g. FOM)
@@ -40,11 +38,9 @@ This repository has the following structure:
 	* :mod:`convert_pdf_fraunhofer_to_dataframe.py` converts table from Fraunhofer ISE report in pdf to csv format for input data. Script can be modified to convert other .pdf sources to .csv format
 	* :mod:`retrieve_data_from_dea.py` downloads up-to-date technology data from DEA website and saves it in the **input** folder. Optional, also retrieves the documentation of the data into the folder **docu**
 
--  **docu**:
- reports, paper, additional information about the input data, format .pdf
+-  **docu**: reports, paper, additional information about the input data, format .pdf
 
--  **latex_tables**: 
- .tex files with tables of the cost.csv and two python scripts
+-  **latex_tables**: .tex files with tables of the cost.csv and two python scripts
 
 	* ``tables_in_latex.py`` to create .tex files with nice names
 	* ``tables_in_csv.py`` to create csv files with nice name (which can be used in latex with csv autotabular)

inputs/costs_PyPSA.csv

@@ -109,7 +109,7 @@ SMR,2030,investment,540.56,EUR/kWCH4,https://www.gov.uk/government/publications/
 SMR,2030,lifetime,25,years,TODO
 SMR,2030,FOM,5.4,%/year,https://www.gov.uk/government/publications/hydrogen-supply-chain-evidence-base; slide 42 assumption for 2030
 SMR,2030,efficiency,0.74,per unit,https://www.gov.uk/government/publications/hydrogen-supply-chain-evidence-base; slide 42 assumption for 2030
-SMR CC,2030,investment,1032,EUR/kWCH4,https://www.gov.uk/government/publications/hydrogen-supply-chain-evidence-base; slide 42 assumption for 2030; GBP 466 exchange 1.16; CC costed at 300 EUR/tCO2/a
+SMR CC,2030,investment,1032,EUR/kWCH4,https://www.gov.uk/government/publications/hydrogen-supply-chain-evidence-base; slide 42 assumption for 2030; GBP 466 exchange 1.16; CC costed at 300 EUR/tCO2/a from Saygin2013 https://doi.org/10.1016/j.ijggc.2013.05.032
 SMR CC,2030,lifetime,25,years,TODO
 SMR CC,2030,FOM,5.4,%/year,https://www.gov.uk/government/publications/hydrogen-supply-chain-evidence-base; slide 42 assumption for 2030
 SMR CC,2030,efficiency,0.67,per unit,https://www.gov.uk/government/publications/hydrogen-supply-chain-evidence-base; slide 42 assumption for 2030; CC uses 10% of gas
@@ -204,18 +204,6 @@ decentral solar thermal,2030,lifetime,20,years,HP
 central solar thermal,2030,FOM,1.4,%/year,HP
 central solar thermal,2030,investment,140000,EUR/1000m2,HP
 central solar thermal,2030,lifetime,20,years,HP
-HVAC overhead,2030,investment,400,EUR/MW/km,Hagspiel
-HVAC overhead,2030,lifetime,40,years,Hagspiel
-HVAC overhead,2030,FOM,2,%/year,Hagspiel
-HVDC overhead,2030,investment,400,EUR/MW/km,Hagspiel
-HVDC overhead,2030,lifetime,40,years,Hagspiel
-HVDC overhead,2030,FOM,2,%/year,Hagspiel
-HVDC submarine,2030,investment,2000,EUR/MW/km,Own analysis of European submarine HVDC projects since 2000
-HVDC submarine,2030,lifetime,40,years,Hagspiel
-HVDC submarine,2030,FOM,2,%/year,Hagspiel
-HVDC inverter pair,2030,investment,150000,EUR/MW,Hagspiel
-HVDC inverter pair,2030,lifetime,40,years,Hagspiel
-HVDC inverter pair,2030,FOM,2,%/year,Hagspiel
 electricity distribution grid,2030,investment,500,EUR/kW,TODO
 electricity distribution grid,2030,lifetime,40,years,TODO
 electricity distribution grid,2030,FOM,2,%/year,TODO