Skip to content

Commit

Permalink
Merge pull request #15 from umd-cgs/dev
Browse files Browse the repository at this point in the history 
ComDef: fix final en commercial heat mapping
  • Loading branch information
@klau506
klau506 authored Jan 17, 2025
2 parents a652db7 + 715c6d1 commit 609d42b
Show file tree
Hide file tree
Showing 7 changed files with 25 additions and 24 deletions.
Binary file modified data/final_energy_map_v7.0.rda
View file
Binary file not shown.
Binary file modified data/final_energy_map_v7.1.rda
View file
Binary file not shown.
Binary file modified data/final_energy_map_v7.2.rda
View file
Binary file not shown.
1 change: 1 addition & 0 deletions gcamreport.Rproj
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
Version: 1.0
ProjectId: 038a8a56-eebf-4be3-abac-b4bbc1bae262

RestoreWorkspace: No
SaveWorkspace: No
Expand Down
16 changes: 8 additions & 8 deletions inst/extdata/mappings/GCAM7.0/final_energy_map.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,14 @@ CO2 removal,electricity,Final Energy,Final Energy|Electricity,,Final Energy|Carb
CO2 removal,process heat dac,Final Energy,Final Energy|Electricity,,Final Energy|Carbon Management,Final Energy|Carbon Management|Electricity,Final Energy|Carbon Management|Direct Air Capture,Final Energy|Carbon Management|Direct Air Capture|Electricity,,,,,,Final Energy (w/o bunkers),1
comm cooling,electricity,Final Energy,Final Energy|Electricity,,Final Energy|Residential and Commercial,Final Energy|Residential and Commercial|Electricity,,Final Energy|Commercial|Electricity,,,,,,Final Energy (w/o bunkers),1
comm cooling,gas,Final Energy,Final Energy|Gases,,Final Energy|Residential and Commercial,Final Energy|Residential and Commercial|Gases,,Final Energy|Commercial|Gases,,,,,,Final Energy (w/o bunkers),1
comm heating,biomass,Final Energy,Final Energy|Solids,Final Energy|Solids|Biomass,Final Energy|Residential and Commercial,Final Energy|Residential and Commercial|Solids,Final Energy|Residential and Commercial|Solids|Biomass,Final Energy|Commercial|Solids,Final Energy|Commercial|Solids|Biomass,,Final Energy|Residential and Commercial|Heat,Final Energy|Commercial|Heat,,Final Energy (w/o bunkers),1
comm heating,coal,Final Energy,Final Energy|Solids,Final Energy|Solids|Coal,Final Energy|Residential and Commercial,Final Energy|Residential and Commercial|Solids,Final Energy|Residential and Commercial|Solids|Coal,Final Energy|Commercial|Solids,Final Energy|Commercial|Solids|Coal,,Final Energy|Residential and Commercial|Heat,Final Energy|Commercial|Heat,,Final Energy (w/o bunkers),1
comm heating,district heat,Final Energy,Final Energy|Heat,,Final Energy|Residential and Commercial,Final Energy|Residential and Commercial|Heat,,Final Energy|Commercial|Heat,,,Final Energy|Residential and Commercial|Heat,Final Energy|Commercial|Heat,,Final Energy (w/o bunkers),1
comm heating,electricity,Final Energy,Final Energy|Electricity,,Final Energy|Residential and Commercial,Final Energy|Residential and Commercial|Electricity,,Final Energy|Commercial|Electricity,,,Final Energy|Residential and Commercial|Heat,Final Energy|Commercial|Heat,,Final Energy (w/o bunkers),1
comm heating,gas,Final Energy,Final Energy|Gases,,Final Energy|Residential and Commercial,Final Energy|Residential and Commercial|Gases,,Final Energy|Commercial|Gases,,,Final Energy|Residential and Commercial|Heat,Final Energy|Commercial|Heat,,Final Energy (w/o bunkers),1
comm heating,H2 retail delivery,Final Energy,Final Energy|Hydrogen,,Final Energy|Residential and Commercial,Final Energy|Residential and Commercial|Hydrogen,,Final Energy|Commercial|Hydrogen,,,Final Energy|Residential and Commercial|Heat,Final Energy|Commercial|Heat,,Final Energy (w/o bunkers),1
comm heating,hydrogen,Final Energy,Final Energy|Hydrogen,,Final Energy|Residential and Commercial,Final Energy|Residential and Commercial|Hydrogen,,Final Energy|Commercial|Hydrogen,,,Final Energy|Residential and Commercial|Heat,Final Energy|Commercial|Heat,,Final Energy (w/o bunkers),1
comm heating,refined liquids,Final Energy,Final Energy|Liquids,,Final Energy|Residential and Commercial,Final Energy|Residential and Commercial|Liquids,,Final Energy|Commercial|Liquids,,,Final Energy|Residential and Commercial|Heat,Final Energy|Commercial|Heat,,Final Energy (w/o bunkers),1
comm heating,biomass,Final Energy,Final Energy|Solids,Final Energy|Solids|Biomass,Final Energy|Residential and Commercial,Final Energy|Residential and Commercial|Solids,Final Energy|Residential and Commercial|Solids|Biomass,Final Energy|Commercial|Solids,Final Energy|Commercial|Solids|Biomass,,,,,Final Energy (w/o bunkers),1
comm heating,coal,Final Energy,Final Energy|Solids,Final Energy|Solids|Coal,Final Energy|Residential and Commercial,Final Energy|Residential and Commercial|Solids,Final Energy|Residential and Commercial|Solids|Coal,Final Energy|Commercial|Solids,Final Energy|Commercial|Solids|Coal,,,,,Final Energy (w/o bunkers),1
comm heating,district heat,Final Energy,Final Energy|Heat,,Final Energy|Residential and Commercial,Final Energy|Residential and Commercial|Heat,,Final Energy|Commercial|Heat,,,,,,Final Energy (w/o bunkers),1
comm heating,electricity,Final Energy,Final Energy|Electricity,,Final Energy|Residential and Commercial,Final Energy|Residential and Commercial|Electricity,,Final Energy|Commercial|Electricity,,,,,,Final Energy (w/o bunkers),1
comm heating,gas,Final Energy,Final Energy|Gases,,Final Energy|Residential and Commercial,Final Energy|Residential and Commercial|Gases,,Final Energy|Commercial|Gases,,,,,,Final Energy (w/o bunkers),1
comm heating,H2 retail delivery,Final Energy,Final Energy|Hydrogen,,Final Energy|Residential and Commercial,Final Energy|Residential and Commercial|Hydrogen,,Final Energy|Commercial|Hydrogen,,,,,,Final Energy (w/o bunkers),1
comm heating,hydrogen,Final Energy,Final Energy|Hydrogen,,Final Energy|Residential and Commercial,Final Energy|Residential and Commercial|Hydrogen,,Final Energy|Commercial|Hydrogen,,,,,,Final Energy (w/o bunkers),1
comm heating,refined liquids,Final Energy,Final Energy|Liquids,,Final Energy|Residential and Commercial,Final Energy|Residential and Commercial|Liquids,,Final Energy|Commercial|Liquids,,,,,,Final Energy (w/o bunkers),1
comm others,biomass,Final Energy,Final Energy|Solids,Final Energy|Solids|Biomass,Final Energy|Residential and Commercial,Final Energy|Residential and Commercial|Solids,Final Energy|Residential and Commercial|Solids|Biomass,Final Energy|Commercial|Solids,Final Energy|Commercial|Solids|Biomass,,,,,Final Energy (w/o bunkers),1
comm others,coal,Final Energy,Final Energy|Solids,Final Energy|Solids|Coal,Final Energy|Residential and Commercial,Final Energy|Residential and Commercial|Solids,Final Energy|Residential and Commercial|Solids|Coal,Final Energy|Commercial|Solids,Final Energy|Commercial|Solids|Coal,,,,,Final Energy (w/o bunkers),1
comm others,district heat,Final Energy,Final Energy|Heat,,Final Energy|Residential and Commercial,Final Energy|Residential and Commercial|Heat,,Final Energy|Commercial|Heat,,,,,,Final Energy (w/o bunkers),1
Expand Down
16 changes: 8 additions & 8 deletions inst/extdata/mappings/GCAM7.1/final_energy_map.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,14 @@ CO2 removal,electricity,Final Energy,Final Energy|Electricity,,Final Energy|Carb
CO2 removal,process heat dac,Final Energy,Final Energy|Electricity,,Final Energy|Carbon Management,Final Energy|Carbon Management|Electricity,Final Energy|Carbon Management|Direct Air Capture,Final Energy|Carbon Management|Direct Air Capture|Electricity,,,,,,Final Energy (w/o bunkers),1
comm cooling,electricity,Final Energy,Final Energy|Electricity,,Final Energy|Residential and Commercial,Final Energy|Residential and Commercial|Electricity,,Final Energy|Commercial|Electricity,,,,,,Final Energy (w/o bunkers),1
comm cooling,gas,Final Energy,Final Energy|Gases,,Final Energy|Residential and Commercial,Final Energy|Residential and Commercial|Gases,,Final Energy|Commercial|Gases,,,,,,Final Energy (w/o bunkers),1
comm heating,biomass,Final Energy,Final Energy|Solids,Final Energy|Solids|Biomass,Final Energy|Residential and Commercial,Final Energy|Residential and Commercial|Solids,Final Energy|Residential and Commercial|Solids|Biomass,Final Energy|Commercial|Solids,Final Energy|Commercial|Solids|Biomass,,Final Energy|Residential and Commercial|Heat,Final Energy|Commercial|Heat,,Final Energy (w/o bunkers),1
comm heating,coal,Final Energy,Final Energy|Solids,Final Energy|Solids|Coal,Final Energy|Residential and Commercial,Final Energy|Residential and Commercial|Solids,Final Energy|Residential and Commercial|Solids|Coal,Final Energy|Commercial|Solids,Final Energy|Commercial|Solids|Coal,,Final Energy|Residential and Commercial|Heat,Final Energy|Commercial|Heat,,Final Energy (w/o bunkers),1
comm heating,district heat,Final Energy,Final Energy|Heat,,Final Energy|Residential and Commercial,Final Energy|Residential and Commercial|Heat,,Final Energy|Commercial|Heat,,,Final Energy|Residential and Commercial|Heat,Final Energy|Commercial|Heat,,Final Energy (w/o bunkers),1
comm heating,electricity,Final Energy,Final Energy|Electricity,,Final Energy|Residential and Commercial,Final Energy|Residential and Commercial|Electricity,,Final Energy|Commercial|Electricity,,,Final Energy|Residential and Commercial|Heat,Final Energy|Commercial|Heat,,Final Energy (w/o bunkers),1
comm heating,gas,Final Energy,Final Energy|Gases,,Final Energy|Residential and Commercial,Final Energy|Residential and Commercial|Gases,,Final Energy|Commercial|Gases,,,Final Energy|Residential and Commercial|Heat,Final Energy|Commercial|Heat,,Final Energy (w/o bunkers),1
comm heating,H2 retail delivery,Final Energy,Final Energy|Hydrogen,,Final Energy|Residential and Commercial,Final Energy|Residential and Commercial|Hydrogen,,Final Energy|Commercial|Hydrogen,,,Final Energy|Residential and Commercial|Heat,Final Energy|Commercial|Heat,,Final Energy (w/o bunkers),1
comm heating,hydrogen,Final Energy,Final Energy|Hydrogen,,Final Energy|Residential and Commercial,Final Energy|Residential and Commercial|Hydrogen,,Final Energy|Commercial|Hydrogen,,,Final Energy|Residential and Commercial|Heat,Final Energy|Commercial|Heat,,Final Energy (w/o bunkers),1
comm heating,refined liquids,Final Energy,Final Energy|Liquids,,Final Energy|Residential and Commercial,Final Energy|Residential and Commercial|Liquids,,Final Energy|Commercial|Liquids,,,Final Energy|Residential and Commercial|Heat,Final Energy|Commercial|Heat,,Final Energy (w/o bunkers),1
comm heating,biomass,Final Energy,Final Energy|Solids,Final Energy|Solids|Biomass,Final Energy|Residential and Commercial,Final Energy|Residential and Commercial|Solids,Final Energy|Residential and Commercial|Solids|Biomass,Final Energy|Commercial|Solids,Final Energy|Commercial|Solids|Biomass,,,,,Final Energy (w/o bunkers),1
comm heating,coal,Final Energy,Final Energy|Solids,Final Energy|Solids|Coal,Final Energy|Residential and Commercial,Final Energy|Residential and Commercial|Solids,Final Energy|Residential and Commercial|Solids|Coal,Final Energy|Commercial|Solids,Final Energy|Commercial|Solids|Coal,,,,,Final Energy (w/o bunkers),1
comm heating,district heat,Final Energy,Final Energy|Heat,,Final Energy|Residential and Commercial,Final Energy|Residential and Commercial|Heat,,Final Energy|Commercial|Heat,,,,,,Final Energy (w/o bunkers),1
comm heating,electricity,Final Energy,Final Energy|Electricity,,Final Energy|Residential and Commercial,Final Energy|Residential and Commercial|Electricity,,Final Energy|Commercial|Electricity,,,,,,Final Energy (w/o bunkers),1
comm heating,gas,Final Energy,Final Energy|Gases,,Final Energy|Residential and Commercial,Final Energy|Residential and Commercial|Gases,,Final Energy|Commercial|Gases,,,,,,Final Energy (w/o bunkers),1
comm heating,H2 retail delivery,Final Energy,Final Energy|Hydrogen,,Final Energy|Residential and Commercial,Final Energy|Residential and Commercial|Hydrogen,,Final Energy|Commercial|Hydrogen,,,,,,Final Energy (w/o bunkers),1
comm heating,hydrogen,Final Energy,Final Energy|Hydrogen,,Final Energy|Residential and Commercial,Final Energy|Residential and Commercial|Hydrogen,,Final Energy|Commercial|Hydrogen,,,,,,Final Energy (w/o bunkers),1
comm heating,refined liquids,Final Energy,Final Energy|Liquids,,Final Energy|Residential and Commercial,Final Energy|Residential and Commercial|Liquids,,Final Energy|Commercial|Liquids,,,,,,Final Energy (w/o bunkers),1
comm others,biomass,Final Energy,Final Energy|Solids,Final Energy|Solids|Biomass,Final Energy|Residential and Commercial,Final Energy|Residential and Commercial|Solids,Final Energy|Residential and Commercial|Solids|Biomass,Final Energy|Commercial|Solids,Final Energy|Commercial|Solids|Biomass,,,,,Final Energy (w/o bunkers),1
comm others,coal,Final Energy,Final Energy|Solids,Final Energy|Solids|Coal,Final Energy|Residential and Commercial,Final Energy|Residential and Commercial|Solids,Final Energy|Residential and Commercial|Solids|Coal,Final Energy|Commercial|Solids,Final Energy|Commercial|Solids|Coal,,,,,Final Energy (w/o bunkers),1
comm others,district heat,Final Energy,Final Energy|Heat,,Final Energy|Residential and Commercial,Final Energy|Residential and Commercial|Heat,,Final Energy|Commercial|Heat,,,,,,Final Energy (w/o bunkers),1
Expand Down
16 changes: 8 additions & 8 deletions inst/extdata/mappings/GCAM7.2/final_energy_map.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,14 @@ CO2 removal,electricity,Final Energy,Final Energy|Electricity,,Final Energy|Carb
CO2 removal,process heat dac,Final Energy,Final Energy|Electricity,,Final Energy|Carbon Management,Final Energy|Carbon Management|Electricity,Final Energy|Carbon Management|Direct Air Capture,Final Energy|Carbon Management|Direct Air Capture|Electricity,,,,,,Final Energy (w/o bunkers),1
comm cooling,electricity,Final Energy,Final Energy|Electricity,,Final Energy|Residential and Commercial,Final Energy|Residential and Commercial|Electricity,,Final Energy|Commercial|Electricity,,,,,,Final Energy (w/o bunkers),1
comm cooling,gas,Final Energy,Final Energy|Gases,,Final Energy|Residential and Commercial,Final Energy|Residential and Commercial|Gases,,Final Energy|Commercial|Gases,,,,,,Final Energy (w/o bunkers),1
comm heating,biomass,Final Energy,Final Energy|Solids,Final Energy|Solids|Biomass,Final Energy|Residential and Commercial,Final Energy|Residential and Commercial|Solids,Final Energy|Residential and Commercial|Solids|Biomass,Final Energy|Commercial|Solids,Final Energy|Commercial|Solids|Biomass,,Final Energy|Residential and Commercial|Heat,Final Energy|Commercial|Heat,,Final Energy (w/o bunkers),1
comm heating,coal,Final Energy,Final Energy|Solids,Final Energy|Solids|Coal,Final Energy|Residential and Commercial,Final Energy|Residential and Commercial|Solids,Final Energy|Residential and Commercial|Solids|Coal,Final Energy|Commercial|Solids,Final Energy|Commercial|Solids|Coal,,Final Energy|Residential and Commercial|Heat,Final Energy|Commercial|Heat,,Final Energy (w/o bunkers),1
comm heating,district heat,Final Energy,Final Energy|Heat,,Final Energy|Residential and Commercial,Final Energy|Residential and Commercial|Heat,,Final Energy|Commercial|Heat,,,Final Energy|Residential and Commercial|Heat,Final Energy|Commercial|Heat,,Final Energy (w/o bunkers),1
comm heating,electricity,Final Energy,Final Energy|Electricity,,Final Energy|Residential and Commercial,Final Energy|Residential and Commercial|Electricity,,Final Energy|Commercial|Electricity,,,Final Energy|Residential and Commercial|Heat,Final Energy|Commercial|Heat,,Final Energy (w/o bunkers),1
comm heating,gas,Final Energy,Final Energy|Gases,,Final Energy|Residential and Commercial,Final Energy|Residential and Commercial|Gases,,Final Energy|Commercial|Gases,,,Final Energy|Residential and Commercial|Heat,Final Energy|Commercial|Heat,,Final Energy (w/o bunkers),1
comm heating,H2 retail delivery,Final Energy,Final Energy|Hydrogen,,Final Energy|Residential and Commercial,Final Energy|Residential and Commercial|Hydrogen,,Final Energy|Commercial|Hydrogen,,,Final Energy|Residential and Commercial|Heat,Final Energy|Commercial|Heat,,Final Energy (w/o bunkers),1
comm heating,hydrogen,Final Energy,Final Energy|Hydrogen,,Final Energy|Residential and Commercial,Final Energy|Residential and Commercial|Hydrogen,,Final Energy|Commercial|Hydrogen,,,Final Energy|Residential and Commercial|Heat,Final Energy|Commercial|Heat,,Final Energy (w/o bunkers),1
comm heating,refined liquids,Final Energy,Final Energy|Liquids,,Final Energy|Residential and Commercial,Final Energy|Residential and Commercial|Liquids,,Final Energy|Commercial|Liquids,,,Final Energy|Residential and Commercial|Heat,Final Energy|Commercial|Heat,,Final Energy (w/o bunkers),1
comm heating,biomass,Final Energy,Final Energy|Solids,Final Energy|Solids|Biomass,Final Energy|Residential and Commercial,Final Energy|Residential and Commercial|Solids,Final Energy|Residential and Commercial|Solids|Biomass,Final Energy|Commercial|Solids,Final Energy|Commercial|Solids|Biomass,,,,,Final Energy (w/o bunkers),1
comm heating,coal,Final Energy,Final Energy|Solids,Final Energy|Solids|Coal,Final Energy|Residential and Commercial,Final Energy|Residential and Commercial|Solids,Final Energy|Residential and Commercial|Solids|Coal,Final Energy|Commercial|Solids,Final Energy|Commercial|Solids|Coal,,,,,Final Energy (w/o bunkers),1
comm heating,district heat,Final Energy,Final Energy|Heat,,Final Energy|Residential and Commercial,Final Energy|Residential and Commercial|Heat,,Final Energy|Commercial|Heat,,,,,,Final Energy (w/o bunkers),1
comm heating,electricity,Final Energy,Final Energy|Electricity,,Final Energy|Residential and Commercial,Final Energy|Residential and Commercial|Electricity,,Final Energy|Commercial|Electricity,,,,,,Final Energy (w/o bunkers),1
comm heating,gas,Final Energy,Final Energy|Gases,,Final Energy|Residential and Commercial,Final Energy|Residential and Commercial|Gases,,Final Energy|Commercial|Gases,,,,,,Final Energy (w/o bunkers),1
comm heating,H2 retail delivery,Final Energy,Final Energy|Hydrogen,,Final Energy|Residential and Commercial,Final Energy|Residential and Commercial|Hydrogen,,Final Energy|Commercial|Hydrogen,,,,,,Final Energy (w/o bunkers),1
comm heating,hydrogen,Final Energy,Final Energy|Hydrogen,,Final Energy|Residential and Commercial,Final Energy|Residential and Commercial|Hydrogen,,Final Energy|Commercial|Hydrogen,,,,,,Final Energy (w/o bunkers),1
comm heating,refined liquids,Final Energy,Final Energy|Liquids,,Final Energy|Residential and Commercial,Final Energy|Residential and Commercial|Liquids,,Final Energy|Commercial|Liquids,,,,,,Final Energy (w/o bunkers),1
comm others,biomass,Final Energy,Final Energy|Solids,Final Energy|Solids|Biomass,Final Energy|Residential and Commercial,Final Energy|Residential and Commercial|Solids,Final Energy|Residential and Commercial|Solids|Biomass,Final Energy|Commercial|Solids,Final Energy|Commercial|Solids|Biomass,,,,,Final Energy (w/o bunkers),1
comm others,coal,Final Energy,Final Energy|Solids,Final Energy|Solids|Coal,Final Energy|Residential and Commercial,Final Energy|Residential and Commercial|Solids,Final Energy|Residential and Commercial|Solids|Coal,Final Energy|Commercial|Solids,Final Energy|Commercial|Solids|Coal,,,,,Final Energy (w/o bunkers),1
comm others,district heat,Final Energy,Final Energy|Heat,,Final Energy|Residential and Commercial,Final Energy|Residential and Commercial|Heat,,Final Energy|Commercial|Heat,,,,,,Final Energy (w/o bunkers),1
Expand Down

0 comments on commit 609d42b

Please sign in to comment.