diff --git a/environment.yaml b/environment.yaml index 0dd1aabe..ff13fd47 100644 --- a/environment.yaml +++ b/environment.yaml @@ -37,7 +37,7 @@ dependencies: # The FRESNA/KIT stuff is not packaged for conda yet - pip: - pypsa>=0.13 - - vresutils>=0.2.4 + - vresutils>=0.2.5 - git+https://github.com/FRESNA/atlite.git #- git+https://github.com/FRESNA/powerplantmatching.git #- https://software.ecmwf.int/wiki/download/attachments/56664858/ecmwf-api-client-python.tgz diff --git a/scripts/add_electricity.py b/scripts/add_electricity.py index 2494e45e..5bb68c9b 100644 --- a/scripts/add_electricity.py +++ b/scripts/add_electricity.py @@ -108,7 +108,8 @@ def load_powerplants(n, ppl_fn=None): def attach_load(n): substation_lv_i = n.buses.index[n.buses['substation_lv']] 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')