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

Fix central water tank storage source data #144

Merged
merged 4 commits into from
Oct 10, 2024
Merged

Fix central water tank storage source data #144

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
12a39a4
fix: update TTES sheet name
amos-schledorn Oct 7, 2024
fc567df
fix: update TTES in cost tables
amos-schledorn Oct 8, 2024
97f0a6e
doc: update release notes
amos-schledorn Oct 8, 2024
fc8bdc2
Merge branch 'master' into fix-ttes-source-data
fneum Oct 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
3 changes: 3 additions & 0 deletions docs/release_notes.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,11 @@ Release Notes
.. Upcoming Release
.. ================

* 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
10 changes: 5 additions & 5 deletions outputs/costs_2020.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -709,9 +709,9 @@ central solid biomass CHP powerboost CC,efficiency,0.2689,per unit,"Danish Energ
central solid biomass CHP powerboost CC,efficiency-heat,0.8255,per unit,"Danish Energy Agency, technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree: Heat efficiency, net, annual average",2015.0
central solid biomass CHP powerboost CC,investment,3740.4387,EUR/kW_e,"Danish Energy Agency, technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree: Nominal investment ",2015.0
central solid biomass CHP powerboost CC,lifetime,25.0,years,"Danish Energy Agency, technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree: Technical lifetime",2015.0
central water tank storage,FOM,0.5176,%/year,"Danish Energy Agency, technology_data_catalogue_for_energy_storage.xlsx",140 PTES seasonal: Fixed O&M,2015.0
central water tank storage,investment,0.6133,EUR/kWhCapacity,"Danish Energy Agency, technology_data_catalogue_for_energy_storage.xlsx",140 PTES seasonal: Specific investment,2015.0
central water tank storage,lifetime,20.0,years,"Danish Energy Agency, technology_data_catalogue_for_energy_storage.xlsx",140 PTES seasonal: Technical lifetime,2015.0
central water tank storage,FOM,0.2901,%/year,"Danish Energy Agency, technology_data_catalogue_for_energy_storage.xlsx",141 Large hot water tank: Fixed O&M,2015.0
central water tank storage,investment,3.1374,EUR/kWhCapacity,"Danish Energy Agency, technology_data_catalogue_for_energy_storage.xlsx",141 Large hot water tank: Specific investment,2015.0
central water tank storage,lifetime,40.0,years,"Danish Energy Agency, technology_data_catalogue_for_energy_storage.xlsx",141 Large hot water tank: Technical lifetime,2015.0
clean water tank storage,FOM,2.0,%/year,"Caldera et al 2016: Local cost of seawater RO desalination based on solar PV and windenergy: A global estimate. (https://doi.org/10.1016/j.desal.2016.02.004), Table 1.",,
clean water tank storage,investment,69.1286,EUR/m^3-H2O,"Caldera et al 2016: Local cost of seawater RO desalination based on solar PV and windenergy: A global estimate. (https://doi.org/10.1016/j.desal.2016.02.004), Table 1.",,2013.0
clean water tank storage,lifetime,30.0,years,"Caldera et al 2016: Local cost of seawater RO desalination based on solar PV and windenergy: A global estimate. (https://doi.org/10.1016/j.desal.2016.02.004), Table 1.",,
Expand Down Expand Up @@ -1055,5 +1055,5 @@ waste CHP CC,efficiency,0.2021,per unit,"Danish Energy Agency, technology_data_f
waste CHP CC,efficiency-heat,0.7635,per unit,"Danish Energy Agency, technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree: Heat efficiency, net, annual average",2015.0
waste CHP CC,investment,9077.1074,EUR/kW_e,"Danish Energy Agency, technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree: Nominal investment ",2015.0
waste CHP CC,lifetime,25.0,years,"Danish Energy Agency, technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree: Technical lifetime",2015.0
water tank charger,efficiency,0.8367,per unit,"Danish Energy Agency, technology_data_catalogue_for_energy_storage.xlsx",: efficiency from sqr(Round trip efficiency),2015.0
water tank discharger,efficiency,0.8367,per unit,"Danish Energy Agency, technology_data_catalogue_for_energy_storage.xlsx",: efficiency from sqr(Round trip efficiency),2015.0
water tank charger,efficiency,0.9899,per unit,"Danish Energy Agency, technology_data_catalogue_for_energy_storage.xlsx",: efficiency from sqr(Round trip efficiency),2015.0
water tank discharger,efficiency,0.9899,per unit,"Danish Energy Agency, technology_data_catalogue_for_energy_storage.xlsx",: efficiency from sqr(Round trip efficiency),2015.0
10 changes: 5 additions & 5 deletions outputs/costs_2025.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -709,9 +709,9 @@ central solid biomass CHP powerboost CC,efficiency,0.2694,per unit,"Danish Energ
central solid biomass CHP powerboost CC,efficiency-heat,0.825,per unit,"Danish Energy Agency, technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree: Heat efficiency, net, annual average",2015.0
central solid biomass CHP powerboost CC,investment,3642.4702,EUR/kW_e,"Danish Energy Agency, technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree: Nominal investment ",2015.0
central solid biomass CHP powerboost CC,lifetime,25.0,years,"Danish Energy Agency, technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree: Technical lifetime",2015.0
central water tank storage,FOM,0.5338,%/year,"Danish Energy Agency, technology_data_catalogue_for_energy_storage.xlsx",140 PTES seasonal: Fixed O&M,2015.0
central water tank storage,investment,0.5947,EUR/kWhCapacity,"Danish Energy Agency, technology_data_catalogue_for_energy_storage.xlsx",140 PTES seasonal: Specific investment,2015.0
central water tank storage,lifetime,22.5,years,"Danish Energy Agency, technology_data_catalogue_for_energy_storage.xlsx",140 PTES seasonal: Technical lifetime,2015.0
central water tank storage,FOM,0.2901,%/year,"Danish Energy Agency, technology_data_catalogue_for_energy_storage.xlsx",141 Large hot water tank: Fixed O&M,2015.0
central water tank storage,investment,3.1374,EUR/kWhCapacity,"Danish Energy Agency, technology_data_catalogue_for_energy_storage.xlsx",141 Large hot water tank: Specific investment,2015.0
central water tank storage,lifetime,40.0,years,"Danish Energy Agency, technology_data_catalogue_for_energy_storage.xlsx",141 Large hot water tank: Technical lifetime,2015.0
clean water tank storage,FOM,2.0,%/year,"Caldera et al 2016: Local cost of seawater RO desalination based on solar PV and windenergy: A global estimate. (https://doi.org/10.1016/j.desal.2016.02.004), Table 1.",,
clean water tank storage,investment,69.1286,EUR/m^3-H2O,"Caldera et al 2016: Local cost of seawater RO desalination based on solar PV and windenergy: A global estimate. (https://doi.org/10.1016/j.desal.2016.02.004), Table 1.",,2013.0
clean water tank storage,lifetime,30.0,years,"Caldera et al 2016: Local cost of seawater RO desalination based on solar PV and windenergy: A global estimate. (https://doi.org/10.1016/j.desal.2016.02.004), Table 1.",,
Expand Down Expand Up @@ -1055,5 +1055,5 @@ waste CHP CC,efficiency,0.2051,per unit,"Danish Energy Agency, technology_data_f
waste CHP CC,efficiency-heat,0.7627,per unit,"Danish Energy Agency, technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree: Heat efficiency, net, annual average",2015.0
waste CHP CC,investment,8829.8509,EUR/kW_e,"Danish Energy Agency, technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree: Nominal investment ",2015.0
waste CHP CC,lifetime,25.0,years,"Danish Energy Agency, technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree: Technical lifetime",2015.0
water tank charger,efficiency,0.8367,per unit,"Danish Energy Agency, technology_data_catalogue_for_energy_storage.xlsx",: efficiency from sqr(Round trip efficiency),2015.0
water tank discharger,efficiency,0.8367,per unit,"Danish Energy Agency, technology_data_catalogue_for_energy_storage.xlsx",: efficiency from sqr(Round trip efficiency),2015.0
water tank charger,efficiency,0.9899,per unit,"Danish Energy Agency, technology_data_catalogue_for_energy_storage.xlsx",: efficiency from sqr(Round trip efficiency),2015.0
water tank discharger,efficiency,0.9899,per unit,"Danish Energy Agency, technology_data_catalogue_for_energy_storage.xlsx",: efficiency from sqr(Round trip efficiency),2015.0
10 changes: 5 additions & 5 deletions outputs/costs_2030.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -709,9 +709,9 @@ central solid biomass CHP powerboost CC,efficiency,0.2699,per unit,"Danish Energ
central solid biomass CHP powerboost CC,efficiency-heat,0.8245,per unit,"Danish Energy Agency, technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree: Heat efficiency, net, annual average",2015.0
central solid biomass CHP powerboost CC,investment,3544.5017,EUR/kW_e,"Danish Energy Agency, technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree: Nominal investment ",2015.0
central solid biomass CHP powerboost CC,lifetime,25.0,years,"Danish Energy Agency, technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree: Technical lifetime",2015.0
central water tank storage,FOM,0.551,%/year,"Danish Energy Agency, technology_data_catalogue_for_energy_storage.xlsx",140 PTES seasonal: Fixed O&M,2015.0
central water tank storage,investment,0.5761,EUR/kWhCapacity,"Danish Energy Agency, technology_data_catalogue_for_energy_storage.xlsx",140 PTES seasonal: Specific investment,2015.0
central water tank storage,lifetime,25.0,years,"Danish Energy Agency, technology_data_catalogue_for_energy_storage.xlsx",140 PTES seasonal: Technical lifetime,2015.0
central water tank storage,FOM,0.2901,%/year,"Danish Energy Agency, technology_data_catalogue_for_energy_storage.xlsx",141 Large hot water tank: Fixed O&M,2015.0
central water tank storage,investment,3.1374,EUR/kWhCapacity,"Danish Energy Agency, technology_data_catalogue_for_energy_storage.xlsx",141 Large hot water tank: Specific investment,2015.0
central water tank storage,lifetime,40.0,years,"Danish Energy Agency, technology_data_catalogue_for_energy_storage.xlsx",141 Large hot water tank: Technical lifetime,2015.0
clean water tank storage,FOM,2.0,%/year,"Caldera et al 2016: Local cost of seawater RO desalination based on solar PV and windenergy: A global estimate. (https://doi.org/10.1016/j.desal.2016.02.004), Table 1.",,
clean water tank storage,investment,69.1286,EUR/m^3-H2O,"Caldera et al 2016: Local cost of seawater RO desalination based on solar PV and windenergy: A global estimate. (https://doi.org/10.1016/j.desal.2016.02.004), Table 1.",,2013.0
clean water tank storage,lifetime,30.0,years,"Caldera et al 2016: Local cost of seawater RO desalination based on solar PV and windenergy: A global estimate. (https://doi.org/10.1016/j.desal.2016.02.004), Table 1.",,
Expand Down Expand Up @@ -1055,5 +1055,5 @@ waste CHP CC,efficiency,0.2081,per unit,"Danish Energy Agency, technology_data_f
waste CHP CC,efficiency-heat,0.7619,per unit,"Danish Energy Agency, technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree: Heat efficiency, net, annual average",2015.0
waste CHP CC,investment,8582.5944,EUR/kW_e,"Danish Energy Agency, technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree: Nominal investment ",2015.0
waste CHP CC,lifetime,25.0,years,"Danish Energy Agency, technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree: Technical lifetime",2015.0
water tank charger,efficiency,0.8367,per unit,"Danish Energy Agency, technology_data_catalogue_for_energy_storage.xlsx",: efficiency from sqr(Round trip efficiency),2015.0
water tank discharger,efficiency,0.8367,per unit,"Danish Energy Agency, technology_data_catalogue_for_energy_storage.xlsx",: efficiency from sqr(Round trip efficiency),2015.0
water tank charger,efficiency,0.9899,per unit,"Danish Energy Agency, technology_data_catalogue_for_energy_storage.xlsx",: efficiency from sqr(Round trip efficiency),2015.0
water tank discharger,efficiency,0.9899,per unit,"Danish Energy Agency, technology_data_catalogue_for_energy_storage.xlsx",: efficiency from sqr(Round trip efficiency),2015.0
10 changes: 5 additions & 5 deletions outputs/costs_2035.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -709,9 +709,9 @@ central solid biomass CHP powerboost CC,efficiency,0.2687,per unit,"Danish Energ
central solid biomass CHP powerboost CC,efficiency-heat,0.8257,per unit,"Danish Energy Agency, technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree: Heat efficiency, net, annual average",2015.0
central solid biomass CHP powerboost CC,investment,3493.3,EUR/kW_e,"Danish Energy Agency, technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree: Nominal investment ",2015.0
central solid biomass CHP powerboost CC,lifetime,25.0,years,"Danish Energy Agency, technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree: Technical lifetime",2015.0
central water tank storage,FOM,0.5714,%/year,"Danish Energy Agency, technology_data_catalogue_for_energy_storage.xlsx",140 PTES seasonal: Fixed O&M,2015.0
central water tank storage,investment,0.5556,EUR/kWhCapacity,"Danish Energy Agency, technology_data_catalogue_for_energy_storage.xlsx",140 PTES seasonal: Specific investment,2015.0
central water tank storage,lifetime,25.0,years,"Danish Energy Agency, technology_data_catalogue_for_energy_storage.xlsx",140 PTES seasonal: Technical lifetime,2015.0
central water tank storage,FOM,0.2901,%/year,"Danish Energy Agency, technology_data_catalogue_for_energy_storage.xlsx",141 Large hot water tank: Fixed O&M,2015.0
central water tank storage,investment,3.1374,EUR/kWhCapacity,"Danish Energy Agency, technology_data_catalogue_for_energy_storage.xlsx",141 Large hot water tank: Specific investment,2015.0
central water tank storage,lifetime,40.0,years,"Danish Energy Agency, technology_data_catalogue_for_energy_storage.xlsx",141 Large hot water tank: Technical lifetime,2015.0
clean water tank storage,FOM,2.0,%/year,"Caldera et al 2016: Local cost of seawater RO desalination based on solar PV and windenergy: A global estimate. (https://doi.org/10.1016/j.desal.2016.02.004), Table 1.",,
clean water tank storage,investment,69.1286,EUR/m^3-H2O,"Caldera et al 2016: Local cost of seawater RO desalination based on solar PV and windenergy: A global estimate. (https://doi.org/10.1016/j.desal.2016.02.004), Table 1.",,2013.0
clean water tank storage,lifetime,30.0,years,"Caldera et al 2016: Local cost of seawater RO desalination based on solar PV and windenergy: A global estimate. (https://doi.org/10.1016/j.desal.2016.02.004), Table 1.",,
Expand Down Expand Up @@ -1055,5 +1055,5 @@ waste CHP CC,efficiency,0.2102,per unit,"Danish Energy Agency, technology_data_f
waste CHP CC,efficiency-heat,0.762,per unit,"Danish Energy Agency, technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree: Heat efficiency, net, annual average",2015.0
waste CHP CC,investment,8307.058,EUR/kW_e,"Danish Energy Agency, technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree: Nominal investment ",2015.0
waste CHP CC,lifetime,25.0,years,"Danish Energy Agency, technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree: Technical lifetime",2015.0
water tank charger,efficiency,0.8367,per unit,"Danish Energy Agency, technology_data_catalogue_for_energy_storage.xlsx",: efficiency from sqr(Round trip efficiency),2015.0
water tank discharger,efficiency,0.8367,per unit,"Danish Energy Agency, technology_data_catalogue_for_energy_storage.xlsx",: efficiency from sqr(Round trip efficiency),2015.0
water tank charger,efficiency,0.9899,per unit,"Danish Energy Agency, technology_data_catalogue_for_energy_storage.xlsx",: efficiency from sqr(Round trip efficiency),2015.0
water tank discharger,efficiency,0.9899,per unit,"Danish Energy Agency, technology_data_catalogue_for_energy_storage.xlsx",: efficiency from sqr(Round trip efficiency),2015.0
10 changes: 5 additions & 5 deletions outputs/costs_2040.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -709,9 +709,9 @@ central solid biomass CHP powerboost CC,efficiency,0.2675,per unit,"Danish Energ
central solid biomass CHP powerboost CC,efficiency-heat,0.8269,per unit,"Danish Energy Agency, technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree: Heat efficiency, net, annual average",2015.0
central solid biomass CHP powerboost CC,investment,3442.0984,EUR/kW_e,"Danish Energy Agency, technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree: Nominal investment ",2015.0
central solid biomass CHP powerboost CC,lifetime,25.0,years,"Danish Energy Agency, technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree: Technical lifetime",2015.0
central water tank storage,FOM,0.5934,%/year,"Danish Energy Agency, technology_data_catalogue_for_energy_storage.xlsx",140 PTES seasonal: Fixed O&M,2015.0
central water tank storage,investment,0.535,EUR/kWhCapacity,"Danish Energy Agency, technology_data_catalogue_for_energy_storage.xlsx",140 PTES seasonal: Specific investment,2015.0
central water tank storage,lifetime,25.0,years,"Danish Energy Agency, technology_data_catalogue_for_energy_storage.xlsx",140 PTES seasonal: Technical lifetime,2015.0
central water tank storage,FOM,0.2901,%/year,"Danish Energy Agency, technology_data_catalogue_for_energy_storage.xlsx",141 Large hot water tank: Fixed O&M,2015.0
central water tank storage,investment,3.1374,EUR/kWhCapacity,"Danish Energy Agency, technology_data_catalogue_for_energy_storage.xlsx",141 Large hot water tank: Specific investment,2015.0
central water tank storage,lifetime,40.0,years,"Danish Energy Agency, technology_data_catalogue_for_energy_storage.xlsx",141 Large hot water tank: Technical lifetime,2015.0
clean water tank storage,FOM,2.0,%/year,"Caldera et al 2016: Local cost of seawater RO desalination based on solar PV and windenergy: A global estimate. (https://doi.org/10.1016/j.desal.2016.02.004), Table 1.",,
clean water tank storage,investment,69.1286,EUR/m^3-H2O,"Caldera et al 2016: Local cost of seawater RO desalination based on solar PV and windenergy: A global estimate. (https://doi.org/10.1016/j.desal.2016.02.004), Table 1.",,2013.0
clean water tank storage,lifetime,30.0,years,"Caldera et al 2016: Local cost of seawater RO desalination based on solar PV and windenergy: A global estimate. (https://doi.org/10.1016/j.desal.2016.02.004), Table 1.",,
Expand Down Expand Up @@ -1055,5 +1055,5 @@ waste CHP CC,efficiency,0.2123,per unit,"Danish Energy Agency, technology_data_f
waste CHP CC,efficiency-heat,0.7622,per unit,"Danish Energy Agency, technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree: Heat efficiency, net, annual average",2015.0
waste CHP CC,investment,8031.5216,EUR/kW_e,"Danish Energy Agency, technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree: Nominal investment ",2015.0
waste CHP CC,lifetime,25.0,years,"Danish Energy Agency, technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree: Technical lifetime",2015.0
water tank charger,efficiency,0.8367,per unit,"Danish Energy Agency, technology_data_catalogue_for_energy_storage.xlsx",: efficiency from sqr(Round trip efficiency),2015.0
water tank discharger,efficiency,0.8367,per unit,"Danish Energy Agency, technology_data_catalogue_for_energy_storage.xlsx",: efficiency from sqr(Round trip efficiency),2015.0
water tank charger,efficiency,0.9899,per unit,"Danish Energy Agency, technology_data_catalogue_for_energy_storage.xlsx",: efficiency from sqr(Round trip efficiency),2015.0
water tank discharger,efficiency,0.9899,per unit,"Danish Energy Agency, technology_data_catalogue_for_energy_storage.xlsx",: efficiency from sqr(Round trip efficiency),2015.0
Loading
Loading