Skip to content

Commit

Permalink
Merge pull request #964 from openego/features/#942-add-vom-heat-sector
Browse files Browse the repository at this point in the history
Set marginal costs for heat links
  • Loading branch information
ClaraBuettner committed Dec 14, 2022
2 parents 6ebf7b1 + 29577e2 commit fa17899
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 2 deletions.
3 changes: 2 additions & 1 deletion CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -446,7 +446,8 @@ Changed
`#987 <https://github.com/openego/eGon-data/issues/987>`_
* Add eGon2021 scenario to demandregio dataset
`#1035 <https://github.com/openego/eGon-data/issues/1035>`_

* Add missing VOM costs for heat sector components
`#942 <https://github.com/openego/eGon-data/issues/942>`_

Bug Fixes
---------
Expand Down
11 changes: 10 additions & 1 deletion src/egon/data/datasets/heat_etrago/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,9 @@ def insert_store(scenario, carrier):
"efficiency": get_sector_parameters("heat", "eGon2035")[
"efficiency"
]["water_tank_charger"],
"marginal_cost": get_sector_parameters("heat", "eGon2035")[
"marginal_cost"
]["water_tank_charger"],
"p_nom_extendable": True,
"link_id": range(
db.next_etrago_id("link"),
Expand All @@ -211,6 +214,9 @@ def insert_store(scenario, carrier):
"efficiency": get_sector_parameters("heat", "eGon2035")[
"efficiency"
]["water_tank_discharger"],
"marginal_cost": get_sector_parameters("heat", "eGon2035")[
"marginal_cost"
]["water_tank_discharger"],
"p_nom_extendable": True,
"link_id": range(
db.next_etrago_id("link"),
Expand Down Expand Up @@ -450,10 +456,13 @@ def insert_central_gas_boilers(scenario="eGon2035"):
# Add LineString topology
central_boilers = link_geom_from_buses(central_boilers, scenario)

# Add efficiency of gas boilers
# Add efficiency and marginal costs of gas boilers
central_boilers["efficiency"] = get_sector_parameters("heat", "eGon2035")[
"efficiency"
]["central_gas_boiler"]
central_boilers["marginal_cost"] = get_sector_parameters(
"heat", "eGon2035"
)["marginal_cost"]["central_gas_boiler"]

# Transform thermal capacity to CH4 installed capacity
central_boilers["p_nom"] = central_boilers.capacity.div(
Expand Down
10 changes: 10 additions & 0 deletions src/egon/data/datasets/heat_etrago/power_to_heat.py
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,11 @@ def insert_individual_power_to_heat(scenario="eGon2035"):
# Assign voltage level
heat_pumps["voltage_level"] = 7

# Set marginal_cost
heat_pumps["marginal_cost"] = get_sector_parameters("heat", "eGon2035")[
"marginal_cost"
]["rural_heat_pump"]

# Insert heatpumps
insert_power_to_heat_per_level(
heat_pumps,
Expand Down Expand Up @@ -175,6 +180,11 @@ def insert_central_power_to_heat(scenario="eGon2035"):
central_heat_pumps, carrier="heat_pump"
)

# Set marginal_cost
central_heat_pumps["marginal_cost"] = get_sector_parameters(
"heat", "eGon2035"
)["marginal_cost"]["central_heat_pump"]

# Insert heatpumps in mv and below
# (one hvmv substation per district heating grid)
insert_power_to_heat_per_level(
Expand Down
3 changes: 3 additions & 0 deletions src/egon/data/datasets/scenario_parameters/parameters.py
Original file line number Diff line number Diff line change
Expand Up @@ -833,6 +833,9 @@ def heat(scenario):
costs, "central resistive heater", "VOM"
),
"geo_thermal": 2.9, # Danish Energy Agency
"water_tank_charger": 0, # Danish Energy Agency
"water_tank_discharger": 0, # Danish Energy Agency
"rural_heat_pump": 0, # Danish Energy Agency, Technology Data for Individual Heating Plants
}

elif scenario == "eGon100RE":
Expand Down

0 comments on commit fa17899

Please sign in to comment.