Skip to content

Commit bcf3ce3

Browse files
committed
fix: renormalize line endings
1 parent b0f4aa7 commit bcf3ce3

16 files changed

Lines changed: 635 additions & 635 deletions

data/agg_p_nom_minmax.csv

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,33 @@
1-
,,2030,2030,2040,2040,2050,2050
2-
,,min,max,min,max,min,max
3-
country,carrier,,,,,,
4-
DE,onwind,0.1,,0.1,,0.1,
5-
DE,offwind-ac,0.1,,0.1,,0.1,
6-
DE,offwind-dc,0.1,,0.1,,0.1,
7-
DE,solar,0.2,,0.2,,0.2,
8-
LU,onwind,,,,,,
9-
LU,solar,,,,,,
10-
NL,onwind,,,,,,
11-
NL,offwind-ac,,,,,,
12-
NL,offwind-dc,,,,,,
13-
NL,solar,,,,,,
14-
GB,onwind,,,,,,
15-
GB,offwind-ac,,,,,,
16-
GB,offwind-dc,,,,,,
17-
GB,solar,,,,,,
18-
IE,onwind,,,,,,
19-
IE,offwind-ac,,,,,,
20-
IE,offwind-dc,,,,,,
21-
IE,solar,,,,,,
22-
FR,onwind,,,,,,
23-
FR,offwind-ac,,,,,,
24-
FR,offwind-dc,,,,,,
25-
FR,solar,,,,,,
26-
DK,onwind,,,,,,
27-
DK,offwind-ac,,,,,,
28-
DK,offwind-dc,,,,,,
29-
DK,solar,,,,,,
30-
BE,onwind,,,,,,
31-
BE,offwind-ac,,,,,,
32-
BE,offwind-dc,,,,,,
33-
BE,solar,,,,,,
1+
,,2030,2030,2040,2040,2050,2050
2+
,,min,max,min,max,min,max
3+
country,carrier,,,,,,
4+
DE,onwind,0.1,,0.1,,0.1,
5+
DE,offwind-ac,0.1,,0.1,,0.1,
6+
DE,offwind-dc,0.1,,0.1,,0.1,
7+
DE,solar,0.2,,0.2,,0.2,
8+
LU,onwind,,,,,,
9+
LU,solar,,,,,,
10+
NL,onwind,,,,,,
11+
NL,offwind-ac,,,,,,
12+
NL,offwind-dc,,,,,,
13+
NL,solar,,,,,,
14+
GB,onwind,,,,,,
15+
GB,offwind-ac,,,,,,
16+
GB,offwind-dc,,,,,,
17+
GB,solar,,,,,,
18+
IE,onwind,,,,,,
19+
IE,offwind-ac,,,,,,
20+
IE,offwind-dc,,,,,,
21+
IE,solar,,,,,,
22+
FR,onwind,,,,,,
23+
FR,offwind-ac,,,,,,
24+
FR,offwind-dc,,,,,,
25+
FR,solar,,,,,,
26+
DK,onwind,,,,,,
27+
DK,offwind-ac,,,,,,
28+
DK,offwind-dc,,,,,,
29+
DK,solar,,,,,,
30+
BE,onwind,,,,,,
31+
BE,offwind-ac,,,,,,
32+
BE,offwind-dc,,,,,,
33+
BE,solar,,,,,,

data/eia_hydro_annual_capacity.csv

Lines changed: 52 additions & 52 deletions
Large diffs are not rendered by default.

data/eia_hydro_annual_generation.csv

Lines changed: 52 additions & 52 deletions
Large diffs are not rendered by default.

doc/configtables/biomass.csv

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
,Unit,Values,Description
2-
year ,--,"{2010, 2020, 2030, 2040, 2050}",Year for which to retrieve biomass potential according to the assumptions of the `JRC ENSPRESO <https://data.jrc.ec.europa.eu/dataset/74ed5a04-7d74-4807-9eab-b94774309d9f>`_ .
3-
scenario ,--,"{""ENS_Low"", ""ENS_Med"", ""ENS_High""}",Scenario for which to retrieve biomass potential. The scenario definition can be seen in `ENSPRESO_BIOMASS <https://cidportal.jrc.ec.europa.eu/ftp/jrc-opendata/ENSPRESO/ENSPRESO_BIOMASS.xlsx>`_
4-
classes ,,,
5-
-- solid biomass,--,Array of biomass comodity,The comodity that are included as solid biomass
6-
-- not included,--,Array of biomass comodity,The comodity that are not included as a biomass potential
7-
-- biogas,--,Array of biomass comodity,The comodity that are included as biogas
8-
share_unsustainable_use_retained,--,Dictionary with planning horizons as keys., Share of unsustainable biomass use retained using primary production of Eurostat data as reference
9-
share_sustainable_potential_available,--,Dictionary with planning horizons as keys., Share determines phase-in of ENSPRESO biomass potentials
1+
,Unit,Values,Description
2+
year ,--,"{2010, 2020, 2030, 2040, 2050}",Year for which to retrieve biomass potential according to the assumptions of the `JRC ENSPRESO <https://data.jrc.ec.europa.eu/dataset/74ed5a04-7d74-4807-9eab-b94774309d9f>`_ .
3+
scenario ,--,"{""ENS_Low"", ""ENS_Med"", ""ENS_High""}",Scenario for which to retrieve biomass potential. The scenario definition can be seen in `ENSPRESO_BIOMASS <https://cidportal.jrc.ec.europa.eu/ftp/jrc-opendata/ENSPRESO/ENSPRESO_BIOMASS.xlsx>`_
4+
classes ,,,
5+
-- solid biomass,--,Array of biomass comodity,The comodity that are included as solid biomass
6+
-- not included,--,Array of biomass comodity,The comodity that are not included as a biomass potential
7+
-- biogas,--,Array of biomass comodity,The comodity that are included as biogas
8+
share_unsustainable_use_retained,--,Dictionary with planning horizons as keys., Share of unsustainable biomass use retained using primary production of Eurostat data as reference
9+
share_sustainable_potential_available,--,Dictionary with planning horizons as keys., Share determines phase-in of ENSPRESO biomass potentials

doc/configtables/clustering.csv

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
1-
,Unit,Values,Description
2-
mode,str,"One of {'busmap', 'custom_busmap', 'administrative', 'custom_busshapes'}","'busmap': Default. 'custom_busmap': Enable the use of custom busmaps in rule mod:`cluster_network`. If activated the rule looks for provided busmaps at ``data/busmaps/base_s_{clusters}_{base_network}.csv`` which should have the same format as ``resources/busmap_base_s_{clusters}.csv``, i.e. the index should contain the buses of ``networks/base_s.nc``. {base_network} is the name of the selected base_network in electricity, e.g. ``gridkit``, ``osm-prebuilt``, or ``osm-raw``. 'administrative': Clusters and indexes the network based on the administrative regions of the countries based on ``nuts3_shapes.geojson`` (level: 1, 2, 3, bz). To activate this, additionally set the ``clusters`` wildcard in ``scenario`` to 'adm'. 'custom_busshapes': Enable the use of custom shapes in rule mod:`cluster_network`. If activated the rule looks for provided busshapes at ``data/busshapes/base_s_{clusters}_{base_network}.geojson``."
3-
administrative,,,
4-
-- level,int,"{0, 1, 2, 3}","Level of administrative regions to cluster the network. 0: Country level, 1: NUTS1 level, 2: NUTS2 level, 3: NUTS3 level. Only applies when mode is set to `administrative`. Note that non-NUTS countries 'BA', 'MD', 'UA', and 'XK' can only be clustered to level 0 and 1."
5-
-- countries (optional),dict,"Subset of country codes in 'busmap'","Optionally include dictionary of individual country codes and their individual NUTS levels. Overwrites country-specific `level`. For example: `{'DE': 1, 'FR': 2}`. Only applies when mode is set to `administrative`."
6-
focus_weights,,,"Optionally specify the focus weights for the clustering of countries. For instance: `DE: 0.8` will distribute 80% of all nodes to Germany and 20% to the rest of the countries. Only applies when mode is set to `busmap`."
7-
copperplate_regions,,,"Optionally specify the regions to copperplate as a list of regions (using the region indexes defined by the clustering mode)."
8-
build_bidding_zones,,,
9-
-- remove_islands,bool,"{'true','false'}","Exclude from the shape file the Balearic Islands, Bornholm, the Canary Islands, the Orkney Islands, the Shetland Islands, the Azores Islands and Madeira"
10-
-- aggregate_to_tyndp,bool,"{'true','false'}","Adjust the shape file to the TYNDP topology. Aggregate the Southern Norwegian bidding zones and extract Crete as a separate zone from the Greek shape."
11-
simplify_network,,,
12-
-- to_substations,bool,"{'true','false'}","Aggregates all nodes without power injection (positive or negative, i.e. demand or generation) to electrically closest ones"
13-
-- exclude_carriers,list,"List of Str like [ 'solar', 'onwind'] or empy list []","List of carriers which will not be aggregated. If empty, all carriers will be aggregated."
14-
-- remove_stubs,bool,"{'true','false'}",Controls whether radial parts of the network should be recursively aggregated. Defaults to true.
15-
-- remove_stubs_across_borders,bool,"{'true','false'}",Controls whether radial parts of the network should be recursively aggregated across borders. Defaults to true.
16-
cluster_network,,,
17-
-- algorithm,str,"One of {'kmeans', 'hac'}",
18-
-- hac_features,list,"List of meteorological variables contained in the weather data cutout that should be considered for hierarchical clustering.",
19-
exclude_carriers,list,"List of Str like [ 'solar', 'onwind'] or empy list []","List of carriers which will not be aggregated. If empty, all carriers will be aggregated."
20-
consider_efficiency_classes,bool,"{'true','false'}","Aggregated each carriers into the top 10-quantile (high), the bottom 90-quantile (low), and everything in between (medium)."
21-
aggregation_strategies,,,
22-
-- generators,,,
23-
-- -- {key},str,"{key} can be any of the component of the generator (str). It's value can be any that can be converted to pandas.Series using getattr(). For example one of {min, max, sum}.","Aggregates the component according to the given strategy. For example, if sum, then all values within each cluster are summed to represent the new generator."
24-
-- buses,,,
25-
-- -- {key},str,"{key} can be any of the component of the bus (str). It's value can be any that can be converted to pandas.Series using getattr(). For example one of {min, max, sum}.","Aggregates the component according to the given strategy. For example, if sum, then all values within each cluster are summed to represent the new bus."
26-
temporal,,,Options for temporal resolution
27-
-- resolution_elec,--,"{false,``nH``; i.e. ``2H``-``6H``}","Resample the time-resolution by averaging over every ``n`` snapshots in :mod:`prepare_network`. **Warning:** This option should currently only be used with electricity-only networks, not for sector-coupled networks."
28-
-- resolution_sector,--,"{false,``nH``; i.e. ``2H``-``6H``}","Resample the time-resolution by averaging over every ``n`` snapshots in :mod:`prepare_sector_network`."
1+
,Unit,Values,Description
2+
mode,str,"One of {'busmap', 'custom_busmap', 'administrative', 'custom_busshapes'}","'busmap': Default. 'custom_busmap': Enable the use of custom busmaps in rule mod:`cluster_network`. If activated the rule looks for provided busmaps at ``data/busmaps/base_s_{clusters}_{base_network}.csv`` which should have the same format as ``resources/busmap_base_s_{clusters}.csv``, i.e. the index should contain the buses of ``networks/base_s.nc``. {base_network} is the name of the selected base_network in electricity, e.g. ``gridkit``, ``osm-prebuilt``, or ``osm-raw``. 'administrative': Clusters and indexes the network based on the administrative regions of the countries based on ``nuts3_shapes.geojson`` (level: 1, 2, 3, bz). To activate this, additionally set the ``clusters`` wildcard in ``scenario`` to 'adm'. 'custom_busshapes': Enable the use of custom shapes in rule mod:`cluster_network`. If activated the rule looks for provided busshapes at ``data/busshapes/base_s_{clusters}_{base_network}.geojson``."
3+
administrative,,,
4+
-- level,int,"{0, 1, 2, 3}","Level of administrative regions to cluster the network. 0: Country level, 1: NUTS1 level, 2: NUTS2 level, 3: NUTS3 level. Only applies when mode is set to `administrative`. Note that non-NUTS countries 'BA', 'MD', 'UA', and 'XK' can only be clustered to level 0 and 1."
5+
-- countries (optional),dict,"Subset of country codes in 'busmap'","Optionally include dictionary of individual country codes and their individual NUTS levels. Overwrites country-specific `level`. For example: `{'DE': 1, 'FR': 2}`. Only applies when mode is set to `administrative`."
6+
focus_weights,,,"Optionally specify the focus weights for the clustering of countries. For instance: `DE: 0.8` will distribute 80% of all nodes to Germany and 20% to the rest of the countries. Only applies when mode is set to `busmap`."
7+
copperplate_regions,,,"Optionally specify the regions to copperplate as a list of regions (using the region indexes defined by the clustering mode)."
8+
build_bidding_zones,,,
9+
-- remove_islands,bool,"{'true','false'}","Exclude from the shape file the Balearic Islands, Bornholm, the Canary Islands, the Orkney Islands, the Shetland Islands, the Azores Islands and Madeira"
10+
-- aggregate_to_tyndp,bool,"{'true','false'}","Adjust the shape file to the TYNDP topology. Aggregate the Southern Norwegian bidding zones and extract Crete as a separate zone from the Greek shape."
11+
simplify_network,,,
12+
-- to_substations,bool,"{'true','false'}","Aggregates all nodes without power injection (positive or negative, i.e. demand or generation) to electrically closest ones"
13+
-- exclude_carriers,list,"List of Str like [ 'solar', 'onwind'] or empy list []","List of carriers which will not be aggregated. If empty, all carriers will be aggregated."
14+
-- remove_stubs,bool,"{'true','false'}",Controls whether radial parts of the network should be recursively aggregated. Defaults to true.
15+
-- remove_stubs_across_borders,bool,"{'true','false'}",Controls whether radial parts of the network should be recursively aggregated across borders. Defaults to true.
16+
cluster_network,,,
17+
-- algorithm,str,"One of {'kmeans', 'hac'}",
18+
-- hac_features,list,"List of meteorological variables contained in the weather data cutout that should be considered for hierarchical clustering.",
19+
exclude_carriers,list,"List of Str like [ 'solar', 'onwind'] or empy list []","List of carriers which will not be aggregated. If empty, all carriers will be aggregated."
20+
consider_efficiency_classes,bool,"{'true','false'}","Aggregated each carriers into the top 10-quantile (high), the bottom 90-quantile (low), and everything in between (medium)."
21+
aggregation_strategies,,,
22+
-- generators,,,
23+
-- -- {key},str,"{key} can be any of the component of the generator (str). It's value can be any that can be converted to pandas.Series using getattr(). For example one of {min, max, sum}.","Aggregates the component according to the given strategy. For example, if sum, then all values within each cluster are summed to represent the new generator."
24+
-- buses,,,
25+
-- -- {key},str,"{key} can be any of the component of the bus (str). It's value can be any that can be converted to pandas.Series using getattr(). For example one of {min, max, sum}.","Aggregates the component according to the given strategy. For example, if sum, then all values within each cluster are summed to represent the new bus."
26+
temporal,,,Options for temporal resolution
27+
-- resolution_elec,--,"{false,``nH``; i.e. ``2H``-``6H``}","Resample the time-resolution by averaging over every ``n`` snapshots in :mod:`prepare_network`. **Warning:** This option should currently only be used with electricity-only networks, not for sector-coupled networks."
28+
-- resolution_sector,--,"{false,``nH``; i.e. ``2H``-``6H``}","Resample the time-resolution by averaging over every ``n`` snapshots in :mod:`prepare_sector_network`."

doc/configtables/conventional.csv

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
,Unit,Values,Description
2-
unit_commitment ,bool,"{true, false}","Allow the overwrite of ramp_limit_up, ramp_limit_start_up, ramp_limit_shut_down, p_min_pu, min_up_time, min_down_time, and start_up_cost of conventional generators. Refer to the CSV file „unit_commitment.csv“."
3-
dynamic_fuel_price ,bool,"{true, false}","Consider the monthly fluctuating fuel prices for each conventional generator. Refer to the CSV file ""data/validation/monthly_fuel_price.csv""."
4-
{name},--,string,For any carrier/technology overwrite attributes as listed below.
5-
-- {attribute},--,string or float,"For any attribute, can specify a float or reference to a file path to a CSV file giving floats for each country (2-letter code)."
1+
,Unit,Values,Description
2+
unit_commitment ,bool,"{true, false}","Allow the overwrite of ramp_limit_up, ramp_limit_start_up, ramp_limit_shut_down, p_min_pu, min_up_time, min_down_time, and start_up_cost of conventional generators. Refer to the CSV file „unit_commitment.csv“."
3+
dynamic_fuel_price ,bool,"{true, false}","Consider the monthly fluctuating fuel prices for each conventional generator. Refer to the CSV file ""data/validation/monthly_fuel_price.csv""."
4+
{name},--,string,For any carrier/technology overwrite attributes as listed below.
5+
-- {attribute},--,string or float,"For any attribute, can specify a float or reference to a file path to a CSV file giving floats for each country (2-letter code)."

doc/configtables/costs.csv

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
,Unit,Values,Description
2-
year,--,YYYY; e.g. '2030',Year for which to retrieve cost assumptions of ``resources/costs.csv``.
3-
version,--,vX.X.X or <user>/<repo>/vX.X.X; e.g. 'v0.5.0',Version of ``technology-data`` repository to use. If this string is of the form <user>/<repo>/<version> then costs are instead retrieved from ``github.com/<user>/<repo>`` at the <version> tag.
4-
social_discountrate,p.u.,float,Social discount rate to compare costs in different investment periods. 0.02 corresponds to a social discount rate of 2%.
5-
fill_values,--,float,Default values if not specified for a technology in ``resources/costs.csv``.
6-
custom_cost_fn,--,str or None,Path to the custom costs file. None if it should not be used. Default ``data/custom_costs.csv`` contains minor adjustments for stabilising the optimisation results.
7-
overwrites,--,Keys should be in the 'parameter' column of ``resources/costs.csv``. Values are dictionaries with keys from the 'technology' column of ``resources/costs.csv`` and float values.,"For the given parameters and technologies, assumptions about their parameter are overwritten the corresponding value of the technology."
8-
capital_cost,EUR/MW,Keys should be in the 'technology' column of ``resources/costs.csv``. Values can be any float.,"For the given technologies, assumptions about their capital investment costs are set to the corresponding value. Optional; overwrites cost assumptions from ``resources/costs.csv``."
9-
marginal_cost,EUR/MWh,Keys should be in the 'technology' column of ``resources/costs.csv``. Values can be any float.,"For the given technologies, assumptions about their marginal operating costs are set to the corresponding value. Optional; overwrites cost assumptions from ``resources/costs.csv``."
10-
emission_prices,,,Specify exogenous prices for emission types listed in ``network.carriers`` to marginal costs.
11-
-- enable,bool,true or false,Add cost for a carbon-dioxide price configured in ``costs: emission_prices: co2`` to ``marginal_cost`` of generators. Config setting can also be enabled with the keyword ``Ep`` in the ``{opts}`` wildcard for electricity-only runs.
12-
-- co2,EUR/t,float or dictionary with planning horizons as keys.,"Exogenous price of carbon-dioxide. In electricity-only runs it is added to the marginal costs of fossil-fuelled generators according to their carbon intensity, while for sector networks it applies to emissions ending up in CO2 atmosphere."
13-
-- co2_monthly_price,bool,true or false,Add monthly cost for a carbon-dioxide price based on historical values built by the rule ``build_monthly_prices``
1+
,Unit,Values,Description
2+
year,--,YYYY; e.g. '2030',Year for which to retrieve cost assumptions of ``resources/costs.csv``.
3+
version,--,vX.X.X or <user>/<repo>/vX.X.X; e.g. 'v0.5.0',Version of ``technology-data`` repository to use. If this string is of the form <user>/<repo>/<version> then costs are instead retrieved from ``github.com/<user>/<repo>`` at the <version> tag.
4+
social_discountrate,p.u.,float,Social discount rate to compare costs in different investment periods. 0.02 corresponds to a social discount rate of 2%.
5+
fill_values,--,float,Default values if not specified for a technology in ``resources/costs.csv``.
6+
custom_cost_fn,--,str or None,Path to the custom costs file. None if it should not be used. Default ``data/custom_costs.csv`` contains minor adjustments for stabilising the optimisation results.
7+
overwrites,--,Keys should be in the 'parameter' column of ``resources/costs.csv``. Values are dictionaries with keys from the 'technology' column of ``resources/costs.csv`` and float values.,"For the given parameters and technologies, assumptions about their parameter are overwritten the corresponding value of the technology."
8+
capital_cost,EUR/MW,Keys should be in the 'technology' column of ``resources/costs.csv``. Values can be any float.,"For the given technologies, assumptions about their capital investment costs are set to the corresponding value. Optional; overwrites cost assumptions from ``resources/costs.csv``."
9+
marginal_cost,EUR/MWh,Keys should be in the 'technology' column of ``resources/costs.csv``. Values can be any float.,"For the given technologies, assumptions about their marginal operating costs are set to the corresponding value. Optional; overwrites cost assumptions from ``resources/costs.csv``."
10+
emission_prices,,,Specify exogenous prices for emission types listed in ``network.carriers`` to marginal costs.
11+
-- enable,bool,true or false,Add cost for a carbon-dioxide price configured in ``costs: emission_prices: co2`` to ``marginal_cost`` of generators. Config setting can also be enabled with the keyword ``Ep`` in the ``{opts}`` wildcard for electricity-only runs.
12+
-- co2,EUR/t,float or dictionary with planning horizons as keys.,"Exogenous price of carbon-dioxide. In electricity-only runs it is added to the marginal costs of fossil-fuelled generators according to their carbon intensity, while for sector networks it applies to emissions ending up in CO2 atmosphere."
13+
-- co2_monthly_price,bool,true or false,Add monthly cost for a carbon-dioxide price based on historical values built by the rule ``build_monthly_prices``

0 commit comments

Comments
 (0)