bjoern/pypsa-eur
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' into fix-p_nom-existing-renewables

Browse Source
This commit is contained in:
Micha 2024-06-10 10:59:49 +02:00 committed by GitHub
commit b052a5e54a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/release_notes.rst
View File

@ -10,6 +10,8 @@ Release Notes
Upcoming Release Upcoming Release
================ ================
* Reverted outdated hotfix for doubled renewable capacity in myopic optimization.
* Added Enhanced Geothermal Systems for generation of electricity and district heat. * Added Enhanced Geothermal Systems for generation of electricity and district heat.
Cost and available capacity assumptions based on `Aghahosseini et al. (2020) Cost and available capacity assumptions based on `Aghahosseini et al. (2020)
<https://www.sciencedirect.com/science/article/pii/S0306261920312551>`__. <https://www.sciencedirect.com/science/article/pii/S0306261920312551>`__.

4
scripts/solve_network.py
View File

@ -132,8 +132,6 @@ def _add_land_use_constraint(n):
"offwind-dc", "offwind-dc",
"offwind-float", "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 ext_i = (n.generators.carrier == carrier) & ~n.generators.p_nom_extendable
existing = ( existing = (
@ -174,8 +172,6 @@ def _add_land_use_constraint_m(n, planning_horizons, config):
"offwind-ac", "offwind-ac",
"offwind-dc", "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"] existing = n.generators.loc[n.generators.carrier == carrier, "p_nom"]
ind = list( ind = list(