Skip to content

Commit

Permalink
doc/configuration.rst: update lines
Browse files Browse the repository at this point in the history
  • Loading branch information
FabianHofmann committed Dec 3, 2020
1 parent 3fa5bba commit f563b61
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 17 deletions.
4 changes: 1 addition & 3 deletions config.default.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ electricity:
powerplants_filter: false # use pandas query strings here, e.g. Country not in ['Germany']
custom_powerplants: false # use pandas query strings here, e.g. Country in ['Germany']
conventional_carriers: [nuclear, oil, OCGT, CCGT, coal, lignite, geothermal, biomass]

renewable_capacities_from_OPSD: [] # onwind, offwind, solar

# estimate_renewable_capacities_from_capacity_stats:
Expand Down Expand Up @@ -144,8 +143,7 @@ renewable:
cutout: europe-2013-era5
carriers: [ror, PHS, hydro]
PHS_max_hours: 6
hydro_max_hours: "energy_capacity_totals_by_country" # one of energy_capacity_totals_by_country,
# estimate_by_large_installations or a float
hydro_max_hours: "energy_capacity_totals_by_country" # one of energy_capacity_totals_by_country, estimate_by_large_installations or a float
clip_min_inflow: 1.0

lines:
Expand Down
28 changes: 14 additions & 14 deletions doc/configuration.rst
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ An exemplary dependency graph (starting from the simplification rules) then look

.. literalinclude:: ../config.default.yaml
:language: yaml
:lines: 14-19
:lines: 14-18

.. csv-table::
:header-rows: 1
Expand All @@ -66,7 +66,7 @@ Specifies the temporal range to build an energy system model for as arguments to

.. literalinclude:: ../config.default.yaml
:language: yaml
:lines: 23-26
:lines: 22-25

.. csv-table::
:header-rows: 1
Expand All @@ -80,7 +80,7 @@ Specifies the temporal range to build an energy system model for as arguments to

.. literalinclude:: ../config.default.yaml
:language: yaml
:lines: 36-54
:lines: 36-55

.. csv-table::
:header-rows: 1
Expand All @@ -97,7 +97,7 @@ Specifies the temporal range to build an energy system model for as arguments to

.. literalinclude:: ../config.default.yaml
:language: yaml
:lines: 61-74
:lines: 62-75

.. csv-table::
:header-rows: 1
Expand All @@ -114,7 +114,7 @@ Specifies the temporal range to build an energy system model for as arguments to

.. literalinclude:: ../config.default.yaml
:language: yaml
:lines: 76-93
:lines: 77-94

.. csv-table::
:header-rows: 1
Expand All @@ -126,7 +126,7 @@ Specifies the temporal range to build an energy system model for as arguments to

.. literalinclude:: ../config.default.yaml
:language: yaml
:lines: 76,94-106
:lines: 77,95-107

.. csv-table::
:header-rows: 1
Expand All @@ -138,7 +138,7 @@ Specifies the temporal range to build an energy system model for as arguments to

.. literalinclude:: ../config.default.yaml
:language: yaml
:lines: 76,107-120
:lines: 77,108-121

.. csv-table::
:header-rows: 1
Expand All @@ -150,7 +150,7 @@ Specifies the temporal range to build an energy system model for as arguments to

.. literalinclude:: ../config.default.yaml
:language: yaml
:lines: 76,121-140
:lines: 77,122-141

.. csv-table::
:header-rows: 1
Expand All @@ -162,7 +162,7 @@ Specifies the temporal range to build an energy system model for as arguments to

.. literalinclude:: ../config.default.yaml
:language: yaml
:lines: 76,141-147
:lines: 77,142-147

.. csv-table::
:header-rows: 1
Expand Down Expand Up @@ -218,7 +218,7 @@ Specifies the temporal range to build an energy system model for as arguments to

.. literalinclude:: ../config.default.yaml
:language: yaml
:lines: 170-174
:lines: 170-176

.. csv-table::
:header-rows: 1
Expand All @@ -232,7 +232,7 @@ Specifies the temporal range to build an energy system model for as arguments to

.. literalinclude:: ../config.default.yaml
:language: yaml
:lines: 175-188
:lines: 178-190

.. csv-table::
:header-rows: 1
Expand All @@ -254,7 +254,7 @@ Specifies the temporal range to build an energy system model for as arguments to

.. literalinclude:: ../config.default.yaml
:language: yaml
:lines: 190-200
:lines: 192-202

.. csv-table::
:header-rows: 1
Expand All @@ -266,7 +266,7 @@ Specifies the temporal range to build an energy system model for as arguments to

.. literalinclude:: ../config.default.yaml
:language: yaml
:lines: 190,201-217
:lines: 192,203-219

.. csv-table::
:header-rows: 1
Expand All @@ -280,7 +280,7 @@ Specifies the temporal range to build an energy system model for as arguments to

.. literalinclude:: ../config.default.yaml
:language: yaml
:lines: 219-358
:lines: 221-299

.. csv-table::
:header-rows: 1
Expand Down

0 comments on commit f563b61

Please sign in to comment.