add_electricity: Assume load scaling factor is 1.0 if omitted

This commit is contained in:
Jonas Hoersch 2019-02-22 22:06:03 +01:00
parent 0cafe40bdd
commit 66fe76288c

View File

@ -120,8 +120,9 @@ 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(slice(*n.snapshots[[0,-1]].year.astype(str)),
snakemake.input.opsd_load)*snakemake.config['load']['scaling_factor']
opsd_load = (timeseries_opsd(slice(*n.snapshots[[0,-1]].year.astype(str)),
snakemake.input.opsd_load) *
snakemake.config.get('load', {}).get('scaling_factor', 1.0))
# Convert to naive UTC (has to be explicit since pandas 0.24)
opsd_load.index = opsd_load.index.tz_localize(None)