Skip to content

Commit

Permalink
ComDef: fix primary energy mapping
Browse files Browse the repository at this point in the history
  • Loading branch information
@klau506
klau506 committed Nov 14, 2024
1 parent 2bd5625 commit 0f4ea13
Show file tree
Hide file tree
Showing 5 changed files with 56 additions and 50 deletions.
Binary file modified data/primary_energy_map_v7.1.rda
View file
Binary file not shown.
Binary file modified data/queries_general_v7.1.rda
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion inst/extdata/mappings/GCAM7.1/en_demand_price_map.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ Final Energy|Industry|Solids|Coal,Price|Final Energy|Industry|Solids|Coal
Final Energy|Liquids,NoReported
Final Energy|Liquids|Oil,NoReported
Final Energy|Non-Energy Use,NoReported
Final Energy|Non-Energy Use|Gas,NoReported
Final Energy|Non-Energy Use|Gases,NoReported
Final Energy|Non-Energy Use|Liquids,NoReported
Final Energy|Non-Energy Use|Liquids|Oil,NoReported
Final Energy|Non-Energy Use|Solids,NoReported
Expand Down
90 changes: 48 additions & 42 deletions inst/extdata/mappings/GCAM7.1/primary_energy_map.csv
View file
Original file line number Diff line number Diff line change
@@ -1,43 +1,49 @@
# Energy consumption by technology
fuel,var1,var2,var3,var4,var5,var6,var7,var8,unit_conv
a oil,Primary Energy,Primary Energy|Fossil,Primary Energy|Fossil|w/o CCS,Primary Energy|Oil,Primary Energy|Oil|w/o CCS,,,,1
a oil CCS,Primary Energy,Primary Energy|Fossil,Primary Energy|Fossil|w/ CCS,Primary Energy|Oil,Primary Energy|Oil|w/ CCS,,,,1
b natural gas,Primary Energy,Primary Energy|Fossil,Primary Energy|Fossil|w/o CCS,Primary Energy|Gas,Primary Energy|Gas|w/o CCS,,,,1
b natural gas CCS,Primary Energy,Primary Energy|Fossil,Primary Energy|Fossil|w/ CCS,Primary Energy|Gas,Primary Energy|Gas|w/ CCS,,,,1
c coal,Primary Energy,Primary Energy|Fossil,Primary Energy|Fossil|w/o CCS,Primary Energy|Coal,Primary Energy|Coal|w/o CCS,,,,1
c coal CCS,Primary Energy,Primary Energy|Fossil,Primary Energy|Fossil|w/ CCS,Primary Energy|Coal,Primary Energy|Coal|w/ CCS,,,,1
d biomass,Primary Energy,Primary Energy|Biomass,Primary Energy|Biomass|w/o CCS,Primary Energy|Biomass|Modern,Primary Energy|Biomass|Modern|w/o CCS,,,,1
d biomass CCS,Primary Energy,Primary Energy|Biomass,Primary Energy|Biomass|w/ CCS,Primary Energy|Biomass|Modern,Primary Energy|Biomass|Modern|w/ CCS,,,,1
first gen biomass,Primary Energy,Primary Energy|Biomass,Primary Energy|Biomass|w/o CCS,Primary Energy|Biomass|1st Generation,,,,,1
first gen biomass CCS,Primary Energy,Primary Energy|Biomass,Primary Energy|Biomass|w/ CCS,Primary Energy|Biomass|1st Generation,,,,,1
e nuclear,Primary Energy,Primary Energy|Nuclear,,,,,,,1
f hydro,Primary Energy,Primary Energy|Non-Biomass Renewables,Primary Energy|Hydro,,,,,,1
g wind,Primary Energy,Primary Energy|Non-Biomass Renewables,Primary Energy|Wind,,,,,,1
h solar,Primary Energy,Primary Energy|Non-Biomass Renewables,Primary Energy|Solar,,,,,,1
global solar resource,Primary Energy,Primary Energy|Non-Biomass Renewables,Primary Energy|Solar,,,,,,1
i geothermal,Primary Energy,Primary Energy|Non-Biomass Renewables,Primary Energy|Geothermal,,,,,,1
j traditional biomass,Primary Energy,Primary Energy|Biomass,Primary Energy|Biomass|w/o CCS,Primary Energy|Biomass|Traditional,,,,,1
traded coal,Primary Energy,Primary Energy|Fossil,Primary Energy|Fossil|w/o CCS,Primary Energy|Coal,Primary Energy|Coal|w/o CCS,Primary Energy|Secondary Energy Trade,,,1
traded natural gas,Primary Energy,Primary Energy|Fossil,Primary Energy|Fossil|w/o CCS,Primary Energy|Gas,Primary Energy|Gas|w/o CCS,Primary Energy|Secondary Energy Trade,,,1
traded oil,Primary Energy,Primary Energy|Fossil,Primary Energy|Fossil|w/o CCS,Primary Energy|Oil,Primary Energy|Oil|w/o CCS,Primary Energy|Secondary Energy Trade,,,1
traded oil CCS,Primary Energy,Primary Energy|Fossil,Primary Energy|Fossil|w/ CCS,Primary Energy|Oil,Primary Energy|Oil|w/ CCS,Primary Energy|Secondary Energy Trade,,,1
desalination,NoReported,,,,,,,,1
desalination CCS,NoReported,,,,,,,,1
traded natural gas CCS,Primary Energy,Primary Energy|Fossil,Primary Energy|Fossil|w/ CCS,Primary Energy|Gas,Primary Energy|Gas|w/ CCS,Primary Energy|Secondary Energy Trade,,,1
traded coal CCS,Primary Energy,Primary Energy|Fossil,Primary Energy|Fossil|w/ CCS,Primary Energy|Coal,Primary Energy|Coal|w/ CCS,Primary Energy|Secondary Energy Trade,,,1
traded industrial_roundwood,Primary Energy,Primary Energy|Biomass,Primary Energy|Biomass|w/o CCS,Primary Energy|Biomass|Electricity,Primary Energy|Biomass|Electricity|w/o CCS,Primary Energy|Biomass|Residues,Primary Energy|Biomass|Residues|Forest Residues,Primary Energy|Secondary Energy Trade,1
traded woodpulp,Primary Energy,Primary Energy|Biomass,Primary Energy|Biomass|w/o CCS,Primary Energy|Biomass|Electricity,Primary Energy|Biomass|Electricity|w/o CCS,Primary Energy|Biomass|Residues,Primary Energy|Biomass|Residues|Other Residues,Primary Energy|Secondary Energy Trade,1
traded Afr_MidE pipeline gas,Primary Energy,Primary Energy|Fossil,Primary Energy|Fossil|w/o CCS,Primary Energy|Gas,Primary Energy|Gas|w/o CCS,Primary Energy|Secondary Energy Trade,,,1
traded N.Amer pipeline gas,Primary Energy,Primary Energy|Fossil,Primary Energy|Fossil|w/o CCS,Primary Energy|Gas,Primary Energy|Gas|w/o CCS,Primary Energy|Secondary Energy Trade,,,1
traded N.Amer pipeline gas CCS,Primary Energy,Primary Energy|Fossil,Primary Energy|Fossil|w/o CCS,Primary Energy|Gas,Primary Energy|Gas|w/o CCS,Primary Energy|Secondary Energy Trade,,,1
traded EUR pipeline gas,Primary Energy,Primary Energy|Fossil,Primary Energy|Fossil|w/o CCS,Primary Energy|Gas,Primary Energy|Gas|w/o CCS,Primary Energy|Secondary Energy Trade,,,1
traded EUR pipeline gas CCS,Primary Energy,Primary Energy|Fossil,Primary Energy|Fossil|w/o CCS,Primary Energy|Gas,Primary Energy|Gas|w/o CCS,Primary Energy|Secondary Energy Trade,,,1
traded LNG,Primary Energy,Primary Energy|Fossil,Primary Energy|Fossil|w/o CCS,Primary Energy|Gas,Primary Energy|Gas|w/o CCS,Primary Energy|Secondary Energy Trade,,,1
traded LNG CCS,Primary Energy,Primary Energy|Fossil,Primary Energy|Fossil|w/o CCS,Primary Energy|Gas,Primary Energy|Gas|w/o CCS,Primary Energy|Secondary Energy Trade,,,1
traded RUS pipeline gas,Primary Energy,Primary Energy|Fossil,Primary Energy|Fossil|w/o CCS,Primary Energy|Gas,Primary Energy|Gas|w/o CCS,Primary Energy|Secondary Energy Trade,,,1
traded RUS pipeline gas CCS,Primary Energy,Primary Energy|Fossil,Primary Energy|Fossil|w/o CCS,Primary Energy|Gas,Primary Energy|Gas|w/o CCS,Primary Energy|Secondary Energy Trade,,,1
traded LA pipeline gas,Primary Energy,Primary Energy|Fossil,Primary Energy|Fossil|w/o CCS,Primary Energy|Gas,Primary Energy|Gas|w/o CCS,Primary Energy|Secondary Energy Trade,,,1
traded LA pipeline gas CCS,Primary Energy,Primary Energy|Fossil,Primary Energy|Fossil|w/o CCS,Primary Energy|Gas,Primary Energy|Gas|w/o CCS,Primary Energy|Secondary Energy Trade,,,1
traded PAC pipeline gas,Primary Energy,Primary Energy|Fossil,Primary Energy|Fossil|w/o CCS,Primary Energy|Gas,Primary Energy|Gas|w/o CCS,Primary Energy|Secondary Energy Trade,,,1
traded Afr_MidE pipeline gas CCS,Primary Energy,Primary Energy|Fossil,Primary Energy|Fossil|w/o CCS,Primary Energy|Gas,Primary Energy|Gas|w/o CCS,Primary Energy|Secondary Energy Trade,,,1
traded PAC pipeline gas CCS,Primary Energy,Primary Energy|Fossil,Primary Energy|Fossil|w/o CCS,Primary Energy|Gas,Primary Energy|Gas|w/o CCS,Primary Energy|Secondary Energy Trade,,,1
fuel,var1,var2,var3,var4,var5,var6,var7,var8,var9,var10,unit_conv
a oil,Primary Energy,Primary Energy|Fossil,Primary Energy|Fossil|w/o CCS,Primary Energy|Oil,Primary Energy|Oil|w/o CCS,,,,,,1
a oil CCS,Primary Energy,Primary Energy|Fossil,Primary Energy|Fossil|w/ CCS,Primary Energy|Oil,Primary Energy|Oil|w/ CCS,,,,,,1
b natural gas,Primary Energy,Primary Energy|Fossil,Primary Energy|Fossil|w/o CCS,Primary Energy|Gas,Primary Energy|Gas|w/o CCS,,,,,,1
b natural gas CCS,Primary Energy,Primary Energy|Fossil,Primary Energy|Fossil|w/ CCS,Primary Energy|Gas,Primary Energy|Gas|w/ CCS,,,,,,1
c coal,Primary Energy,Primary Energy|Fossil,Primary Energy|Fossil|w/o CCS,Primary Energy|Coal,Primary Energy|Coal|w/o CCS,,,,,,1
c coal CCS,Primary Energy,Primary Energy|Fossil,Primary Energy|Fossil|w/ CCS,Primary Energy|Coal,Primary Energy|Coal|w/ CCS,,,,,,1
d biomass,Primary Energy,Primary Energy|Biomass,Primary Energy|Biomass|w/o CCS,Primary Energy|Biomass|Modern,Primary Energy|Biomass|Modern|w/o CCS,Primary Energy|Biomass|Energy Crops,,,,,1
d biomass CCS,Primary Energy,Primary Energy|Biomass,Primary Energy|Biomass|w/ CCS,Primary Energy|Biomass|Modern,Primary Energy|Biomass|Modern|w/ CCS,Primary Energy|Biomass|Energy Crops,,,,,1
d biomassOil,Primary Energy,Primary Energy|Biomass,Primary Energy|Biomass|w/o CCS,,,Primary Energy|Biomass|1st Generation,,,,,1
d biomassOil CCS,Primary Energy,Primary Energy|Biomass,Primary Energy|Biomass|w/ CCS,,,Primary Energy|Biomass|1st Generation,,,,,1
d corn for ethanol,Primary Energy,Primary Energy|Biomass,Primary Energy|Biomass|w/o CCS,,,Primary Energy|Biomass|1st Generation,,,,,1
d corn for ethanol CCS,Primary Energy,Primary Energy|Biomass,Primary Energy|Biomass|w/ CCS,,,Primary Energy|Biomass|1st Generation,,,,,1
d sugar for ethanol,Primary Energy,Primary Energy|Biomass,Primary Energy|Biomass|w/o CCS,,,Primary Energy|Biomass|1st Generation,,,,,1
d sugar for ethanol CCS,Primary Energy,Primary Energy|Biomass,Primary Energy|Biomass|w/ CCS,,,Primary Energy|Biomass|1st Generation,,,,,1
first gen biomass,Primary Energy,Primary Energy|Biomass,Primary Energy|Biomass|w/o CCS,Primary Energy|Biomass|1st Generation,,,,,,,1
first gen biomass CCS,Primary Energy,Primary Energy|Biomass,Primary Energy|Biomass|w/ CCS,Primary Energy|Biomass|1st Generation,,,,,,,1
e nuclear,Primary Energy,Primary Energy|Nuclear,,,,,,,,,1
f hydro,Primary Energy,Primary Energy|Non-Biomass Renewables,Primary Energy|Hydro,,,,,,,,1
g wind,Primary Energy,Primary Energy|Non-Biomass Renewables,Primary Energy|Wind,,,,,,,,1
h solar,Primary Energy,Primary Energy|Non-Biomass Renewables,Primary Energy|Solar,,,,,,,,1
global solar resource,Primary Energy,Primary Energy|Non-Biomass Renewables,Primary Energy|Solar,,,,,,,,1
i geothermal,Primary Energy,Primary Energy|Non-Biomass Renewables,Primary Energy|Geothermal,,,,,,,,1
j traditional biomass,Primary Energy,Primary Energy|Biomass,Primary Energy|Biomass|w/o CCS,Primary Energy|Biomass|Traditional,,,,,,,1
traded coal,Primary Energy,Primary Energy|Fossil,Primary Energy|Fossil|w/o CCS,Primary Energy|Coal,Primary Energy|Coal|w/o CCS,Primary Energy|Secondary Energy Trade,,,,,1
traded natural gas,Primary Energy,Primary Energy|Fossil,Primary Energy|Fossil|w/o CCS,Primary Energy|Gas,Primary Energy|Gas|w/o CCS,Primary Energy|Secondary Energy Trade,,,,,1
traded oil,Primary Energy,Primary Energy|Fossil,Primary Energy|Fossil|w/o CCS,Primary Energy|Oil,Primary Energy|Oil|w/o CCS,Primary Energy|Secondary Energy Trade,,,,,1
traded oil CCS,Primary Energy,Primary Energy|Fossil,Primary Energy|Fossil|w/ CCS,Primary Energy|Oil,Primary Energy|Oil|w/ CCS,Primary Energy|Secondary Energy Trade,,,,,1
desalination,NoReported,,,,,,,,,,1
desalination CCS,NoReported,,,,,,,,,,1
traded natural gas CCS,Primary Energy,Primary Energy|Fossil,Primary Energy|Fossil|w/ CCS,Primary Energy|Gas,Primary Energy|Gas|w/ CCS,Primary Energy|Secondary Energy Trade,,,,,1
traded coal CCS,Primary Energy,Primary Energy|Fossil,Primary Energy|Fossil|w/ CCS,Primary Energy|Coal,Primary Energy|Coal|w/ CCS,Primary Energy|Secondary Energy Trade,,,,,1
traded industrial_roundwood,Primary Energy,Primary Energy|Biomass,Primary Energy|Biomass|w/o CCS,Primary Energy|Biomass|Electricity,Primary Energy|Biomass|Electricity|w/o CCS,Primary Energy|Biomass|Residues,Primary Energy|Biomass|Residues|Forest Residues,Primary Energy|Biomass|Modern,Primary Energy|Biomass|Modern|w/o CCS,Primary Energy|Secondary Energy Trade,1
traded woodpulp,Primary Energy,Primary Energy|Biomass,Primary Energy|Biomass|w/o CCS,Primary Energy|Biomass|Electricity,Primary Energy|Biomass|Electricity|w/o CCS,Primary Energy|Biomass|Residues,Primary Energy|Biomass|Residues|Forest Residues,Primary Energy|Biomass|Modern,Primary Energy|Biomass|Modern|w/o CCS,Primary Energy|Secondary Energy Trade,1
traded Afr_MidE pipeline gas,Primary Energy,Primary Energy|Fossil,Primary Energy|Fossil|w/o CCS,Primary Energy|Gas,Primary Energy|Gas|w/o CCS,Primary Energy|Secondary Energy Trade,,,,,1
traded N.Amer pipeline gas,Primary Energy,Primary Energy|Fossil,Primary Energy|Fossil|w/o CCS,Primary Energy|Gas,Primary Energy|Gas|w/o CCS,Primary Energy|Secondary Energy Trade,,,,,1
traded N.Amer pipeline gas CCS,Primary Energy,Primary Energy|Fossil,Primary Energy|Fossil|w/o CCS,Primary Energy|Gas,Primary Energy|Gas|w/o CCS,Primary Energy|Secondary Energy Trade,,,,,1
traded EUR pipeline gas,Primary Energy,Primary Energy|Fossil,Primary Energy|Fossil|w/o CCS,Primary Energy|Gas,Primary Energy|Gas|w/o CCS,Primary Energy|Secondary Energy Trade,,,,,1
traded EUR pipeline gas CCS,Primary Energy,Primary Energy|Fossil,Primary Energy|Fossil|w/o CCS,Primary Energy|Gas,Primary Energy|Gas|w/o CCS,Primary Energy|Secondary Energy Trade,,,,,1
traded LNG,Primary Energy,Primary Energy|Fossil,Primary Energy|Fossil|w/o CCS,Primary Energy|Gas,Primary Energy|Gas|w/o CCS,Primary Energy|Secondary Energy Trade,,,,,1
traded LNG CCS,Primary Energy,Primary Energy|Fossil,Primary Energy|Fossil|w/o CCS,Primary Energy|Gas,Primary Energy|Gas|w/o CCS,Primary Energy|Secondary Energy Trade,,,,,1
traded RUS pipeline gas,Primary Energy,Primary Energy|Fossil,Primary Energy|Fossil|w/o CCS,Primary Energy|Gas,Primary Energy|Gas|w/o CCS,Primary Energy|Secondary Energy Trade,,,,,1
traded RUS pipeline gas CCS,Primary Energy,Primary Energy|Fossil,Primary Energy|Fossil|w/o CCS,Primary Energy|Gas,Primary Energy|Gas|w/o CCS,Primary Energy|Secondary Energy Trade,,,,,1
traded LA pipeline gas,Primary Energy,Primary Energy|Fossil,Primary Energy|Fossil|w/o CCS,Primary Energy|Gas,Primary Energy|Gas|w/o CCS,Primary Energy|Secondary Energy Trade,,,,,1
traded LA pipeline gas CCS,Primary Energy,Primary Energy|Fossil,Primary Energy|Fossil|w/o CCS,Primary Energy|Gas,Primary Energy|Gas|w/o CCS,Primary Energy|Secondary Energy Trade,,,,,1
traded PAC pipeline gas,Primary Energy,Primary Energy|Fossil,Primary Energy|Fossil|w/o CCS,Primary Energy|Gas,Primary Energy|Gas|w/o CCS,Primary Energy|Secondary Energy Trade,,,,,1
traded Afr_MidE pipeline gas CCS,Primary Energy,Primary Energy|Fossil,Primary Energy|Fossil|w/o CCS,Primary Energy|Gas,Primary Energy|Gas|w/o CCS,Primary Energy|Secondary Energy Trade,,,,,1
traded PAC pipeline gas CCS,Primary Energy,Primary Energy|Fossil,Primary Energy|Fossil|w/o CCS,Primary Energy|Gas,Primary Energy|Gas|w/o CCS,Primary Energy|Secondary Energy Trade,,,,,1
14 changes: 7 additions & 7 deletions inst/extdata/queries/GCAM7.1/queries_gcamreport_general.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@ local:run-input-by-primary((:scenarios:), (:regions:), (:collection:))
<rewrite from="coal CCS" to="c coal CCS"/>
<rewrite from="traded LNG" to="b natural gas"/>
<rewrite from="wind-H2 renewable" to="g wind"/>
<rewrite from="regional biomassOil CCS" to="d biomass CCS"/>
<rewrite from="regional biomassOil CCS" to="d biomassOil CCS"/>
<rewrite from="traded coal" to="c coal"/>
<rewrite from="limestone" to=""/>
<rewrite from="seawater" to=""/>
Expand Down Expand Up @@ -335,16 +335,16 @@ local:run-input-by-primary((:scenarios:), (:regions:), (:collection:))
<rewrite from="coal" to="c coal"/>
<rewrite from="traded natural gas CCS" to="b natural gas CCS"/>
<rewrite from="traded RUS pipeline gas" to="b natural gas"/>
<rewrite from="regional corn for ethanol" to="d biomass"/>
<rewrite from="regional corn for ethanol" to="d corn for ethanol"/>
<rewrite from="geothermal-elect renewable" to="i geothermal"/>
<rewrite from="crude oil CCS" to="a oil CCS"/>
<rewrite from="regional biomassOil" to="d biomass"/>
<rewrite from="regional biomassOil" to="d biomassOil"/>
<rewrite from="wind-elect renewable CCS" to="g wind"/>
<rewrite from="regional corn for ethanol CCS" to="d biomass CCS"/>
<rewrite from="regional corn for ethanol CCS" to="d corn for ethanol CCS"/>
<rewrite from="traded N.Amer pipeline gas" to="b natural gas"/>
<rewrite from="hydro-elect renewable CCS" to="f hydro"/>
<rewrite from="traded LA pipeline gas CCS" to="b natural gas CCS"/>
<rewrite from="regional sugar for ethanol CCS" to="d biomass CCS"/>
<rewrite from="regional sugar for ethanol CCS" to="d sugar for ethanol CCS"/>
<rewrite from="traded unconventional oil CCS" to="a oil CCS"/>
<rewrite from="elect_td_ind" to=""/>
<rewrite from="biomass CCS" to="d biomass CCS"/>
Expand All @@ -356,11 +356,11 @@ local:run-input-by-primary((:scenarios:), (:regions:), (:collection:))
<rewrite from="traded N.Amer pipeline gas CCS" to="b natural gas CCS"/>
<rewrite from="solar-elect renewable CCS" to="h solar"/>
<rewrite from="traded unconventional oil" to="a oil"/>
<rewrite from="regional sugar for ethanol" to="d biomass"/>
<rewrite from="regional sugar for ethanol" to="d sugar for ethanol"/>
<rewrite from="natural gas" to="b natural gas"/>
<rewrite from="solar-elect renewable" to="h solar"/>
<rewrite from="traded natural gas" to="b natural gas"/>
<rewrite from="regional sugarbeet for ethanol" to="d biomass"/>
<rewrite from="regional sugarbeet for ethanol" to="d sugar for ethanol"/>
<rewrite from="water withdrawals" to=""/>
<rewrite from="solar-H2 renewable" to="h solar"/>
<rewrite from="global solar resource" to="h solar"/>
Expand Down

0 comments on commit 0f4ea13

Please sign in to comment.