Skip to content

Commit

Permalink
clarify differences between Co2L in {sector_opts} and {opts} wildcard (
Browse files Browse the repository at this point in the history
…closes #865)
  • Loading branch information
fneum committed May 20, 2024
1 parent c7d8af9 commit a8cd118
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion doc/configtables/co2_budget.csv
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
,Unit,Values,Description
co2_budget,--,Dictionary with planning horizons as keys.,CO2 budget as a fraction of 1990 emissions. Overwritten if ``CO2Lx`` or ``cb`` are set in ``{sector_opts}`` wildcard"doc/configtables/othertoplevel.csv
co2_budget,--,Dictionary with planning horizons as keys.,CO2 budget as a fraction of 1990 emissions. Overwritten if ``Co2Lx`` or ``cb`` are set in ``{sector_opts}`` wildcard"doc/configtables/othertoplevel.csv
2 changes: 1 addition & 1 deletion doc/configtables/sector-opts.csv
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Trigger, Description, Definition, Status
``nH``, i.e. ``2h``-``6h``, "Resample the time-resolution by averaging over every ``n`` snapshots, ``prepare_network``: `average_every_nhours() <https://github.com/PyPSA/pypsa-eur/blob/6b964540ed39d44079cdabddee8333f486d0cd63/scripts/prepare_network.py#L110>`_ and its `caller <https://github.com/PyPSA/pypsa-eur/blob/6b964540ed39d44079cdabddee8333f486d0cd63/scripts/prepare_network.py#L146>`__)", In active use
``Co2L``, Add an overall absolute carbon-dioxide emissions limit configured in ``electricity: co2limit``. If a float is appended an overall emission limit relative to the emission level given in ``electricity: co2base`` is added (e.g. ``Co2L0.05`` limits emissisions to 5% of what is given in ``electricity: co2base``), ``prepare_network``: `add_co2limit() <https://github.com/PyPSA/pypsa-eur/blob/6b964540ed39d44079cdabddee8333f486d0cd63/scripts/prepare_network.py#L19>`_ and its `caller <https://github.com/PyPSA/pypsa-eur/blob/6b964540ed39d44079cdabddee8333f486d0cd63/scripts/prepare_network.py#L154>`__, In active use
``Co2L`` + ``n``, Add an overall absolute carbon-dioxide emissions limit of ``n`` times of the 1990 base emissions (e.g. ``Co2L0.05`` limits emissisions to 5% of what is calculated in the rule :mod:``prepare_sector_network`` in the function ``co2_emissions_year()``),:mod:``prepare_sector_network`` in the function ``co2_emissions_year()`` , In active use
``carrier+{c|p|m}factor``,"Alter the capital cost (``c``), installable potential (``p``) or marginal costs (``m``) of a carrier by a factor. Example: ``solar+c0.5`` reduces the capital cost of solar to 50\% of original values.", ``prepare_network``, In active use
``T``,Add land transport sector,,In active use
``H``,Add heating sector,,In active use
Expand Down
2 changes: 1 addition & 1 deletion doc/configuration.rst
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ Switches for some rules and optional features.
:file: configtables/co2_budget.csv

.. note::
this parameter is over-ridden if ``CO2Lx`` or ``cb`` is set in
this parameter is over-ridden if ``Co2Lx`` or ``cb`` is set in
sector_opts.

.. _electricity_cf:
Expand Down
2 changes: 1 addition & 1 deletion scripts/time_aggregation.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
opts="",
clusters="37",
ll="v1.0",
sector_opts="CO2L0-24h-T-H-B-I-A-dist1",
sector_opts="Co2L0-24h-T-H-B-I-A-dist1",
planning_horizons="2030",
)

Expand Down

0 comments on commit a8cd118

Please sign in to comment.