From 0e5886081ee9dd88b27ceb5fe6a2a92e8219cb33 Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Wed, 14 Aug 2019 15:36:46 +0200 Subject: [PATCH] move rules to own pages and adapt image paths --- doc/contributing.rst | 2 +- doc/index.rst | 1 - doc/preparation.rst | 88 +++----------------- doc/preparation/add_electricity.rst | 6 ++ doc/preparation/base_network.rst | 6 ++ doc/preparation/build_bus_regions.rst | 6 ++ doc/preparation/build_country_flh.rst | 6 ++ doc/preparation/build_cutout.rst | 6 ++ doc/preparation/build_hydro_profile.rst | 6 ++ doc/preparation/build_natura_raster.rst | 6 ++ doc/preparation/build_powerplants.rst | 6 ++ doc/preparation/build_renewable_profiles.rst | 6 ++ doc/preparation/build_shapes.rst | 6 ++ doc/preparation/prepare_links_p_nom.rst | 6 ++ doc/simplification.rst | 26 ++---- doc/simplification/cluster_network.rst | 6 ++ doc/simplification/prepare_network.rst | 6 ++ doc/simplification/simplify_network.rst | 6 ++ doc/solving.rst | 24 ++---- doc/solving/solve_network.rst | 6 ++ doc/solving/solve_operations_network.rst | 6 ++ doc/solving/trace_solve_network.rst | 6 ++ scripts/add_electricity.py | 8 +- scripts/base_network.py | 2 +- scripts/build_bus_regions.py | 4 +- scripts/build_country_flh.py | 4 +- scripts/build_cutout.py | 4 +- scripts/build_hydro_profile.py | 6 +- scripts/build_natura_raster.py | 4 +- scripts/build_powerplants.py | 2 +- scripts/build_renewable_profiles.py | 14 ++-- scripts/build_shapes.py | 14 ++-- scripts/cluster_network.py | 6 +- scripts/simplify_network.py | 6 +- scripts/solve_network.py | 2 +- 35 files changed, 165 insertions(+), 154 deletions(-) create mode 100644 doc/preparation/add_electricity.rst create mode 100644 doc/preparation/base_network.rst create mode 100644 doc/preparation/build_bus_regions.rst create mode 100644 doc/preparation/build_country_flh.rst create mode 100644 doc/preparation/build_cutout.rst create mode 100644 doc/preparation/build_hydro_profile.rst create mode 100644 doc/preparation/build_natura_raster.rst create mode 100644 doc/preparation/build_powerplants.rst create mode 100644 doc/preparation/build_renewable_profiles.rst create mode 100644 doc/preparation/build_shapes.rst create mode 100644 doc/preparation/prepare_links_p_nom.rst create mode 100644 doc/simplification/cluster_network.rst create mode 100644 doc/simplification/prepare_network.rst create mode 100644 doc/simplification/simplify_network.rst create mode 100644 doc/solving/solve_network.rst create mode 100644 doc/solving/solve_operations_network.rst create mode 100644 doc/solving/trace_solve_network.rst diff --git a/doc/contributing.rst b/doc/contributing.rst index b8634df3..4ba0f147 100644 --- a/doc/contributing.rst +++ b/doc/contributing.rst @@ -7,4 +7,4 @@ be it with new ideas, suggestions, by filing bug reports or contributing code. You are invited to submit pull requests and file issues to the `GitHub repository `_. -If you are unfamiliar with pull requests, the GitHub help pages have a nice `guide `_. +If you are unfamiliar with pull requests, the GitHub help pages have a nice `guide `_. \ No newline at end of file diff --git a/doc/index.rst b/doc/index.rst index 4fa53e71..927f5099 100644 --- a/doc/index.rst +++ b/doc/index.rst @@ -78,7 +78,6 @@ Documentation :hidden: :maxdepth: 1 :caption: Rules Overview - :numbered: preparation simplification diff --git a/doc/preparation.rst b/doc/preparation.rst index 53e2dac9..30d88439 100644 --- a/doc/preparation.rst +++ b/doc/preparation.rst @@ -23,79 +23,17 @@ Then the process continues by calculating conventional power plant capacities, p The central rule :mod:`add_electricity` then ties all the different data inputs together into a detailed PyPSA network stored in ``networks/elec.nc``. -.. _shapes: +.. toctree:: + :caption: Overview -Build Shapes -============================= - -.. automodule:: build_shapes - -.. _cutout: - -Build Cutout -============================= - -.. automodule:: build_cutout - -.. _links: - -Prepare HVDC Links -============================= - -.. automodule:: prepare_links_p_nom - -.. _base: - -Base Network -============================= - -.. automodule:: base_network - -.. _busregions: - -Build Bus Regions -============================= - -.. automodule:: build_bus_regions - -.. _natura: - -Build Natura Raster -============================= - -.. automodule:: build_natura_raster - -.. _flh: - -Build Country Full Load Hours -============================= - -.. automodule:: build_country_flh - -.. _powerplants: - -Build Power Plants -============================= - -.. automodule:: build_powerplants - -.. _renewableprofiles: - -Build Renewable Profiles -======================== - -.. automodule:: build_renewable_profiles - -.. _hydroprofiles: - -Build Hydro Profile -============================= - -.. automodule:: build_hydro_profile - -.. _electricity: - -Add Electricity -============================= - -.. automodule:: add_electricity + preparation/build_shapes + preparation/build_cutout + preparation/prepare_links_p_nom + preparation/base_network + preparation/build_bus_regions + preparation/build_natura_raster + preparation/build_country_flh + preparation/build_powerplants + preparation/build_renewable_profiles + preparation/build_hydro_profile + preparation/add_electricity diff --git a/doc/preparation/add_electricity.rst b/doc/preparation/add_electricity.rst new file mode 100644 index 00000000..fad502a5 --- /dev/null +++ b/doc/preparation/add_electricity.rst @@ -0,0 +1,6 @@ +.. _electricity: + +Rule :mod:`add_electricity` +============================= + +.. automodule:: add_electricity diff --git a/doc/preparation/base_network.rst b/doc/preparation/base_network.rst new file mode 100644 index 00000000..cb29093d --- /dev/null +++ b/doc/preparation/base_network.rst @@ -0,0 +1,6 @@ +.. _base: + +Rule :mod:`base_network` +============================= + +.. automodule:: base_network \ No newline at end of file diff --git a/doc/preparation/build_bus_regions.rst b/doc/preparation/build_bus_regions.rst new file mode 100644 index 00000000..96063104 --- /dev/null +++ b/doc/preparation/build_bus_regions.rst @@ -0,0 +1,6 @@ +.. _busregions: + +Rule :mod:`build_bus_regions` +============================= + +.. automodule:: build_bus_regions \ No newline at end of file diff --git a/doc/preparation/build_country_flh.rst b/doc/preparation/build_country_flh.rst new file mode 100644 index 00000000..5c7f053d --- /dev/null +++ b/doc/preparation/build_country_flh.rst @@ -0,0 +1,6 @@ +.. _flh: + +Rule :mod:`build_country_flh` +============================= + +.. automodule:: build_country_flh \ No newline at end of file diff --git a/doc/preparation/build_cutout.rst b/doc/preparation/build_cutout.rst new file mode 100644 index 00000000..e6d4516a --- /dev/null +++ b/doc/preparation/build_cutout.rst @@ -0,0 +1,6 @@ +.. _cutout: + +Rule :mod:`build_cutout` +============================= + +.. automodule:: build_cutout \ No newline at end of file diff --git a/doc/preparation/build_hydro_profile.rst b/doc/preparation/build_hydro_profile.rst new file mode 100644 index 00000000..ae3de14a --- /dev/null +++ b/doc/preparation/build_hydro_profile.rst @@ -0,0 +1,6 @@ +.. _hydroprofiles: + +Rule :mod:`build_hydro_profile` +=============================== + +.. automodule:: build_hydro_profile diff --git a/doc/preparation/build_natura_raster.rst b/doc/preparation/build_natura_raster.rst new file mode 100644 index 00000000..1efc22fe --- /dev/null +++ b/doc/preparation/build_natura_raster.rst @@ -0,0 +1,6 @@ +.. _natura: + +Rule :mod:`build_natura_raster` +=============================== + +.. automodule:: build_natura_raster diff --git a/doc/preparation/build_powerplants.rst b/doc/preparation/build_powerplants.rst new file mode 100644 index 00000000..14c529b2 --- /dev/null +++ b/doc/preparation/build_powerplants.rst @@ -0,0 +1,6 @@ +.. _powerplants: + +Rule :mod:`build_powerplants` +============================= + +.. automodule:: build_powerplants diff --git a/doc/preparation/build_renewable_profiles.rst b/doc/preparation/build_renewable_profiles.rst new file mode 100644 index 00000000..a8252d0b --- /dev/null +++ b/doc/preparation/build_renewable_profiles.rst @@ -0,0 +1,6 @@ +.. _renewableprofiles: + +Rule :mod:`build_renewable_profiles` +==================================== + +.. automodule:: build_renewable_profiles diff --git a/doc/preparation/build_shapes.rst b/doc/preparation/build_shapes.rst new file mode 100644 index 00000000..e78ada6d --- /dev/null +++ b/doc/preparation/build_shapes.rst @@ -0,0 +1,6 @@ +.. _shapes: + +Rule :mod:`build_shapes` +============================= + +.. automodule:: build_shapes diff --git a/doc/preparation/prepare_links_p_nom.rst b/doc/preparation/prepare_links_p_nom.rst new file mode 100644 index 00000000..23272254 --- /dev/null +++ b/doc/preparation/prepare_links_p_nom.rst @@ -0,0 +1,6 @@ +.. _links: + +Rule :mod:`prepare_links_p_nom` +=============================== + +.. automodule:: prepare_links_p_nom diff --git a/doc/simplification.rst b/doc/simplification.rst index 68935a5d..37407bd2 100644 --- a/doc/simplification.rst +++ b/doc/simplification.rst @@ -13,23 +13,9 @@ The simplification and clustering steps are described in detail in the paper - Jonas Hörsch and Tom Brown. `The role of spatial scale in joint optimisations of generation and transmission for European highly renewable scenarios `_), *14th International Conference on the European Energy Market*, 2017. `arXiv:1705.07617 `_, `doi:10.1109/EEM.2017.7982024 `_. -.. _simplify: - -Simplify Network -================ - -.. automodule:: simplify_network - -.. _cluster: - -Cluster Network -=============== - -.. automodule:: cluster_network - -.. _prepare: - -Prepare Network -=============== - -.. automodule:: prepare_network +.. toctree:: + :caption: Overview + + simplification/simplify_network + simplification/cluster_network + simplification/prepare_network diff --git a/doc/simplification/cluster_network.rst b/doc/simplification/cluster_network.rst new file mode 100644 index 00000000..866c73f5 --- /dev/null +++ b/doc/simplification/cluster_network.rst @@ -0,0 +1,6 @@ +.. _cluster: + +Rule :mod:`cluster_network` +=========================== + +.. automodule:: cluster_network diff --git a/doc/simplification/prepare_network.rst b/doc/simplification/prepare_network.rst new file mode 100644 index 00000000..19ec177f --- /dev/null +++ b/doc/simplification/prepare_network.rst @@ -0,0 +1,6 @@ +.. _prepare: + +Rule :mod:`prepare_network` +=========================== + +.. automodule:: prepare_network diff --git a/doc/simplification/simplify_network.rst b/doc/simplification/simplify_network.rst new file mode 100644 index 00000000..b2c96321 --- /dev/null +++ b/doc/simplification/simplify_network.rst @@ -0,0 +1,6 @@ +.. _simplify: + +Rule :mod:`simplify_network` +============================ + +.. automodule:: simplify_network diff --git a/doc/solving.rst b/doc/solving.rst index 5ce15416..717aa2df 100644 --- a/doc/solving.rst +++ b/doc/solving.rst @@ -4,23 +4,9 @@ Solving Networks After generating and simplifying the networks they can be solved through the rule :mod:`solve_network` by using the collection rule :mod:`solve_all_elec_networks`. Moreover, networks can be solved for another focus with the derivative rules :mod:`solve_network` by using the collection rule :mod:`trace_solve_network` to log changes during iterations and :mod:`solve_network` by using the collection rule :mod:`solve_operations_network` for dispatch-only analyses on an already solved network. -.. _solve: +.. toctree:: + :caption: Overview -Solve Network -============= - -.. automodule:: solve_network - -.. _trace_solve: - -Trace Solve Network -=================== - -.. automodule:: trace_solve_network - -.. _solve_operations: - -Solve Operations Network -======================== - -.. automodule:: solve_operations_network + solving/solve_network + solving/trace_solve_network + solving/solve_operations_network diff --git a/doc/solving/solve_network.rst b/doc/solving/solve_network.rst new file mode 100644 index 00000000..12edd2ee --- /dev/null +++ b/doc/solving/solve_network.rst @@ -0,0 +1,6 @@ +.. _solve: + +Rule :mod:`solve_network` +========================= + +.. automodule:: solve_network diff --git a/doc/solving/solve_operations_network.rst b/doc/solving/solve_operations_network.rst new file mode 100644 index 00000000..aaf2e7c4 --- /dev/null +++ b/doc/solving/solve_operations_network.rst @@ -0,0 +1,6 @@ +.. _solve_operations: + +Rule :mod:`solve_operations_network` +==================================== + +.. automodule:: solve_operations_network diff --git a/doc/solving/trace_solve_network.rst b/doc/solving/trace_solve_network.rst new file mode 100644 index 00000000..22f34325 --- /dev/null +++ b/doc/solving/trace_solve_network.rst @@ -0,0 +1,6 @@ +.. _trace_solve: + +Rule :mod:`trace_solve_network` +=============================== + +.. automodule:: trace_solve_network diff --git a/scripts/add_electricity.py b/scripts/add_electricity.py index 725a8fd6..b088453f 100644 --- a/scripts/add_electricity.py +++ b/scripts/add_electricity.py @@ -45,16 +45,16 @@ Inputs - ``data/costs.csv``: The database of cost assumptions for all included technologies for specific years from various sources; e.g. discount rate, lifetime, investment (CAPEX), fixed operation and maintenance (FOM), variable operation and maintenance (VOM), fuel costs, efficiency, carbon-dioxide intensity. - ``data/bundle/hydro_capacities.csv``: Hydropower plant store/discharge power capacities, energy storage capacity, and average hourly inflow by country. - .. image:: img/hydrocapacities.png + .. image:: ../img/hydrocapacities.png :scale: 34 % - ``data/geth2015_hydro_capacities.csv``: alternative to capacities above; NOT CURRENTLY USED! - ``data/bundle/time_series_60min_singleindex_filtered.csv``: Hourly per-country load profiles since 2010 from the `ENTSO-E statistical database `_ - .. image:: img/load-box.png + .. image:: ../img/load-box.png :scale: 33 % - .. image:: img/load-ts.png + .. image:: ../img/load-ts.png :scale: 33 % - ``resources/regions_onshore.geojson``: confer :ref:`busregions` @@ -68,7 +68,7 @@ Outputs - ``networks/elec.nc``: - .. image:: img/elec.png + .. image:: ../img/elec.png :scale: 33 % Description diff --git a/scripts/base_network.py b/scripts/base_network.py index 50f0f141..0f1e9a44 100644 --- a/scripts/base_network.py +++ b/scripts/base_network.py @@ -50,7 +50,7 @@ Outputs - ``networks/base.nc`` - .. image:: img/base.png + .. image:: ../img/base.png :scale: 33 % Description diff --git a/scripts/build_bus_regions.py b/scripts/build_bus_regions.py index f6292350..a767385a 100644 --- a/scripts/build_bus_regions.py +++ b/scripts/build_bus_regions.py @@ -24,12 +24,12 @@ Outputs - ``resources/regions_onshore.geojson``: - .. image:: img/regions_onshore.png + .. image:: ../img/regions_onshore.png :scale: 33 % - ``resources/regions_offshore.geojson``: - .. image:: img/regions_offshore.png + .. image:: ../img/regions_offshore.png :scale: 33 % Description diff --git a/scripts/build_country_flh.py b/scripts/build_country_flh.py index ceae4848..fc32fbf6 100644 --- a/scripts/build_country_flh.py +++ b/scripts/build_country_flh.py @@ -24,12 +24,12 @@ Inputs - ``data/bundle/corine/g250_clc06_V18_5.tif``: `CORINE Land Cover (CLC) `_ inventory on `44 classes `_ of land use (e.g. forests, arable land, industrial, urban areas). - .. image:: img/corine.png + .. image:: ../img/corine.png :scale: 33 % - ``data/bundle/GEBCO_2014_2D.nc``: A `bathymetric `_ data set with a global terrain model for ocean and land at 15 arc-second intervals by the `General Bathymetric Chart of the Oceans (GEBCO) `_. - .. image:: img/gebco_2019_grid_image.jpg + .. image:: ../img/gebco_2019_grid_image.jpg :scale: 50 % **Source:** `GEBCO `_ diff --git a/scripts/build_cutout.py b/scripts/build_cutout.py index 787a4509..0dee18ba 100644 --- a/scripts/build_cutout.py +++ b/scripts/build_cutout.py @@ -64,13 +64,13 @@ Outputs wnd100m time, y, x ms**-1 Wind speeds at 100 meters (regardless of direction) =================== ========== ========== ========================================================= - .. image:: img/era5.png + .. image:: ../img/era5.png :scale: 40 % A **SARAH-2 cutout** can be used to amend the fields ``temperature``, ``influx_toa``, ``influx_direct``, ``albedo``, ``influx_diffuse`` of ERA5 using satellite-based radiation observations. - .. image:: img/sarah.png + .. image:: ../img/sarah.png :scale: 40 % .. seealso:: diff --git a/scripts/build_hydro_profile.py b/scripts/build_hydro_profile.py index 8c8fcf43..d0bc5665 100644 --- a/scripts/build_hydro_profile.py +++ b/scripts/build_hydro_profile.py @@ -23,7 +23,7 @@ Inputs - ``data/bundle/EIA_hydro_generation_2000_2014.csv``: Hydroelectricity net generation per country and year (`EIA `_) - .. image:: img/hydrogeneration.png + .. image:: ../img/hydrogeneration.png :scale: 33 % - ``resources/country_shapes.geojson``: confer :ref:`shapes` @@ -41,10 +41,10 @@ Outputs e.g. due to river inflow in hydro reservoir. =================== ================ ========================================================= - .. image:: img/inflow-ts.png + .. image:: ../img/inflow-ts.png :scale: 33 % - .. image:: img/inflow-box.png + .. image:: ../img/inflow-box.png :scale: 33 % Description diff --git a/scripts/build_natura_raster.py b/scripts/build_natura_raster.py index 588312f3..78c7e804 100644 --- a/scripts/build_natura_raster.py +++ b/scripts/build_natura_raster.py @@ -19,7 +19,7 @@ Inputs - ``data/bundle/natura/Natura2000_end2015.shp``: `Natura 2000 `_ natural protection areas. - .. image:: img/natura.png + .. image:: ../img/natura.png :scale: 33 % Outputs @@ -27,7 +27,7 @@ Outputs - ``resources/natura.tiff``: Rasterized version of `Natura 2000 `_ natural protection areas to reduce computation times. - .. image:: img/natura.png + .. image:: ../img/natura.png :scale: 33 % Description diff --git a/scripts/build_powerplants.py b/scripts/build_powerplants.py index d63c6e2b..8fb193c5 100644 --- a/scripts/build_powerplants.py +++ b/scripts/build_powerplants.py @@ -24,7 +24,7 @@ Outputs - ``resource/powerplants.csv``: A list of conventional power plants (i.e. neither wind nor solar) with fields for name, fuel type, technology, country, capacity in MW, duration, commissioning year, retrofit year, latitude, longitude, and dam information as documented in the `powerplantmatching README `_; additionally it includes information on the closest substation/bus in ``networks/base.nc``. - .. image:: img/powerplantmatching.png + .. image:: ../img/powerplantmatching.png :scale: 30 % **Source:** `powerplantmatching on GitHub `_ diff --git a/scripts/build_renewable_profiles.py b/scripts/build_renewable_profiles.py index e2950806..94411c15 100644 --- a/scripts/build_renewable_profiles.py +++ b/scripts/build_renewable_profiles.py @@ -44,12 +44,12 @@ Inputs - ``data/bundle/corine/g250_clc06_V18_5.tif``: `CORINE Land Cover (CLC) `_ inventory on `44 classes `_ of land use (e.g. forests, arable land, industrial, urban areas). - .. image:: img/corine.png + .. image:: ../img/corine.png :scale: 33 % - ``data/bundle/GEBCO_2014_2D.nc``: A `bathymetric `_ data set with a global terrain model for ocean and land at 15 arc-second intervals by the `General Bathymetric Chart of the Oceans (GEBCO) `_. - .. image:: img/gebco_2019_grid_image.jpg + .. image:: ../img/gebco_2019_grid_image.jpg :scale: 50 % **Source:** `GEBCO `_ @@ -89,27 +89,27 @@ Outputs - **profile** - .. image:: img/profile_ts.png + .. image:: ../img/profile_ts.png :scale: 33 % - **p_nom_max** - .. image:: img/p_nom_max_hist.png + .. image:: ../img/p_nom_max_hist.png :scale: 33 % - **potential** - .. image:: img/potential_heatmap.png + .. image:: ../img/potential_heatmap.png :scale: 33 % - **average_distance** - .. image:: img/distance_hist.png + .. image:: ../img/distance_hist.png :scale: 33 % - **underwater_fraction** - .. image:: img/underwater_hist.png + .. image:: ../img/underwater_hist.png :scale: 33 % Description diff --git a/scripts/build_shapes.py b/scripts/build_shapes.py index 255d7447..972706cf 100644 --- a/scripts/build_shapes.py +++ b/scripts/build_shapes.py @@ -17,17 +17,17 @@ Inputs - ``data/bundle/naturalearth/ne_10m_admin_0_countries.shp``: World country shapes - .. image:: img/countries.png + .. image:: ../img/countries.png :scale: 33 % - ``data/bundle/eez/World_EEZ_v8_2014.shp``: World `exclusive economic zones `_ (EEZ) - .. image:: img/eez.png + .. image:: ../img/eez.png :scale: 33 % - ``data/bundle/NUTS_2013_60M_SH/data/NUTS_RG_60M_2013.shp``: Europe NUTS3 regions - .. image:: img/nuts3.png + .. image:: ../img/nuts3.png :scale: 33 % - ``data/bundle/nama_10r_3popgdp.tsv.gz``: Average annual population by NUTS3 region (`eurostat `_) @@ -40,22 +40,22 @@ Outputs - ``resources/country_shapes.geojson``: country shapes out of country selection - .. image:: img/country_shapes.png + .. image:: ../img/country_shapes.png :scale: 33 % - ``resources/offshore_shapes.geojson``: EEZ shapes out of country selection - .. image:: img/offshore_shapes.png + .. image:: ../img/offshore_shapes.png :scale: 33 % - ``resources/europe_shape.geojson``: Shape of Europe including countries and EEZ - .. image:: img/europe_shape.png + .. image:: ../img/europe_shape.png :scale: 33 % - ``resources/nuts3_shapes.geojson``: NUTS3 shapes out of country selection including population and GDP data. - .. image:: img/nuts3_shapes.png + .. image:: ../img/nuts3_shapes.png :scale: 33 % Description diff --git a/scripts/cluster_network.py b/scripts/cluster_network.py index 23fefae3..a43db0c0 100644 --- a/scripts/cluster_network.py +++ b/scripts/cluster_network.py @@ -35,18 +35,18 @@ Outputs - ``resources/regions_onshore_{network}_s{simpl}_{clusters}.geojson``: - .. image:: img/regions_onshore_elec_s_X.png + .. image:: ../img/regions_onshore_elec_s_X.png :scale: 33 % - ``resources/regions_offshore_{network}_s{simpl}_{clusters}.geojson``: - .. image:: img/regions_offshore_elec_s_X.png + .. image:: ../img/regions_offshore_elec_s_X.png :scale: 33 % - ``resources/clustermaps_{network}_s{simpl}_{clusters}.h5``: Mapping of buses and lines from ``networks/elec_s{simpl}.nc`` to ``networks/elec_s{simpl}_{clusters}.nc``; has keys ['/busmap', '/busmap_s', '/linemap', '/linemap_negative', '/linemap_positive'] - ``networks/{network}_s{simpl}_{clusters}.nc``: - .. image:: img/elec_s_X.png + .. image:: ../img/elec_s_X.png :scale: 40 % Description diff --git a/scripts/simplify_network.py b/scripts/simplify_network.py index 164b50cb..5ea0d282 100644 --- a/scripts/simplify_network.py +++ b/scripts/simplify_network.py @@ -50,18 +50,18 @@ Outputs - ``resources/regions_onshore_{network}_s{simpl}.geojson``: - .. image:: img/regions_onshore_elec_s.png + .. image:: ../img/regions_onshore_elec_s.png :scale: 33 % - ``resources/regions_offshore_{network}_s{simpl}.geojson``: - .. image:: img/regions_offshore_elec_s .png + .. image:: ../img/regions_offshore_elec_s .png :scale: 33 % - ``resources/clustermaps_{network}_s{simpl}.h5``: Mapping of buses from ``networks/elec.nc`` to ``networks/elec_s{simpl}.nc``; has keys ['/busmap_s'] - ``networks/{network}_s{simpl}.nc``: - .. image:: img/elec_s.png + .. image:: ../img/elec_s.png :scale: 33 % Description diff --git a/scripts/solve_network.py b/scripts/solve_network.py index 8a22dc45..2f0228de 100644 --- a/scripts/solve_network.py +++ b/scripts/solve_network.py @@ -41,7 +41,7 @@ Outputs - ``results/networks/{network}_s{simpl}_{clusters}_l{ll}_{opts}.nc``: Solved PyPSA network including optimisation results - .. image:: img/results.png + .. image:: ../img/results.png :scale: 40 % Description