Skip to content

Commit

Permalink
Merge pull request #1059 from openego/features/#1058-capacity-per-hea…
Browse files Browse the repository at this point in the history
…tpump

Fix installed capacity per individual heat pump in eGon2035
  • Loading branch information
ClaraBuettner committed Dec 14, 2022
2 parents ab9aa75 + 71caf3b commit 6ebf7b1
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -655,6 +655,8 @@ Bug Fixes
`#1055 <https://github.com/openego/eGon-data/issues/1055>`_
* Add missing filter for scenario name in chp expansion
`#1015 <https://github.com/openego/eGon-data/issues/1015>`_
* Fix installed capacity per individual heat pump
`#1058 <https://github.com/openego/eGon-data/issues/1058>`_

.. _PR #692: https://github.com/openego/eGon-data/pull/692
.. _#343: https://github.com/openego/eGon-data/issues/343
Expand Down
7 changes: 4 additions & 3 deletions src/egon/data/datasets/scenario_capacities.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ class ScenarioCapacities(Dataset):
def __init__(self, dependencies):
super().__init__(
name="ScenarioCapacities",
version="0.0.11",
version="0.0.12",
dependencies=dependencies,
tasks=(create_table, insert_data_nep, eGon100_capacities),
)
Expand Down Expand Up @@ -244,8 +244,9 @@ def insert_capacities_per_federal_state_nep():
data["nuts"] = map_nuts.nuts[bl]
data["scenario_name"] = "eGon2035"

# According to NEP, each heatpump has 3kW_el installed capacity
data.loc[data.carrier == "residential_rural_heat_pump", bl] *= 3e-6
# According to NEP, each heatpump has 5kW_el installed capacity
# source: Entwurf des Szenariorahmens NEP 2035, version 2021, page 47
data.loc[data.carrier == "residential_rural_heat_pump", bl] *= 5e-6
data.loc[
data.carrier == "residential_rural_heat_pump", "component"
] = "link"
Expand Down

0 comments on commit 6ebf7b1

Please sign in to comment.