Merge branch 'master' into plotting-adjustments

README.md

@@ -9,13 +9,16 @@
 
 
 
-**WARNING**: This model is under construction and contains serious
+**WARNING**: This model is under construction and contains serious problems that
-problems that distort the results. See the github repository
+distort the results. See the github repository
-[issues](https://github.com/PyPSA/pypsa-eur-sec/issues) for some of
+[issues](https://github.com/PyPSA/pypsa-eur-sec/issues) for some of the problems
-the problems (please feel free to help or make suggestions). There is
+(please feel free to help or make suggestions). There is neither a full
-neither documentation nor a paper yet, but we hope to have a preprint
+documentation nor a paper yet, but we hope to have a preprint out by the end of 2021.
-out by autumn 2021. We cannot support this model if you choose to use
+You can find out more about the model capabilities in [a recent
-it.
+presentation at EMP-E](https://nworbmot.org/energy/brown-empe.pdf) or the
+following [preprint with a description of the industry
+sector](https://arxiv.org/abs/2109.09563). We cannot support this model if you
+choose to use it.
 
 
 PyPSA-Eur-Sec builds on the electricity generation and transmission

config.default.yaml

@@ -413,6 +413,7 @@ plotting:
     - solar thermal collector
     - central solar thermal collector
   tech_colors:
+    # wind
     onwind: "#235ebc"
     onshore wind: "#235ebc"
     offwind: "#6895dd"
@@ -421,123 +422,160 @@ plotting:
     offshore wind (AC): "#6895dd"
     offwind-dc: "#74c6f2"
     offshore wind (DC): "#74c6f2"
-    wave: '#004444'
+    # water
-    hydro: '#3B5323'
+    hydro: '#298c81'
-    hydro reservoir: '#3B5323'
+    hydro reservoir: '#298c81'
-    ror: '#78AB46'
+    ror: '#3dbfb0'
-    run of river: '#78AB46'
+    run of river: '#3dbfb0'
-    hydroelectricity: '#006400'
+    hydroelectricity: '#298c81'
+    PHS: '#51dbcc'
+    wave: '#a7d4cf'
+    # solar
     solar: "#f9d002"
     solar PV: "#f9d002"
-    solar thermal: coral
+    solar thermal: '#ffbf2b'
-    solar rooftop: '#ffef60'
+    solar rooftop: '#ffea80'
-    OCGT: wheat
+    # gas
-    OCGT marginal: sandybrown
+    OCGT: '#e0986c'
-    OCGT-heat: '#ee8340'
+    OCGT marginal: '#e0986c'
-    gas boiler: '#ee8340'
+    OCGT-heat: '#e0986c'
-    gas boilers: '#ee8340'
+    gas boiler: '#db6a25'
-    gas boiler marginal: '#ee8340'
+    gas boilers: '#db6a25'
-    gas-to-power/heat: '#ee8340'
+    gas boiler marginal: '#db6a25'
-    gas: brown
+    gas: '#e05b09'
-    natural gas: brown
+    natural gas: '#e05b09'
-    SMR: '#4F4F2F'
+    CCGT: '#a85522'
-    oil: '#B5A642'
+    CCGT marginal: '#a85522'
-    oil boiler: '#B5A677'
+    gas for industry co2 to atmosphere: '#692e0a'
-    lines: k
+    gas for industry co2 to stored: '#8a3400'
-    transmission lines: k
+    gas for industry: '#853403'
-    H2: m
+    gas for industry CC: '#692e0a'
-    H2 liquefaction: m
+    gas pipeline: '#ebbca0'
-    hydrogen storage: m
+    # oil
-    battery: slategray
+    oil: '#c9c9c9'
-    battery storage: slategray
+    oil boiler: '#adadad'
-    home battery: '#614700'
+    agriculture machinery oil: '#949494'
-    home battery storage: '#614700'
+    shipping oil: "#808080"
-    Nuclear: r
+    land transport oil: '#afafaf'
-    Nuclear marginal: r
+    # nuclear
-    nuclear: r
+    Nuclear: '#ff8c00'
-    uranium: r
+    Nuclear marginal: '#ff8c00'
-    Coal: k
+    nuclear: '#ff8c00'
-    coal: k
+    uranium: '#ff8c00'
-    Coal marginal: k
+    # coal
-    Lignite: grey
+    Coal: '#545454'
-    lignite: grey
+    coal: '#545454'
-    Lignite marginal: grey
+    Coal marginal: '#545454'
-    CCGT: '#ee8340'
+    solid: '#545454'
-    CCGT marginal: '#ee8340'
+    Lignite: '#826837'
-    heat pumps: '#76EE00'
+    lignite: '#826837'
-    heat pump: '#76EE00'
+    Lignite marginal: '#826837'
-    air heat pump: '#76EE00'
+    # biomass
-    ground heat pump: '#40AA00'
+    biogas: '#e3d37d'
-    power-to-heat: '#40AA00'
+    biomass: '#baa741'
-    resistive heater: pink
+    solid biomass: '#baa741'
-    Sabatier: '#FF1493'
+    solid biomass transport: '#baa741'
-    methanation: '#FF1493'
+    solid biomass for industry: '#7a6d26'
-    power-to-gas: '#FF1493'
+    solid biomass for industry CC: '#47411c'
-    power-to-liquid: '#FFAAE9'
+    solid biomass for industry co2 from atmosphere: '#736412'
-    helmeth: '#7D0552'
+    solid biomass for industry co2 to stored: '#47411c'
-    DAC: '#E74C3C'
+    # power transmission
-    co2 stored: '#123456'
+    lines: '#6c9459'
-    CO2 sequestration: '#123456'
+    transmission lines: '#6c9459'
-    CC: k
+    electricity distribution grid: '#97ad8c'
-    co2: '#123456'
+    # electricity demand
-    co2 vent: '#654321'
+    Electric load: '#110d63'
-    agriculture heat: '#D07A7A'
+    electric demand: '#110d63'
-    agriculture machinery oil: '#1e1e1e'
+    electricity: '#110d63'
-    agriculture machinery oil emissions: '#111111'
+    industry electricity: '#2d2a66'
-    agriculture electricity: '#222222'
+    industry new electricity: '#2d2a66'
-    solid biomass for industry co2 from atmosphere: '#654321'
+    agriculture electricity: '#494778'
-    solid biomass for industry co2 to stored: '#654321'
+    # battery + EVs
-    gas for industry co2 to atmosphere: '#654321'
+    battery: '#ace37f'
-    gas for industry co2 to stored: '#654321'
+    battery storage: '#ace37f'
-    Fischer-Tropsch: '#44DD33'
+    home battery: '#80c944'
-    kerosene for aviation: '#44BB11'
+    home battery storage: '#80c944'
-    naphtha for industry: '#44FF55'
+    BEV charger: '#baf238'
-    land transport oil: '#44DD33'
+    V2G: '#e5ffa8'
-    water tanks: '#BBBBBB'
+    land transport EV: '#baf238'
-    hot water storage: '#BBBBBB'
+    Li ion: '#baf238'
-    hot water charging: '#BBBBBB'
+    # hot water storage
-    hot water discharging: '#999999'
+    water tanks: '#e69487'
-    CO2 pipeline: '#999999'
+    hot water storage: '#e69487'
-    CHP: r
+    hot water charging: '#e69487'
-    CHP heat: r
+    hot water discharging: '#e69487'
-    CHP electric: r
+    # heat demand
-    PHS: g
+    Heat load: '#cc1f1f'
-    Ambient: k
+    heat: '#cc1f1f'
-    Electric load: b
+    heat demand: '#cc1f1f'
-    Heat load: r
+    rural heat: '#ff5c5c'
-    heat: darkred
+    central heat: '#cc1f1f'
-    rural heat: '#880000'
+    decentral heat: '#750606'
-    central heat: '#b22222'
+    low-temperature heat for industry: '#8f2727'
-    decentral heat: '#800000'
+    process heat: '#ff0000'
-    low-temperature heat for industry: '#991111'
+    agriculture heat: '#d9a5a5'
-    process heat: '#FF3333'
+    # heat supply
-    heat demand: darkred
+    heat pumps: '#2fb537'
-    electric demand: k
+    heat pump: '#2fb537'
-    Li ion: grey
+    air heat pump: '#36eb41'
-    district heating: '#CC4E5C'
+    ground heat pump: '#2fb537'
-    retrofitting: purple
+    Ambient: '#98eb9d'
-    building retrofitting: purple
+    CHP: '#8a5751'
-    BEV charger: grey
+    CHP CC: '#634643'
-    V2G: grey
+    CHP heat: '#8a5751'
-    land transport EV: grey
+    CHP electric: '#8a5751'
-    electricity: k
+    district heating: '#e8beac'
-    gas for industry: '#333333'
+    resistive heater: '#d8f9b8'
-    solid biomass for industry: '#555555'
+    retrofitting: '#8487e8'
-    industry electricity: '#222222'
+    building retrofitting: '#8487e8'
-    industry new electricity: '#222222'
+    # hydrogen
+    H2 for industry: "#f073da"
+    H2 for shipping: "#ebaee0"
+    H2: '#bf13a0'
+    hydrogen: '#bf13a0'
+    SMR: '#870c71'
+    SMR CC: '#4f1745'
+    H2 liquefaction: '#d647bd'
+    hydrogen storage: '#bf13a0'
+    H2 storage: '#bf13a0'
+    land transport fuel cell: '#6b3161'
+    H2 pipeline: '#f081dc'
+    H2 Fuel Cell: '#c251ae'
+    H2 Electrolysis: '#ff29d9'
+    # syngas
+    Sabatier: '#9850ad'
+    methanation: '#c44ce6'
+    methane: '#c44ce6'
+    helmeth: '#e899ff'
+    # synfuels
+    Fischer-Tropsch: '#25c49a'
+    liquid: '#25c49a'
+    kerosene for aviation: '#a1ffe6'
+    naphtha for industry: '#57ebc4'
+    # co2
+    CC: '#f29dae'
+    CCS: '#f29dae'
+    CO2 sequestration: '#f29dae'
+    DAC: '#ff5270'
+    co2 stored: '#f2385a'
+    co2: '#f29dae'
+    co2 vent: '#ffd4dc'
+    CO2 pipeline: '#f5627f'
+    # emissions
+    process emissions CC: '#000000'
+    process emissions: '#222222'
     process emissions to stored: '#444444'
     process emissions to atmosphere: '#888888'
-    process emissions: '#222222'
+    oil emissions: '#aaaaaa'
-    oil emissions: '#666666'
+    shipping oil emissions: "#555555"
-    land transport oil emissions: '#666666'
+    land transport oil emissions: '#777777'
-    land transport fuel cell: '#AAAAAA'
+    agriculture machinery oil emissions: '#333333'
-    biogas: '#800000'
+    # other
-    solid biomass: '#DAA520'
+    shipping: '#03a2ff'
-    today: '#D2691E'
+    power-to-heat: '#2fb537'
-    shipping: '#6495ED'
+    power-to-gas: '#c44ce6'
-    shipping oil: "#6495ED"
+    power-to-H2: '#ff29d9'
-    shipping oil emissions: "#6495ED"
+    power-to-liquid: '#25c49a'
-    electricity distribution grid: '#333333'
+    gas-to-power/heat: '#ee8340'
-    solid biomass transport: green
+    waste: '#e3d37d'
-    H2 for industry: "#222222"
+    other: '#000000'
-    H2 for shipping: "#6495ED"

doc/index.rst

@@ -29,6 +29,11 @@ heating, biomass, industry and industrial feedstocks. This completes
 the energy system and includes all greenhouse gas emitters except
 waste management, agriculture, forestry and land use.
 
+.. note::
+    More about the current model capabilities and preliminary results
+    can be found in `a recent presentation at EMP-E <https://nworbmot.org/energy/brown-empe.pdf>`_
+    and the the following `preprint with a description of the industry sector <https://arxiv.org/abs/2109.09563>`_.
+
 This diagram gives an overview of the sectors and the links between
 them:
 
@@ -61,9 +66,25 @@ PyPSA-Eur-Sec is the different extra_functionality required to build
 storage and CHP constraints.
 
 
-PyPSA-Eur-Sec is designed to be imported into the open toolbox `PyPSA <https://www.pypsa.org>`_ for which `documentation <https://pypsa.org/doc>`_ is available as well.
+PyPSA-Eur-Sec is designed to be imported into the open toolbox `PyPSA
+<https://www.pypsa.org>`_ for which `documentation <https://pypsa.org/doc>`_ is
+available as well.
 
-This project is maintained by 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 group is funded by the `Helmholtz Association <https://www.helmholtz.de/en/>`_ until 2024. Previous versions were developed by the `Renewable Energy Group <https://fias.uni-frankfurt.de/physics/schramm/renewable-energy-system-and-network-analysis/>`_ at `FIAS <https://fias.uni-frankfurt.de/>`_ to carry out simulations for the `CoNDyNet project <http://condynet.de/>`_, financed by the `German Federal Ministry for Education and Research (BMBF) <https://www.bmbf.de/en/index.html>`_ as part of the `Stromnetze Research Initiative <http://forschung-stromnetze.info/projekte/grundlagen-und-konzepte-fuer-effiziente-dezentrale-stromnetze/>`_.
+This project is currently maintained by the `Department of Digital
+Transformation in Energy Systems <https://tub-ensys.github.io>`_ at the
+`Technical University of Berlin <https://www.tu.berlin>`_. Previous versions
+were developed by 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>`_
+which was funded by the `Helmholtz Association <https://www.helmholtz.de/en/>`_,
+and by the `Renewable Energy Group
+<https://fias.uni-frankfurt.de/physics/schramm/renewable-energy-system-and-network-analysis/>`_
+at `FIAS <https://fias.uni-frankfurt.de/>`_ to carry out simulations for the
+`CoNDyNet project <http://condynet.de/>`_, financed by the `German Federal
+Ministry for Education and Research (BMBF) <https://www.bmbf.de/en/index.html>`_
+as part of the `Stromnetze Research Initiative
+<http://forschung-stromnetze.info/projekte/grundlagen-und-konzepte-fuer-effiziente-dezentrale-stromnetze/>`_.
 
 
 Documentation