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

resolve cherry merge conflict 2

Browse Source
This commit is contained in:
Fabian Neumann 2022-03-29 09:17:28 +02:00
parent 998761ec88
commit 9812e64e82
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
envs/environment.yaml
View File

@ -37,6 +37,7 @@ dependencies:
- matplotlib - matplotlib
- proj - proj
- fiona <= 1.18.20 # Till issue https://github.com/Toblerity/Fiona/issues/1085 is not solved - fiona <= 1.18.20 # Till issue https://github.com/Toblerity/Fiona/issues/1085 is not solved
- country_converter
# Keep in conda environment when calling ipython # Keep in conda environment when calling ipython
- ipython - ipython
@ -50,7 +51,6 @@ dependencies:
- geopy - geopy
- tqdm - tqdm
- pytz - pytz
- country_converter
- tabula-py - tabula-py
- pip: - pip:

1
scripts/build_hydro_profile.py
View File

@ -79,6 +79,7 @@ def get_eia_annual_hydro_generation(fn, countries):
df.loc["Germany"] = df.filter(like='Germany', axis=0).sum() df.loc["Germany"] = df.filter(like='Germany', axis=0).sum()
df.loc["Serbia"] += df.loc["Kosovo"] df.loc["Serbia"] += df.loc["Kosovo"]
df = df.loc[~df.index.str.contains('Former')] df = df.loc[~df.index.str.contains('Former')]
df.drop(["Europe", "Germany, West", "Germany, East"], inplace=True)
df.index = cc.convert(df.index, to='iso2') df.index = cc.convert(df.index, to='iso2')
df.index.name = 'countries' df.index.name = 'countries'