Skip to content

Commit

Permalink
Merge branch 'master' into fix-ttes-source-data
Browse files Browse the repository at this point in the history
  • Loading branch information
fneum authored Oct 10, 2024
2 parents 97f0a6e + 12f3598 commit fc8bdc2
Show file tree
Hide file tree
Showing 9 changed files with 35 additions and 2 deletions.
3 changes: 3 additions & 0 deletions docs/release_notes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ Release Notes
* fixed DEA technology data sheet name for central water tank storage to point to actual PTES data

* added geothermal district heating as `central geothermal-sourced heat pump` based on DEA technology catalogue ("45.1.a Geothermal DH, 1200m, E")


Technology-Data 0.9.2 (30 August 2024)
======================================

Expand Down
4 changes: 4 additions & 0 deletions outputs/costs_2020.csv
Original file line number Diff line number Diff line change
Expand Up @@ -662,6 +662,10 @@ central gas boiler,VOM,1.164,EUR/MWh_th,"Danish Energy Agency, technology_data_f
central gas boiler,efficiency,1.03,per unit,"Danish Energy Agency, technology_data_for_el_and_dh.xlsx","44 Natural Gas DH Only: Total efficiency , net, annual average",2015.0
central gas boiler,investment,63.4933,EUR/kW_th,"Danish Energy Agency, technology_data_for_el_and_dh.xlsx",44 Natural Gas DH Only: Nominal investment,2015.0
central gas boiler,lifetime,25.0,years,"Danish Energy Agency, technology_data_for_el_and_dh.xlsx",44 Natural Gas DH Only: Technical lifetime,2015.0
central geothermal-sourced heat pump,FOM,0.8328,%/year,"Danish Energy Agency, technology_data_for_el_and_dh.xlsx","45.1.a Geothermal DH, 1200m, E: Fixed O&M",2015.0
central geothermal-sourced heat pump,VOM,6.0281,EUR/MWh_th,"Danish Energy Agency, technology_data_for_el_and_dh.xlsx","45.1.a Geothermal DH, 1200m, E: Variable O&M",2015.0
central geothermal-sourced heat pump,investment,2871.7979,EUR/kW_th,"Danish Energy Agency, technology_data_for_el_and_dh.xlsx","45.1.a Geothermal DH, 1200m, E: Nominal investment",2015.0
central geothermal-sourced heat pump,lifetime,25.0,years,"Danish Energy Agency, technology_data_for_el_and_dh.xlsx","45.1.a Geothermal DH, 1200m, E: Technical lifetime",2015.0
central ground-sourced heat pump,FOM,0.3546,%/year,"Danish Energy Agency, technology_data_for_el_and_dh.xlsx","40 Absorption heat pump, DH: Fixed O&M",2015.0
central ground-sourced heat pump,VOM,1.0392,EUR/MWh_th,"Danish Energy Agency, technology_data_for_el_and_dh.xlsx","40 Absorption heat pump, DH: Variable O&M",2015.0
central ground-sourced heat pump,efficiency,1.71,per unit,"Danish Energy Agency, technology_data_for_el_and_dh.xlsx","40 Absorption heat pump, DH: Total efficiency , net, annual average",2015.0
Expand Down
4 changes: 4 additions & 0 deletions outputs/costs_2025.csv
Original file line number Diff line number Diff line change
Expand Up @@ -662,6 +662,10 @@ central gas boiler,VOM,1.1111,EUR/MWh_th,"Danish Energy Agency, technology_data_
central gas boiler,efficiency,1.035,per unit,"Danish Energy Agency, technology_data_for_el_and_dh.xlsx","44 Natural Gas DH Only: Total efficiency , net, annual average",2015.0
central gas boiler,investment,58.2022,EUR/kW_th,"Danish Energy Agency, technology_data_for_el_and_dh.xlsx",44 Natural Gas DH Only: Nominal investment,2015.0
central gas boiler,lifetime,25.0,years,"Danish Energy Agency, technology_data_for_el_and_dh.xlsx",44 Natural Gas DH Only: Technical lifetime,2015.0
central geothermal-sourced heat pump,FOM,0.8253,%/year,"Danish Energy Agency, technology_data_for_el_and_dh.xlsx","45.1.a Geothermal DH, 1200m, E: Fixed O&M",2015.0
central geothermal-sourced heat pump,VOM,6.0453,EUR/MWh_th,"Danish Energy Agency, technology_data_for_el_and_dh.xlsx","45.1.a Geothermal DH, 1200m, E: Variable O&M",2015.0
central geothermal-sourced heat pump,investment,2808.061,EUR/kW_th,"Danish Energy Agency, technology_data_for_el_and_dh.xlsx","45.1.a Geothermal DH, 1200m, E: Nominal investment",2015.0
central geothermal-sourced heat pump,lifetime,25.0,years,"Danish Energy Agency, technology_data_for_el_and_dh.xlsx","45.1.a Geothermal DH, 1200m, E: Technical lifetime",2015.0
central ground-sourced heat pump,FOM,0.3733,%/year,"Danish Energy Agency, technology_data_for_el_and_dh.xlsx","40 Absorption heat pump, DH: Fixed O&M",2015.0
central ground-sourced heat pump,VOM,1.183,EUR/MWh_th,"Danish Energy Agency, technology_data_for_el_and_dh.xlsx","40 Absorption heat pump, DH: Variable O&M",2015.0
central ground-sourced heat pump,efficiency,1.72,per unit,"Danish Energy Agency, technology_data_for_el_and_dh.xlsx","40 Absorption heat pump, DH: Total efficiency , net, annual average",2015.0
Expand Down
4 changes: 4 additions & 0 deletions outputs/costs_2030.csv
Original file line number Diff line number Diff line change
Expand Up @@ -662,6 +662,10 @@ central gas boiler,VOM,1.0582,EUR/MWh_th,"Danish Energy Agency, technology_data_
central gas boiler,efficiency,1.04,per unit,"Danish Energy Agency, technology_data_for_el_and_dh.xlsx","44 Natural Gas DH Only: Total efficiency , net, annual average",2015.0
central gas boiler,investment,52.9111,EUR/kW_th,"Danish Energy Agency, technology_data_for_el_and_dh.xlsx",44 Natural Gas DH Only: Nominal investment,2015.0
central gas boiler,lifetime,25.0,years,"Danish Energy Agency, technology_data_for_el_and_dh.xlsx",44 Natural Gas DH Only: Technical lifetime,2015.0
central geothermal-sourced heat pump,FOM,0.8526,%/year,"Danish Energy Agency, technology_data_for_el_and_dh.xlsx","45.1.a Geothermal DH, 1200m, E: Fixed O&M",2015.0
central geothermal-sourced heat pump,VOM,6.4843,EUR/MWh_th,"Danish Energy Agency, technology_data_for_el_and_dh.xlsx","45.1.a Geothermal DH, 1200m, E: Variable O&M",2015.0
central geothermal-sourced heat pump,investment,2643.6464,EUR/kW_th,"Danish Energy Agency, technology_data_for_el_and_dh.xlsx","45.1.a Geothermal DH, 1200m, E: Nominal investment",2015.0
central geothermal-sourced heat pump,lifetime,30.0,years,"Danish Energy Agency, technology_data_for_el_and_dh.xlsx","45.1.a Geothermal DH, 1200m, E: Technical lifetime",2015.0
central ground-sourced heat pump,FOM,0.394,%/year,"Danish Energy Agency, technology_data_for_el_and_dh.xlsx","40 Absorption heat pump, DH: Fixed O&M",2015.0
central ground-sourced heat pump,VOM,1.3268,EUR/MWh_th,"Danish Energy Agency, technology_data_for_el_and_dh.xlsx","40 Absorption heat pump, DH: Variable O&M",2015.0
central ground-sourced heat pump,efficiency,1.73,per unit,"Danish Energy Agency, technology_data_for_el_and_dh.xlsx","40 Absorption heat pump, DH: Total efficiency , net, annual average",2015.0
Expand Down
4 changes: 4 additions & 0 deletions outputs/costs_2035.csv
Original file line number Diff line number Diff line change
Expand Up @@ -662,6 +662,10 @@ central gas boiler,VOM,1.0582,EUR/MWh_th,"Danish Energy Agency, technology_data_
central gas boiler,efficiency,1.04,per unit,"Danish Energy Agency, technology_data_for_el_and_dh.xlsx","44 Natural Gas DH Only: Total efficiency , net, annual average",2015.0
central gas boiler,investment,52.9111,EUR/kW_th,"Danish Energy Agency, technology_data_for_el_and_dh.xlsx",44 Natural Gas DH Only: Nominal investment,2015.0
central gas boiler,lifetime,25.0,years,"Danish Energy Agency, technology_data_for_el_and_dh.xlsx",44 Natural Gas DH Only: Technical lifetime,2015.0
central geothermal-sourced heat pump,FOM,0.8488,%/year,"Danish Energy Agency, technology_data_for_el_and_dh.xlsx","45.1.a Geothermal DH, 1200m, E: Fixed O&M",2015.0
central geothermal-sourced heat pump,VOM,6.5503,EUR/MWh_th,"Danish Energy Agency, technology_data_for_el_and_dh.xlsx","45.1.a Geothermal DH, 1200m, E: Variable O&M",2015.0
central geothermal-sourced heat pump,investment,2611.778,EUR/kW_th,"Danish Energy Agency, technology_data_for_el_and_dh.xlsx","45.1.a Geothermal DH, 1200m, E: Nominal investment",2015.0
central geothermal-sourced heat pump,lifetime,30.0,years,"Danish Energy Agency, technology_data_for_el_and_dh.xlsx","45.1.a Geothermal DH, 1200m, E: Technical lifetime",2015.0
central ground-sourced heat pump,FOM,0.4041,%/year,"Danish Energy Agency, technology_data_for_el_and_dh.xlsx","40 Absorption heat pump, DH: Fixed O&M",2015.0
central ground-sourced heat pump,VOM,1.373,EUR/MWh_th,"Danish Energy Agency, technology_data_for_el_and_dh.xlsx","40 Absorption heat pump, DH: Variable O&M",2015.0
central ground-sourced heat pump,efficiency,1.735,per unit,"Danish Energy Agency, technology_data_for_el_and_dh.xlsx","40 Absorption heat pump, DH: Total efficiency , net, annual average",2015.0
Expand Down
4 changes: 4 additions & 0 deletions outputs/costs_2040.csv
Original file line number Diff line number Diff line change
Expand Up @@ -662,6 +662,10 @@ central gas boiler,VOM,1.0582,EUR/MWh_th,"Danish Energy Agency, technology_data_
central gas boiler,efficiency,1.04,per unit,"Danish Energy Agency, technology_data_for_el_and_dh.xlsx","44 Natural Gas DH Only: Total efficiency , net, annual average",2015.0
central gas boiler,investment,52.9111,EUR/kW_th,"Danish Energy Agency, technology_data_for_el_and_dh.xlsx",44 Natural Gas DH Only: Nominal investment,2015.0
central gas boiler,lifetime,25.0,years,"Danish Energy Agency, technology_data_for_el_and_dh.xlsx",44 Natural Gas DH Only: Technical lifetime,2015.0
central geothermal-sourced heat pump,FOM,0.845,%/year,"Danish Energy Agency, technology_data_for_el_and_dh.xlsx","45.1.a Geothermal DH, 1200m, E: Fixed O&M",2015.0
central geothermal-sourced heat pump,VOM,6.6163,EUR/MWh_th,"Danish Energy Agency, technology_data_for_el_and_dh.xlsx","45.1.a Geothermal DH, 1200m, E: Variable O&M",2015.0
central geothermal-sourced heat pump,investment,2579.9096,EUR/kW_th,"Danish Energy Agency, technology_data_for_el_and_dh.xlsx","45.1.a Geothermal DH, 1200m, E: Nominal investment",2015.0
central geothermal-sourced heat pump,lifetime,30.0,years,"Danish Energy Agency, technology_data_for_el_and_dh.xlsx","45.1.a Geothermal DH, 1200m, E: Technical lifetime",2015.0
central ground-sourced heat pump,FOM,0.4147,%/year,"Danish Energy Agency, technology_data_for_el_and_dh.xlsx","40 Absorption heat pump, DH: Fixed O&M",2015.0
central ground-sourced heat pump,VOM,1.4192,EUR/MWh_th,"Danish Energy Agency, technology_data_for_el_and_dh.xlsx","40 Absorption heat pump, DH: Variable O&M",2015.0
central ground-sourced heat pump,efficiency,1.74,per unit,"Danish Energy Agency, technology_data_for_el_and_dh.xlsx","40 Absorption heat pump, DH: Total efficiency , net, annual average",2015.0
Expand Down
4 changes: 4 additions & 0 deletions outputs/costs_2045.csv
Original file line number Diff line number Diff line change
Expand Up @@ -662,6 +662,10 @@ central gas boiler,VOM,1.0582,EUR/MWh_th,"Danish Energy Agency, technology_data_
central gas boiler,efficiency,1.04,per unit,"Danish Energy Agency, technology_data_for_el_and_dh.xlsx","44 Natural Gas DH Only: Total efficiency , net, annual average",2015.0
central gas boiler,investment,52.9111,EUR/kW_th,"Danish Energy Agency, technology_data_for_el_and_dh.xlsx",44 Natural Gas DH Only: Nominal investment,2015.0
central gas boiler,lifetime,25.0,years,"Danish Energy Agency, technology_data_for_el_and_dh.xlsx",44 Natural Gas DH Only: Technical lifetime,2015.0
central geothermal-sourced heat pump,FOM,0.841,%/year,"Danish Energy Agency, technology_data_for_el_and_dh.xlsx","45.1.a Geothermal DH, 1200m, E: Fixed O&M",2015.0
central geothermal-sourced heat pump,VOM,6.411,EUR/MWh_th,"Danish Energy Agency, technology_data_for_el_and_dh.xlsx","45.1.a Geothermal DH, 1200m, E: Variable O&M",2015.0
central geothermal-sourced heat pump,investment,2548.0411,EUR/kW_th,"Danish Energy Agency, technology_data_for_el_and_dh.xlsx","45.1.a Geothermal DH, 1200m, E: Nominal investment",2015.0
central geothermal-sourced heat pump,lifetime,30.0,years,"Danish Energy Agency, technology_data_for_el_and_dh.xlsx","45.1.a Geothermal DH, 1200m, E: Technical lifetime",2015.0
central ground-sourced heat pump,FOM,0.426,%/year,"Danish Energy Agency, technology_data_for_el_and_dh.xlsx","40 Absorption heat pump, DH: Fixed O&M",2015.0
central ground-sourced heat pump,VOM,1.4654,EUR/MWh_th,"Danish Energy Agency, technology_data_for_el_and_dh.xlsx","40 Absorption heat pump, DH: Variable O&M",2015.0
central ground-sourced heat pump,efficiency,1.745,per unit,"Danish Energy Agency, technology_data_for_el_and_dh.xlsx","40 Absorption heat pump, DH: Total efficiency , net, annual average",2015.0
Expand Down
4 changes: 4 additions & 0 deletions outputs/costs_2050.csv
Original file line number Diff line number Diff line change
Expand Up @@ -662,6 +662,10 @@ central gas boiler,VOM,1.0582,EUR/MWh_th,"Danish Energy Agency, technology_data_
central gas boiler,efficiency,1.04,per unit,"Danish Energy Agency, technology_data_for_el_and_dh.xlsx","44 Natural Gas DH Only: Total efficiency , net, annual average",2015.0
central gas boiler,investment,52.9111,EUR/kW_th,"Danish Energy Agency, technology_data_for_el_and_dh.xlsx",44 Natural Gas DH Only: Nominal investment,2015.0
central gas boiler,lifetime,25.0,years,"Danish Energy Agency, technology_data_for_el_and_dh.xlsx",44 Natural Gas DH Only: Technical lifetime,2015.0
central geothermal-sourced heat pump,FOM,0.8369,%/year,"Danish Energy Agency, technology_data_for_el_and_dh.xlsx","45.1.a Geothermal DH, 1200m, E: Fixed O&M",2015.0
central geothermal-sourced heat pump,VOM,6.2056,EUR/MWh_th,"Danish Energy Agency, technology_data_for_el_and_dh.xlsx","45.1.a Geothermal DH, 1200m, E: Variable O&M",2015.0
central geothermal-sourced heat pump,investment,2516.1727,EUR/kW_th,"Danish Energy Agency, technology_data_for_el_and_dh.xlsx","45.1.a Geothermal DH, 1200m, E: Nominal investment",2015.0
central geothermal-sourced heat pump,lifetime,30.0,years,"Danish Energy Agency, technology_data_for_el_and_dh.xlsx","45.1.a Geothermal DH, 1200m, E: Technical lifetime",2015.0
central ground-sourced heat pump,FOM,0.4378,%/year,"Danish Energy Agency, technology_data_for_el_and_dh.xlsx","40 Absorption heat pump, DH: Fixed O&M",2015.0
central ground-sourced heat pump,VOM,1.5116,EUR/MWh_th,"Danish Energy Agency, technology_data_for_el_and_dh.xlsx","40 Absorption heat pump, DH: Variable O&M",2015.0
central ground-sourced heat pump,efficiency,1.75,per unit,"Danish Energy Agency, technology_data_for_el_and_dh.xlsx","40 Absorption heat pump, DH: Total efficiency , net, annual average",2015.0
Expand Down
6 changes: 4 additions & 2 deletions scripts/compile_cost_assumptions.py
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@
# 'solid biomass power': '09a Wood Chips extract. plant',
# 'solid biomass power CC': '09a Wood Chips extract. plant',
'central air-sourced heat pump': '40 Comp. hp, airsource 3 MW',
'central geothermal-sourced heat pump': '45.1.a Geothermal DH, 1200m, E',
'central ground-sourced heat pump': '40 Absorption heat pump, DH',
'central resistive heater': '41 Electric Boilers',
'central gas boiler': '44 Natural Gas DH Only',
Expand Down Expand Up @@ -164,6 +165,7 @@
# 'solid biomass power CC': 'J:K',
'solar': '',
'central air-sourced heat pump': 'J:K',
'central geothermal-sourced heat pump': 'H:K',
'central ground-sourced heat pump': 'I:J',
'central resistive heater': 'I:J',
'central gas boiler': 'I:J',
Expand Down Expand Up @@ -1019,8 +1021,8 @@ def clean_up_units(tech_data, value_column="", source=""):
# see on p.278 of docu: "However, the primary purpose of the heat pumps in the
# technology catalogue is heating. In this chapter the unit MW is referring to
# the heat output (also MJ/s) unless otherwise noted"
techs_mwth = ['central air-sourced heat pump', 'central gas boiler',
'central resistive heater', 'decentral air-sourced heat pump',
techs_mwth = ['central air-sourced heat pump', 'central geothermal-sourced heat pump',
'central gas boiler', 'central resistive heater', 'decentral air-sourced heat pump',
'decentral gas boiler', 'decentral ground-sourced heat pump' ]
tech_data.loc[techs_mwth, "unit"] = (tech_data.loc[techs_mwth, "unit"]
.replace({"EUR/MW": "EUR/MW_th",
Expand Down

0 comments on commit fc8bdc2

Please sign in to comment.