diff --git a/doc/configtables/co2_budget.csv b/doc/configtables/co2_budget.csv index 21b42f056..8f11f9c6a 100644 --- a/doc/configtables/co2_budget.csv +++ b/doc/configtables/co2_budget.csv @@ -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 diff --git a/doc/configtables/sector-opts.csv b/doc/configtables/sector-opts.csv index 5f5bb2501..afe631fab 100644 --- a/doc/configtables/sector-opts.csv +++ b/doc/configtables/sector-opts.csv @@ -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() `_ and its `caller `__)", 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() `_ and its `caller `__, 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 diff --git a/doc/configuration.rst b/doc/configuration.rst index f34e9109d..8695d4bb4 100644 --- a/doc/configuration.rst +++ b/doc/configuration.rst @@ -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: diff --git a/scripts/time_aggregation.py b/scripts/time_aggregation.py index a8ad7aaac..3792a39fa 100644 --- a/scripts/time_aggregation.py +++ b/scripts/time_aggregation.py @@ -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", )