From b6fa0043bf9ee824a240f780a8b5fa7c0686872c Mon Sep 17 00:00:00 2001 From: Koen van Greevenbroek Date: Tue, 21 May 2024 15:47:11 +0000 Subject: [PATCH] Fix disabling transmission limit for volume limit type --- scripts/add_brownfield.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/scripts/add_brownfield.py b/scripts/add_brownfield.py index 0f2d6aa3..672f9e62 100644 --- a/scripts/add_brownfield.py +++ b/scripts/add_brownfield.py @@ -132,22 +132,20 @@ def disable_grid_expansion_if_limit_hit(n): minimum and extendable is turned off; the corresponding global constraint is then dropped. """ - cols = {"cost": "capital_cost", "volume": "length"} - for limit_type in ["cost", "volume"]: - glcs = n.global_constraints.query( - f"type == 'transmission_expansion_{limit_type}_limit'" - ) + types = {"expansion_cost": "capital_cost", "volume_expansion": "length"} + for limit_type in types: + glcs = n.global_constraints.query(f"type == 'transmission_{limit_type}_limit'") for name, glc in glcs.iterrows(): total_expansion = ( ( n.lines.query("s_nom_extendable") - .eval(f"s_nom_min * {cols[limit_type]}") + .eval(f"s_nom_min * {types[limit_type]}") .sum() ) + ( n.links.query("carrier == 'DC' and p_nom_extendable") - .eval(f"p_nom_min * {cols[limit_type]}") + .eval(f"p_nom_min * {types[limit_type]}") .sum() ) ).sum()