Skip to content

Commit 77c1f14

Browse files
fix: remove water sourced heat pumps (for now) (#196)
* feat: remove water-sourced heat pumps reccomendation: use excess-heat-sourced heat pump data instead or see related DEA data on seawater-sourced heat pumps * docs: update release notes * feat: remove WSHPs from tests
1 parent 5a79d48 commit 77c1f14

17 files changed

Lines changed: 2 additions & 111 deletions

docs/release_notes.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ Release Notes
1111
Upcoming Release
1212
================
1313

14+
* Removed water-sourced heat pumps, as cost assumptions (based on higher uncertainty range in DEA tables) are a) likely overestimates and b) break pessimistic/optimistic scenarios. Reccomendation: Use excess-heat-sourced heat pump data or see DEA data on seawater-sourced heat pumps.
15+
1416
.. .. warning::
1517
1618
.. The features listed below are not released yet, but will be part of the next release!

outputs/US/costs_2020.csv

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3676,11 +3676,6 @@ central water tank storage,FOM,0.2901,%/year,"Danish Energy Agency, inputs/techn
36763676
central water tank storage,energy to power ratio,60.3448,h,"Danish Energy Agency, inputs/technology_data_catalogue_for_energy_storage.xlsx",141 Large hot water tank: Ratio between energy storage and input capacity,2015.0,,
36773677
central water tank storage,investment,3.1374,EUR/kWhCapacity,"Danish Energy Agency, inputs/technology_data_catalogue_for_energy_storage.xlsx",141 Large hot water tank: Specific investment,2015.0,,
36783678
central water tank storage,lifetime,40.0,years,"Danish Energy Agency, inputs/technology_data_catalogue_for_energy_storage.xlsx",141 Large hot water tank: Technical lifetime,2015.0,,
3679-
central water-sourced heat pump,FOM,0.5,%/year,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","40 Comp. hp, seawater 20 MW: Fixed O&M",2015.0,,
3680-
central water-sourced heat pump,VOM,1.8942,EUR/MWh,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","40 Comp. hp, seawater 20 MW: Variable O&M",2015.0,,
3681-
central water-sourced heat pump,efficiency,3.78,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","40 Comp. hp, seawater 20 MW: Total efficiency , net, annual average",2015.0,,
3682-
central water-sourced heat pump,investment,1058.2216,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","40 Comp. hp, seawater 20 MW: Specific investment",2015.0,,
3683-
central water-sourced heat pump,lifetime,40.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","40 Comp. hp, seawater 20 MW: Technical lifetime",2015.0,,
36843679
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.",,2013.0,,
36853680
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,,
36863681
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.",,,,

outputs/US/costs_2025.csv

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3756,11 +3756,6 @@ central water tank storage,FOM,0.2901,%/year,"Danish Energy Agency, inputs/techn
37563756
central water tank storage,energy to power ratio,60.3448,h,"Danish Energy Agency, inputs/technology_data_catalogue_for_energy_storage.xlsx",141 Large hot water tank: Ratio between energy storage and input capacity,2015.0,,
37573757
central water tank storage,investment,3.1374,EUR/kWhCapacity,"Danish Energy Agency, inputs/technology_data_catalogue_for_energy_storage.xlsx",141 Large hot water tank: Specific investment,2015.0,,
37583758
central water tank storage,lifetime,40.0,years,"Danish Energy Agency, inputs/technology_data_catalogue_for_energy_storage.xlsx",141 Large hot water tank: Technical lifetime,2015.0,,
3759-
central water-sourced heat pump,FOM,0.5,%/year,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","40 Comp. hp, seawater 20 MW: Fixed O&M",2015.0,,
3760-
central water-sourced heat pump,VOM,1.7884,EUR/MWh,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","40 Comp. hp, seawater 20 MW: Variable O&M",2015.0,,
3761-
central water-sourced heat pump,efficiency,3.8,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","40 Comp. hp, seawater 20 MW: Total efficiency , net, annual average",2015.0,,
3762-
central water-sourced heat pump,investment,1058.2216,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","40 Comp. hp, seawater 20 MW: Specific investment",2015.0,,
3763-
central water-sourced heat pump,lifetime,40.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","40 Comp. hp, seawater 20 MW: Technical lifetime",2015.0,,
37643759
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.",,2013.0,,
37653760
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,,
37663761
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.",,,,

outputs/US/costs_2030.csv

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3912,11 +3912,6 @@ central water tank storage,FOM,0.2901,%/year,"Danish Energy Agency, inputs/techn
39123912
central water tank storage,energy to power ratio,60.3448,h,"Danish Energy Agency, inputs/technology_data_catalogue_for_energy_storage.xlsx",141 Large hot water tank: Ratio between energy storage and input capacity,2015.0,,
39133913
central water tank storage,investment,3.1374,EUR/kWhCapacity,"Danish Energy Agency, inputs/technology_data_catalogue_for_energy_storage.xlsx",141 Large hot water tank: Specific investment,2015.0,,
39143914
central water tank storage,lifetime,40.0,years,"Danish Energy Agency, inputs/technology_data_catalogue_for_energy_storage.xlsx",141 Large hot water tank: Technical lifetime,2015.0,,
3915-
central water-sourced heat pump,FOM,0.5,%/year,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","40 Comp. hp, seawater 20 MW: Fixed O&M",2015.0,,
3916-
central water-sourced heat pump,VOM,1.6826,EUR/MWh,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","40 Comp. hp, seawater 20 MW: Variable O&M",2015.0,,
3917-
central water-sourced heat pump,efficiency,3.82,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","40 Comp. hp, seawater 20 MW: Total efficiency , net, annual average",2015.0,,
3918-
central water-sourced heat pump,investment,1058.2216,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","40 Comp. hp, seawater 20 MW: Specific investment",2015.0,,
3919-
central water-sourced heat pump,lifetime,40.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","40 Comp. hp, seawater 20 MW: Technical lifetime",2015.0,,
39203915
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.",,2013.0,,
39213916
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,,
39223917
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.",,,,

outputs/US/costs_2035.csv

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3936,11 +3936,6 @@ central water tank storage,FOM,0.2901,%/year,"Danish Energy Agency, inputs/techn
39363936
central water tank storage,energy to power ratio,60.3448,h,"Danish Energy Agency, inputs/technology_data_catalogue_for_energy_storage.xlsx",141 Large hot water tank: Ratio between energy storage and input capacity,2015.0,,
39373937
central water tank storage,investment,3.1374,EUR/kWhCapacity,"Danish Energy Agency, inputs/technology_data_catalogue_for_energy_storage.xlsx",141 Large hot water tank: Specific investment,2015.0,,
39383938
central water tank storage,lifetime,40.0,years,"Danish Energy Agency, inputs/technology_data_catalogue_for_energy_storage.xlsx",141 Large hot water tank: Technical lifetime,2015.0,,
3939-
central water-sourced heat pump,FOM,0.5,%/year,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","40 Comp. hp, seawater 20 MW: Fixed O&M",2015.0,,
3940-
central water-sourced heat pump,VOM,1.5768,EUR/MWh,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","40 Comp. hp, seawater 20 MW: Variable O&M",2015.0,,
3941-
central water-sourced heat pump,efficiency,3.84,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","40 Comp. hp, seawater 20 MW: Total efficiency , net, annual average",2015.0,,
3942-
central water-sourced heat pump,investment,1058.2216,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","40 Comp. hp, seawater 20 MW: Specific investment",2015.0,,
3943-
central water-sourced heat pump,lifetime,40.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","40 Comp. hp, seawater 20 MW: Technical lifetime",2015.0,,
39443939
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.",,2013.0,,
39453940
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,,
39463941
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.",,,,

outputs/US/costs_2040.csv

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3936,11 +3936,6 @@ central water tank storage,FOM,0.2901,%/year,"Danish Energy Agency, inputs/techn
39363936
central water tank storage,energy to power ratio,60.3448,h,"Danish Energy Agency, inputs/technology_data_catalogue_for_energy_storage.xlsx",141 Large hot water tank: Ratio between energy storage and input capacity,2015.0,,
39373937
central water tank storage,investment,3.1374,EUR/kWhCapacity,"Danish Energy Agency, inputs/technology_data_catalogue_for_energy_storage.xlsx",141 Large hot water tank: Specific investment,2015.0,,
39383938
central water tank storage,lifetime,40.0,years,"Danish Energy Agency, inputs/technology_data_catalogue_for_energy_storage.xlsx",141 Large hot water tank: Technical lifetime,2015.0,,
3939-
central water-sourced heat pump,FOM,0.5,%/year,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","40 Comp. hp, seawater 20 MW: Fixed O&M",2015.0,,
3940-
central water-sourced heat pump,VOM,1.4709,EUR/MWh,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","40 Comp. hp, seawater 20 MW: Variable O&M",2015.0,,
3941-
central water-sourced heat pump,efficiency,3.86,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","40 Comp. hp, seawater 20 MW: Total efficiency , net, annual average",2015.0,,
3942-
central water-sourced heat pump,investment,1058.2216,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","40 Comp. hp, seawater 20 MW: Specific investment",2015.0,,
3943-
central water-sourced heat pump,lifetime,40.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","40 Comp. hp, seawater 20 MW: Technical lifetime",2015.0,,
39443939
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.",,2013.0,,
39453940
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,,
39463941
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.",,,,

outputs/US/costs_2045.csv

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3936,11 +3936,6 @@ central water tank storage,FOM,0.2901,%/year,"Danish Energy Agency, inputs/techn
39363936
central water tank storage,energy to power ratio,60.3448,h,"Danish Energy Agency, inputs/technology_data_catalogue_for_energy_storage.xlsx",141 Large hot water tank: Ratio between energy storage and input capacity,2015.0,,
39373937
central water tank storage,investment,3.1374,EUR/kWhCapacity,"Danish Energy Agency, inputs/technology_data_catalogue_for_energy_storage.xlsx",141 Large hot water tank: Specific investment,2015.0,,
39383938
central water tank storage,lifetime,40.0,years,"Danish Energy Agency, inputs/technology_data_catalogue_for_energy_storage.xlsx",141 Large hot water tank: Technical lifetime,2015.0,,
3939-
central water-sourced heat pump,FOM,0.5,%/year,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","40 Comp. hp, seawater 20 MW: Fixed O&M",2015.0,,
3940-
central water-sourced heat pump,VOM,1.4709,EUR/MWh,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","40 Comp. hp, seawater 20 MW: Variable O&M",2015.0,,
3941-
central water-sourced heat pump,efficiency,3.86,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","40 Comp. hp, seawater 20 MW: Total efficiency , net, annual average",2015.0,,
3942-
central water-sourced heat pump,investment,1058.2216,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","40 Comp. hp, seawater 20 MW: Specific investment",2015.0,,
3943-
central water-sourced heat pump,lifetime,40.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","40 Comp. hp, seawater 20 MW: Technical lifetime",2015.0,,
39443939
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.",,2013.0,,
39453940
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,,
39463941
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.",,,,

outputs/US/costs_2050.csv

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3936,11 +3936,6 @@ central water tank storage,FOM,0.2901,%/year,"Danish Energy Agency, inputs/techn
39363936
central water tank storage,energy to power ratio,60.3448,h,"Danish Energy Agency, inputs/technology_data_catalogue_for_energy_storage.xlsx",141 Large hot water tank: Ratio between energy storage and input capacity,2015.0,,
39373937
central water tank storage,investment,3.1374,EUR/kWhCapacity,"Danish Energy Agency, inputs/technology_data_catalogue_for_energy_storage.xlsx",141 Large hot water tank: Specific investment,2015.0,,
39383938
central water tank storage,lifetime,40.0,years,"Danish Energy Agency, inputs/technology_data_catalogue_for_energy_storage.xlsx",141 Large hot water tank: Technical lifetime,2015.0,,
3939-
central water-sourced heat pump,FOM,0.5,%/year,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","40 Comp. hp, seawater 20 MW: Fixed O&M",2015.0,,
3940-
central water-sourced heat pump,VOM,1.4709,EUR/MWh,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","40 Comp. hp, seawater 20 MW: Variable O&M",2015.0,,
3941-
central water-sourced heat pump,efficiency,3.86,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","40 Comp. hp, seawater 20 MW: Total efficiency , net, annual average",2015.0,,
3942-
central water-sourced heat pump,investment,1058.2216,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","40 Comp. hp, seawater 20 MW: Specific investment",2015.0,,
3943-
central water-sourced heat pump,lifetime,40.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","40 Comp. hp, seawater 20 MW: Technical lifetime",2015.0,,
39443939
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.",,2013.0,,
39453940
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,,
39463941
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.",,,,

outputs/costs_2020.csv

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -737,11 +737,6 @@ central water tank storage,FOM,0.2901,%/year,"Danish Energy Agency, inputs/techn
737737
central water tank storage,energy to power ratio,60.3448,h,"Danish Energy Agency, inputs/technology_data_catalogue_for_energy_storage.xlsx",141 Large hot water tank: Ratio between energy storage and input capacity,2015.0
738738
central water tank storage,investment,3.1374,EUR/kWhCapacity,"Danish Energy Agency, inputs/technology_data_catalogue_for_energy_storage.xlsx",141 Large hot water tank: Specific investment,2015.0
739739
central water tank storage,lifetime,40.0,years,"Danish Energy Agency, inputs/technology_data_catalogue_for_energy_storage.xlsx",141 Large hot water tank: Technical lifetime,2015.0
740-
central water-sourced heat pump,FOM,0.5,%/year,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","40 Comp. hp, seawater 20 MW: Fixed O&M",2015.0
741-
central water-sourced heat pump,VOM,1.8942,EUR/MWh,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","40 Comp. hp, seawater 20 MW: Variable O&M",2015.0
742-
central water-sourced heat pump,efficiency,3.78,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","40 Comp. hp, seawater 20 MW: Total efficiency , net, annual average",2015.0
743-
central water-sourced heat pump,investment,1058.2216,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","40 Comp. hp, seawater 20 MW: Specific investment",2015.0
744-
central water-sourced heat pump,lifetime,40.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","40 Comp. hp, seawater 20 MW: Technical lifetime",2015.0
745740
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.",,2013.0
746741
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
747742
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.",,

0 commit comments

Comments
 (0)