From 136442b87cf0bfec6dee06f52a8c6f1363c93016 Mon Sep 17 00:00:00 2001 From: Michael Lindner Date: Fri, 7 Jun 2024 14:20:58 +0200 Subject: [PATCH 1/3] revert hotfix for #1016 --- scripts/solve_network.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/scripts/solve_network.py b/scripts/solve_network.py index 65dae0c4b..3212c2ffb 100644 --- a/scripts/solve_network.py +++ b/scripts/solve_network.py @@ -132,9 +132,7 @@ def _add_land_use_constraint(n): "offwind-dc", "offwind-float", ]: - extendable_i = (n.generators.carrier == carrier) & n.generators.p_nom_extendable - n.generators.loc[extendable_i, "p_nom_min"] = 0 - + ext_i = (n.generators.carrier == carrier) & ~n.generators.p_nom_extendable existing = ( n.generators.loc[ext_i, "p_nom"] @@ -174,9 +172,7 @@ def _add_land_use_constraint_m(n, planning_horizons, config): "offwind-ac", "offwind-dc", ]: - extendable_i = (n.generators.carrier == carrier) & n.generators.p_nom_extendable - n.generators.loc[extendable_i, "p_nom_min"] = 0 - + existing = n.generators.loc[n.generators.carrier == carrier, "p_nom"] ind = list( {i.split(sep=" ")[0] + " " + i.split(sep=" ")[1] for i in existing.index} From bcef24f913f476081780b6d97090b304187bfff2 Mon Sep 17 00:00:00 2001 From: Michael Lindner Date: Fri, 7 Jun 2024 14:32:14 +0200 Subject: [PATCH 2/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 efb9deb6c..988b8803d 100644 --- a/doc/release_notes.rst +++ b/doc/release_notes.rst @@ -10,6 +10,8 @@ Release Notes Upcoming Release ================ +* Reverted outdated hotfix for doubled renewable capacity in myopic optimization. + * Added Enhanced Geothermal Systems for generation of electricity and district heat. Cost and available capacity assumptions based on `Aghahosseini et al. (2020) `__. From 47889d728f50b5a200c41282973740926a294aa4 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 12:34:49 +0000 Subject: [PATCH 3/3] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- scripts/solve_network.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/solve_network.py b/scripts/solve_network.py index 3212c2ffb..ba2fac7fe 100644 --- a/scripts/solve_network.py +++ b/scripts/solve_network.py @@ -132,7 +132,7 @@ def _add_land_use_constraint(n): "offwind-dc", "offwind-float", ]: - + ext_i = (n.generators.carrier == carrier) & ~n.generators.p_nom_extendable existing = ( n.generators.loc[ext_i, "p_nom"] @@ -172,7 +172,7 @@ def _add_land_use_constraint_m(n, planning_horizons, config): "offwind-ac", "offwind-dc", ]: - + existing = n.generators.loc[n.generators.carrier == carrier, "p_nom"] ind = list( {i.split(sep=" ")[0] + " " + i.split(sep=" ")[1] for i in existing.index}