Merge branch 'master' into rm-raster-natura

This commit is contained in:
Fabian Neumann 2022-06-24 23:12:39 +02:00 committed by GitHub
commit 4e8d510332
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -100,7 +100,7 @@ def prepare_network(n, solve_opts):
df.where(df>solve_opts['clip_p_max_pu'], other=0., inplace=True) df.where(df>solve_opts['clip_p_max_pu'], other=0., inplace=True)
if solve_opts.get('load_shedding'): if solve_opts.get('load_shedding'):
n.add("Carrier", "Load") n.add("Carrier", "load", color="#dd2e23", nice_name="Load shedding")
buses_i = n.buses.query("carrier == 'AC'").index buses_i = n.buses.query("carrier == 'AC'").index
n.madd("Generator", buses_i, " load", n.madd("Generator", buses_i, " load",
bus=buses_i, bus=buses_i,