ComDef: fix final en NoReported

bc3LC · Jan 14, 2025 · 245710e · 245710e
1 parent 39d8a06
commit 245710e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/inst/extdata/mappings/GCAM7.0/final_energy_map.csv b/inst/extdata/mappings/GCAM7.0/final_energy_map.csv
@@ -78,7 +78,7 @@ desalinated water,electricity,Final Energy,Final Energy|Electricity,,Final Energ
 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
+food processing,process heat food processing,NoReported,,,,,,,,,,,,,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
 industrial 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
 industrial energy use,district heat,Final Energy,Final Energy|Heat,,Final Energy|Industry,Final Energy|Industry|Heat,,Final Energy|Industry|Other Sector,Final Energy|Industry|Other Sector|Heat,,,,,Final Energy (w/o bunkers),1
@@ -149,8 +149,8 @@ other industrial feedstocks,wholesale gas feedstocks,Final Energy,Final Energy|G
 other 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
 other industrial 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|Other Sector,Final Energy|Non-Energy Use|Other Sector|Liquids,,,,,Final Energy (w/o bunkers),1
 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
+paper,process heat paper,NoReported,,,,,,,,,,,,,1
+paper,waste biomass for paper,NoReported,,,,,,,,,,,,,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

diff --git a/inst/extdata/mappings/GCAM7.1/final_energy_map.csv b/inst/extdata/mappings/GCAM7.1/final_energy_map.csv
@@ -73,7 +73,7 @@ desalinated water,electricity,Final Energy,Final Energy|Electricity,,Final Energ
 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
+food processing,process heat food processing,NoReported,,,,,,,,,,,,,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
 industrial 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
 industrial energy use,district heat,Final Energy,Final Energy|Heat,,Final Energy|Industry,Final Energy|Industry|Heat,,Final Energy|Industry|Other Sector,Final Energy|Industry|Other Sector|Heat,,,,,Final Energy (w/o bunkers),1
@@ -139,8 +139,8 @@ other industrial feedstocks,wholesale gas feedstocks,Final Energy,Final Energy|G
 other 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
 other industrial 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|Other Sector,Final Energy|Non-Energy Use|Other Sector|Liquids,,,,,Final Energy (w/o bunkers),1
 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
+paper,process heat paper,NoReported,,,,,,,,,,,,,1
+paper,waste biomass for paper,NoReported,,,,,,,,,,,,,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

diff --git a/inst/extdata/mappings/GCAM7.2/final_energy_map.csv b/inst/extdata/mappings/GCAM7.2/final_energy_map.csv
@@ -73,7 +73,7 @@ desalinated water,electricity,Final Energy,Final Energy|Electricity,,Final Energ
 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
+food processing,process heat food processing,NoReported,,,,,,,,,,,,,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
 industrial 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
 industrial energy use,district heat,Final Energy,Final Energy|Heat,,Final Energy|Industry,Final Energy|Industry|Heat,,Final Energy|Industry|Other Sector,Final Energy|Industry|Other Sector|Heat,,,,,Final Energy (w/o bunkers),1
@@ -139,8 +139,8 @@ other industrial feedstocks,wholesale gas feedstocks,Final Energy,Final Energy|G
 other 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
 other industrial 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|Other Sector,Final Energy|Non-Energy Use|Other Sector|Liquids,,,,,Final Energy (w/o bunkers),1
 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
+paper,process heat paper,NoReported,,,,,,,,,,,,,1
+paper,waste biomass for paper,NoReported,,,,,,,,,,,,,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