From cec9dcc41ce96034c6c11f78d154b06b04be759f Mon Sep 17 00:00:00 2001 From: martacki Date: Tue, 1 Jun 2021 12:02:43 +0200 Subject: [PATCH] adapt configuration options --- doc/configtables/clustering.csv | 3 +++ doc/configuration.rst | 6 +++--- doc/tutorial.rst | 12 ++++++------ 3 files changed, 12 insertions(+), 9 deletions(-) create mode 100644 doc/configtables/clustering.csv diff --git a/doc/configtables/clustering.csv b/doc/configtables/clustering.csv new file mode 100644 index 00000000..2f63f955 --- /dev/null +++ b/doc/configtables/clustering.csv @@ -0,0 +1,3 @@ +,Unit,Values,Description +simplify,,, +-- to_substations,bool,"{'true','false'}","Aggregates all nodes without power injection (positive or negative, i.e. demand or generation) to electrically closest ones" diff --git a/doc/configuration.rst b/doc/configuration.rst index a75669cd..e7c31793 100644 --- a/doc/configuration.rst +++ b/doc/configuration.rst @@ -256,7 +256,7 @@ Define and specify the ``atlite.Cutout`` used for calculating renewable potentia .. literalinclude:: ../config.default.yaml :language: yaml - :lines: 192-202 + :lines: 208-217 .. csv-table:: :header-rows: 1 @@ -268,7 +268,7 @@ Define and specify the ``atlite.Cutout`` used for calculating renewable potentia .. literalinclude:: ../config.default.yaml :language: yaml - :lines: 192,203-219 + :lines: 218-227 .. csv-table:: :header-rows: 1 @@ -282,7 +282,7 @@ Define and specify the ``atlite.Cutout`` used for calculating renewable potentia .. literalinclude:: ../config.default.yaml :language: yaml - :lines: 221-299 + :lines: 236-314 .. csv-table:: :header-rows: 1 diff --git a/doc/tutorial.rst b/doc/tutorial.rst index 507b1485..d2fb8433 100644 --- a/doc/tutorial.rst +++ b/doc/tutorial.rst @@ -53,41 +53,41 @@ Likewise, the example's temporal scope can be restricted (e.g. to a single month .. literalinclude:: ../config.tutorial.yaml :language: yaml - :lines: 22-25 + :lines: 24-27 It is also possible to allow less or more carbon-dioxide emissions. Here, we limit the emissions of Germany 100 Megatonnes per year. .. literalinclude:: ../config.tutorial.yaml :language: yaml - :lines: 36,38 + :lines: 38,40 PyPSA-Eur also includes a database of existing conventional powerplants. We can select which types of powerplants we like to be included with fixed capacities: .. literalinclude:: ../config.tutorial.yaml :language: yaml - :lines: 36,52 + :lines: 38,54 To accurately model the temporal and spatial availability of renewables such as wind and solar energy, we rely on historical weather data. It is advisable to adapt the required range of coordinates to the selection of countries. .. literalinclude:: ../config.tutorial.yaml :language: yaml - :lines: 54-62 + :lines: 56-63 We can also decide which weather data source should be used to calculate potentials and capacity factor time-series for each carrier. For example, we may want to use the ERA-5 dataset for solar and not the default SARAH-2 dataset. .. literalinclude:: ../config.tutorial.yaml :language: yaml - :lines: 64,107-108 + :lines: 65,108-109 Finally, it is possible to pick a solver. For instance, this tutorial uses the open-source solvers CBC and Ipopt and does not rely on the commercial solvers Gurobi or CPLEX (for which free academic licenses are available). .. literalinclude:: ../config.tutorial.yaml :language: yaml - :lines: 170,180-181 + :lines: 171,181-182 .. note::