diff --git a/data/carbon_seq_tech_map_v7.1.rda b/data/carbon_seq_tech_map_v7.1.rda index fbbbeea9..72ef1025 100644 Binary files a/data/carbon_seq_tech_map_v7.1.rda and b/data/carbon_seq_tech_map_v7.1.rda differ diff --git a/data/final_energy_map_v7.1.rda b/data/final_energy_map_v7.1.rda index cb2e2994..092fa2d1 100644 Binary files a/data/final_energy_map_v7.1.rda and b/data/final_energy_map_v7.1.rda differ diff --git a/data/template_v7.1.rda b/data/template_v7.1.rda index 12c78154..082d60e7 100644 Binary files a/data/template_v7.1.rda and b/data/template_v7.1.rda differ diff --git a/inst/extdata/mappings/GCAM7.1/carbon_seq_tech_map.csv b/inst/extdata/mappings/GCAM7.1/carbon_seq_tech_map.csv index 9cdea0c0..7a71de3b 100644 --- a/inst/extdata/mappings/GCAM7.1/carbon_seq_tech_map.csv +++ b/inst/extdata/mappings/GCAM7.1/carbon_seq_tech_map.csv @@ -1,29 +1,29 @@ # CO2 Sequestration sector,technology,var1,var2,var3,var4,var5,var6,var7,var8,var9,unit_conv -alumina,biomass CCS,Carbon Removal,Carbon Removal|Geological Storage,Carbon Removal|Geological Storage|Bioenergy,,Carbon Capture,Carbon Capture|Geological Storage,,,,3.666667 +alumina,biomass CCS,Carbon Removal,Carbon Removal|Geological Storage,Carbon Removal|Geological Storage|Biomass,,Carbon Capture,Carbon Capture|Geological Storage,,,,3.666667 alumina,coal CCS,Carbon Capture,Carbon Capture|Geological Storage,,,,,,,,3.666667 alumina,gas CCS,Carbon Capture,Carbon Capture|Geological Storage,,,,,,,,3.666667 alumina,refined liquids CCS,Carbon Capture,Carbon Capture|Geological Storage,,,,,,,,3.666667 -chemical feedstocks,refined liquids,Carbon Capture,Carbon Capture|Utilization,,,,,,,,3.666667 -construction feedstocks,refined liquids,Carbon Capture,Carbon Capture|Utilization,,,,,,,,3.666667 +chemical feedstocks,refined liquids,Carbon Capture,Carbon Capture|Utilization,Carbon Capture|Utilization|Liquids,,,,,,,3.666667 +construction feedstocks,refined liquids,Carbon Capture,Carbon Capture|Utilization,Carbon Capture|Utilization|Liquids,,,,,,,3.666667 iron and steel,BLASTFUR CCS,Carbon Capture,Carbon Capture|Geological Storage,,,,,,,,3.666667 -other industrial feedstocks,refined liquids,Carbon Capture,Carbon Capture|Utilization,,,,,,,,3.666667 +other industrial feedstocks,refined liquids,Carbon Capture,Carbon Capture|Utilization,Carbon Capture|Utilization|Liquids,,,,,,,3.666667 cement,cement CCS,Carbon Capture,Carbon Capture|Geological Storage,,,,,,,,3.666667 -chemical energy use,biomass CCS,Carbon Removal,Carbon Removal|Geological Storage,Carbon Removal|Geological Storage|Bioenergy,,Carbon Capture,Carbon Capture|Geological Storage,,,,3.666667 +chemical energy use,biomass CCS,Carbon Removal,Carbon Removal|Geological Storage,Carbon Removal|Geological Storage|Biomass,,Carbon Capture,Carbon Capture|Geological Storage,,,,3.666667 chemical energy use,coal CCS,Carbon Capture,Carbon Capture|Geological Storage,,,,,,,,3.666667 chemical energy use,gas CCS,Carbon Capture,Carbon Capture|Geological Storage,,,,,,,,3.666667 chemical energy use,refined liquids CCS,Carbon Capture,Carbon Capture|Geological Storage,,,,,,,,3.666667 CO2 removal,hightemp DAC NG,Carbon Removal,Carbon Removal|Geological Storage,Carbon Removal|Geological Storage|Direct Air Capture,,,,,,,3.666667 CO2 removal,hightemp DAC elec,Carbon Removal,Carbon Removal|Geological Storage,Carbon Removal|Geological Storage|Direct Air Capture,,,,,,,3.666667 CO2 removal,lowtemp DAC heatpump,Carbon Removal,Carbon Removal|Geological Storage,Carbon Removal|Geological Storage|Direct Air Capture,,,,,,,3.666667 -elec_biomass (conv CCS),biomass (conv CCS) (dry cooling),Carbon Removal,Carbon Removal|Geological Storage,Carbon Removal|Geological Storage|Bioenergy,,Carbon Capture,Carbon Capture|Geological Storage,,,,3.666667 -elec_biomass (conv CCS),biomass (conv CCS) (once through),Carbon Removal,Carbon Removal|Geological Storage,Carbon Removal|Geological Storage|Bioenergy,,Carbon Capture,Carbon Capture|Geological Storage,,,,3.666667 -elec_biomass (conv CCS),biomass (conv CCS) (recirculating),Carbon Removal,Carbon Removal|Geological Storage,Carbon Removal|Geological Storage|Bioenergy,,Carbon Capture,Carbon Capture|Geological Storage,,,,3.666667 -elec_biomass (conv CCS),biomass (conv CCS) (seawater),Carbon Removal,Carbon Removal|Geological Storage,Carbon Removal|Geological Storage|Bioenergy,,Carbon Capture,Carbon Capture|Geological Storage,,,,3.666667 -elec_biomass (IGCC CCS),biomass (IGCC CCS) (dry cooling),Carbon Removal,Carbon Removal|Geological Storage,Carbon Removal|Geological Storage|Bioenergy,,Carbon Capture,Carbon Capture|Geological Storage,,,,3.666667 -elec_biomass (IGCC CCS),biomass (IGCC CCS) (once through),Carbon Removal,Carbon Removal|Geological Storage,Carbon Removal|Geological Storage|Bioenergy,,Carbon Capture,Carbon Capture|Geological Storage,,,,3.666667 -elec_biomass (IGCC CCS),biomass (IGCC CCS) (recirculating),Carbon Removal,Carbon Removal|Geological Storage,Carbon Removal|Geological Storage|Bioenergy,,Carbon Capture,Carbon Capture|Geological Storage,,,,3.666667 -elec_biomass (IGCC CCS),biomass (IGCC CCS) (seawater),Carbon Removal,Carbon Removal|Geological Storage,Carbon Removal|Geological Storage|Bioenergy,,Carbon Capture,Carbon Capture|Geological Storage,,,,3.666667 +elec_biomass (conv CCS),biomass (conv CCS) (dry cooling),Carbon Removal,Carbon Removal|Geological Storage,Carbon Removal|Geological Storage|Biomass,,Carbon Capture,Carbon Capture|Geological Storage,,,,3.666667 +elec_biomass (conv CCS),biomass (conv CCS) (once through),Carbon Removal,Carbon Removal|Geological Storage,Carbon Removal|Geological Storage|Biomass,,Carbon Capture,Carbon Capture|Geological Storage,,,,3.666667 +elec_biomass (conv CCS),biomass (conv CCS) (recirculating),Carbon Removal,Carbon Removal|Geological Storage,Carbon Removal|Geological Storage|Biomass,,Carbon Capture,Carbon Capture|Geological Storage,,,,3.666667 +elec_biomass (conv CCS),biomass (conv CCS) (seawater),Carbon Removal,Carbon Removal|Geological Storage,Carbon Removal|Geological Storage|Biomass,,Carbon Capture,Carbon Capture|Geological Storage,,,,3.666667 +elec_biomass (IGCC CCS),biomass (IGCC CCS) (dry cooling),Carbon Removal,Carbon Removal|Geological Storage,Carbon Removal|Geological Storage|Biomass,,Carbon Capture,Carbon Capture|Geological Storage,,,,3.666667 +elec_biomass (IGCC CCS),biomass (IGCC CCS) (once through),Carbon Removal,Carbon Removal|Geological Storage,Carbon Removal|Geological Storage|Biomass,,Carbon Capture,Carbon Capture|Geological Storage,,,,3.666667 +elec_biomass (IGCC CCS),biomass (IGCC CCS) (recirculating),Carbon Removal,Carbon Removal|Geological Storage,Carbon Removal|Geological Storage|Biomass,,Carbon Capture,Carbon Capture|Geological Storage,,,,3.666667 +elec_biomass (IGCC CCS),biomass (IGCC CCS) (seawater),Carbon Removal,Carbon Removal|Geological Storage,Carbon Removal|Geological Storage|Biomass,,Carbon Capture,Carbon Capture|Geological Storage,,,,3.666667 elec_coal (conv pul CCS),coal (conv pul CCS) (dry cooling),Carbon Capture,Carbon Capture|Geological Storage,,,,,,,,3.666667 elec_coal (conv pul CCS),coal (conv pul CCS) (once through),Carbon Capture,Carbon Capture|Geological Storage,,,,,,,,3.666667 elec_coal (conv pul CCS),coal (conv pul CCS) (recirculating),Carbon Capture,Carbon Capture|Geological Storage,,,,,,,,3.666667 @@ -40,7 +40,7 @@ elec_refined liquids (CC CCS),refined liquids (CC CCS) (dry cooling),Carbon Capt elec_refined liquids (CC CCS),refined liquids (CC CCS) (recirculating),Carbon Capture,Carbon Capture|Geological Storage,,,,,,,,3.666667 elec_refined liquids (CC CCS),refined liquids (CC CCS) (seawater),Carbon Capture,Carbon Capture|Geological Storage,,,,,,,,3.666667 elec_refined liquids (CC CCS),refined liquids (CC CCS) (once through),Carbon Capture,Carbon Capture|Geological Storage,,,,,,,,3.666667 -H2 central production,biomass to H2 CCS,Carbon Removal,Carbon Removal|Geological Storage,Carbon Removal|Geological Storage|Bioenergy,,Carbon Capture,Carbon Capture|Geological Storage,,,,3.666667 +H2 central production,biomass to H2 CCS,Carbon Removal,Carbon Removal|Geological Storage,Carbon Removal|Geological Storage|Biomass,,Carbon Capture,Carbon Capture|Geological Storage,,,,3.666667 H2 central production,coal chemical CCS,Carbon Capture,Carbon Capture|Geological Storage,,,,,,,,3.666667 H2 central production,gas ATR CCS,Carbon Capture,Carbon Capture|Geological Storage,,,,,,,,3.666667 H2 central production,natural gas steam reforming CCS,Carbon Capture,Carbon Capture|Geological Storage,,,,,,,,3.666667 @@ -50,10 +50,10 @@ N fertilizer,gas CCS,Carbon Capture,Carbon Capture|Geological Storage,,,,,,,,3.6 ammonia,gas CCS,Carbon Capture,Carbon Capture|Geological Storage,,,,,,,,3.666667 ammonia,coal CCS,Carbon Capture,Carbon Capture|Geological Storage,,,,,,,,3.666667 process heat dac,gas CCS,Carbon Capture,Carbon Capture|Geological Storage,,,,,,,,3.666667 -refining,cellulosic ethanol CCS level 1,Carbon Removal,Carbon Removal|Geological Storage,Carbon Removal|Geological Storage|Bioenergy,,Carbon Capture,Carbon Capture|Geological Storage,,,,3.666667 -refining,cellulosic ethanol CCS level 2,Carbon Removal,Carbon Removal|Geological Storage,Carbon Removal|Geological Storage|Bioenergy,,Carbon Capture,Carbon Capture|Geological Storage,,,,3.666667 +refining,cellulosic ethanol CCS level 1,Carbon Removal,Carbon Removal|Geological Storage,Carbon Removal|Geological Storage|Biomass,,Carbon Capture,Carbon Capture|Geological Storage,,,,3.666667 +refining,cellulosic ethanol CCS level 2,Carbon Removal,Carbon Removal|Geological Storage,Carbon Removal|Geological Storage|Biomass,,Carbon Capture,Carbon Capture|Geological Storage,,,,3.666667 refining,coal to liquids CCS level 1,Carbon Capture,Carbon Capture|Geological Storage,,,,,,,,3.666667 refining,coal to liquids CCS level 2,Carbon Capture,Carbon Capture|Geological Storage,,,,,,,,3.666667 -refining,FT biofuels CCS level 1,Carbon Removal,Carbon Removal|Geological Storage,Carbon Removal|Geological Storage|Bioenergy,,Carbon Capture,Carbon Capture|Geological Storage,,,,3.666667 -refining,FT biofuels CCS level 2,Carbon Removal,Carbon Removal|Geological Storage,Carbon Removal|Geological Storage|Bioenergy,,Carbon Capture,Carbon Capture|Geological Storage,,,,3.666667 -waste biomass for paper,biomass CCS,Carbon Removal,Carbon Removal|Geological Storage,Carbon Removal|Geological Storage|Bioenergy,,Carbon Capture,Carbon Capture|Geological Storage,,,,3.666667 +refining,FT biofuels CCS level 1,Carbon Removal,Carbon Removal|Geological Storage,Carbon Removal|Geological Storage|Biomass,,Carbon Capture,Carbon Capture|Geological Storage,,,,3.666667 +refining,FT biofuels CCS level 2,Carbon Removal,Carbon Removal|Geological Storage,Carbon Removal|Geological Storage|Biomass,,Carbon Capture,Carbon Capture|Geological Storage,,,,3.666667 +waste biomass for paper,biomass CCS,Carbon Removal,Carbon Removal|Geological Storage,Carbon Removal|Geological Storage|Biomass,,Carbon Capture,Carbon Capture|Geological Storage,,,,3.666667 diff --git a/inst/extdata/mappings/GCAM7.1/final_energy_map.csv b/inst/extdata/mappings/GCAM7.1/final_energy_map.csv index 133a2598..42e6db94 100644 --- a/inst/extdata/mappings/GCAM7.1/final_energy_map.csv +++ b/inst/extdata/mappings/GCAM7.1/final_energy_map.csv @@ -11,15 +11,15 @@ agricultural energy use,H2 retail delivery,Final Energy,Final Energy|Hydrogen,,F agricultural energy use,H2 wholesale dispensing,Final Energy,Final Energy|Hydrogen,,Final Energy|Agriculture,Final Energy|Agriculture|Hydrogen,,,,,,,,Final Energy (w/o bunkers),1 agricultural energy use,hydrogen,Final Energy,Final Energy|Hydrogen,,Final Energy|Agriculture,Final Energy|Agriculture|Hydrogen,,,,,,,,Final Energy (w/o bunkers),1 agricultural energy use,refined liquids,Final Energy,Final Energy|Liquids,,Final Energy|Agriculture,Final Energy|Agriculture|Liquids,,,,,,,,Final Energy (w/o bunkers),1 -alumina,biomass,Final Energy,Final Energy|Solids,Final Energy|Solids|Biomass,Final Energy|Industry,Final Energy|Industry|Solids,Final Energy|Industry|Solids|Biomass,Final Energy|Industry|Non-ferrous metals,Final Energy|Industry|Non-ferrous metals|Solids,Final Energy|Industry|Non-ferrous metals|Solids|Biomass,,,,Final Energy (w/o bunkers),1 -alumina,delivered biomass industry,Final Energy,Final Energy|Solids,Final Energy|Solids|Biomass,Final Energy|Industry,Final Energy|Industry|Solids,Final Energy|Industry|Solids|Biomass,Final Energy|Industry|Non-ferrous metals,Final Energy|Industry|Non-ferrous metals|Solids,Final Energy|Industry|Non-ferrous metals|Solids|Biomass,,,,Final Energy (w/o bunkers),1 -alumina,coal,Final Energy,Final Energy|Solids,Final Energy|Solids|Coal,Final Energy|Industry,Final Energy|Industry|Solids,Final Energy|Industry|Solids|Coal,Final Energy|Industry|Non-ferrous metals,Final Energy|Industry|Non-ferrous metals|Solids,Final Energy|Industry|Non-ferrous metals|Solids|Coal,,,,Final Energy (w/o bunkers),1 -alumina,delivered coal industry,Final Energy,Final Energy|Solids,Final Energy|Solids|Coal,Final Energy|Industry,Final Energy|Industry|Solids,Final Energy|Industry|Solids|Coal,Final Energy|Industry|Non-ferrous metals,Final Energy|Industry|Non-ferrous metals|Solids,Final Energy|Industry|Non-ferrous metals|Solids|Coal,,,,Final Energy (w/o bunkers),1 -alumina,gas,Final Energy,Final Energy|Gases,,Final Energy|Industry,Final Energy|Industry|Gases,,Final Energy|Industry|Non-ferrous metals,Final Energy|Industry|Non-ferrous metals|Gases,,,,,Final Energy (w/o bunkers),1 -alumina,refined liquids,Final Energy,Final Energy|Liquids,,Final Energy|Industry,Final Energy|Industry|Liquids,,Final Energy|Industry|Non-ferrous metals,Final Energy|Industry|Non-ferrous metals|Liquids,,,,,Final Energy (w/o bunkers),1 -alumina,electricity,Final Energy,Final Energy|Electricity,,Final Energy|Industry,Final Energy|Industry|Electricity,,Final Energy|Industry|Non-ferrous metals,Final Energy|Industry|Non-ferrous metals|Electricity,,,,,Final Energy (w/o bunkers),1 -aluminum,electricity,Final Energy,Final Energy|Electricity,,Final Energy|Industry,Final Energy|Industry|Electricity,,Final Energy|Industry|Non-ferrous metals,Final Energy|Industry|Non-ferrous metals|Electricity,,,,,Final Energy (w/o bunkers),1 -cement,electricity,Final Energy,Final Energy|Electricity,,Final Energy|Industry,Final Energy|Industry|Electricity,,Final Energy|Industry|Cement,Final Energy|Industry|Cement|Electricity,,,,,Final Energy (w/o bunkers),1 +alumina,biomass,Final Energy,Final Energy|Solids,Final Energy|Solids|Biomass,Final Energy|Industry,Final Energy|Industry|Solids,Final Energy|Industry|Solids|Biomass,Final Energy|Industry|Non-ferrous metals,Final Energy|Industry|Non-ferrous metals|Solids,Final Energy|Industry|Non-ferrous metals|Solids|Biomass,Final Energy|Industry|Non-Ferrous Metals|Aluminum,Final Energy|Industry|Non-Ferrous Metals|Aluminum|Solids,Final Energy|Industry|Non-Ferrous Metals|Aluminum|Solids|Biomass,Final Energy (w/o bunkers),1 +alumina,delivered biomass industry,Final Energy,Final Energy|Solids,Final Energy|Solids|Biomass,Final Energy|Industry,Final Energy|Industry|Solids,Final Energy|Industry|Solids|Biomass,Final Energy|Industry|Non-ferrous metals,Final Energy|Industry|Non-ferrous metals|Solids,Final Energy|Industry|Non-ferrous metals|Solids|Biomass,Final Energy|Industry|Non-Ferrous Metals|Aluminum,Final Energy|Industry|Non-Ferrous Metals|Aluminum|Solids,Final Energy|Industry|Non-Ferrous Metals|Aluminum|Solids|Biomass,Final Energy (w/o bunkers),1 +alumina,coal,Final Energy,Final Energy|Solids,Final Energy|Solids|Coal,Final Energy|Industry,Final Energy|Industry|Solids,Final Energy|Industry|Solids|Coal,Final Energy|Industry|Non-ferrous metals,Final Energy|Industry|Non-ferrous metals|Solids,Final Energy|Industry|Non-ferrous metals|Solids|Coal,Final Energy|Industry|Non-Ferrous Metals|Aluminum,Final Energy|Industry|Non-Ferrous Metals|Aluminum|Solids,Final Energy|Industry|Non-Ferrous Metals|Aluminum|Solids|Coal,Final Energy (w/o bunkers),1 +alumina,delivered coal industry,Final Energy,Final Energy|Solids,Final Energy|Solids|Coal,Final Energy|Industry,Final Energy|Industry|Solids,Final Energy|Industry|Solids|Coal,Final Energy|Industry|Non-ferrous metals,Final Energy|Industry|Non-ferrous metals|Solids,Final Energy|Industry|Non-ferrous metals|Solids|Coal,Final Energy|Industry|Non-Ferrous Metals|Aluminum,Final Energy|Industry|Non-Ferrous Metals|Aluminum|Solids,Final Energy|Industry|Non-Ferrous Metals|Aluminum|Solids|Coal,Final Energy (w/o bunkers),1 +alumina,gas,Final Energy,Final Energy|Gases,,Final Energy|Industry,Final Energy|Industry|Gases,,Final Energy|Industry|Non-ferrous metals,Final Energy|Industry|Non-ferrous metals|Gases,,Final Energy|Industry|Non-Ferrous Metals|Aluminum,Final Energy|Industry|Non-Ferrous Metals|Aluminum|Gases,,Final Energy (w/o bunkers),1 +alumina,refined liquids,Final Energy,Final Energy|Liquids,,Final Energy|Industry,Final Energy|Industry|Liquids,,Final Energy|Industry|Non-ferrous metals,Final Energy|Industry|Non-ferrous metals|Liquids,,Final Energy|Industry|Non-Ferrous Metals|Aluminum,Final Energy|Industry|Non-Ferrous Metals|Aluminum|Liquids,,Final Energy (w/o bunkers),1 +alumina,electricity,Final Energy,Final Energy|Electricity,,Final Energy|Industry,Final Energy|Industry|Electricity,,Final Energy|Industry|Non-ferrous metals,Final Energy|Industry|Non-ferrous metals|Electricity,,Final Energy|Industry|Non-Ferrous Metals|Aluminum,Final Energy|Industry|Non-Ferrous Metals|Aluminum|Electricity,,Final Energy (w/o bunkers),1 +aluminum,electricity,Final Energy,Final Energy|Electricity,,Final Energy|Industry,Final Energy|Industry|Electricity,,Final Energy|Industry|Non-ferrous metals,Final Energy|Industry|Non-ferrous metals|Electricity,,Final Energy|Industry|Non-Ferrous Metals|Aluminum,Final Energy|Industry|Non-Ferrous Metals|Aluminum|Electricity,,Final Energy (w/o bunkers),1 +cement,electricity,Final Energy,Final Energy|Electricity,,Final Energy|Industry,Final Energy|Industry|Electricity,,Final Energy|Industry|Non-Metallic Minerals,Final Energy|Industry|Non-Metallic Minerals|Cement,Final Energy|Industry|Non-Metallic Minerals|Cement|Electricity,,,,Final Energy (w/o bunkers),1 chemical energy use,biomass,Final Energy,Final Energy|Solids,Final Energy|Solids|Biomass,Final Energy|Industry,Final Energy|Industry|Solids,Final Energy|Industry|Solids|Biomass,Final Energy|Industry|Chemicals,Final Energy|Industry|Chemicals|Solids,Final Energy|Industry|Chemicals|Solids|Biomass,Final Energy|Industry|Chemicals|Other Sector,Final Energy|Industry|Chemicals|Other Sector|Solids,Final Energy|Industry|Chemicals|Other Sector|Solids|Biomass,Final Energy (w/o bunkers),1 chemical energy use,delivered biomass industry,Final Energy,Final Energy|Solids,Final Energy|Solids|Biomass,Final Energy|Industry,Final Energy|Industry|Solids,Final Energy|Industry|Solids|Biomass,Final Energy|Industry|Chemicals,Final Energy|Industry|Chemicals|Solids,Final Energy|Industry|Chemicals|Solids|Biomass,Final Energy|Industry|Chemicals|Other Sector,Final Energy|Industry|Chemicals|Other Sector|Solids,Final Energy|Industry|Chemicals|Other Sector|Solids|Biomass,Final Energy (w/o bunkers),1 chemical energy use,coal,Final Energy,Final Energy|Solids,Final Energy|Solids|Coal,Final Energy|Industry,Final Energy|Industry|Solids,Final Energy|Industry|Solids|Coal,Final Energy|Industry|Chemicals,Final Energy|Industry|Chemicals|Solids,Final Energy|Industry|Chemicals|Solids|Coal,Final Energy|Industry|Chemicals|Other Sector,Final Energy|Industry|Chemicals|Other Sector|Solids,Final Energy|Industry|Chemicals|Other Sector|Solids|Coal,Final Energy (w/o bunkers),1 @@ -69,9 +69,9 @@ construction energy use,hydrogen,Final Energy,Final Energy|Hydrogen,,Final Energ construction energy use,refined liquids,Final Energy,Final Energy|Liquids,,Final Energy|Industry,Final Energy|Industry|Liquids,,Final Energy|Industry|Other Sector,Final Energy|Industry|Other Sector|Liquids,,,,,Final Energy (w/o bunkers),1 construction feedstocks,refined liquids,Final Energy,Final Energy|Liquids,,Final Energy|Non-Energy Use,Final Energy|Non-Energy Use|Liquids,,Final Energy|Non-Energy Use|Non-Metallic Minerals,Final Energy|Non-Energy Use|Non-Metallic Minerals|Liquids,,,,,Final Energy (w/o bunkers),1 construction feedstocks,refined liquids feedstocks,Final Energy,Final Energy|Liquids,,Final Energy|Non-Energy Use,Final Energy|Non-Energy Use|Liquids,,Final Energy|Non-Energy Use|Non-Metallic Minerals,Final Energy|Non-Energy Use|Non-Metallic Minerals|Liquids,,,,,Final Energy (w/o bunkers),1 -desalinated water,electricity,Final Energy,Final Energy|Electricity,,Final Energy|Commercial,Final Energy|Commercial|Water|Desalination,,,,,,,,Final Energy (w/o bunkers),1 -desalinated water,gas,Final Energy,Final Energy|Gases,,Final Energy|Commercial,Final Energy|Commercial|Water|Desalination,,,,,,,,Final Energy (w/o bunkers),1 -desalinated water,refined liquids,Final Energy,Final Energy|Liquids,,Final Energy|Commercial,Final Energy|Commercial|Water|Desalination,,,,,,,,Final Energy (w/o bunkers),1 +desalinated water,electricity,Final Energy,Final Energy|Electricity,,Final Energy|Commercial,Final Energy|Commercial|Water,Final Energy|Commercial|Water|Desalination,,,,,,,Final Energy (w/o bunkers),1 +desalinated water,gas,Final Energy,Final Energy|Gases,,Final Energy|Commercial,Final Energy|Commercial|Water,Final Energy|Commercial|Water|Desalination,,,,,,,Final Energy (w/o bunkers),1 +desalinated water,refined liquids,Final Energy,Final Energy|Liquids,,Final Energy|Commercial,Final Energy|Commercial|Water,Final Energy|Commercial|Water|Desalination,,,,,,,Final Energy (w/o bunkers),1 food processing,electricity,Final Energy,Final Energy|Electricity,,Final Energy|Industry,Final Energy|Industry|Electricity,,Final Energy|Industry|Other Sector,Final Energy|Industry|Other Sector|Electricity,,,,,Final Energy (w/o bunkers),1 food processing,process heat food processing,NoReported,,,,,,,,,,,,Final Energy (w/o bunkers),1 industrial energy use,biomass,Final Energy,Final Energy|Solids,Final Energy|Solids|Biomass,Final Energy|Industry,Final Energy|Industry|Solids,Final Energy|Industry|Solids|Biomass,Final Energy|Industry|Other Sector,Final Energy|Industry|Other Sector|Solids,Final Energy|Industry|Other Sector|Solids|Biomass,,,,Final Energy (w/o bunkers),1 @@ -84,7 +84,7 @@ industrial feedstocks,coal,Final Energy,Final Energy|Solids,Final Energy|Solids| industrial feedstocks,gas,Final Energy,Final Energy|Gases,,Final Energy|Non-Energy Use,Final Energy|Non-Energy Use|Gases,,Final Energy|Non-Energy Use|Other Sector,Final Energy|Non-Energy Use|Other Sector|Gases,,,,,Final Energy (w/o bunkers),1 industrial feedstocks,refined liquids,Final Energy,Final Energy|Liquids,,Final Energy|Non-Energy Use,Final Energy|Non-Energy Use|Liquids,,Final Energy|Non-Energy Use|Other Sector,Final Energy|Non-Energy Use|Other Sector|Liquids,,,,,Final Energy (w/o bunkers),1 industrial wastewater treatment,electricity,Final Energy,Final Energy|Electricity,,Final Energy|Commercial,,,,,,,,,Final Energy (w/o bunkers),1 -industrial water abstraction,electricity,Final Energy,Final Energy|Electricity,,Final Energy|Commercial,Final Energy|Commercial|Water|Groundwater Extraction,,,,,,,,Final Energy (w/o bunkers),1 +industrial water abstraction,electricity,Final Energy,Final Energy|Electricity,,Final Energy|Commercial,Final Energy|Commercial|Water,Final Energy|Commercial|Water|Groundwater Extraction,,,,,,,Final Energy (w/o bunkers),1 industrial water treatment,electricity,Final Energy,Final Energy|Electricity,,Final Energy|Commercial,,,,,,,,,Final Energy (w/o bunkers),1 iron and steel,biomass,Final Energy,Final Energy|Solids,Final Energy|Solids|Biomass,Final Energy|Industry,Final Energy|Industry|Solids,Final Energy|Industry|Solids|Biomass,Final Energy|Industry|Iron and Steel,Final Energy|Industry|Iron and Steel|Solids,Final Energy|Industry|Iron and Steel|Solids|Biomass,,,,Final Energy (w/o bunkers),1 iron and steel,delivered biomass industry,Final Energy,Final Energy|Solids,Final Energy|Solids|Biomass,Final Energy|Industry,Final Energy|Industry|Solids,Final Energy|Industry|Solids|Biomass,Final Energy|Industry|Iron and Steel,Final Energy|Industry|Iron and Steel|Solids,Final Energy|Industry|Iron and Steel|Solids|Biomass,,,,Final Energy (w/o bunkers),1 @@ -95,7 +95,7 @@ iron and steel,gas,Final Energy,Final Energy|Liquids,,Final Energy|Industry,Fina iron and steel,H2 industrial,Final Energy,Final Energy|Hydrogen,,Final Energy|Industry,Final Energy|Industry|Hydrogen,,Final Energy|Industry|Iron and Steel,Final Energy|Industry|Iron and Steel|Hydrogen,,,,,Final Energy (w/o bunkers),1 iron and steel,hydrogen,Final Energy,Final Energy|Hydrogen,,Final Energy|Industry,Final Energy|Industry|Hydrogen,,Final Energy|Industry|Iron and Steel,Final Energy|Industry|Iron and Steel|Hydrogen,,,,,Final Energy (w/o bunkers),1 iron and steel,refined liquids,Final Energy,Final Energy|Liquids,,Final Energy|Industry,Final Energy|Industry|Liquids,,Final Energy|Industry|Iron and Steel,Final Energy|Industry|Iron and Steel|Liquids,,,,,Final Energy (w/o bunkers),1 -irrigation water abstraction,electricity,Final Energy,Final Energy|Electricity,,Final Energy|Commercial,Final Energy|Commercial|Water|Groundwater Extraction,,,,,,,,Final Energy (w/o bunkers),1 +irrigation water abstraction,electricity,Final Energy,Final Energy|Electricity,,Final Energy|Commercial,Final Energy|Commercial|Water,Final Energy|Commercial|Water|Groundwater Extraction,,,,,,,Final Energy (w/o bunkers),1 mining energy use,biomass,Final Energy,Final Energy|Solids,Final Energy|Solids|Biomass,Final Energy|Industry,Final Energy|Industry|Solids,Final Energy|Industry|Solids|Biomass,Final Energy|Industry|Other Sector,Final Energy|Industry|Other Sector|Solids,Final Energy|Industry|Other Sector|Solids|Biomass,,,,Final Energy (w/o bunkers),1 mining energy use,delivered biomass industry,Final Energy,Final Energy|Solids,Final Energy|Solids|Biomass,Final Energy|Industry,Final Energy|Industry|Solids,Final Energy|Industry|Solids|Biomass,Final Energy|Industry|Other Sector,Final Energy|Industry|Other Sector|Solids,Final Energy|Industry|Other Sector|Solids|Biomass,,,,Final Energy (w/o bunkers),1 mining energy use,coal,Final Energy,Final Energy|Solids,Final Energy|Solids|Coal,Final Energy|Industry,Final Energy|Industry|Solids,Final Energy|Industry|Solids|Coal,Final Energy|Industry|Other Sector,Final Energy|Industry|Other Sector|Solids,Final Energy|Industry|Other Sector|Solids|Coal,,,,Final Energy (w/o bunkers),1 @@ -109,7 +109,7 @@ mining energy use,hydrogen,Final Energy,Final Energy|Hydrogen,,Final Energy|Indu mining energy use,refined liquids,Final Energy,Final Energy|Liquids,,Final Energy|Industry,Final Energy|Industry|Liquids,,Final Energy|Industry|Other Sector,Final Energy|Industry|Other Sector|Liquids,,,,,Final Energy (w/o bunkers),1 municipal wastewater treatment,electricity,Final Energy,Final Energy|Electricity,,Final Energy|Commercial,,,,,,,,,Final Energy (w/o bunkers),1 municipal water abstraction,electricity,Final Energy,Final Energy|Electricity,,Final Energy|Commercial,,,,,,,,,Final Energy (w/o bunkers),1 -municipal water distribution,electricity,Final Energy,Final Energy|Electricity,,Final Energy|Commercial,Final Energy|Commercial|Water|Transfer,,,,,,,,Final Energy (w/o bunkers),1 +municipal water distribution,electricity,Final Energy,Final Energy|Electricity,,Final Energy|Commercial,Final Energy|Commercial|Water,Final Energy|Commercial|Water|Transfer,,,,,,,Final Energy (w/o bunkers),1 municipal water treatment,electricity,Final Energy,Final Energy|Electricity,,Final Energy|Commercial,,,,,,,,,Final Energy (w/o bunkers),1 N fertilizer,coal,Final Energy,Final Energy|Solids,Final Energy|Solids|Coal,Final Energy|Industry,Final Energy|Industry|Solids,Final Energy|Industry|Solids|Coal,Final Energy|Industry|Chemicals,Final Energy|Industry|Chemicals|Solids,Final Energy|Industry|Chemicals|Solids|Coal,Final Energy|Industry|Chemicals|Ammonia,Final Energy|Industry|Chemicals|Ammonia|Solids,Final Energy|Industry|Chemicals|Ammonia|Solids|Coal,Final Energy (w/o bunkers),1 N fertilizer,delivered coal industry,Final Energy,Final Energy|Solids,Final Energy|Solids|Coal,Final Energy|Industry,Final Energy|Industry|Solids,Final Energy|Industry|Solids|Coal,Final Energy|Industry|Chemicals,Final Energy|Industry|Chemicals|Solids,Final Energy|Industry|Chemicals|Solids|Coal,Final Energy|Industry|Chemicals|Ammonia,Final Energy|Industry|Chemicals|Ammonia|Solids,Final Energy|Industry|Chemicals|Ammonia|Solids|Coal,Final Energy (w/o bunkers),1 @@ -141,14 +141,14 @@ other industrial feedstocks,refined liquids feedstocks,Final Energy,Final Energy paper,electricity,Final Energy,Final Energy|Electricity,,Final Energy|Industry,Final Energy|Industry|Electricity,,Final Energy|Industry|Pulp and Paper,Final Energy|Industry|Pulp and Paper|Electricity,,,,,Final Energy (w/o bunkers),1 paper,process heat paper,NoReported,,,,,,,,,,,,Final Energy (w/o bunkers),1 paper,waste biomass for paper,NoReported,,,,,,,,,,,,Final Energy (w/o bunkers),1 -process heat cement,biomass,Final Energy,Final Energy|Solids,Final Energy|Solids|Biomass,Final Energy|Industry,Final Energy|Industry|Solids,Final Energy|Industry|Solids|Biomass,Final Energy|Industry|Cement,Final Energy|Industry|Cement|Solids,Final Energy|Industry|Cement|Solids|Biomass,,,,Final Energy (w/o bunkers),1 -process heat cement,delivered biomass industry,Final Energy,Final Energy|Solids,Final Energy|Solids|Biomass,Final Energy|Industry,Final Energy|Industry|Solids,Final Energy|Industry|Solids|Biomass,Final Energy|Industry|Cement,Final Energy|Industry|Cement|Solids,Final Energy|Industry|Cement|Solids|Biomass,,,,Final Energy (w/o bunkers),1 -process heat cement,coal,Final Energy,Final Energy|Solids,Final Energy|Solids|Coal,Final Energy|Industry,Final Energy|Industry|Solids,Final Energy|Industry|Solids|Coal,Final Energy|Industry|Cement,Final Energy|Industry|Cement|Solids,Final Energy|Industry|Cement|Solids|Coal,,,,Final Energy (w/o bunkers),1 -process heat cement,delivered coal industry,Final Energy,Final Energy|Solids,Final Energy|Solids|Coal,Final Energy|Industry,Final Energy|Industry|Solids,Final Energy|Industry|Solids|Coal,Final Energy|Industry|Cement,Final Energy|Industry|Cement|Solids,Final Energy|Industry|Cement|Solids|Coal,,,,Final Energy (w/o bunkers),1 -process heat cement,gas,Final Energy,Final Energy|Gases,,Final Energy|Industry,Final Energy|Industry|Gases,,Final Energy|Industry|Cement,Final Energy|Industry|Cement|Gases,,,,,Final Energy (w/o bunkers),1 -process heat cement,H2 industrial,Final Energy,Final Energy|Hydrogen,,Final Energy|Industry,Final Energy|Industry|Hydrogen,,Final Energy|Industry|Cement,Final Energy|Industry|Cement|Hydrogen,,,,,Final Energy (w/o bunkers),1 -process heat cement,hydrogen,Final Energy,Final Energy|Hydrogen,,Final Energy|Industry,Final Energy|Industry|Hydrogen,,Final Energy|Industry|Cement,Final Energy|Industry|Cement|Hydrogen,,,,,Final Energy (w/o bunkers),1 -process heat cement,refined liquids,Final Energy,Final Energy|Liquids,,Final Energy|Industry,Final Energy|Industry|Liquids,,Final Energy|Industry|Cement,Final Energy|Industry|Cement|Liquids,,,,,Final Energy (w/o bunkers),1 +process heat cement,biomass,Final Energy,Final Energy|Solids,Final Energy|Solids|Biomass,Final Energy|Industry,Final Energy|Industry|Solids,Final Energy|Industry|Solids|Biomass,Final Energy|Industry|Non-Metallic Minerals,Final Energy|Industry|Non-Metallic Minerals|Cement,Final Energy|Industry|Non-Metallic Minerals|Cement|Solids,Final Energy|Industry|Non-Metallic Minerals|Cement|Solids|Biomass,,,Final Energy (w/o bunkers),1 +process heat cement,delivered biomass industry,Final Energy,Final Energy|Solids,Final Energy|Solids|Biomass,Final Energy|Industry,Final Energy|Industry|Solids,Final Energy|Industry|Solids|Biomass,Final Energy|Industry|Non-Metallic Minerals,Final Energy|Industry|Non-Metallic Minerals|Cement,Final Energy|Industry|Non-Metallic Minerals|Cement|Solids,Final Energy|Industry|Non-Metallic Minerals|Cement|Solids|Biomass,,,Final Energy (w/o bunkers),1 +process heat cement,coal,Final Energy,Final Energy|Solids,Final Energy|Solids|Coal,Final Energy|Industry,Final Energy|Industry|Solids,Final Energy|Industry|Solids|Coal,Final Energy|Industry|Non-Metallic Minerals,Final Energy|Industry|Non-Metallic Minerals|Cement,Final Energy|Industry|Non-Metallic Minerals|Cement|Solids,Final Energy|Industry|Non-Metallic Minerals|Cement|Solids|Coal,,,Final Energy (w/o bunkers),1 +process heat cement,delivered coal industry,Final Energy,Final Energy|Solids,Final Energy|Solids|Coal,Final Energy|Industry,Final Energy|Industry|Solids,Final Energy|Industry|Solids|Coal,Final Energy|Industry|Non-Metallic Minerals,Final Energy|Industry|Non-Metallic Minerals|Cement,Final Energy|Industry|Non-Metallic Minerals|Cement|Solids,Final Energy|Industry|Non-Metallic Minerals|Cement|Solids|Coal,,,Final Energy (w/o bunkers),1 +process heat cement,gas,Final Energy,Final Energy|Gases,,Final Energy|Industry,Final Energy|Industry|Gases,,Final Energy|Industry|Non-Metallic Minerals,Final Energy|Industry|Non-Metallic Minerals|Cement,Final Energy|Industry|Non-Metallic Minerals|Cement|Gases,,,,Final Energy (w/o bunkers),1 +process heat cement,H2 industrial,Final Energy,Final Energy|Hydrogen,,Final Energy|Industry,Final Energy|Industry|Hydrogen,,Final Energy|Industry|Non-Metallic Minerals,Final Energy|Industry|Non-Metallic Minerals|Cement,Final Energy|Industry|Non-Metallic Minerals|Cement|Hydrogen,,,,Final Energy (w/o bunkers),1 +process heat cement,hydrogen,Final Energy,Final Energy|Hydrogen,,Final Energy|Industry,Final Energy|Industry|Hydrogen,,Final Energy|Industry|Non-Metallic Minerals,Final Energy|Industry|Non-Metallic Minerals|Cement,Final Energy|Industry|Non-Metallic Minerals|Cement|Hydrogen,,,,Final Energy (w/o bunkers),1 +process heat cement,refined liquids,Final Energy,Final Energy|Liquids,,Final Energy|Industry,Final Energy|Industry|Liquids,,Final Energy|Industry|Non-Metallic Minerals,Final Energy|Industry|Non-Metallic Minerals|Cement,Final Energy|Industry|Non-Metallic Minerals|Cement|Liquids,,,,Final Energy (w/o bunkers),1 process heat food processing,biomass,Final Energy,Final Energy|Solids,Final Energy|Solids|Biomass,Final Energy|Industry,Final Energy|Industry|Solids,Final Energy|Industry|Solids|Biomass,Final Energy|Industry|Other Sector,Final Energy|Industry|Other Sector|Solids,Final Energy|Industry|Other Sector|Solids|Biomass,,,,Final Energy (w/o bunkers),1 process heat food processing,coal,Final Energy,Final Energy|Solids,Final Energy|Solids|Coal,Final Energy|Industry,Final Energy|Industry|Solids,Final Energy|Industry|Solids|Coal,Final Energy|Industry|Other Sector,Final Energy|Industry|Other Sector|Solids,Final Energy|Industry|Other Sector|Solids|Coal,,,,Final Energy (w/o bunkers),1 process heat food processing,electricity,Final Energy,Final Energy|Electricity,,Final Energy|Industry,Final Energy|Industry|Electricity,,Final Energy|Industry|Other Sector,Final Energy|Industry|Other Sector|Electricity,,,,,Final Energy (w/o bunkers),1 diff --git a/inst/extdata/template/GCAM7.1/common-definitions-template.xlsx b/inst/extdata/template/GCAM7.1/common-definitions-template.xlsx index 48f8c2a6..0ca56254 100644 Binary files a/inst/extdata/template/GCAM7.1/common-definitions-template.xlsx and b/inst/extdata/template/GCAM7.1/common-definitions-template.xlsx differ