forked from open-energy-transition/pypsa-eur
-
Notifications
You must be signed in to change notification settings - Fork 19
Fix windows compatibility and other small changes #357
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 7 commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
779a4d2
fix: test internet connection with google.org instead of zenodo
coroa 0f0f1cd
fix: configure line endings explicitly
coroa cb532d2
fix: renormalize line endings
coroa 999128c
fix: logfile
coroa 71e380e
fix: use storage provider in retrieve_tyndp_bundle
coroa de8ca36
fix: remove retrieve_tyndp_bundle script file
coroa e87790f
fix: has_internet_access should not retry and just use a reliable server
coroa 611cb87
doc: add release note
tgilon 78cfd5c
Merge branch 'master' into fix/windows-compatibility
tgilon 25b4f31
Merge branch 'master' into fix/windows-compatibility
tgilon File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,33 +1,33 @@ | ||
| ,,2030,2030,2040,2040,2050,2050 | ||
| ,,min,max,min,max,min,max | ||
| country,carrier,,,,,, | ||
| DE,onwind,0.1,,0.1,,0.1, | ||
| DE,offwind-ac,0.1,,0.1,,0.1, | ||
| DE,offwind-dc,0.1,,0.1,,0.1, | ||
| DE,solar,0.2,,0.2,,0.2, | ||
| LU,onwind,,,,,, | ||
| LU,solar,,,,,, | ||
| NL,onwind,,,,,, | ||
| NL,offwind-ac,,,,,, | ||
| NL,offwind-dc,,,,,, | ||
| NL,solar,,,,,, | ||
| GB,onwind,,,,,, | ||
| GB,offwind-ac,,,,,, | ||
| GB,offwind-dc,,,,,, | ||
| GB,solar,,,,,, | ||
| IE,onwind,,,,,, | ||
| IE,offwind-ac,,,,,, | ||
| IE,offwind-dc,,,,,, | ||
| IE,solar,,,,,, | ||
| FR,onwind,,,,,, | ||
| FR,offwind-ac,,,,,, | ||
| FR,offwind-dc,,,,,, | ||
| FR,solar,,,,,, | ||
| DK,onwind,,,,,, | ||
| DK,offwind-ac,,,,,, | ||
| DK,offwind-dc,,,,,, | ||
| DK,solar,,,,,, | ||
| BE,onwind,,,,,, | ||
| BE,offwind-ac,,,,,, | ||
| BE,offwind-dc,,,,,, | ||
| BE,solar,,,,,, | ||
| ,,2030,2030,2040,2040,2050,2050 | ||
| ,,min,max,min,max,min,max | ||
| country,carrier,,,,,, | ||
| DE,onwind,0.1,,0.1,,0.1, | ||
| DE,offwind-ac,0.1,,0.1,,0.1, | ||
| DE,offwind-dc,0.1,,0.1,,0.1, | ||
| DE,solar,0.2,,0.2,,0.2, | ||
| LU,onwind,,,,,, | ||
| LU,solar,,,,,, | ||
| NL,onwind,,,,,, | ||
| NL,offwind-ac,,,,,, | ||
| NL,offwind-dc,,,,,, | ||
| NL,solar,,,,,, | ||
| GB,onwind,,,,,, | ||
| GB,offwind-ac,,,,,, | ||
| GB,offwind-dc,,,,,, | ||
| GB,solar,,,,,, | ||
| IE,onwind,,,,,, | ||
| IE,offwind-ac,,,,,, | ||
| IE,offwind-dc,,,,,, | ||
| IE,solar,,,,,, | ||
| FR,onwind,,,,,, | ||
| FR,offwind-ac,,,,,, | ||
| FR,offwind-dc,,,,,, | ||
| FR,solar,,,,,, | ||
| DK,onwind,,,,,, | ||
| DK,offwind-ac,,,,,, | ||
| DK,offwind-dc,,,,,, | ||
| DK,solar,,,,,, | ||
| BE,onwind,,,,,, | ||
| BE,offwind-ac,,,,,, | ||
| BE,offwind-dc,,,,,, | ||
| BE,solar,,,,,, |
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,9 @@ | ||
| ,Unit,Values,Description | ||
| 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>`_ . | ||
| 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>`_ | ||
| classes ,,, | ||
| -- solid biomass,--,Array of biomass comodity,The comodity that are included as solid biomass | ||
| -- not included,--,Array of biomass comodity,The comodity that are not included as a biomass potential | ||
| -- biogas,--,Array of biomass comodity,The comodity that are included as biogas | ||
| share_unsustainable_use_retained,--,Dictionary with planning horizons as keys., Share of unsustainable biomass use retained using primary production of Eurostat data as reference | ||
| share_sustainable_potential_available,--,Dictionary with planning horizons as keys., Share determines phase-in of ENSPRESO biomass potentials | ||
| ,Unit,Values,Description | ||
| 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>`_ . | ||
| 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>`_ | ||
| classes ,,, | ||
| -- solid biomass,--,Array of biomass comodity,The comodity that are included as solid biomass | ||
| -- not included,--,Array of biomass comodity,The comodity that are not included as a biomass potential | ||
| -- biogas,--,Array of biomass comodity,The comodity that are included as biogas | ||
| share_unsustainable_use_retained,--,Dictionary with planning horizons as keys., Share of unsustainable biomass use retained using primary production of Eurostat data as reference | ||
| share_sustainable_potential_available,--,Dictionary with planning horizons as keys., Share determines phase-in of ENSPRESO biomass potentials |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,28 +1,28 @@ | ||
| ,Unit,Values,Description | ||
| 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``." | ||
| administrative,,, | ||
| -- 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." | ||
| -- 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`." | ||
| 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`." | ||
| copperplate_regions,,,"Optionally specify the regions to copperplate as a list of regions (using the region indexes defined by the clustering mode)." | ||
| build_bidding_zones,,, | ||
| -- 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" | ||
| -- 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." | ||
| simplify_network,,, | ||
| -- to_substations,bool,"{'true','false'}","Aggregates all nodes without power injection (positive or negative, i.e. demand or generation) to electrically closest ones" | ||
| -- 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." | ||
| -- remove_stubs,bool,"{'true','false'}",Controls whether radial parts of the network should be recursively aggregated. Defaults to true. | ||
| -- remove_stubs_across_borders,bool,"{'true','false'}",Controls whether radial parts of the network should be recursively aggregated across borders. Defaults to true. | ||
| cluster_network,,, | ||
| -- algorithm,str,"One of {'kmeans', 'hac'}", | ||
| -- hac_features,list,"List of meteorological variables contained in the weather data cutout that should be considered for hierarchical clustering.", | ||
| 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." | ||
| 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)." | ||
| aggregation_strategies,,, | ||
| -- generators,,, | ||
| -- -- {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." | ||
| -- buses,,, | ||
| -- -- {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." | ||
| temporal,,,Options for temporal resolution | ||
| -- 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." | ||
| -- resolution_sector,--,"{false,``nH``; i.e. ``2H``-``6H``}","Resample the time-resolution by averaging over every ``n`` snapshots in :mod:`prepare_sector_network`." | ||
| ,Unit,Values,Description | ||
| 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``." | ||
| administrative,,, | ||
| -- 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." | ||
| -- 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`." | ||
| 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`." | ||
| copperplate_regions,,,"Optionally specify the regions to copperplate as a list of regions (using the region indexes defined by the clustering mode)." | ||
| build_bidding_zones,,, | ||
| -- 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" | ||
| -- 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." | ||
| simplify_network,,, | ||
| -- to_substations,bool,"{'true','false'}","Aggregates all nodes without power injection (positive or negative, i.e. demand or generation) to electrically closest ones" | ||
| -- 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." | ||
| -- remove_stubs,bool,"{'true','false'}",Controls whether radial parts of the network should be recursively aggregated. Defaults to true. | ||
| -- remove_stubs_across_borders,bool,"{'true','false'}",Controls whether radial parts of the network should be recursively aggregated across borders. Defaults to true. | ||
| cluster_network,,, | ||
| -- algorithm,str,"One of {'kmeans', 'hac'}", | ||
| -- hac_features,list,"List of meteorological variables contained in the weather data cutout that should be considered for hierarchical clustering.", | ||
| 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." | ||
| 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)." | ||
| aggregation_strategies,,, | ||
| -- generators,,, | ||
| -- -- {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." | ||
| -- buses,,, | ||
| -- -- {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." | ||
| temporal,,,Options for temporal resolution | ||
| -- 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." | ||
| -- resolution_sector,--,"{false,``nH``; i.e. ``2H``-``6H``}","Resample the time-resolution by averaging over every ``n`` snapshots in :mod:`prepare_sector_network`." |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| ,Unit,Values,Description | ||
| 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“." | ||
| 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""." | ||
| {name},--,string,For any carrier/technology overwrite attributes as listed below. | ||
| -- {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)." | ||
| ,Unit,Values,Description | ||
| 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“." | ||
| 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""." | ||
| {name},--,string,For any carrier/technology overwrite attributes as listed below. | ||
| -- {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)." |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.