diff --git a/README.md b/README.md index f4cc34cc..b6929873 100644 --- a/README.md +++ b/README.md @@ -9,13 +9,16 @@ -**WARNING**: This model is under construction and contains serious -problems that distort the results. See the github repository -[issues](https://github.com/PyPSA/pypsa-eur-sec/issues) for some of -the problems (please feel free to help or make suggestions). There is -neither documentation nor a paper yet, but we hope to have a preprint -out by autumn 2021. We cannot support this model if you choose to use -it. +**WARNING**: This model is under construction and contains serious problems that +distort the results. See the github repository +[issues](https://github.com/PyPSA/pypsa-eur-sec/issues) for some of the problems +(please feel free to help or make suggestions). There is neither a full +documentation nor a paper yet, but we hope to have a preprint out by the end of 2021. +You can find out more about the model capabilities in [a recent +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 diff --git a/doc/index.rst b/doc/index.rst index 0c6f929d..c4174b52 100644 --- a/doc/index.rst +++ b/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 `_ + and the the following `preprint with a description of the industry sector `_. + 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 `_ for which `documentation `_ is available as well. +PyPSA-Eur-Sec is designed to be imported into the open toolbox `PyPSA +`_ for which `documentation `_ is +available as well. -This project is maintained by the `Energy System Modelling group `_ at the `Institute for Automation and Applied Informatics `_ at the `Karlsruhe Institute of Technology `_. The group is funded by the `Helmholtz Association `_ until 2024. Previous versions were developed by the `Renewable Energy Group `_ at `FIAS `_ to carry out simulations for the `CoNDyNet project `_, financed by the `German Federal Ministry for Education and Research (BMBF) `_ as part of the `Stromnetze Research Initiative `_. +This project is currently maintained by the `Department of Digital +Transformation in Energy Systems `_ at the +`Technical University of Berlin `_. Previous versions +were developed by the `Energy System Modelling group +`_ at the `Institute for Automation +and Applied Informatics `_ at the +`Karlsruhe Institute of Technology `_ +which was funded by the `Helmholtz Association `_, +and by the `Renewable Energy Group +`_ +at `FIAS `_ to carry out simulations for the +`CoNDyNet project `_, financed by the `German Federal +Ministry for Education and Research (BMBF) `_ +as part of the `Stromnetze Research Initiative +`_. Documentation