Skip to content

Commit 3dfdf7b

Browse files
authored
Merge branch 'PyPSA:master' into biomass_emissions
2 parents 316137b + 4e48474 commit 3dfdf7b

19 files changed

+1150
-785
lines changed

docs/release_notes.rst

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,12 @@ Upcoming Release
2020
.. The features listed below are not released yet, but will be part of the next release!
2121
.. To use the features already you have to use the ``master`` branch.
2222
23+
* Updated DEA Energy Storage data file (technology_data_catalogue_for_energy_storage.xlsx) to the newest version 9 – costs are now given in 2020 currency year.
24+
25+
* Added storage temperatures as a parameter for central and decentral water tanks as well as for pit thermal energy storage.
26+
27+
* Integrated gas storage processing directly into the order_data function and removed the add_gas_storage function, as its data structure now matches that of the other components in the technology_data_catalogue_for_energy_storage.xlsx file.
28+
2329
* Include unit test for compile_cost_assumptions_usa.py (https://github.com/PyPSA/technology-data/pull/170)
2430

2531
* US specific folder for NREL/ATB data (https://github.com/PyPSA/technology-data/pull/172)
@@ -54,6 +60,8 @@ Upcoming Release
5460

5561
* Updates ci.yaml such that it fails if the generated outputs are different than the ones committed (https://github.com/PyPSA/technology-data/pull/205)
5662

63+
* Add industrial plant CCS retrofit options (https://github.com/PyPSA/technology-data/pull/212)
64+
5765
* Include further unit tests for compile_cost_assumptions.py (https://github.com/PyPSA/technology-data/pull/210)
5866

5967
`v0.11.0 <https://github.com/PyPSA/technology-data/releases/tag/v0.11.0>`__ (24th January 2025)

inputs/manual_input.csv

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -392,15 +392,37 @@ iron-air battery,FOM,2030,1,%/year,2023,"Form Energy, docu/FormEnergy_Europe_mod
392392
iron-air battery,FOM,2035,1.10628646943421,%/year,2023,"Form Energy, docu/FormEnergy_Europe_modeling_recommendations_2023.03.pdf, p4",
393393
iron-air battery,FOM,2040,1.1807773334732,%/year,2023,"Form Energy, docu/FormEnergy_Europe_modeling_recommendations_2023.03.pdf, p4",
394394
iron-air battery,investment,2025,30.05,EUR/kWh,2023,"Form Energy, docu/FormEnergy_Europe_modeling_recommendations_2023.03.pdf, p4",
395-
iron-air battery,investment,2030,20.00,EUR/kWh,2023,"Form Energy, docu/FormEnergy_Europe_modeling_recommendations_2023.03.pdf, p4",
395+
iron-air battery,investment,2030,20,EUR/kWh,2023,"Form Energy, docu/FormEnergy_Europe_modeling_recommendations_2023.03.pdf, p4",
396396
iron-air battery,investment,2035,15.11,EUR/kWh,2023,"Form Energy, docu/FormEnergy_Europe_modeling_recommendations_2023.03.pdf, p4",
397397
iron-air battery,investment,2040,13.33,EUR/kWh,2023,"Form Energy, docu/FormEnergy_Europe_modeling_recommendations_2023.03.pdf, p4",
398-
iron-air battery charge,efficiency,2025,0.70,per unit,2023,"Form Energy, docu/FormEnergy_Europe_modeling_recommendations_2023.03.pdf, p4",
398+
iron-air battery charge,efficiency,2025,0.7,per unit,2023,"Form Energy, docu/FormEnergy_Europe_modeling_recommendations_2023.03.pdf, p4",
399399
iron-air battery charge,efficiency,2030,0.71,per unit,2023,"Form Energy, docu/FormEnergy_Europe_modeling_recommendations_2023.03.pdf, p4",
400400
iron-air battery charge,efficiency,2035,0.73,per unit,2023,"Form Energy, docu/FormEnergy_Europe_modeling_recommendations_2023.03.pdf, p4",
401401
iron-air battery charge,efficiency,2040,0.74,per unit,2023,"Form Energy, docu/FormEnergy_Europe_modeling_recommendations_2023.03.pdf, p4",
402402
iron-air battery discharge,efficiency,2025,0.59,per unit,2023,"Form Energy, docu/FormEnergy_Europe_modeling_recommendations_2023.03.pdf, p4",
403-
iron-air battery discharge,efficiency,2030,0.60,per unit,2023,"Form Energy, docu/FormEnergy_Europe_modeling_recommendations_2023.03.pdf, p4",
403+
iron-air battery discharge,efficiency,2030,0.6,per unit,2023,"Form Energy, docu/FormEnergy_Europe_modeling_recommendations_2023.03.pdf, p4",
404404
iron-air battery discharge,efficiency,2035,0.62,per unit,2023,"Form Energy, docu/FormEnergy_Europe_modeling_recommendations_2023.03.pdf, p4",
405405
iron-air battery discharge,efficiency,2040,0.63,per unit,2023,"Form Energy, docu/FormEnergy_Europe_modeling_recommendations_2023.03.pdf, p4",
406406
iron-air battery,lifetime,2030,17.5,years,2023,"Form Energy, docu/FormEnergy_Europe_modeling_recommendations_2023.03.pdf, p4",
407+
ethanol carbon capture retrofit,FOM,2030,7,%/year,2019,"National Petroleum Council, Meeting the Dual Challenge - A Roadmap to At-Scale Deployment of Carbon Capture, Use, and Storage: https://dualchallenge.npc.org/files/CCUS-Chap_2-030521.pdf, p2-21, accessed 2025-04-16",
408+
ethanol carbon capture retrofit,capture_rate,2030,0.94,per unit,2019,"National Petroleum Council, Meeting the Dual Challenge - A Roadmap to At-Scale Deployment of Carbon Capture, Use, and Storage: https://dualchallenge.npc.org/files/CCUS-Chap_2-030521.pdf, p2-16, accessed 2025-04-16",
409+
ethanol carbon capture retrofit,electricity-input,2030,0.12,MWh/tCO2,2019,"National Petroleum Council, Meeting the Dual Challenge - A Roadmap to At-Scale Deployment of Carbon Capture, Use, and Storage: https://dualchallenge.npc.org/files/CCUS-Chap_2-030521.pdf, p2-20, accessed 2025-04-16",
410+
ethanol carbon capture retrofit,investment,2030,922105,USD/(tCO2/h),2019,"National Petroleum Council, Meeting the Dual Challenge - A Roadmap to At-Scale Deployment of Carbon Capture, Use, and Storage: https://dualchallenge.npc.org/files/CCUS-Chap_2-030521.pdf, p2-18, accessed 2025-04-16","Capital cost 36 million USD, CO2 Volume captured 342000 t/year"
411+
ethanol carbon capture retrofit,lifetime,2030,20,years,2019,"National Petroleum Council, Meeting the Dual Challenge - A Roadmap to At-Scale Deployment of Carbon Capture, Use, and Storage: https://dualchallenge.npc.org/files/CCUS-Chap_2-030521.pdf, p2-21, accessed 2025-04-16",
412+
ammonia carbon capture retrofit,FOM,2030,5,%/year,2019,"National Petroleum Council, Meeting the Dual Challenge - A Roadmap to At-Scale Deployment of Carbon Capture, Use, and Storage: https://dualchallenge.npc.org/files/CCUS-Chap_2-030521.pdf, p2-21, accessed 2025-04-16",
413+
ammonia carbon capture retrofit,capture_rate,2030,0.99,per unit,2019,"National Petroleum Council, Meeting the Dual Challenge - A Roadmap to At-Scale Deployment of Carbon Capture, Use, and Storage: https://dualchallenge.npc.org/files/CCUS-Chap_2-030521.pdf, p2-16, accessed 2025-04-16",CO2 volume captured / (Stream flowrate * Max. capacity utilization * CO2 in exhaust * 8760)
414+
ammonia carbon capture retrofit,electricity-input,2030,0.1,MWh/tCO2,2019,"National Petroleum Council, Meeting the Dual Challenge - A Roadmap to At-Scale Deployment of Carbon Capture, Use, and Storage: https://dualchallenge.npc.org/files/CCUS-Chap_2-030521.pdf, p2-20, accessed 2025-04-16",
415+
ammonia carbon capture retrofit,investment,2030,923290,USD/(tCO2/h),2019,"National Petroleum Council, Meeting the Dual Challenge - A Roadmap to At-Scale Deployment of Carbon Capture, Use, and Storage: https://dualchallenge.npc.org/files/CCUS-Chap_2-030521.pdf, p2-18, accessed 2025-04-16","Capital cost 41 million USD, CO2 Volume captured 389000 t/year"
416+
ammonia carbon capture retrofit,lifetime,2030,20,years,2019,"National Petroleum Council, Meeting the Dual Challenge - A Roadmap to At-Scale Deployment of Carbon Capture, Use, and Storage: https://dualchallenge.npc.org/files/CCUS-Chap_2-030521.pdf, p2-21, accessed 2025-04-16",
417+
cement carbon capture retrofit,FOM,2030,7,%/year,2019,"National Petroleum Council, Meeting the Dual Challenge - A Roadmap to At-Scale Deployment of Carbon Capture, Use, and Storage: https://dualchallenge.npc.org/files/CCUS-Chap_2-030521.pdf, p2-21, accessed 2025-04-16",
418+
cement carbon capture retrofit,capture_rate,2030,0.9,per unit,2019,"National Petroleum Council, Meeting the Dual Challenge - A Roadmap to At-Scale Deployment of Carbon Capture, Use, and Storage: https://dualchallenge.npc.org/files/CCUS-Chap_2-030521.pdf, p2-16, accessed 2025-04-16",CO2 volume captured / (Stream flowrate * Max. capacity utilization * CO2 in exhaust * 8760)
419+
cement carbon capture retrofit,electricity-input,2030,0.16,MWh/tCO2,2019,"National Petroleum Council, Meeting the Dual Challenge - A Roadmap to At-Scale Deployment of Carbon Capture, Use, and Storage: https://dualchallenge.npc.org/files/CCUS-Chap_2-030521.pdf, p2-20, accessed 2025-04-16",
420+
cement carbon capture retrofit,gas-input,2030,0.76,MWh/tCO2,2019,"National Petroleum Council, Meeting the Dual Challenge - A Roadmap to At-Scale Deployment of Carbon Capture, Use, and Storage: https://dualchallenge.npc.org/files/CCUS-Chap_2-030521.pdf, p2-20, accessed 2025-04-16",
421+
cement carbon capture retrofit,investment,2030,2569739,USD/(tCO2/h),2019,"National Petroleum Council, Meeting the Dual Challenge - A Roadmap to At-Scale Deployment of Carbon Capture, Use, and Storage: https://dualchallenge.npc.org/files/CCUS-Chap_2-030521.pdf, p2-18, accessed 2025-04-16","Capital cost 247 million USD, CO2 Volume captured 842000 t/year"
422+
cement carbon capture retrofit,lifetime,2030,20,years,2019,"National Petroleum Council, Meeting the Dual Challenge - A Roadmap to At-Scale Deployment of Carbon Capture, Use, and Storage: https://dualchallenge.npc.org/files/CCUS-Chap_2-030521.pdf, p2-21, accessed 2025-04-16",
423+
steel carbon capture retrofit,FOM,2030,5,%/year,2019,"National Petroleum Council, Meeting the Dual Challenge - A Roadmap to At-Scale Deployment of Carbon Capture, Use, and Storage: https://dualchallenge.npc.org/files/CCUS-Chap_2-030521.pdf, p2-21, accessed 2025-04-16",
424+
steel carbon capture retrofit,capture_rate,2030,0.9,per unit,2019,"National Petroleum Council, Meeting the Dual Challenge - A Roadmap to At-Scale Deployment of Carbon Capture, Use, and Storage: https://dualchallenge.npc.org/files/CCUS-Chap_2-030521.pdf, p2-16, accessed 2025-04-16",CO2 volume captured / (Stream flowrate * Max. capacity utilization * CO2 in exhaust * 8760)
425+
steel carbon capture retrofit,electricity-input,2030,0.16,MWh/tCO2,2019,"National Petroleum Council, Meeting the Dual Challenge - A Roadmap to At-Scale Deployment of Carbon Capture, Use, and Storage: https://dualchallenge.npc.org/files/CCUS-Chap_2-030521.pdf, p2-20, accessed 2025-04-16",
426+
steel carbon capture retrofit,gas-input,2030,0.76,MWh/tCO2,2019,"National Petroleum Council, Meeting the Dual Challenge - A Roadmap to At-Scale Deployment of Carbon Capture, Use, and Storage: https://dualchallenge.npc.org/files/CCUS-Chap_2-030521.pdf, p2-20, accessed 2025-04-16",
427+
steel carbon capture retrofit,investment,2030,3536679,USD/(tCO2/h),2019,"National Petroleum Council, Meeting the Dual Challenge - A Roadmap to At-Scale Deployment of Carbon Capture, Use, and Storage: https://dualchallenge.npc.org/files/CCUS-Chap_2-030521.pdf, p2-18, accessed 2025-04-16","Capital cost 1342 million USD, CO2 Volume captured 3324000 t/year"
428+
steel carbon capture retrofit,lifetime,2030,20,years,2019,"National Petroleum Council, Meeting the Dual Challenge - A Roadmap to At-Scale Deployment of Carbon Capture, Use, and Storage: https://dualchallenge.npc.org/files/CCUS-Chap_2-030521.pdf, p2-21, accessed 2025-04-16",
160 KB
Binary file not shown.

0 commit comments

Comments
 (0)