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

add_electricity: Adapt to reverse compatible argument change in timeseries_opsd

Browse Source
This commit is contained in:
Jonas Hörsch 2018-09-03 23:05:33 +02:00
parent 3afacfeacc
commit ba3a008018
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
environment.yaml
View File

@ -37,7 +37,7 @@ dependencies:
# The FRESNA/KIT stuff is not packaged for conda yet # The FRESNA/KIT stuff is not packaged for conda yet
- pip: - pip:
- pypsa>=0.13 - pypsa>=0.13
- vresutils>=0.2.4 - vresutils>=0.2.5
- git+https://github.com/FRESNA/atlite.git - git+https://github.com/FRESNA/atlite.git
#- git+https://github.com/FRESNA/powerplantmatching.git #- git+https://github.com/FRESNA/powerplantmatching.git
#- https://software.ecmwf.int/wiki/download/attachments/56664858/ecmwf-api-client-python.tgz #- https://software.ecmwf.int/wiki/download/attachments/56664858/ecmwf-api-client-python.tgz

3
scripts/add_electricity.py
View File

@ -108,7 +108,8 @@ def load_powerplants(n, ppl_fn=None):
def attach_load(n): def attach_load(n):
substation_lv_i = n.buses.index[n.buses['substation_lv']] substation_lv_i = n.buses.index[n.buses['substation_lv']]
regions = gpd.read_file(snakemake.input.regions).set_index('name').reindex(substation_lv_i) regions = gpd.read_file(snakemake.input.regions).set_index('name').reindex(substation_lv_i)
opsd_load = timeseries_opsd(snakemake.input.opsd_load) opsd_load = timeseries_opsd(slice(*n.snapshots[[0,-1]].year.astype(str)),
snakemake.input.opsd_load)
nuts3 = gpd.read_file(snakemake.input.nuts3_shapes).set_index('index') nuts3 = gpd.read_file(snakemake.input.nuts3_shapes).set_index('index')