You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
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
Copy file name to clipboardExpand all lines: docs/release_notes.rst
+2Lines changed: 2 additions & 0 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -11,6 +11,8 @@ Release Notes
11
11
Upcoming Release
12
12
================
13
13
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
+
14
16
.. .. warning::
15
17
16
18
.. The features listed below are not released yet, but will be part of the next release!
Copy file name to clipboardExpand all lines: outputs/US/costs_2020.csv
-5Lines changed: 0 additions & 5 deletions
Original file line number
Diff line number
Diff line change
@@ -3676,11 +3676,6 @@ central water tank storage,FOM,0.2901,%/year,"Danish Energy Agency, inputs/techn
3676
3676
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,,
3677
3677
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,,
3678
3678
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,,
3684
3679
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,,
3685
3680
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,,
3686
3681
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.",,,,
Copy file name to clipboardExpand all lines: outputs/US/costs_2025.csv
-5Lines changed: 0 additions & 5 deletions
Original file line number
Diff line number
Diff line change
@@ -3756,11 +3756,6 @@ central water tank storage,FOM,0.2901,%/year,"Danish Energy Agency, inputs/techn
3756
3756
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,,
3757
3757
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,,
3758
3758
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,,
3764
3759
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,,
3765
3760
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,,
3766
3761
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.",,,,
Copy file name to clipboardExpand all lines: outputs/US/costs_2030.csv
-5Lines changed: 0 additions & 5 deletions
Original file line number
Diff line number
Diff line change
@@ -3912,11 +3912,6 @@ central water tank storage,FOM,0.2901,%/year,"Danish Energy Agency, inputs/techn
3912
3912
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,,
3913
3913
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,,
3914
3914
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,,
3920
3915
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,,
3921
3916
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,,
3922
3917
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.",,,,
Copy file name to clipboardExpand all lines: outputs/US/costs_2035.csv
-5Lines changed: 0 additions & 5 deletions
Original file line number
Diff line number
Diff line change
@@ -3936,11 +3936,6 @@ central water tank storage,FOM,0.2901,%/year,"Danish Energy Agency, inputs/techn
3936
3936
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,,
3937
3937
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,,
3938
3938
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,,
3944
3939
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,,
3945
3940
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,,
3946
3941
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.",,,,
Copy file name to clipboardExpand all lines: outputs/US/costs_2040.csv
-5Lines changed: 0 additions & 5 deletions
Original file line number
Diff line number
Diff line change
@@ -3936,11 +3936,6 @@ central water tank storage,FOM,0.2901,%/year,"Danish Energy Agency, inputs/techn
3936
3936
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,,
3937
3937
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,,
3938
3938
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,,
3944
3939
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,,
3945
3940
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,,
3946
3941
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.",,,,
Copy file name to clipboardExpand all lines: outputs/US/costs_2045.csv
-5Lines changed: 0 additions & 5 deletions
Original file line number
Diff line number
Diff line change
@@ -3936,11 +3936,6 @@ central water tank storage,FOM,0.2901,%/year,"Danish Energy Agency, inputs/techn
3936
3936
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,,
3937
3937
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,,
3938
3938
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,,
3944
3939
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,,
3945
3940
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,,
3946
3941
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.",,,,
Copy file name to clipboardExpand all lines: outputs/US/costs_2050.csv
-5Lines changed: 0 additions & 5 deletions
Original file line number
Diff line number
Diff line change
@@ -3936,11 +3936,6 @@ central water tank storage,FOM,0.2901,%/year,"Danish Energy Agency, inputs/techn
3936
3936
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,,
3937
3937
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,,
3938
3938
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,,
3944
3939
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,,
3945
3940
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,,
3946
3941
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.",,,,
Copy file name to clipboardExpand all lines: outputs/costs_2020.csv
-5Lines changed: 0 additions & 5 deletions
Original file line number
Diff line number
Diff line change
@@ -737,11 +737,6 @@ central water tank storage,FOM,0.2901,%/year,"Danish Energy Agency, inputs/techn
737
737
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
738
738
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
739
739
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
745
740
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
746
741
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
747
742
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