From c24b7f657b97a2874ca9447f9ed939e7d925bec2 Mon Sep 17 00:00:00 2001 From: Michael Lindner Date: Fri, 7 Jun 2024 17:59:43 +0200 Subject: [PATCH 1/3] set generator baseyear p_nom to p_nom_min --- scripts/add_existing_baseyear.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/scripts/add_existing_baseyear.py b/scripts/add_existing_baseyear.py index 4e6f5ddaa..83ba91e45 100644 --- a/scripts/add_existing_baseyear.py +++ b/scripts/add_existing_baseyear.py @@ -272,9 +272,11 @@ def add_power_capacities_installed_before_baseyear(n, grouping_years, costs, bas # this is for the year 2020 if not already_build.empty: - n.generators.loc[already_build, "p_nom_min"] = capacity.loc[ - already_build.str.replace(name_suffix, "") - ].values + n.generators.loc[already_build, "p_nom"] = \ + n.generators.loc[already_build, "p_nom_min"] = \ + capacity.loc[ + already_build.str.replace(name_suffix, "") + ].values new_capacity = capacity.loc[new_build.str.replace(name_suffix, "")] if "m" in snakemake.wildcards.clusters: From 5168b3fe0b66230e9aadc5a843a27d921b7ed956 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Fri, 7 Jun 2024 16:01:59 +0000 Subject: [PATCH 2/3] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- scripts/add_existing_baseyear.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/scripts/add_existing_baseyear.py b/scripts/add_existing_baseyear.py index 83ba91e45..a209e934d 100644 --- a/scripts/add_existing_baseyear.py +++ b/scripts/add_existing_baseyear.py @@ -272,11 +272,9 @@ def add_power_capacities_installed_before_baseyear(n, grouping_years, costs, bas # this is for the year 2020 if not already_build.empty: - n.generators.loc[already_build, "p_nom"] = \ - n.generators.loc[already_build, "p_nom_min"] = \ - capacity.loc[ - already_build.str.replace(name_suffix, "") - ].values + n.generators.loc[already_build, "p_nom"] = n.generators.loc[ + already_build, "p_nom_min" + ] = capacity.loc[already_build.str.replace(name_suffix, "")].values new_capacity = capacity.loc[new_build.str.replace(name_suffix, "")] if "m" in snakemake.wildcards.clusters: From a4a048f1292a013669afe7e679323441a6c4778b Mon Sep 17 00:00:00 2001 From: Michael Lindner Date: Mon, 10 Jun 2024 11:21:43 +0200 Subject: [PATCH 3/3] add release note --- doc/release_notes.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/release_notes.rst b/doc/release_notes.rst index 988b8803d..ae003d072 100644 --- a/doc/release_notes.rst +++ b/doc/release_notes.rst @@ -10,6 +10,8 @@ Release Notes Upcoming Release ================ +* Set p_nom = p_nom_min for generators with baseyear == grouping_year in add_existing_baseyear. This has no effect on the optimization but helps n.statistics to correctly report already installed capacities. + * Reverted outdated hotfix for doubled renewable capacity in myopic optimization. * Added Enhanced Geothermal Systems for generation of electricity and district heat.