diff --git a/config/config.default.yaml b/config/config.default.yaml index c59ff3944..b16f25f8e 100644 --- a/config/config.default.yaml +++ b/config/config.default.yaml @@ -280,7 +280,7 @@ transformers: s_nom: 2000. type: '' -# docs in https://pypsa-eur.readthedocs.io/en/latest/configuration.html#load +# docs-load in https://pypsa-eur.readthedocs.io/en/latest/configuration.html#load load: power_statistics: true interpolate_limit: 3 diff --git a/doc/configuration.rst b/doc/configuration.rst index ceda11416..92ed269b6 100644 --- a/doc/configuration.rst +++ b/doc/configuration.rst @@ -383,7 +383,7 @@ overwrite the existing values. .. literalinclude:: ../config/config.default.yaml :language: yaml - :start-after: type: + :start-after: # docs-load :end-before: # docs .. csv-table:: diff --git a/doc/img/intro-workflow.png b/doc/img/intro-workflow.png index da2c06d80..27b5a389d 100644 Binary files a/doc/img/intro-workflow.png and b/doc/img/intro-workflow.png differ diff --git a/doc/index.rst b/doc/index.rst index 909a96a2d..7eaffa016 100644 --- a/doc/index.rst +++ b/doc/index.rst @@ -35,6 +35,8 @@ PyPSA-Eur: A Sector-Coupled Open Optimisation Model of the European Energy Syste :target: https://stackoverflow.com/questions/tagged/pypsa :alt: Stackoverflow +| + PyPSA-Eur is an open model dataset of the European energy system at the transmission network level that covers the full ENTSO-E area. It covers demand and supply for all energy sectors. From version v0.8.0, PyPSA-Eur includes all @@ -209,24 +211,6 @@ If you want to cite a specific PyPSA-Eur version, each release of PyPSA-Eur is s :target: https://doi.org/10.5281/zenodo.3520874 -Pre-Built Networks as a Dataset -=============================== - -There are pre-built networks available as a dataset on Zenodo as well for every release of PyPSA-Eur. - -.. image:: https://zenodo.org/badge/DOI/10.5281/zenodo.3601881.svg - :target: https://doi.org/10.5281/zenodo.3601881 - -The included ``.nc`` files are PyPSA network files which can be imported with PyPSA via: - -.. code:: python - - import pypsa - - filename = "elec_s_1024_ec.nc" # example - n = pypsa.Network(filename) - - Operating Systems ================= diff --git a/doc/introduction.rst b/doc/introduction.rst index df0607232..413db9d16 100644 --- a/doc/introduction.rst +++ b/doc/introduction.rst @@ -89,8 +89,8 @@ Folder Structure - ``results``: Stores the solved PyPSA network data, summary files and plots. - ``logs``: Stores log files. - ``benchmarks``: Stores ``snakemake`` benchmarks. -- ``test``: Includes the test configuration files used for continuous integration. - ``doc``: Includes the documentation of PyPSA-Eur. +- ``graphics``: Includes some graphics for the documentation of PyPSA-Eur. System Requirements =================== diff --git a/doc/release_notes.rst b/doc/release_notes.rst index 9baeeb88c..2675e4c6f 100644 --- a/doc/release_notes.rst +++ b/doc/release_notes.rst @@ -158,6 +158,8 @@ PyPSA-Eur 0.9.0 (5th January 2024) * Remove "conservative" renewable potentials estimation option (https://github.com/PyPSA/pypsa-eur/pull/838). +* With this release we stop posting updates to the network pre-builts. + **Changes** * Updated Global Energy Monitor LNG terminal data to March 2023 version @@ -1676,8 +1678,4 @@ Release Process * Make a `GitHub release `_, which automatically triggers archiving to the `zenodo code repository `_ with `MIT license `_. -* Create pre-built networks for ``config.default.yaml`` by running ``snakemake -call prepare_sector_networks``. - -* Upload pre-built networks to `zenodo data repository `_ with `CC BY 4.0 `_ license. - * Send announcement on the `PyPSA mailing list `_. diff --git a/doc/spatial_resolution.rst b/doc/spatial_resolution.rst index 0293a5cef..c6e9c3de5 100644 --- a/doc/spatial_resolution.rst +++ b/doc/spatial_resolution.rst @@ -45,7 +45,7 @@ Here are some examples of how spatial resolution is set for different sectors in • CO2: It can be modeled as a single node for Europe or it can be nodally resolved with CO2 transport pipelines if activated in the `config `_. It should mentioned that in single node mode a transport and storage cost is added for sequestered CO2, the cost of which can be adjusted in the `config `_. -• Liquid hydrocarbons: Modeled as a single node for Europe, since transport costs for liquids are low and no bottlenecks are expected. +• Carbonaceous fuels: Modeled as a single node for Europe by default, since transport costs for liquids are low and no bottlenecks are expected. Can be regionally resolved in configuration. **Electricity distribution network** diff --git a/graphics/workflow.png b/graphics/workflow.png index f60f34622..a43f240dd 100644 Binary files a/graphics/workflow.png and b/graphics/workflow.png differ