From 10b744002b0c72e808f7d08f4dd80ffcbade003f Mon Sep 17 00:00:00 2001 From: klau506 Date: Wed, 13 Nov 2024 10:47:42 +0100 Subject: [PATCH] ComDef: finish elec capacity map - fossil --- data/capacity_map_v7.1.rda | Bin 912 -> 1009 bytes data/secondary_energy_map_v7.1.rda | Bin 911 -> 1011 bytes .../extdata/mappings/GCAM7.1/capacity_map.csv | 30 +++++++++--------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/data/capacity_map_v7.1.rda b/data/capacity_map_v7.1.rda index fed741d23db7c0b78ca8652b410e26cba2d17c5a..57a8880f8dba50231422187cdb65ceef567ba4d1 100644 GIT binary patch literal 1009 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 literal 911 zcmV;A191F8T4*^jL0KkKS(;pb(Etbw|Iq*c{B(E!xPTtz-N3)+|D-?w06+i%&;(o$ z6jDVABsql9k)ffG!Zb1(XwU(O$&d^n7!F}HWN2t)FpUg`nlu1nGGqe?1_PK)85$ZH z3?oA!ri}m?jF|w!0f0pz38qN(OwkO0(V%*UfXFlkm_Qn6@_?l&2uvZQW|K@bL8DBY zNMsrhPzHlRjYED)i8q}W-WqU$iUD%hB~d>dvIUXBrAw+68*C4jjQ9$rkeiT!%cDwS zsJMds&)umB$q6Y-+BOj(uF^wKiFDen5yKN?l2Wvsn3UR5`|@O$5o8HEM5}^r=wp(^tV#SfcUR=vD_D4?HX>f{dCf#(Aw6fBdAhNL^ox-;) zFxttRV@7N>q5Bix_0GJ*2z+bH0%On|1jBe-x9GCVEVAK)R2)Xfh~iogZv{4mJ)+QZ zJS`fVrH?s`YLkg}jV+@!9(RLvHS{Sys$8ey{GVyiciiCNn;aZsT2#`aq~bW8+;1Jm z3Sd4^e#FOVIKN);*LWw($k6pB@#8fcCcN*bkiJ6jtTWZ2cR{&rkWQ*9EL2>YT zuGMIbcNbK;)ws7-c?CNfre!4CM!RA>)1^e~oIg5tH`cw&ofPJ-dwn+T&56c(I%wtQ zn$zqq8~3|+Y<5PybQIKF{RP??(L_n@2w*u~un%(sE);VYpu)v$M^l25bZFyYnJwkf zrLS^g;uQ3XYE7%@M%L!0V=-{o9<-XQO~b9z+f}Y9l55=*#NX`t?Oo$;TlM%yM7(Ae z9Rp%|-B4|*t$>M~OGO6ZHdQcPHRYw^YxBmAda?Pic++w zbmltCenBj(8)Tv-sv=IH*fa=kj!4H1P_Pb6)ZbT7O_$Cb$HIJG%B9B?)40FgVW?9j lJY!=NuGTDQeHx+E?%2j=S)PCUm5l$z+>uTcBqo<1^gtE-tr7qL diff --git a/inst/extdata/mappings/GCAM7.1/capacity_map.csv b/inst/extdata/mappings/GCAM7.1/capacity_map.csv index cc3a8b9e..c8196002 100644 --- 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