documentation fixes

PyPSA · Jan 5, 2024 · b98f1ef · b98f1ef
1 parent 66c9513
commit b98f1ef
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 26 deletions.
diff --git 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
@@ -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
diff --git 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
@@ -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
@@ -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 <https://github.com/PyPSA/pypsa-eur-sec/releases>`_, which automatically triggers archiving to the `zenodo code repository <https://doi.org/10.5281/zenodo.3520874>`_ with `MIT license <https://opensource.org/licenses/MIT>`_.
 
-* Create pre-built networks for ``config.default.yaml`` by running ``snakemake -call prepare_sector_networks``.
-
-* Upload pre-built networks to `zenodo data repository <https://doi.org/10.5281/zenodo.3601881>`_ with `CC BY 4.0 <https://creativecommons.org/licenses/by/4.0/>`_ license.
-
 * Send announcement on the `PyPSA mailing list <https://groups.google.com/forum/#!forum/pypsa>`_.
diff --git 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 <https://github.com/PyPSA/pypsa-eur-sec/blob/3daff49c9999ba7ca7534df4e587e1d516044fc3/config.default.yaml#L248>`_. 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 <https://github.com/PyPSA/pypsa-eur-sec/blob/3daff49c9999ba7ca7534df4e587e1d516044fc3/config.default.yaml#L247>`_.
 
-•	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