Skip to content

Commit acc22b1

Browse files
authored
Merge pull request #128 from PyPSA/vehicle-data
Add DEA transport data
2 parents 1d3eb62 + c714bf4 commit acc22b1

12 files changed

+1024
-3
lines changed

Snakefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,13 @@ rule compile_cost_assumptions:
1111
fraunhofer_vehicles_costs = "inputs/Fraunhofer_ISE_vehicles_costs.csv",
1212
EWG_costs = "inputs/EWG_costs.csv",
1313
dea_transport = "inputs/energy_transport_data_sheet_dec_2017.xlsx",
14+
dea_vehicles = "inputs/data_sheets_for_commercial_freight_and_passenger_transport_0.xlsx",
1415
dea_renewable_fuels = "inputs/data_sheets_for_renewable_fuels.xlsx",
1516
dea_storage = "inputs/technology_data_catalogue_for_energy_storage.xlsx",
1617
dea_generation = "inputs/technology_data_for_el_and_dh.xlsx",
1718
dea_heating = "inputs/technologydatafor_heating_installations_marts_2018.xlsx",
1819
dea_industrial = "inputs/technology_data_for_industrial_process_heat.xlsx",
20+
dea_ship = "inputs/data_sheets_for_maritime_commercial_freight_and_passenger_transport.xlsx",
1921
dea_ccts = "inputs/technology_data_for_carbon_capture_transport_storage.xlsx",
2022
pnnl_energy_storage = "inputs/pnnl-energy-storage-database.xlsx",
2123
manual_input = "inputs/manual_input.csv"

docs/release_notes.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ Release Notes
55
.. Upcoming Release
66
.. ================
77
8+
* add heavy duty and shipping technology assumptions from DEA
89

910
Technology-Data 0.8.1 (28 February 2024)
1011
========================================
Binary file not shown.
Binary file not shown.

outputs/costs_2020.csv

Lines changed: 117 additions & 0 deletions
Large diffs are not rendered by default.

outputs/costs_2025.csv

Lines changed: 117 additions & 0 deletions
Large diffs are not rendered by default.

outputs/costs_2030.csv

Lines changed: 117 additions & 0 deletions
Large diffs are not rendered by default.

outputs/costs_2035.csv

Lines changed: 117 additions & 0 deletions
Large diffs are not rendered by default.

outputs/costs_2040.csv

Lines changed: 117 additions & 0 deletions
Large diffs are not rendered by default.

outputs/costs_2045.csv

Lines changed: 117 additions & 0 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)