bjoern/pypsa-eur
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:pypsa/pypsa-eur-sec

Browse Source
This commit is contained in:
Fabian Neumann 2022-07-20 15:47:55 +02:00
commit d346e9c34a
3 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
README.md
View File

@ -20,14 +20,16 @@ all greenhouse gas emitters except waste management and land use.
**WARNING**: PyPSA-Eur-Sec is under active development and has several **WARNING**: PyPSA-Eur-Sec is under active development and has several
[limitations](https://pypsa-eur-sec.readthedocs.io/en/latest/limitations.html) which [limitations](https://pypsa-eur-sec.readthedocs.io/en/latest/limitations.html) which
you should understand before using the model. The github repository you should understand before using the model. The github repository
[issues](https://github.com/PyPSA/pypsa-eur-sec/issues) collects known [issues](https://github.com/PyPSA/pypsa-eur-sec/issues) collect known
topics we are working on (please feel free to help or make suggestions). There is neither a full topics we are working on (please feel free to help or make suggestions).
documentation nor a paper yet, but we hope to have a preprint out by mid-2022. The [documentation](https://pypsa-eur-sec.readthedocs.io/) remains somewhat
You can find out more about the model capabilities in [a recent patchy.
presentation at EMP-E](https://nworbmot.org/energy/brown-empe.pdf) or the You can find showcases of the model's capabilities in the preprint
following [paper in Joule with a description of the industry [Benefits of a Hydrogen Network in Europe](https://arxiv.org/abs/2207.05816),
sector](https://arxiv.org/abs/2109.09563). We cannot support this model if you a [paper in Joule with a description of the industry
choose to use it. sector](https://arxiv.org/abs/2109.09563), or in [a 2021
presentation at EMP-E](https://nworbmot.org/energy/brown-empe.pdf).
We cannot support this model if you choose to use it.
Please see the [documentation](https://pypsa-eur-sec.readthedocs.io/) Please see the [documentation](https://pypsa-eur-sec.readthedocs.io/)
for installation instructions and other useful information about the snakemake workflow. for installation instructions and other useful information about the snakemake workflow.

21
doc/index.rst
View File

@ -33,17 +33,20 @@ waste management, agriculture, forestry and land use.
**WARNING**: PyPSA-Eur-Sec is under active development and has several **WARNING**: PyPSA-Eur-Sec is under active development and has several
`limitations <https://pypsa-eur-sec.readthedocs.io/en/latest/limitations.html>`_ which `limitations <https://pypsa-eur-sec.readthedocs.io/en/latest/limitations.html>`_ which
you should understand before using the model. The github repository you should understand before using the model. The github repository
`issues <https://github.com/PyPSA/pypsa-eur-sec/issues>`_ collects known `issues <https://github.com/PyPSA/pypsa-eur-sec/issues>`_ collect known
topics we are working on (please feel free to help or make suggestions). There is neither a full topics we are working on (please feel free to help or make suggestions).
documentation nor a paper yet, but we hope to have a preprint out by mid-2022. The `documentation <https://pypsa-eur-sec.readthedocs.io/>`_ remains somewhat
We cannot support this model if you patchy.
choose to use it. We cannot support this model if you choose to use it.
.. note:: .. note::
More about the current model capabilities and preliminary results You can find showcases of the model's capabilities in the
can be found in `a recent presentation at EMP-E <https://nworbmot.org/energy/brown-empe.pdf>`_ preprint `Benefits of a Hydrogen Network in Europe
and the following `paper in Joule with a description of the industry sector <https://arxiv.org/abs/2109.09563>`_. <https://arxiv.org/abs/2207.05816>`_, a `paper in Joule with a
description of the industry sector
<https://arxiv.org/abs/2109.09563>`_, or in `a 2021 presentation
at EMP-E <https://nworbmot.org/energy/brown-empe.pdf>`_.
This diagram gives an overview of the sectors and the links between This diagram gives an overview of the sectors and the links between
them: them:

5
scripts/prepare_sector_network.py
View File

@ -1481,9 +1481,6 @@ def add_heat(n, costs):
"for 'decentral' and 'central' separately.") "for 'decentral' and 'central' separately.")
tes_time_constant_days = options["tes_tau"] if name_type == "decentral" else 180. tes_time_constant_days = options["tes_tau"] if name_type == "decentral" else 180.
# conversion from EUR/m^3 to EUR/MWh for 40 K diff and 1.17 kWh/m^3/K
capital_cost = costs.at[name_type + ' water tank storage', 'fixed'] / 0.00117 / 40
n.madd("Store", n.madd("Store",
nodes[name] + f" {name} water tanks", nodes[name] + f" {name} water tanks",
bus=nodes[name] + f" {name} water tanks", bus=nodes[name] + f" {name} water tanks",
@ -1491,7 +1488,7 @@ def add_heat(n, costs):
e_nom_extendable=True, e_nom_extendable=True,
carrier=name + " water tanks", carrier=name + " water tanks",
standing_loss=1 - np.exp(- 1 / 24 / tes_time_constant_days), standing_loss=1 - np.exp(- 1 / 24 / tes_time_constant_days),
capital_cost=capital_cost, capital_cost=costs.at[name_type + ' water tank storage', 'fixed'],
lifetime=costs.at[name_type + ' water tank storage', 'lifetime'] lifetime=costs.at[name_type + ' water tank storage', 'lifetime']
) )