bjoern/pypsa-eur
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

base_network: Important small fixes

Browse Source 
- Allow connecting at substations
- Fix offshore shape selection
This commit is contained in:
Jonas Hörsch 2018-10-27 03:34:40 +02:00
parent b30f4a2fff
commit f87d7d9f94
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/base_network.py
View File

@ -279,7 +279,7 @@ def _set_countries_and_substations(n):
countries = snakemake.config['countries'] countries = snakemake.config['countries']
country_shapes = gpd.read_file(snakemake.input.country_shapes).set_index('id')['geometry'] country_shapes = gpd.read_file(snakemake.input.country_shapes).set_index('id')['geometry']
offshore_shapes = gpd.read_file(snakemake.input.offshore_shapes).set_index('id')['geometry'] offshore_shapes = gpd.read_file(snakemake.input.offshore_shapes).set_index('id')['geometry']
substation_b = buses['symbol'].str.contains('substation', case=False) substation_b = buses['symbol'].str.contains('substation|converter station', case=False)
def prefer_voltage(x, which): def prefer_voltage(x, which):
index = x.index index = x.index
@ -307,7 +307,7 @@ def _set_countries_and_substations(n):
buses.loc[onshore_country_b, 'country'] = country buses.loc[onshore_country_b, 'country'] = country
if country not in offshore_shapes: continue if country not in offshore_shapes.index: continue
offshore_country_b = buses_in_shape(offshore_shapes[country]) offshore_country_b = buses_in_shape(offshore_shapes[country])
offshore_b |= offshore_country_b offshore_b |= offshore_country_b
@ -325,7 +325,7 @@ def _set_countries_and_substations(n):
c_nan_b = buses.country.isnull() c_nan_b = buses.country.isnull()
if c_nan_b.sum() > 0: if c_nan_b.sum() > 0:
c_tag = _get_country(buses.loc[c_nan_b]) c_tag = _get_country(buses.loc[c_nan_b])
c_tag.loc[c_tag.index.difference(countries)] = np.nan c_tag.loc[~c_tag.isin(countries)] = np.nan
n.buses.loc[c_nan_b, 'country'] = c_tag n.buses.loc[c_nan_b, 'country'] = c_tag
c_tag_nan_b = n.buses.country.isnull() c_tag_nan_b = n.buses.country.isnull()