Merge pull request #1052 from PyPSA/graphics-to-doc-img

move all graphics to doc/img
PyPSA · May 12, 2024 · 45d76e3 · 45d76e3
2 parents 497797b + f21c6f5
commit 45d76e3
Show file tree

Hide file tree

Showing 19 changed files with 13 additions and 17 deletions.
diff --git a/.reuse/dep5 b/.reuse/dep5
@@ -30,7 +30,3 @@ License: CC0-1.0
 Files: borg-it
 Copyright: 2017-2024 The PyPSA-Eur Authors
 License: CC0-1.0
-
-Files: graphics/*
-Copyright: 2017-2024 The PyPSA-Eur Authors
-License: CC-BY-4.0
diff --git a/README.md b/README.md
@@ -80,7 +80,7 @@ all greenhouse gas emitters except waste management and land use.
 This diagram gives an overview of the sectors and the links between
 them:
 
-![sector diagram](graphics/multisector_figure.png)
+![sector diagram](doc/img/multisector_figure.png)
 
 Each of these sectors is built up on the transmission network nodes
 from [PyPSA-Eur](https://github.com/PyPSA/pypsa-eur):

diff --git a/graphics/Heat_and_el_demand_timeseries.png → doc/img/Heat_and_el_demand_timeseries.png b/graphics/Heat_and_el_demand_timeseries.png → doc/img/Heat_and_el_demand_timeseries.png
diff --git a/graphics/demand-map-heat.png → doc/img/demand-map-heat.png b/graphics/demand-map-heat.png → doc/img/demand-map-heat.png
diff --git a/graphics/fec_industry_today_tomorrow.png → doc/img/fec_industry_today_tomorrow.png b/graphics/fec_industry_today_tomorrow.png → doc/img/fec_industry_today_tomorrow.png
diff --git a/graphics/gas_pipeline_figure.png → doc/img/gas_pipeline_figure.png b/graphics/gas_pipeline_figure.png → doc/img/gas_pipeline_figure.png
diff --git a/graphics/hotmaps.png → doc/img/hotmaps.png b/graphics/hotmaps.png → doc/img/hotmaps.png
diff --git a/graphics/multisector_figure.pdf → doc/img/multisector_figure.pdf b/graphics/multisector_figure.pdf → doc/img/multisector_figure.pdf
diff --git a/graphics/multisector_figure.png → doc/img/multisector_figure.png b/graphics/multisector_figure.png → doc/img/multisector_figure.png
diff --git a/graphics/multisector_figure.svg → doc/img/multisector_figure.svg b/graphics/multisector_figure.svg → doc/img/multisector_figure.svg
diff --git a/graphics/process-emissions.png → doc/img/process-emissions.png b/graphics/process-emissions.png → doc/img/process-emissions.png
diff --git a/...production_bar_elec_s_37_ec_lv1.0_Ept.png → ...production_bar_elec_s_37_ec_lv1.0_Ept.png b/...production_bar_elec_s_37_ec_lv1.0_Ept.png → ...production_bar_elec_s_37_ec_lv1.0_Ept.png
diff --git a/...operation_area_elec_s_37_ec_lv1.0_Ept.png → ...operation_area_elec_s_37_ec_lv1.0_Ept.png b/...operation_area_elec_s_37_ec_lv1.0_Ept.png → ...operation_area_elec_s_37_ec_lv1.0_Ept.png
diff --git a/doc/index.rst b/doc/index.rst
@@ -74,7 +74,7 @@ greenhouse gas emitters except waste management, agriculture, forestry and land
 use. The diagram below gives an overview of the sectors and the links between
 them:
 
-.. image:: ../graphics/multisector_figure.png
+.. image:: img/multisector_figure.png
     :width: 70%
     :align: center
 

diff --git a/doc/spatial_resolution.rst b/doc/spatial_resolution.rst
@@ -15,11 +15,11 @@ The total number of nodes for Europe is set in the ``config/config.yaml`` file u
 
 Exemplary unsolved network clustered to 512 nodes:
 
-.. image:: ../graphics/elec_s_512.png
+.. image:: img/elec_s_512.png
 
 Exemplary unsolved network clustered to 37 nodes:
 
-.. image:: ../graphics/elec_s_37.png
+.. image:: img/elec_s_37.png
 
 The total number of nodes for Europe is set in the ``config/config.yaml`` file under `clusters <https://github.com/PyPSA/pypsa-eur-sec/blob/3daff49c9999ba7ca7534df4e587e1d516044fc3/config.default.yaml#L20>`__.  The number of nodes can vary between 37, the number of independent countries/synchronous areas, and several hundred. With 200-300 nodes, the model needs 100-150 GB RAM to solve with a commercial solver like Gurobi.
 Not all of the sectors are at the full nodal resolution, and some demand for some sectors is distributed to nodes using heuristics that need to be corrected. Some networks are copper-plated to reduce computational times.

diff --git a/doc/supply_demand.rst b/doc/supply_demand.rst
@@ -18,7 +18,7 @@ management, carbon capture and usage/sequestration, and gas networks.
 
 The basic supply (left column) and demand (right column) options in the model are described in this figure:
 
-.. image:: ../graphics/multisector_figure.png
+.. image:: img/multisector_figure.png
 
 .. _Electricity supply and demand:
 
@@ -72,11 +72,11 @@ For every country, heat demand is split between low and high population density
 
 Cooling is electrified and is included in the electricity demand. Cooling demand is assumed to remain at current levels.  An example of regional distribution of the total heat demand for network 181 regions is depicted below.
 
-.. image:: ../graphics/demand-map-heat.png
+.. image:: img/demand-map-heat.png
 
 As below figure shows, the current total heat demand in Europe is similar to the total electricity demand but features much more pronounced seasonal variations. The current total building heating demand in Europe adds up to 3084 TWh/a of which 78% occurs in urban areas.
 
-.. image:: ../graphics/Heat_and_el_demand_timeseries.png
+.. image:: img/Heat_and_el_demand_timeseries.png
 
 In practice, in PyPSA-Eur-Sec, there are heat demand buses to which the corresponding heat demands are added.
 
@@ -269,7 +269,7 @@ The existing European gas transmission network is represented based on the SciGR
 
 The following figure shows the unclustered European gas transmission network based on the SciGRID Gas IGGIELGN dataset. Pipelines are color-coded by estimated capacities. Markers indicate entry-points, sites of fossil resource extraction, and LNG terminals.
 
-.. image:: ../graphics/gas_pipeline_figure.png
+.. image:: img/gas_pipeline_figure.png
 
 .. _Biomass supply:
 
@@ -374,7 +374,7 @@ Where process heat is required, our approach depends on the necessary temperatur
 
 The following figure shows the final consumption of energy and non-energy feedstocks in industry today in comparison to the scenario in 2050 assumed in `Neumann et al <https://arxiv.org/abs/2207.05816>`__.
 
-.. image:: ../graphics/fec_industry_today_tomorrow.png
+.. image:: img/fec_industry_today_tomorrow.png
 
 
 The following figure shows the process emissions in industry today (top bar) and in 2050 without
@@ -383,12 +383,12 @@ carbon capture (bottom bar) assumed in `Neumann et al <https://arxiv.org/abs/220
 
 
 
-.. image:: ../graphics/process-emissions.png
+.. image:: img/process-emissions.png
 
 
 Inside each country the industrial demand is then distributed using the `Hotmaps Industrial Database <https://zenodo.org/record/4687147#.YvOaxhxBy5c>`__, which is illustrated in the figure below. This open database includes georeferenced industrial sites of energy-intensive industry sectors in EU28, including cement, basic chemicals, glass, iron and steel, non-ferrous metals, non-metallic minerals, paper, and refineries subsectors. The use of this spatial dataset enables the calculation of regional and process-specific energy demands. This approach assumes that there will be no significant migration of energy-intensive industries.
 
-.. image:: ../graphics/hotmaps.png
+.. image:: img/hotmaps.png
 
 
 .. _Iron and Steel:

diff --git a/doc/validation.rst b/doc/validation.rst
@@ -29,11 +29,11 @@ Results
 
 By the time of writing the comparison with the historical data shows partially accurate, partially improvable results. The following figures show the comparison of the dispatch of the different carriers.
 
-.. image:: ../graphics/validation_seasonal_operation_area_elec_s_37_ec_lv1.0_Ept.png
+.. image:: img/validation_seasonal_operation_area_elec_s_37_ec_lv1.0_Ept.png
    :width: 100%
    :align: center
 
-.. image:: ../graphics/validation_production_bar_elec_s_37_ec_lv1.0_Ept.png
+.. image:: img/validation_production_bar_elec_s_37_ec_lv1.0_Ept.png
    :width: 100%
    :align: center
 

diff --git a/graphics/elec_s_37.png b/graphics/elec_s_37.png
diff --git a/graphics/elec_s_512.png b/graphics/elec_s_512.png