Skip to content

Commit

Permalink
update final energy map, kyoto gases map, and GCAM6.0 and GCAM7.0 tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@klau506
klau506 committed Aug 22, 2024
1 parent 9029e71 commit 789b0a2
Show file tree
Hide file tree
Showing 23 changed files with 129 additions and 3,778 deletions.
42 changes: 42 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -163,3 +163,45 @@ tests/testthat/testInputs/v_6.0/gcamv6.4_test_standardized.xlsx
tests/testthat/testInputs/v_6.0/test6_standardized.csv
tests/testthat/testInputs/v_6.0/test6_standardized.RData
tests/testthat/testInputs/v_6.0/test6_standardized.xlsx
tests/testthat/testInputs/v_7.1/database_basexdb_ref_gcamv6.1_test.dat
tests/testthat/testInputs/v_7.1/database_basexdb_ref_gcamv6.2_test.dat
tests/testthat/testInputs/v_7.1/database_basexdb_ref_gcamv6.3_test.dat
tests/testthat/testInputs/v_7.1/database_basexdb_ref_gcamv7.10.1_test.dat
tests/testthat/testInputs/v_7.1/database_basexdb_ref_gcamv7.10.2_test.dat
tests/testthat/testInputs/v_7.1/database_basexdb_ref_gcamv7.10.3_test.dat
tests/testthat/testInputs/v_7.1/database_basexdb_ref_gcamv7.11.3_test_scenarios.dat
tests/testthat/testInputs/v_7.1/database_basexdb_ref_gcamv7.11.6_test_scenarios.dat
tests/testthat/testInputs/v_7.1/database_basexdb_ref_gcamv7.11.7_test_scenarios.dat
tests/testthat/testInputs/v_7.1/database_basexdb_ref_gcamv7.1_test.dat
tests/testthat/testInputs/v_7.1/database_basexdb_ref_gcamv7.1_test2.dat
tests/testthat/testInputs/v_7.1/database_basexdb_ref_gcamv7.1_test_specify_queries.dat
tests/testthat/testInputs/v_7.1/database_basexdb_ref_gcamv7.4_test.dat
tests/testthat/testInputs/v_7.1/gcamv7.10.1_test_standardized.csv
tests/testthat/testInputs/v_7.1/gcamv7.10.1_test_standardized.RData
tests/testthat/testInputs/v_7.1/gcamv7.10.1_test_standardized.xlsx
tests/testthat/testInputs/v_7.1/gcamv7.10.2_test_standardized.csv
tests/testthat/testInputs/v_7.1/gcamv7.10.2_test_standardized.RData
tests/testthat/testInputs/v_7.1/gcamv7.10.2_test_standardized.xlsx
tests/testthat/testInputs/v_7.1/gcamv7.10.3_test_standardized.csv
tests/testthat/testInputs/v_7.1/gcamv7.10.3_test_standardized.RData
tests/testthat/testInputs/v_7.1/gcamv7.10.3_test_standardized.xlsx
tests/testthat/testInputs/v_7.1/gcamv7.11.3_test_scenarios_standardized.csv
tests/testthat/testInputs/v_7.1/gcamv7.11.3_test_scenarios_standardized.RData
tests/testthat/testInputs/v_7.1/gcamv7.11.3_test_scenarios_standardized.xlsx
tests/testthat/testInputs/v_7.1/gcamv7.11.6_test_scenarios_standardized.csv
tests/testthat/testInputs/v_7.1/gcamv7.11.6_test_scenarios_standardized.RData
tests/testthat/testInputs/v_7.1/gcamv7.11.6_test_scenarios_standardized.xlsx
tests/testthat/testInputs/v_7.1/gcamv7.11.7_test_scenarios_standardized.csv
tests/testthat/testInputs/v_7.1/gcamv7.11.7_test_scenarios_standardized.RData
tests/testthat/testInputs/v_7.1/gcamv7.11.7_test_scenarios_standardized.xlsx
tests/testthat/testInputs/v_7.1/gcamv7.1_test_specify_queries_standardized.csv
tests/testthat/testInputs/v_7.1/gcamv7.1_test_specify_queries_standardized.RData
tests/testthat/testInputs/v_7.1/gcamv7.1_test_specify_queries_standardized.xlsx
tests/testthat/testInputs/v_7.1/gcamv7.4_test_standardized.csv
tests/testthat/testInputs/v_7.1/gcamv7.4_test_standardized.RData
tests/testthat/testInputs/v_7.1/gcamv7.4_test_standardized.xlsx
tests/testthat/testInputs/v_7.1/test7.1_standardized.csv
tests/testthat/testInputs/v_7.1/test7.1_standardized.RData
tests/testthat/testInputs/v_7.1/test7.1_standardized.xlsx
gcamv7.3_test.dat
gcamv7.4_test.dat
Binary file modified data/final_energy_map_v6.0.rda
View file
Binary file not shown.
Binary file modified data/final_energy_map_v7.0.rda
View file
Binary file not shown.
Binary file modified data/kyoto_sector_map_v6.0.rda
View file
Binary file not shown.
Binary file modified data/kyoto_sector_map_v7.0.rda
View file
Binary file not shown.
28 changes: 14 additions & 14 deletions inst/extdata/mappings/GCAM6.0/Kyotogas_sector.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -135,20 +135,20 @@ CO2,,refined liquids transport,Emissions|Kyoto Gases,Emissions|Kyoto Gases|Energ
CH4,,refining,Emissions|Kyoto Gases,Emissions|Kyoto Gases|Energy,Emissions|Kyoto Gases|Energy|Supply,Emissions|Kyoto Gases|Energy|Supply|Other,,,,,,,1
N2O,,refining,Emissions|Kyoto Gases,Emissions|Kyoto Gases|Energy,Emissions|Kyoto Gases|Energy|Supply,Emissions|Kyoto Gases|Energy|Supply|Other,,,,,,,1
CO2,,refining,Emissions|Kyoto Gases,Emissions|Kyoto Gases|Energy,Emissions|Kyoto Gases|Energy|Supply,Emissions|Kyoto Gases|Energy|Supply|Other,,,,,,,1
HFC125,,resid cooling,Emissions|Kyoto Gases,Emissions|Kyoto Gases|Energy,Emissions|Kyoto Gases|Energy|Demand,Emissions|Kyoto Gases|Energy|Demand|Industry,Emissions|Kyoto Gases|Energy|Demand|Industry|Cement,,,,,,1
HFC134a,,resid cooling,Emissions|Kyoto Gases,Emissions|Kyoto Gases|Energy,Emissions|Kyoto Gases|Energy|Demand,Emissions|Kyoto Gases|Energy|Demand|Industry,Emissions|Kyoto Gases|Energy|Demand|Industry|Cement,,,,,,1
HFC143a,,resid cooling,Emissions|Kyoto Gases,Emissions|Kyoto Gases|Energy,Emissions|Kyoto Gases|Energy|Demand,Emissions|Kyoto Gases|Energy|Demand|Industry,Emissions|Kyoto Gases|Energy|Demand|Industry|Cement,,,,,,1
HFC23,,resid cooling,Emissions|Kyoto Gases,Emissions|Kyoto Gases|Energy,Emissions|Kyoto Gases|Energy|Demand,Emissions|Kyoto Gases|Energy|Demand|Industry,Emissions|Kyoto Gases|Energy|Demand|Industry|Cement,,,,,,1
HFC32,,resid cooling,Emissions|Kyoto Gases,Emissions|Kyoto Gases|Energy,Emissions|Kyoto Gases|Energy|Demand,Emissions|Kyoto Gases|Energy|Demand|Industry,Emissions|Kyoto Gases|Energy|Demand|Industry|Cement,,,,,,1
CH4,,resid cooling,Emissions|Kyoto Gases,Emissions|Kyoto Gases|Energy,Emissions|Kyoto Gases|Energy|Demand,Emissions|Kyoto Gases|Energy|Demand|Industry,Emissions|Kyoto Gases|Energy|Demand|Industry|Cement,,,,,,1
N2O,,resid cooling,Emissions|Kyoto Gases,Emissions|Kyoto Gases|Energy,Emissions|Kyoto Gases|Energy|Demand,Emissions|Kyoto Gases|Energy|Demand|Industry,Emissions|Kyoto Gases|Energy|Demand|Industry|Cement,,,,,,1
CO2,,resid cooling,Emissions|Kyoto Gases,Emissions|Kyoto Gases|Energy,Emissions|Kyoto Gases|Energy|Demand,Emissions|Kyoto Gases|Energy|Demand|Industry,Emissions|Kyoto Gases|Energy|Demand|Industry|Cement,,,,,,1
CH4,,resid heating,Emissions|Kyoto Gases,Emissions|Kyoto Gases|Energy,Emissions|Kyoto Gases|Energy|Demand,Emissions|Kyoto Gases|Energy|Demand|Industry,Emissions|Kyoto Gases|Energy|Demand|Industry|Cement,,,,,,1
N2O,,resid heating,Emissions|Kyoto Gases,Emissions|Kyoto Gases|Energy,Emissions|Kyoto Gases|Energy|Demand,Emissions|Kyoto Gases|Energy|Demand|Industry,Emissions|Kyoto Gases|Energy|Demand|Industry|Cement,,,,,,1
CO2,,resid heating,Emissions|Kyoto Gases,Emissions|Kyoto Gases|Energy,Emissions|Kyoto Gases|Energy|Demand,Emissions|Kyoto Gases|Energy|Demand|Industry,Emissions|Kyoto Gases|Energy|Demand|Industry|Cement,,,,,,1
CH4,,resid others,Emissions|Kyoto Gases,Emissions|Kyoto Gases|Energy,Emissions|Kyoto Gases|Energy|Demand,Emissions|Kyoto Gases|Energy|Demand|Industry,Emissions|Kyoto Gases|Energy|Demand|Industry|Cement,,,,,,1
N2O,,resid others,Emissions|Kyoto Gases,Emissions|Kyoto Gases|Energy,Emissions|Kyoto Gases|Energy|Demand,Emissions|Kyoto Gases|Energy|Demand|Industry,Emissions|Kyoto Gases|Energy|Demand|Industry|Cement,,,,,,1
CO2,,resid others,Emissions|Kyoto Gases,Emissions|Kyoto Gases|Energy,Emissions|Kyoto Gases|Energy|Demand,Emissions|Kyoto Gases|Energy|Demand|Industry,Emissions|Kyoto Gases|Energy|Demand|Industry|Cement,,,,,,1
HFC125,,resid cooling,Emissions|Kyoto Gases,Emissions|Kyoto Gases|Energy,Emissions|Kyoto Gases|Energy|Demand,Emissions|Kyoto Gases|Energy|Demand|Residential and Commercial,,,,,,,1
HFC134a,,resid cooling,Emissions|Kyoto Gases,Emissions|Kyoto Gases|Energy,Emissions|Kyoto Gases|Energy|Demand,Emissions|Kyoto Gases|Energy|Demand|Residential and Commercial,,,,,,,1
HFC143a,,resid cooling,Emissions|Kyoto Gases,Emissions|Kyoto Gases|Energy,Emissions|Kyoto Gases|Energy|Demand,Emissions|Kyoto Gases|Energy|Demand|Residential and Commercial,,,,,,,1
HFC23,,resid cooling,Emissions|Kyoto Gases,Emissions|Kyoto Gases|Energy,Emissions|Kyoto Gases|Energy|Demand,Emissions|Kyoto Gases|Energy|Demand|Residential and Commercial,,,,,,,1
HFC32,,resid cooling,Emissions|Kyoto Gases,Emissions|Kyoto Gases|Energy,Emissions|Kyoto Gases|Energy|Demand,Emissions|Kyoto Gases|Energy|Demand|Residential and Commercial,,,,,,,1
CH4,,resid cooling,Emissions|Kyoto Gases,Emissions|Kyoto Gases|Energy,Emissions|Kyoto Gases|Energy|Demand,Emissions|Kyoto Gases|Energy|Demand|Residential and Commercial,,,,,,,1
N2O,,resid cooling,Emissions|Kyoto Gases,Emissions|Kyoto Gases|Energy,Emissions|Kyoto Gases|Energy|Demand,Emissions|Kyoto Gases|Energy|Demand|Residential and Commercial,,,,,,,1
CO2,,resid cooling,Emissions|Kyoto Gases,Emissions|Kyoto Gases|Energy,Emissions|Kyoto Gases|Energy|Demand,Emissions|Kyoto Gases|Energy|Demand|Residential and Commercial,,,,,,,1
CH4,,resid heating,Emissions|Kyoto Gases,Emissions|Kyoto Gases|Energy,Emissions|Kyoto Gases|Energy|Demand,Emissions|Kyoto Gases|Energy|Demand|Residential and Commercial,,,,,,,1
N2O,,resid heating,Emissions|Kyoto Gases,Emissions|Kyoto Gases|Energy,Emissions|Kyoto Gases|Energy|Demand,Emissions|Kyoto Gases|Energy|Demand|Residential and Commercial,,,,,,,1
CO2,,resid heating,Emissions|Kyoto Gases,Emissions|Kyoto Gases|Energy,Emissions|Kyoto Gases|Energy|Demand,Emissions|Kyoto Gases|Energy|Demand|Residential and Commercial,,,,,,,1
CH4,,resid others,Emissions|Kyoto Gases,Emissions|Kyoto Gases|Energy,Emissions|Kyoto Gases|Energy|Demand,Emissions|Kyoto Gases|Energy|Demand|Residential and Commercial,,,,,,,1
N2O,,resid others,Emissions|Kyoto Gases,Emissions|Kyoto Gases|Energy,Emissions|Kyoto Gases|Energy|Demand,Emissions|Kyoto Gases|Energy|Demand|Residential and Commercial,,,,,,,1
CO2,,resid others,Emissions|Kyoto Gases,Emissions|Kyoto Gases|Energy,Emissions|Kyoto Gases|Energy|Demand,Emissions|Kyoto Gases|Energy|Demand|Residential and Commercial,,,,,,,1
CH4,AGR,Rice,Emissions|Kyoto Gases,Emissions|Kyoto Gases|AFOLU,,,,,,,,,1
N2O,AGR,Rice,Emissions|Kyoto Gases,Emissions|Kyoto Gases|AFOLU,,,,,,,,,1
CH4,AWB,Rice,Emissions|Kyoto Gases,Emissions|Kyoto Gases|AFOLU,,,,,,,,,1
Expand Down
2 changes: 1 addition & 1 deletion inst/extdata/mappings/GCAM6.0/final_energy_map.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ mining energy use,gas,Final Energy,Final Energy|Gases,,,Final Energy|Industry,,F
N fertilizer,gas,Final Energy,Final Energy|Gases,,Final Energy|Industry,Final Energy|Industry|Gases,,Final Energy|Industry|Chemicals,Final Energy|Industry|Chemicals|Gases,,Final Energy|Industry|Chemicals|Ammonia,Final Energy|Industry|Chemicals|Ammonia|Gases,,1
other industrial energy use,gas,Final Energy,Final Energy|Gases,,,Final Energy|Industry,,Final Energy|Industry|Gases,,,,,,1
other industrial feedstocks,gas,Final Energy|Non-Energy Use,Final Energy|Non-Energy Use|Gas,,,,,,,,,,,1
process heat cement,gas,Final Energy,Final Energy|Industry,,,Final Energy|Industry,,Final Energy|Industry|Gases,,Final Energy|Industry|Cement,Final Energy|Industry|Cement|Gases,,,1
process heat cement,gas,Final Energy|Non-Energy Use,Final Energy|Non-Energy Use|Gas,,,,,,,,,,,1
process heat dac,gas,Final Energy,Final Energy|Other Sector,Final Energy|Other Sector|Gas,,,,,,,,,,1
resid cooling,gas,Final Energy,Final Energy|Gases,,,Final Energy|Residential and Commercial,Final Energy|Residential and Commercia|Residential,Final Energy|Residential and Commercial|Gases,Final Energy|Residential and Commercial|Residential|Gases,Final Energy|Residential and Commercial|Cooling,,,Final Energy|Residential and Commercial|Residential|Cooling,1
resid heating,gas,Final Energy,Final Energy|Gases,,,Final Energy|Residential and Commercial,Final Energy|Residential and Commercia|Residential,Final Energy|Residential and Commercial|Gases,Final Energy|Residential and Commercial|Residential|Gases,Final Energy|Residential and Commercial|Heating|Space,,,Final Energy|Residential and Commercial|Residential|Heating|Space,1
Expand Down
28 changes: 14 additions & 14 deletions inst/extdata/mappings/GCAM7.0/Kyotogas_sector.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -135,20 +135,20 @@ CO2,,refined liquids transport,Emissions|Kyoto Gases,Emissions|Kyoto Gases|Energ
CH4,,refining,Emissions|Kyoto Gases,Emissions|Kyoto Gases|Energy,Emissions|Kyoto Gases|Energy|Supply,Emissions|Kyoto Gases|Energy|Supply|Other,,,,,,,1
N2O,,refining,Emissions|Kyoto Gases,Emissions|Kyoto Gases|Energy,Emissions|Kyoto Gases|Energy|Supply,Emissions|Kyoto Gases|Energy|Supply|Other,,,,,,,1
CO2,,refining,Emissions|Kyoto Gases,Emissions|Kyoto Gases|Energy,Emissions|Kyoto Gases|Energy|Supply,Emissions|Kyoto Gases|Energy|Supply|Other,,,,,,,1
HFC125,,resid cooling,Emissions|Kyoto Gases,Emissions|Kyoto Gases|Energy,Emissions|Kyoto Gases|Energy|Demand,Emissions|Kyoto Gases|Energy|Demand|Industry,Emissions|Kyoto Gases|Energy|Demand|Industry|Cement,,,,,,1
HFC134a,,resid cooling,Emissions|Kyoto Gases,Emissions|Kyoto Gases|Energy,Emissions|Kyoto Gases|Energy|Demand,Emissions|Kyoto Gases|Energy|Demand|Industry,Emissions|Kyoto Gases|Energy|Demand|Industry|Cement,,,,,,1
HFC143a,,resid cooling,Emissions|Kyoto Gases,Emissions|Kyoto Gases|Energy,Emissions|Kyoto Gases|Energy|Demand,Emissions|Kyoto Gases|Energy|Demand|Industry,Emissions|Kyoto Gases|Energy|Demand|Industry|Cement,,,,,,1
HFC23,,resid cooling,Emissions|Kyoto Gases,Emissions|Kyoto Gases|Energy,Emissions|Kyoto Gases|Energy|Demand,Emissions|Kyoto Gases|Energy|Demand|Industry,Emissions|Kyoto Gases|Energy|Demand|Industry|Cement,,,,,,1
HFC32,,resid cooling,Emissions|Kyoto Gases,Emissions|Kyoto Gases|Energy,Emissions|Kyoto Gases|Energy|Demand,Emissions|Kyoto Gases|Energy|Demand|Industry,Emissions|Kyoto Gases|Energy|Demand|Industry|Cement,,,,,,1
CH4,,resid cooling,Emissions|Kyoto Gases,Emissions|Kyoto Gases|Energy,Emissions|Kyoto Gases|Energy|Demand,Emissions|Kyoto Gases|Energy|Demand|Industry,Emissions|Kyoto Gases|Energy|Demand|Industry|Cement,,,,,,1
N2O,,resid cooling,Emissions|Kyoto Gases,Emissions|Kyoto Gases|Energy,Emissions|Kyoto Gases|Energy|Demand,Emissions|Kyoto Gases|Energy|Demand|Industry,Emissions|Kyoto Gases|Energy|Demand|Industry|Cement,,,,,,1
CO2,,resid cooling,Emissions|Kyoto Gases,Emissions|Kyoto Gases|Energy,Emissions|Kyoto Gases|Energy|Demand,Emissions|Kyoto Gases|Energy|Demand|Industry,Emissions|Kyoto Gases|Energy|Demand|Industry|Cement,,,,,,1
CH4,,resid heating,Emissions|Kyoto Gases,Emissions|Kyoto Gases|Energy,Emissions|Kyoto Gases|Energy|Demand,Emissions|Kyoto Gases|Energy|Demand|Industry,Emissions|Kyoto Gases|Energy|Demand|Industry|Cement,,,,,,1
N2O,,resid heating,Emissions|Kyoto Gases,Emissions|Kyoto Gases|Energy,Emissions|Kyoto Gases|Energy|Demand,Emissions|Kyoto Gases|Energy|Demand|Industry,Emissions|Kyoto Gases|Energy|Demand|Industry|Cement,,,,,,1
CO2,,resid heating,Emissions|Kyoto Gases,Emissions|Kyoto Gases|Energy,Emissions|Kyoto Gases|Energy|Demand,Emissions|Kyoto Gases|Energy|Demand|Industry,Emissions|Kyoto Gases|Energy|Demand|Industry|Cement,,,,,,1
CH4,,resid others,Emissions|Kyoto Gases,Emissions|Kyoto Gases|Energy,Emissions|Kyoto Gases|Energy|Demand,Emissions|Kyoto Gases|Energy|Demand|Industry,Emissions|Kyoto Gases|Energy|Demand|Industry|Cement,,,,,,1
N2O,,resid others,Emissions|Kyoto Gases,Emissions|Kyoto Gases|Energy,Emissions|Kyoto Gases|Energy|Demand,Emissions|Kyoto Gases|Energy|Demand|Industry,Emissions|Kyoto Gases|Energy|Demand|Industry|Cement,,,,,,1
CO2,,resid others,Emissions|Kyoto Gases,Emissions|Kyoto Gases|Energy,Emissions|Kyoto Gases|Energy|Demand,Emissions|Kyoto Gases|Energy|Demand|Industry,Emissions|Kyoto Gases|Energy|Demand|Industry|Cement,,,,,,1
HFC125,,resid cooling,Emissions|Kyoto Gases,Emissions|Kyoto Gases|Energy,Emissions|Kyoto Gases|Energy|Demand,Emissions|Kyoto Gases|Energy|Demand|Residential and Commercial,,,,,,,1
HFC134a,,resid cooling,Emissions|Kyoto Gases,Emissions|Kyoto Gases|Energy,Emissions|Kyoto Gases|Energy|Demand,Emissions|Kyoto Gases|Energy|Demand|Residential and Commercial,,,,,,,1
HFC143a,,resid cooling,Emissions|Kyoto Gases,Emissions|Kyoto Gases|Energy,Emissions|Kyoto Gases|Energy|Demand,Emissions|Kyoto Gases|Energy|Demand|Residential and Commercial,,,,,,,1
HFC23,,resid cooling,Emissions|Kyoto Gases,Emissions|Kyoto Gases|Energy,Emissions|Kyoto Gases|Energy|Demand,Emissions|Kyoto Gases|Energy|Demand|Residential and Commercial,,,,,,,1
HFC32,,resid cooling,Emissions|Kyoto Gases,Emissions|Kyoto Gases|Energy,Emissions|Kyoto Gases|Energy|Demand,Emissions|Kyoto Gases|Energy|Demand|Residential and Commercial,,,,,,,1
CH4,,resid cooling,Emissions|Kyoto Gases,Emissions|Kyoto Gases|Energy,Emissions|Kyoto Gases|Energy|Demand,Emissions|Kyoto Gases|Energy|Demand|Residential and Commercial,,,,,,,1
N2O,,resid cooling,Emissions|Kyoto Gases,Emissions|Kyoto Gases|Energy,Emissions|Kyoto Gases|Energy|Demand,Emissions|Kyoto Gases|Energy|Demand|Residential and Commercial,,,,,,,1
CO2,,resid cooling,Emissions|Kyoto Gases,Emissions|Kyoto Gases|Energy,Emissions|Kyoto Gases|Energy|Demand,Emissions|Kyoto Gases|Energy|Demand|Residential and Commercial,,,,,,,1
CH4,,resid heating,Emissions|Kyoto Gases,Emissions|Kyoto Gases|Energy,Emissions|Kyoto Gases|Energy|Demand,Emissions|Kyoto Gases|Energy|Demand|Residential and Commercial,,,,,,,1
N2O,,resid heating,Emissions|Kyoto Gases,Emissions|Kyoto Gases|Energy,Emissions|Kyoto Gases|Energy|Demand,Emissions|Kyoto Gases|Energy|Demand|Residential and Commercial,,,,,,,1
CO2,,resid heating,Emissions|Kyoto Gases,Emissions|Kyoto Gases|Energy,Emissions|Kyoto Gases|Energy|Demand,Emissions|Kyoto Gases|Energy|Demand|Residential and Commercial,,,,,,,1
CH4,,resid others,Emissions|Kyoto Gases,Emissions|Kyoto Gases|Energy,Emissions|Kyoto Gases|Energy|Demand,Emissions|Kyoto Gases|Energy|Demand|Residential and Commercial,,,,,,,1
N2O,,resid others,Emissions|Kyoto Gases,Emissions|Kyoto Gases|Energy,Emissions|Kyoto Gases|Energy|Demand,Emissions|Kyoto Gases|Energy|Demand|Residential and Commercial,,,,,,,1
CO2,,resid others,Emissions|Kyoto Gases,Emissions|Kyoto Gases|Energy,Emissions|Kyoto Gases|Energy|Demand,Emissions|Kyoto Gases|Energy|Demand|Residential and Commercial,,,,,,,1
CH4,AGR,Rice,Emissions|Kyoto Gases,Emissions|Kyoto Gases|AFOLU,,,,,,,,,1
N2O,AGR,Rice,Emissions|Kyoto Gases,Emissions|Kyoto Gases|AFOLU,,,,,,,,,1
CH4,AWB,Rice,Emissions|Kyoto Gases,Emissions|Kyoto Gases|AFOLU,,,,,,,,,1
Expand Down
2 changes: 1 addition & 1 deletion inst/extdata/mappings/GCAM7.0/final_energy_map.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ mining energy use,gas,Final Energy,Final Energy|Gases,,,Final Energy|Industry,,F
N fertilizer,gas,Final Energy,Final Energy|Gases,,Final Energy|Industry,Final Energy|Industry|Gases,,Final Energy|Industry|Chemicals,Final Energy|Industry|Chemicals|Gases,,Final Energy|Industry|Chemicals|Ammonia,Final Energy|Industry|Chemicals|Ammonia|Gases,,1
other industrial energy use,gas,Final Energy,Final Energy|Gases,,,Final Energy|Industry,,Final Energy|Industry|Gases,,,,,,1
other industrial feedstocks,gas,Final Energy|Non-Energy Use,Final Energy|Non-Energy Use|Gas,,,,,,,,,,,1
process heat cement,gas,Final Energy,Final Energy|Industry,,,Final Energy|Industry,,Final Energy|Industry|Gases,,Final Energy|Industry|Cement,Final Energy|Industry|Cement|Gases,,,1
process heat cement,gas,Final Energy|Non-Energy Use,Final Energy|Non-Energy Use|Gas,,,,,,,,,,,1
process heat dac,gas,Final Energy,Final Energy|Other Sector,Final Energy|Other Sector|Gas,,,,,,,,,,1
resid cooling,gas,Final Energy,Final Energy|Gases,,,Final Energy|Residential and Commercial,Final Energy|Residential and Commercia|Residential,Final Energy|Residential and Commercial|Gases,Final Energy|Residential and Commercial|Residential|Gases,Final Energy|Residential and Commercial|Cooling,,,Final Energy|Residential and Commercial|Residential|Cooling,1
resid heating,gas,Final Energy,Final Energy|Gases,,,Final Energy|Residential and Commercial,Final Energy|Residential and Commercia|Residential,Final Energy|Residential and Commercial|Gases,Final Energy|Residential and Commercial|Residential|Gases,Final Energy|Residential and Commercial|Heating|Space,,,Final Energy|Residential and Commercial|Residential|Heating|Space,1
Expand Down
Loading

0 comments on commit 789b0a2

Please sign in to comment.