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

Fix small edge cases when looking at only a subset of the european countries

Browse Source
This commit is contained in:
Jonas Hörsch 2018-08-08 16:28:32 +02:00
parent b2d23a3355
commit 4526fbb4ae
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
scripts/base_network.py
View File

@ -107,7 +107,8 @@ def _apply_parameter_corrections(n):
r = pd.Series(repls["index"]) r = pd.Series(repls["index"])
else: else:
raise NotImplementedError() raise NotImplementedError()
df.loc[r.index, attr] = r.astype(df[attr].dtype) inds = r.index.intersection(df.index)
df.loc[inds, attr] = r[inds].astype(df[attr].dtype)
def _set_electrical_parameters_lines(lines): def _set_electrical_parameters_lines(lines):
v_noms = snakemake.config['electricity']['voltages'] v_noms = snakemake.config['electricity']['voltages']

7
scripts/build_shapes.py
View File

@ -28,7 +28,9 @@ def _simplify_polys(polys, minarea=0.1, tolerance=0.01):
return polys.simplify(tolerance=tolerance) return polys.simplify(tolerance=tolerance)
def countries(): def countries():
cntries = snakemake.config['countries'] + ['KV'] cntries = snakemake.config['countries']
if 'RS' in cntries: cntries.append('KV')
df = gpd.read_file(snakemake.input.naturalearth) df = gpd.read_file(snakemake.input.naturalearth)
# Names are a hassle in naturalearth, try several fields # Names are a hassle in naturalearth, try several fields
@ -37,7 +39,7 @@ def countries():
df = df.loc[df.name.isin(cntries) & (df['scalerank'] == 0)] df = df.loc[df.name.isin(cntries) & (df['scalerank'] == 0)]
s = df.set_index('name')['geometry'].map(_simplify_polys) s = df.set_index('name')['geometry'].map(_simplify_polys)
s['RS'] = s['RS'].union(s.pop('KV')) if 'RS' in cntries: s['RS'] = s['RS'].union(s.pop('KV'))
return s return s
@ -109,6 +111,7 @@ def nuts3(country_shapes):
columns=['NUTS_ID', 'country', 'pop'] columns=['NUTS_ID', 'country', 'pop']
).set_index('NUTS_ID') ).set_index('NUTS_ID')
manual['geometry'] = manual['country'].map(country_shapes) manual['geometry'] = manual['country'].map(country_shapes)
manual = manual.dropna()
df = df.append(manual) df = df.append(manual)