Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Hotfix for n.statistics.installed_capacity #1094

Merged
merged 4 commits into from
Jun 10, 2024
Merged

Hotfix for n.statistics.installed_capacity #1094

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c24b7f6
set generator baseyear p_nom to p_nom_min
lindnemi Jun 7, 2024
5168b3f
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jun 7, 2024
b052a5e
Merge branch 'master' into fix-p_nom-existing-renewables
lindnemi Jun 10, 2024
a4a048f
add release note
lindnemi Jun 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions doc/release_notes.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
6 changes: 3 additions & 3 deletions scripts/add_existing_baseyear.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,9 +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_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:
Expand Down
Loading