diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 7bb35b53..cf811240 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -39,7 +39,7 @@ repos: # Make docstrings PEP 257 compliant - repo: https://github.com/PyCQA/docformatter - rev: v1.7.3 + rev: v1.7.4 hooks: - id: docformatter args: ["--in-place", "--make-summary-multi-line", "--pre-summary-newline"] diff --git a/config/config.default.yaml b/config/config.default.yaml index 359b08d2..ad6082d2 100644 --- a/config/config.default.yaml +++ b/config/config.default.yaml @@ -264,6 +264,7 @@ 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 cutout: europe-2013-era5 @@ -276,6 +277,7 @@ lines: 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 efd4e5dc..809c6635 100644 --- a/doc/configtables/lines.csv +++ b/doc/configtables/lines.csv @@ -2,6 +2,7 @@ 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." cutout,--,"Should be a folder listed in the configuration ``atlite: cutouts:`` (e.g. 'europe-2013-era5') or reference an existing folder in the directory ``cutouts``. Source module must be ERA5.","Specifies the directory where the relevant weather data ist stored." diff --git a/doc/configtables/links.csv b/doc/configtables/links.csv index c9981dc7..c1ffb427 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 727675c2..b7fcf2fa 100644 --- a/doc/release_notes.rst +++ b/doc/release_notes.rst @@ -32,6 +32,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. + * Add option to include a piecewise linear approximation of transmission losses, e.g. by setting ``solving: options: transmission_losses: 2`` for an approximation with two tangents. diff --git a/scripts/add_electricity.py b/scripts/add_electricity.py index bb8fca60..ce857742 100755 --- a/scripts/add_electricity.py +++ b/scripts/add_electricity.py @@ -159,7 +159,7 @@ def sanitize_carriers(n, config): for c in n.iterate_components(): if "carrier" in c.df: - add_missing_carriers(n, c.df) + add_missing_carriers(n, c.df.carrier) carrier_i = n.carriers.index nice_names = ( diff --git a/scripts/prepare_network.py b/scripts/prepare_network.py index f45e45ed..7b7f77f9 100755 --- a/scripts/prepare_network.py +++ b/scripts/prepare_network.py @@ -233,7 +233,22 @@ 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) @@ -332,8 +347,10 @@ if __name__ == "__main__": set_line_nom_max( n, - s_nom_max_set=snakemake.params.lines.get("s_nom_max,", np.inf), - p_nom_max_set=snakemake.params.links.get("p_nom_max,", np.inf), + s_nom_max_set=snakemake.params.lines.get("s_nom_max", np.inf), + p_nom_max_set=snakemake.params.links.get("p_nom_max", np.inf), + s_nom_max_ext=snakemake.params.lines.get("max_extension", np.inf), + p_nom_max_ext=snakemake.params.links.get("max_extension", np.inf), ) if "ATK" in opts: diff --git a/scripts/prepare_sector_network.py b/scripts/prepare_sector_network.py index 551ea44e..da6e693a 100644 --- a/scripts/prepare_sector_network.py +++ b/scripts/prepare_sector_network.py @@ -3056,7 +3056,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 diff --git a/scripts/solve_network.py b/scripts/solve_network.py index 58f4db72..f7ab724c 100644 --- a/scripts/solve_network.py +++ b/scripts/solve_network.py @@ -152,7 +152,7 @@ def prepare_network( if "clip_p_max_pu" in solve_opts: for df in ( n.generators_t.p_max_pu, - n.generators_t.p_min_pu, # TODO: check if this can be removed + n.generators_t.p_min_pu, n.storage_units_t.inflow, ): df.where(df > solve_opts["clip_p_max_pu"], other=0.0, inplace=True)