Skip to content

Commit

Permalink
Fix transport_final_en_map GCAM7.0 and update tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@klau506
klau506 committed Jul 5, 2024
1 parent 3370818 commit eff5d49
Show file tree
Hide file tree
Showing 6 changed files with 709 additions and 677 deletions.
Binary file modified data/transport_final_en_map.rda
View file
Binary file not shown.
25 changes: 12 additions & 13 deletions inst/extdata/mappings/transport_final_en_map.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,43 +2,42 @@
input,sector,mode,var1,var2,var3,var4,var5,var6,var7,var8,var9,unit_conv
H2 wholesale dispensing,trn_aviation_intl,International Aviation,Final Energy,Final Energy|Hydogen,Final Energy|Transportation,Final Energy|Transportation|Passenger,Final Energy|Transportation|Hydrogen,Final Energy|Transportation|Passenger|Hydrogen,Final Energy|Transportation|Aviation,Final Energy|Transportation|Aviation|Passenger,,1
elect_td_trn,trn_aviation_intl,International Aviation,Final Energy,Final Energy|Electricity,Final Energy|Transportation,Final Energy|Transportation|Passenger,Final Energy|Transportation|Electricity,Final Energy|Transportation|Passenger|Electricity,Final Energy|Transportation|Aviation,Final Energy|Transportation|Aviation|Passenger,,1
refined liquids bunkers,trn_aviation_intl,International Aviation,Final Energy,Final Energy|Liquids,Final Energy|Transportation,Final Energy|Transportation|Passenger,Final Energy|Transportation|Liquids,Final Energy|Transportation|Passenger|Liquids,Final Energy|Transportation|Aviation,Final Energy|Transportation|Aviation|Passenger,,1
refined liquids enduse,trn_aviation_intl,International Aviation,Final Energy,Final Energy|Liquids,Final Energy|Transportation,Final Energy|Transportation|Passenger,Final Energy|Transportation|Liquids,Final Energy|Transportation|Passenger|Liquids,Final Energy|Transportation|Aviation,Final Energy|Transportation|Aviation|Passenger,,1
H2 wholesale dispensing,trn_freight,Domestic Ship,Final Energy,Final Energy|Hydogen,Final Energy|Transportation,Final Energy|Transportation|Freight,Final Energy|Transportation|Hydrogen,Final Energy|Transportation|Freight|Hydrogen,Final Energy|Transportation|Maritime,Final Energy|Transportation|Maritime|Freight,,1
elect_td_trn,trn_freight,Domestic Ship,Final Energy,Final Energy|Electricity,Final Energy|Transportation,Final Energy|Transportation|Freight,Final Energy|Transportation|Electricity,Final Energy|Transportation|Freight|Electricity,Final Energy|Transportation|Maritime,Final Energy|Transportation|Maritime|Freight,,1
refined liquids transport,trn_freight,Domestic Ship,Final Energy,Final Energy|Liquids,Final Energy|Transportation,Final Energy|Transportation|Freight,Final Energy|Transportation|Liquids,Final Energy|Transportation|Freight|Liquids,Final Energy|Transportation|Maritime,Final Energy|Transportation|Maritime|Freight,,1
refined liquids enduse,trn_freight,Domestic Ship,Final Energy,Final Energy|Liquids,Final Energy|Transportation,Final Energy|Transportation|Freight,Final Energy|Transportation|Liquids,Final Energy|Transportation|Freight|Liquids,Final Energy|Transportation|Maritime,Final Energy|Transportation|Maritime|Freight,,1
H2 wholesale dispensing,trn_freight,Freight Rail,Final Energy,Final Energy|Hydogen,Final Energy|Transportation,Final Energy|Transportation|Freight,Final Energy|Transportation|Hydrogen,Final Energy|Transportation|Freight|Hydrogen,Final Energy|Transportation|Rail,Final Energy|Transportation|Rail|Freight,,1
delivered coal,trn_freight,Freight Rail,Final Energy,Final Energy|Solids,Final Energy|Transportation,Final Energy|Transportation|Freight,Final Energy|Transportation|Other,Final Energy|Transportation|Freight|Other,Final Energy|Transportation|Rail,Final Energy|Transportation|Rail|Freight,,1
elect_td_trn,trn_freight,Freight Rail,Final Energy,Final Energy|Electricity,Final Energy|Transportation,Final Energy|Transportation|Freight,Final Energy|Transportation|Electricity,Final Energy|Transportation|Freight|Electricity,Final Energy|Transportation|Rail,Final Energy|Transportation|Rail|Freight,,1
refined liquids transport,trn_freight,Freight Rail,Final Energy,Final Energy|Liquids,Final Energy|Transportation,Final Energy|Transportation|Freight,Final Energy|Transportation|Liquids,Final Energy|Transportation|Freight|Liquids,Final Energy|Transportation|Rail,Final Energy|Transportation|Rail|Freight,,1
refined liquids enduse,trn_freight,Freight Rail,Final Energy,Final Energy|Liquids,Final Energy|Transportation,Final Energy|Transportation|Freight,Final Energy|Transportation|Liquids,Final Energy|Transportation|Freight|Liquids,Final Energy|Transportation|Rail,Final Energy|Transportation|Rail|Freight,,1
H2 retail dispensing,trn_freight_road,Heavy truck,Final Energy,Final Energy|Hydogen,Final Energy|Transportation,Final Energy|Transportation|Freight,Final Energy|Transportation|Hydrogen,Final Energy|Transportation|Freight|Hydrogen,Final Energy|Transportation|Road,Final Energy|Transportation|Road|Freight,,1
elect_td_trn,trn_freight_road,Heavy truck,Final Energy,Final Energy|Electricity,Final Energy|Transportation,Final Energy|Transportation|Freight,Final Energy|Transportation|Electricity,Final Energy|Transportation|Freight|Electricity,Final Energy|Transportation|Road,Final Energy|Transportation|Road|Freight,,1
refined liquids transport,trn_freight_road,Heavy truck,Final Energy,Final Energy|Liquids,Final Energy|Transportation,Final Energy|Transportation|Freight,Final Energy|Transportation|Liquids,Final Energy|Transportation|Freight|Liquids,Final Energy|Transportation|Road,Final Energy|Transportation|Road|Freight,,1
refined liquids enduse,trn_freight_road,Heavy truck,Final Energy,Final Energy|Liquids,Final Energy|Transportation,Final Energy|Transportation|Freight,Final Energy|Transportation|Liquids,Final Energy|Transportation|Freight|Liquids,Final Energy|Transportation|Road,Final Energy|Transportation|Road|Freight,,1
H2 retail dispensing,trn_freight_road,Light truck,Final Energy,Final Energy|Hydogen,Final Energy|Transportation,Final Energy|Transportation|Freight,Final Energy|Transportation|Hydrogen,Final Energy|Transportation|Freight|Hydrogen,Final Energy|Transportation|Road,Final Energy|Transportation|Road|Freight,,1
elect_td_trn,trn_freight_road,Light truck,Final Energy,Final Energy|Electricity,Final Energy|Transportation,Final Energy|Transportation|Freight,Final Energy|Transportation|Electricity,Final Energy|Transportation|Freight|Electricity,Final Energy|Transportation|Road,Final Energy|Transportation|Road|Freight,,1
refined liquids transport,trn_freight_road,Light truck,Final Energy,Final Energy|Liquids,Final Energy|Transportation,Final Energy|Transportation|Freight,Final Energy|Transportation|Liquids,Final Energy|Transportation|Freight|Liquids,Final Energy|Transportation|Road,Final Energy|Transportation|Road|Freight,,1
refined liquids enduse,trn_freight_road,Light truck,Final Energy,Final Energy|Liquids,Final Energy|Transportation,Final Energy|Transportation|Freight,Final Energy|Transportation|Liquids,Final Energy|Transportation|Freight|Liquids,Final Energy|Transportation|Road,Final Energy|Transportation|Road|Freight,,1
H2 retail dispensing,trn_freight_road,Medium truck,Final Energy,Final Energy|Hydogen,Final Energy|Transportation,Final Energy|Transportation|Freight,Final Energy|Transportation|Hydrogen,Final Energy|Transportation|Freight|Hydrogen,Final Energy|Transportation|Road,Final Energy|Transportation|Road|Freight,,1
elect_td_trn,trn_freight_road,Medium truck,Final Energy,Final Energy|Electricity,Final Energy|Transportation,Final Energy|Transportation|Freight,Final Energy|Transportation|Electricity,Final Energy|Transportation|Freight|Electricity,Final Energy|Transportation|Road,Final Energy|Transportation|Road|Freight,,1
refined liquids transport,trn_freight_road,Medium truck,Final Energy,Final Energy|Liquids,Final Energy|Transportation,Final Energy|Transportation|Freight,Final Energy|Transportation|Liquids,Final Energy|Transportation|Freight|Liquids,Final Energy|Transportation|Road,Final Energy|Transportation|Road|Freight,,1
refined liquids enduse,trn_freight_road,Medium truck,Final Energy,Final Energy|Liquids,Final Energy|Transportation,Final Energy|Transportation|Freight,Final Energy|Transportation|Liquids,Final Energy|Transportation|Freight|Liquids,Final Energy|Transportation|Road,Final Energy|Transportation|Road|Freight,,1
H2 wholesale dispensing,trn_pass,Domestic Aviation,Final Energy,Final Energy|Hydogen,Final Energy|Transportation,Final Energy|Transportation|Passenger,Final Energy|Transportation|Hydrogen,Final Energy|Transportation|Passenger|Hydrogen,Final Energy|Transportation|Aviation,Final Energy|Transportation|Aviation|Passenger,,1
elect_td_trn,trn_pass,Domestic Aviation,Final Energy,Final Energy|Electricity,Final Energy|Transportation,Final Energy|Transportation|Passenger,Final Energy|Transportation|Electricity,Final Energy|Transportation|Passenger|Electricity,Final Energy|Transportation|Aviation,Final Energy|Transportation|Aviation|Passenger,,1
refined liquids transport,trn_pass,Domestic Aviation,Final Energy,Final Energy|Liquids,Final Energy|Transportation,Final Energy|Transportation|Passenger,Final Energy|Transportation|Liquids,Final Energy|Transportation|Passenger|Liquids,Final Energy|Transportation|Aviation,Final Energy|Transportation|Aviation|Passenger,,1
refined liquids enduse,trn_pass,Domestic Aviation,Final Energy,Final Energy|Liquids,Final Energy|Transportation,Final Energy|Transportation|Passenger,Final Energy|Transportation|Liquids,Final Energy|Transportation|Passenger|Liquids,Final Energy|Transportation|Aviation,Final Energy|Transportation|Aviation|Passenger,,1
elect_td_trn,trn_pass,HSR,Final Energy,Final Energy|Electricity,Final Energy|Transportation,Final Energy|Transportation|Passenger,Final Energy|Transportation|Electricity,Final Energy|Transportation|Passenger|Electricity,Final Energy|Transportation|Rail,Final Energy|Transportation|Rail|Passenger,,1
elect_td_trn,trn_pass,Passenger Rail,Final Energy,Final Energy|Electricity,Final Energy|Transportation,Final Energy|Transportation|Passenger,Final Energy|Transportation|Electricity,Final Energy|Transportation|Passenger|Electricity,Final Energy|Transportation|Rail,Final Energy|Transportation|Rail|Passenger,,1
refined liquids transport,trn_pass,Passenger Rail,Final Energy,Final Energy|Liquids,Final Energy|Transportation,Final Energy|Transportation|Passenger,Final Energy|Transportation|Liquids,Final Energy|Transportation|Passenger|Liquids,Final Energy|Transportation|Rail,Final Energy|Transportation|Rail|Passenger,,1
refined liquids enduse,trn_pass,Passenger Rail,Final Energy,Final Energy|Liquids,Final Energy|Transportation,Final Energy|Transportation|Passenger,Final Energy|Transportation|Liquids,Final Energy|Transportation|Passenger|Liquids,Final Energy|Transportation|Rail,Final Energy|Transportation|Rail|Passenger,,1
H2 retail dispensing,trn_pass_road,Bus,Final Energy,Final Energy|Hydogen,Final Energy|Transportation,Final Energy|Transportation|Passenger,Final Energy|Transportation|Hydrogen,Final Energy|Transportation|Passenger|Hydrogen,Final Energy|Transportation|Road,Final Energy|Transportation|Road|Passenger,Final Energy|Transportation|Road|Passenger|Bus,1
delivered gas transport,trn_pass_road,Bus,Final Energy,Final Energy|Gases,Final Energy|Transportation,Final Energy|Transportation|Passenger,Final Energy|Transportation|Gases,Final Energy|Transportation|Passenger|Gases,Final Energy|Transportation|Road,Final Energy|Transportation|Road|Passenger,Final Energy|Transportation|Road|Passenger|Bus,1
elect_td_trn,trn_pass_road,Bus,Final Energy,Final Energy|Electricity,Final Energy|Transportation,Final Energy|Transportation|Passenger,Final Energy|Transportation|Electricity,Final Energy|Transportation|Passenger|Electricity,Final Energy|Transportation|Road,Final Energy|Transportation|Road|Passenger,Final Energy|Transportation|Road|Passenger|Bus,1
refined liquids transport,trn_pass_road,Bus,Final Energy,Final Energy|Liquids,Final Energy|Transportation,Final Energy|Transportation|Passenger,Final Energy|Transportation|Liquids,Final Energy|Transportation|Passenger|Liquids,Final Energy|Transportation|Road,Final Energy|Transportation|Road|Passenger,Final Energy|Transportation|Road|Passenger|Bus,1
refined liquids enduse,trn_pass_road,Bus,Final Energy,Final Energy|Liquids,Final Energy|Transportation,Final Energy|Transportation|Passenger,Final Energy|Transportation|Liquids,Final Energy|Transportation|Passenger|Liquids,Final Energy|Transportation|Road,Final Energy|Transportation|Road|Passenger,Final Energy|Transportation|Road|Passenger|Bus,1
elect_td_trn,trn_pass_road_LDV,2W and 3W,Final Energy,Final Energy|Electricity,Final Energy|Transportation,Final Energy|Transportation|Passenger,Final Energy|Transportation|Electricity,Final Energy|Transportation|Passenger|Electricity,Final Energy|Transportation|Road,Final Energy|Transportation|Road|Passenger,Final Energy|Transportation|Road|Passenger|2W&3W,1
refined liquids transport,trn_pass_road_LDV,2W and 3W,Final Energy,Final Energy|Liquids,Final Energy|Transportation,Final Energy|Transportation|Passenger,Final Energy|Transportation|Liquids,Final Energy|Transportation|Passenger|Liquids,Final Energy|Transportation|Road,Final Energy|Transportation|Road|Passenger,Final Energy|Transportation|Road|Passenger|2W&3W,1
refined liquids enduse,trn_pass_road_LDV,2W and 3W,Final Energy,Final Energy|Liquids,Final Energy|Transportation,Final Energy|Transportation|Passenger,Final Energy|Transportation|Liquids,Final Energy|Transportation|Passenger|Liquids,Final Energy|Transportation|Road,Final Energy|Transportation|Road|Passenger,Final Energy|Transportation|Road|Passenger|2W&3W,1
H2 retail dispensing,trn_pass_road_LDV_4W,Car,Final Energy,Final Energy|Hydogen,Final Energy|Transportation,Final Energy|Transportation|Passenger,Final Energy|Transportation|Hydrogen,Final Energy|Transportation|Passenger|Hydrogen,Final Energy|Transportation|Road,Final Energy|Transportation|Road|Passenger,Final Energy|Transportation|Road|Passenger|4W,1
delivered gas transport,trn_pass_road_LDV_4W,Car,Final Energy,Final Energy|Gases,Final Energy|Transportation,Final Energy|Transportation|Passenger,Final Energy|Transportation|Gases,Final Energy|Transportation|Passenger|Gases,Final Energy|Transportation|Road,Final Energy|Transportation|Road|Passenger,Final Energy|Transportation|Road|Passenger|4W,1
elect_td_trn,trn_pass_road_LDV_4W,Car,Final Energy,Final Energy|Electricity,Final Energy|Transportation,Final Energy|Transportation|Passenger,Final Energy|Transportation|Electricity,Final Energy|Transportation|Passenger|Electricity,Final Energy|Transportation|Road,Final Energy|Transportation|Road|Passenger,Final Energy|Transportation|Road|Passenger|4W,1
refined liquids transport,trn_pass_road_LDV_4W,Car,Final Energy,Final Energy|Liquids,Final Energy|Transportation,Final Energy|Transportation|Passenger,Final Energy|Transportation|Liquids,Final Energy|Transportation|Passenger|Liquids,Final Energy|Transportation|Road,Final Energy|Transportation|Road|Passenger,Final Energy|Transportation|Road|Passenger|4W,1
refined liquids enduse,trn_pass_road_LDV_4W,Car,Final Energy,Final Energy|Liquids,Final Energy|Transportation,Final Energy|Transportation|Passenger,Final Energy|Transportation|Liquids,Final Energy|Transportation|Passenger|Liquids,Final Energy|Transportation|Road,Final Energy|Transportation|Road|Passenger,Final Energy|Transportation|Road|Passenger|4W,1
H2 retail dispensing,trn_pass_road_LDV_4W,Large Car and Truck,Final Energy,Final Energy|Hydogen,Final Energy|Transportation,Final Energy|Transportation|Passenger,Final Energy|Transportation|Hydrogen,Final Energy|Transportation|Passenger|Hydrogen,Final Energy|Transportation|Road,Final Energy|Transportation|Road|Passenger,Final Energy|Transportation|Road|Passenger|4W,1
delivered gas transport,trn_pass_road_LDV_4W,Large Car and Truck,Final Energy,Final Energy|Gases,Final Energy|Transportation,Final Energy|Transportation|Passenger,Final Energy|Transportation|Gases,Final Energy|Transportation|Passenger|Gases,Final Energy|Transportation|Road,Final Energy|Transportation|Road|Passenger,Final Energy|Transportation|Road|Passenger|4W,1
elect_td_trn,trn_pass_road_LDV_4W,Large Car and Truck,Final Energy,Final Energy|Electricity,Final Energy|Transportation,Final Energy|Transportation|Passenger,Final Energy|Transportation|Electricity,Final Energy|Transportation|Passenger|Electricity,Final Energy|Transportation|Road,Final Energy|Transportation|Road|Passenger,Final Energy|Transportation|Road|Passenger|4W,1
refined liquids transport,trn_pass_road_LDV_4W,Large Car and Truck,Final Energy,Final Energy|Liquids,Final Energy|Transportation,Final Energy|Transportation|Passenger,Final Energy|Transportation|Liquids,Final Energy|Transportation|Passenger|Liquids,Final Energy|Transportation|Road,Final Energy|Transportation|Road|Passenger,Final Energy|Transportation|Road|Passenger|4W,1
refined liquids enduse,trn_pass_road_LDV_4W,Large Car and Truck,Final Energy,Final Energy|Liquids,Final Energy|Transportation,Final Energy|Transportation|Passenger,Final Energy|Transportation|Liquids,Final Energy|Transportation|Passenger|Liquids,Final Energy|Transportation|Road,Final Energy|Transportation|Road|Passenger,Final Energy|Transportation|Road|Passenger|4W,1
H2 wholesale dispensing,trn_shipping_intl,International Ship,Final Energy,Final Energy|Hydogen,Final Energy|Transportation,Final Energy|Transportation|Freight,Final Energy|Transportation|Hydrogen,Final Energy|Transportation|Freight|Hydrogen,Final Energy|Transportation|Maritime,Final Energy|Transportation|Maritime|Freight,,1
elect_td_trn,trn_shipping_intl,International Ship,Final Energy,Final Energy|Electricity,Final Energy|Transportation,Final Energy|Transportation|Freight,Final Energy|Transportation|Electricity,Final Energy|Transportation|Freight|Electricity,Final Energy|Transportation|Maritime,Final Energy|Transportation|Maritime|Freight,,1
refined liquids bunkers,trn_shipping_intl,International Ship,Final Energy,Final Energy|Liquids,Final Energy|Transportation,Final Energy|Transportation|Freight,Final Energy|Transportation|Liquids,Final Energy|Transportation|Freight|Liquids,Final Energy|Transportation|Maritime,Final Energy|Transportation|Maritime|Freight,,1
Loading

0 comments on commit eff5d49

Please sign in to comment.