ComDef: finish elec capacity map - fossil

bc3LC · Nov 13, 2024 · 10b7440 · 10b7440
1 parent 5f5abfe
commit 10b7440
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/data/capacity_map_v7.1.rda b/data/capacity_map_v7.1.rda
diff --git a/data/secondary_energy_map_v7.1.rda b/data/secondary_energy_map_v7.1.rda
diff --git a/inst/extdata/mappings/GCAM7.1/capacity_map.csv b/inst/extdata/mappings/GCAM7.1/capacity_map.csv
@@ -1,28 +1,28 @@
-# Multiple load segments Electricity generation by technology (inc solar roofs),,,,,,,,,,
+# Multiple load segments Electricity generation by technology (inc solar roofs)
 output,subsector,technology,var1,var2,var3,var4,var6,var7,var8,unit_conv
 electricity,biomass,biomass (conv CCS),Secondary Energy|Electricity,Secondary Energy|Electricity|Biomass,Secondary Energy|Electricity|Biomass|w/ CCS,,,,,1
 electricity,biomass,biomass (conv),Secondary Energy|Electricity,Secondary Energy|Electricity|Biomass,Secondary Energy|Electricity|Biomass|w/o CCS,,,,,1
 electricity,biomass,biomass (IGCC CCS),Secondary Energy|Electricity,Secondary Energy|Electricity|Biomass,Secondary Energy|Electricity|Biomass|w/ CCS,,,,,1
 electricity,biomass,biomass (IGCC),Secondary Energy|Electricity,Secondary Energy|Electricity|Biomass,Secondary Energy|Electricity|Biomass|w/o CCS,,,,,1
 electricity,biomass,biomass cogen,Secondary Energy|Electricity,Secondary Energy|Electricity|Biomass,Secondary Energy|Electricity|Biomass|w/o CCS,,,,,1
-electricity,coal,coal (conv pul CCS),Secondary Energy|Electricity,Secondary Energy|Electricity|Coal,Secondary Energy|Electricity|Coal|w/ CCS,,,,,1
-electricity,coal,coal (conv pul),Secondary Energy|Electricity,Secondary Energy|Electricity|Coal,Secondary Energy|Electricity|Coal|w/o CCS,,,,,1
-electricity,coal,coal (IGCC CCS),Secondary Energy|Electricity,Secondary Energy|Electricity|Coal,Secondary Energy|Electricity|Coal|w/ CCS,,,,,1
-electricity,coal,coal (IGCC),Secondary Energy|Electricity,Secondary Energy|Electricity|Coal,Secondary Energy|Electricity|Coal|w/o CCS,,,,,1
-electricity,coal,coal cogen,Secondary Energy|Electricity,Secondary Energy|Electricity|Coal,Secondary Energy|Electricity|Coal|w/o CCS,,,,,1
-electricity,gas,gas (CC CCS),Secondary Energy|Electricity,Secondary Energy|Electricity|Gas,Secondary Energy|Electricity|Gas|w/ CCS,,,,,1
-electricity,gas,gas (CC),Secondary Energy|Electricity,Secondary Energy|Electricity|Gas,Secondary Energy|Electricity|Gas|w/o CCS,,,,,1
-electricity,gas,gas (steam/CT),Secondary Energy|Electricity,Secondary Energy|Electricity|Gas,Secondary Energy|Electricity|Gas|w/o CCS,,,,,1
-electricity,gas,gas cogen,Secondary Energy|Electricity,Secondary Energy|Electricity|Gas,Secondary Energy|Electricity|Gas|w/o CCS,,,,,1
-electricity,gas,desalinated water,Secondary Energy|Electricity,Secondary Energy|Electricity|Gas,Secondary Energy|Electricity|Gas|w/o CCS,,,,,1
+electricity,coal,coal (conv pul CCS),Secondary Energy|Electricity,Secondary Energy|Electricity|Coal,Secondary Energy|Electricity|Coal|w/ CCS,Capacity Additions|Electricity|Fossil,Capacity Additions|Electricity|Fossil|w/ CCS,,,1
+electricity,coal,coal (conv pul),Secondary Energy|Electricity,Secondary Energy|Electricity|Coal,Secondary Energy|Electricity|Coal|w/o CCS,Capacity Additions|Electricity|Fossil,Capacity Additions|Electricity|Fossil|w/o CCS,,,1
+electricity,coal,coal (IGCC CCS),Secondary Energy|Electricity,Secondary Energy|Electricity|Coal,Secondary Energy|Electricity|Coal|w/ CCS,Capacity Additions|Electricity|Fossil,Capacity Additions|Electricity|Fossil|w/ CCS,,,1
+electricity,coal,coal (IGCC),Secondary Energy|Electricity,Secondary Energy|Electricity|Coal,Secondary Energy|Electricity|Coal|w/o CCS,Capacity Additions|Electricity|Fossil,Capacity Additions|Electricity|Fossil|w/o CCS,,,1
+electricity,coal,coal cogen,Secondary Energy|Electricity,Secondary Energy|Electricity|Coal,Secondary Energy|Electricity|Coal|w/o CCS,Capacity Additions|Electricity|Fossil,Capacity Additions|Electricity|Fossil|w/o CCS,,,1
+electricity,gas,gas (CC CCS),Secondary Energy|Electricity,Secondary Energy|Electricity|Gas,Secondary Energy|Electricity|Gas|w/ CCS,Capacity Additions|Electricity|Fossil,Capacity Additions|Electricity|Fossil|w/ CCS,,,1
+electricity,gas,gas (CC),Secondary Energy|Electricity,Secondary Energy|Electricity|Gas,Secondary Energy|Electricity|Gas|w/o CCS,Capacity Additions|Electricity|Fossil,Capacity Additions|Electricity|Fossil|w/o CCS,,,1
+electricity,gas,gas (steam/CT),Secondary Energy|Electricity,Secondary Energy|Electricity|Gas,Secondary Energy|Electricity|Gas|w/o CCS,Capacity Additions|Electricity|Fossil,Capacity Additions|Electricity|Fossil|w/o CCS,,,1
+electricity,gas,gas cogen,Secondary Energy|Electricity,Secondary Energy|Electricity|Gas,Secondary Energy|Electricity|Gas|w/o CCS,Capacity Additions|Electricity|Fossil,Capacity Additions|Electricity|Fossil|w/o CCS,,,1
+electricity,gas,desalinated water,Secondary Energy|Electricity,Secondary Energy|Electricity|Gas,Secondary Energy|Electricity|Gas|w/o CCS,Capacity Additions|Electricity|Fossil,Capacity Additions|Electricity|Fossil|w/o CCS,,,1
 electricity,geothermal,geothermal,Secondary Energy|Electricity,Secondary Energy|Electricity|Geothermal,,Secondary Energy|Electricity|Non-Biomass Renewables,,,,1
 electricity,hydro,hydro,Secondary Energy|Electricity,Secondary Energy|Electricity|Hydro,,Secondary Energy|Electricity|Non-Biomass Renewables,,,,1
 electricity,nuclear,Gen_II_LWR,Secondary Energy|Electricity,Secondary Energy|Electricity|Nuclear,,,,,,1
 electricity,nuclear,Gen_III,Secondary Energy|Electricity,Secondary Energy|Electricity|Nuclear,,,,,,1
-electricity,refined liquids,refined liquids (CC CCS),Secondary Energy|Electricity,Secondary Energy|Electricity|Oil,Secondary Energy|Electricity|Oil|w/ CCS,,,,,1
-electricity,refined liquids,refined liquids (CC),Secondary Energy|Electricity,Secondary Energy|Electricity|Oil,Secondary Energy|Electricity|Oil|w/o CCS,,,,,1
-electricity,refined liquids,refined liquids (steam/CT),Secondary Energy|Electricity,Secondary Energy|Electricity|Oil,Secondary Energy|Electricity|Oil|w/o CCS,,,,,1
-electricity,refined liquids,refined liquids cogen,Secondary Energy|Electricity,Secondary Energy|Electricity|Oil,Secondary Energy|Electricity|Oil|w/o CCS,,,,,1
+electricity,refined liquids,refined liquids (CC CCS),Secondary Energy|Electricity,Secondary Energy|Electricity|Oil,Secondary Energy|Electricity|Oil|w/ CCS,Capacity Additions|Electricity|Fossil,Capacity Additions|Electricity|Fossil|w/ CCS,,,1
+electricity,refined liquids,refined liquids (CC),Secondary Energy|Electricity,Secondary Energy|Electricity|Oil,Secondary Energy|Electricity|Oil|w/o CCS,Capacity Additions|Electricity|Fossil,Capacity Additions|Electricity|Fossil|w/o CCS,,,1
+electricity,refined liquids,refined liquids (steam/CT),Secondary Energy|Electricity,Secondary Energy|Electricity|Oil,Secondary Energy|Electricity|Oil|w/o CCS,Capacity Additions|Electricity|Fossil,Capacity Additions|Electricity|Fossil|w/o CCS,,,1
+electricity,refined liquids,refined liquids cogen,Secondary Energy|Electricity,Secondary Energy|Electricity|Oil,Secondary Energy|Electricity|Oil|w/o CCS,Capacity Additions|Electricity|Fossil,Capacity Additions|Electricity|Fossil|w/o CCS,,,1
 electricity,solar,CSP,Secondary Energy|Electricity,Secondary Energy|Electricity|Solar,Secondary Energy|Electricity|Solar|CSP,,Secondary Energy|Electricity|Non-Biomass Renewables,,,1
 electricity,solar,CSP_storage,Secondary Energy|Electricity,Secondary Energy|Electricity|Solar,Secondary Energy|Electricity|Solar|CSP,,Secondary Energy|Electricity|Non-Biomass Renewables,,,1
 electricity,solar,PV,Secondary Energy|Electricity,Secondary Energy|Electricity|Solar,Secondary Energy|Electricity|Solar|PV,,Secondary Energy|Electricity|Non-Biomass Renewables,,,1