From 99963edaaf7c6b7b6d70fe586a15eb4770d3e166 Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Fri, 12 May 2023 09:29:38 +0200 Subject: [PATCH 1/2] add option to limit maximum extension per line/link; linemaxext --- config/config.default.yaml | 2 ++ doc/configtables/lines.csv | 1 + doc/configtables/links.csv | 1 + doc/release_notes.rst | 4 ++++ scripts/prepare_network.py | 18 +++++++++++++++--- scripts/prepare_sector_network.py | 1 - 6 files changed, 23 insertions(+), 4 deletions(-) diff --git a/config/config.default.yaml b/config/config.default.yaml index 10e6a6edf..5733b9423 100644 --- a/config/config.default.yaml +++ b/config/config.default.yaml @@ -264,12 +264,14 @@ lines: 380.: "Al/St 240/40 4-bundle 380.0" s_max_pu: 0.7 s_nom_max: .inf + max_extension: .inf length_factor: 1.25 under_construction: 'zero' # 'zero': set capacity to zero, 'remove': remove, 'keep': with full capacity links: p_max_pu: 1.0 p_nom_max: .inf + max_extension: .inf include_tyndp: true under_construction: 'zero' # 'zero': set capacity to zero, 'remove': remove, 'keep': with full capacity diff --git a/doc/configtables/lines.csv b/doc/configtables/lines.csv index ddf02e542..ad5dd6903 100644 --- a/doc/configtables/lines.csv +++ b/doc/configtables/lines.csv @@ -2,5 +2,6 @@ types,--,"Values should specify a `line type in PyPSA `_. Keys should specify the corresponding voltage level (e.g. 220., 300. and 380. kV)","Specifies line types to assume for the different voltage levels of the ENTSO-E grid extraction. Should normally handle voltage levels 220, 300, and 380 kV" s_max_pu,--,"Value in [0.,1.]","Correction factor for line capacities (``s_nom``) to approximate :math:`N-1` security and reserve capacity for reactive power flows" s_nom_max,MW,"float","Global upper limit for the maximum capacity of each extendable line." +max_extension,MW,"float","Upper limit for the extended capacity of each extendable line." length_factor,--,float,"Correction factor to account for the fact that buses are *not* connected by lines through air-line distance." under_construction,--,"One of {'zero': set capacity to zero, 'remove': remove completely, 'keep': keep with full capacity}","Specifies how to handle lines which are currently under construction." diff --git a/doc/configtables/links.csv b/doc/configtables/links.csv index c9981dc73..c1ffb427c 100644 --- a/doc/configtables/links.csv +++ b/doc/configtables/links.csv @@ -1,5 +1,6 @@ ,Unit,Values,Description p_max_pu,--,"Value in [0.,1.]","Correction factor for link capacities ``p_nom``." p_nom_max,MW,"float","Global upper limit for the maximum capacity of each extendable DC link." +max_extension,MW,"float","Upper limit for the extended capacity of each extendable DC link." include_tyndp,bool,"{'true', 'false'}","Specifies whether to add HVDC link projects from the `TYNDP 2018 `_ which are at least in permitting." under_construction,--,"One of {'zero': set capacity to zero, 'remove': remove completely, 'keep': keep with full capacity}","Specifies how to handle lines which are currently under construction." diff --git a/doc/release_notes.rst b/doc/release_notes.rst index 14f2939d1..818227d86 100644 --- a/doc/release_notes.rst +++ b/doc/release_notes.rst @@ -25,6 +25,10 @@ Upcoming Release * Remove ``vresutils`` dependency. +* Added configuration option ``lines: max_extension:`` and ``links: + max_extension:``` to control the maximum capacity addition per line or link in + MW. + PyPSA-Eur 0.8.0 (18th March 2023) ================================= diff --git a/scripts/prepare_network.py b/scripts/prepare_network.py index 14a003aeb..01b72605a 100755 --- a/scripts/prepare_network.py +++ b/scripts/prepare_network.py @@ -233,7 +233,17 @@ def enforce_autarky(n, only_crossborder=False): n.mremove("Link", links_rm) -def set_line_nom_max(n, s_nom_max_set=np.inf, p_nom_max_set=np.inf): +def set_line_nom_max(n, s_nom_max_set=np.inf, p_nom_max_set=np.inf, s_nom_max_ext=np.inf, p_nom_max_ext=np.inf): + + if np.isfinite(s_nom_max_ext) and s_nom_max_ext > 0: + logger.info(f"Limiting line extensions to {s_nom_max_ext} MW") + n.lines["s_nom_max"] = n.lines["s_nom"] + s_nom_max_ext + + if np.isfinite(p_nom_max_ext) and p_nom_max_ext > 0: + logger.info(f"Limiting line extensions to {p_nom_max_ext} MW") + hvdc = n.links.index[n.links.carrier == "DC"] + n.links.loc[hvdc, "p_nom_max"] = n.links.loc[hvdc, "p_nom"] + p_nom_max_ext + n.lines.s_nom_max.clip(upper=s_nom_max_set, inplace=True) n.links.p_nom_max.clip(upper=p_nom_max_set, inplace=True) @@ -330,8 +340,10 @@ def set_line_nom_max(n, s_nom_max_set=np.inf, p_nom_max_set=np.inf): set_line_nom_max( n, - s_nom_max_set=snakemake.config["lines"].get("s_nom_max,", np.inf), - p_nom_max_set=snakemake.config["links"].get("p_nom_max,", np.inf), + s_nom_max_set=snakemake.config["lines"]["s_nom_max,"], + p_nom_max_set=snakemake.config["links"]["p_nom_max,"], + s_nom_max_ext=snakemake.config["lines"]["max_extension,"], + p_nom_max_ext=snakemake.config["links"]["max_extension,"], ) if "ATK" in opts: diff --git a/scripts/prepare_sector_network.py b/scripts/prepare_sector_network.py index 012c97147..3009bfd99 100644 --- a/scripts/prepare_sector_network.py +++ b/scripts/prepare_sector_network.py @@ -3052,7 +3052,6 @@ def maybe_adjust_costs_and_potentials(n, opts): logger.info(f"changing {attr} for {carrier} by factor {factor}") -# TODO this should rather be a config no wildcard def limit_individual_line_extension(n, maxext): logger.info(f"Limiting new HVAC and HVDC extensions to {maxext} MW") n.lines["s_nom_max"] = n.lines["s_nom"] + maxext From 3343394c65e4268b0c375fd3024daff9d6f94c60 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Fri, 12 May 2023 07:30:10 +0000 Subject: [PATCH 2/2] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- scripts/prepare_network.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/scripts/prepare_network.py b/scripts/prepare_network.py index 01b72605a..e4bc9705f 100755 --- a/scripts/prepare_network.py +++ b/scripts/prepare_network.py @@ -233,8 +233,13 @@ def enforce_autarky(n, only_crossborder=False): n.mremove("Link", links_rm) -def set_line_nom_max(n, s_nom_max_set=np.inf, p_nom_max_set=np.inf, s_nom_max_ext=np.inf, p_nom_max_ext=np.inf): - +def set_line_nom_max( + n, + s_nom_max_set=np.inf, + p_nom_max_set=np.inf, + s_nom_max_ext=np.inf, + p_nom_max_ext=np.inf, +): if np.isfinite(s_nom_max_ext) and s_nom_max_ext > 0: logger.info(f"Limiting line extensions to {s_nom_max_ext} MW") n.lines["s_nom_max"] = n.lines["s_nom"] + s_nom_max_ext