Skip to content

Commit 1a26e6c

Browse files
macflo8macflo8
committed
Extend and rename variable mappings
1 parent 2747073 commit 1a26e6c

9 files changed

+176
-40
lines changed

‎message_ix_models/data/material/reporting/ch4_emi_reporting.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,13 @@ vars:
4141

4242

4343
# aluminum
44-
Industrial Processes|Non-Ferrous Metals|Aluminum:
44+
Industrial Processes|Non-Ferrous Metals|Aluminium:
4545
filter:
4646
{ technology: [prebake_aluminum, soderberg_aluminum], mode: M1}
4747
short:
4848
emi_ch4_ind_proc_alu
4949

50-
Energy|Demand|Industry|Non-Ferrous Metals|Aluminum:
50+
Energy|Demand|Industry|Non-Ferrous Metals|Aluminium:
5151
filter:
5252
{ technology: [furnace_coal_aluminum, furnace_gas_aluminum, furnace_biomass_aluminum, furnace_foil_aluminum], mode: [high_temp, low_temp] }
5353
short:

‎message_ix_models/data/material/reporting/fe_methanol_ammonia_reporting.yaml

+16-7
Original file line numberDiff line numberDiff line change
@@ -12,26 +12,35 @@ common:
1212
unit: GWa
1313

1414
vars:
15-
Chemicals|Ammonia|Solids|Coal:
15+
Chemicals|Ammonia|Electricity:
1616
filter:
17-
{ technology: [ coal_NH3, coal_NH3_ccs ], mode: M1, commodity: coal, level: secondary }
18-
short: fe_nh3_coal
17+
{ technology: [biomass_NH3, biomass_NH3_ccs, coal_NH3, coal_NH3_ccs,
18+
electr_NH3, fueloil_NH3, fueloil_NH3_ccs, gas_NH3, gas_NH3_ccs ],
19+
mode: M1,
20+
commodity: electr, level: secondary }
21+
short:
22+
fe_pe_nh3_el
1923

2024
Chemicals|Ammonia|Solids|Biomass:
2125
filter:
2226
{ technology: [ biomass_NH3, biomass_NH3_ccs ], mode: M1, commodity: biomass, level: primary }
2327
short: fe_nh3_bio
2428

25-
Chemicals|Ammonia|Gases|Gas:
29+
Chemicals|Ammonia|Solids|Coal:
2630
filter:
27-
{ technology: [ gas_NH3, gas_NH3_ccs ], mode: M1, commodity: gas, level: secondary }
28-
short: fe_nh3_gas
31+
{ technology: [ coal_NH3, coal_NH3_ccs ], mode: M1, commodity: coal, level: secondary }
32+
short: fe_nh3_coal
2933

3034
Chemicals|Ammonia|Liquids|Oil:
3135
filter:
3236
{ technology: [ fueloil_NH3, fueloil_NH3_ccs ], mode: M1, commodity: fueloil, level: secondary }
3337
short: fe_nh3_oil
3438

39+
Chemicals|Ammonia|Gases|Gas:
40+
filter:
41+
{ technology: [ gas_NH3, gas_NH3_ccs ], mode: M1, commodity: gas, level: secondary }
42+
short: fe_nh3_gas
43+
3544

3645
Chemicals|Methanol|Solids|Coal:
3746
filter:
@@ -50,5 +59,5 @@ vars:
5059

5160
Chemicals|Methanol|Hydrogen:
5261
filter:
53-
{technology: meth_h2, mode: feedstock, commodity: [hydrogen, ht_heat], level: secondary}
62+
{technology: meth_h2, mode: feedstock, commodity: hydrogen, level: secondary}
5463
short: fe_meth_h2

‎message_ix_models/data/material/reporting/fe_reporting.yaml

+40-8
Original file line numberDiff line numberDiff line change
@@ -45,18 +45,45 @@ vars:
4545

4646
Chemicals|Resins|Electricity:
4747
filter:
48-
{ technology: CH2O_to_resin, mode: M1, commodity: electr, level: final }
48+
{ technology: [CH2O_to_resin, furnace_elec_resins], mode: M1, commodity: electr, level: final }
4949
short:
5050
fe_pe_resin_el
51-
52-
Chemicals|Ammonia|Electricity:
51+
Chemicals|Resins|Solids|Coal:
5352
filter:
54-
{ technology: [biomass_NH3, biomass_NH3_ccs, coal_NH3, coal_NH3_ccs,
55-
electr_NH3, fueloil_NH3, fueloil_NH3_ccs, gas_NH3, gas_NH3_ccs ],
56-
mode: M1,
57-
commodity: electr, level: secondary }
53+
{ technology: furnace_coal_resins, mode: M1, commodity: coal, level: final }
5854
short:
59-
fe_pe_nh3_el
55+
fe_pe_resin_coal
56+
Chemicals|Resins|Solids|Biomass:
57+
filter:
58+
{ technology: furnace_biomass_resins, mode: M1, commodity: biomass, level: final }
59+
short:
60+
fe_pe_resin_bio
61+
Chemicals|Resins|Liquids|Oil:
62+
filter:
63+
{ technology: [furnace_foil_resins, furnace_loil_resins], mode: M1, commodity: [fueloil, lightoil], level: final }
64+
short:
65+
fe_pe_resin_oil
66+
Chemicals|Resins|Liquids|Biomass:
67+
filter:
68+
{ technology: [ furnace_ethanol_resins ], mode: M1, commodity: [ ethanol ], level: final }
69+
short:
70+
fe_pe_resin_eth
71+
Chemicals|Resins|Gases|Gas:
72+
filter:
73+
{ technology: furnace_gas_resins, mode: M1, commodity: gas, level: final }
74+
short:
75+
fe_pe_resin_gas
76+
Chemicals|Resins|Hydrogen:
77+
filter:
78+
{ technology: [furnace_h2_resins, fc_h2_resins], mode: M1, commodity: hydrogen, level: final }
79+
short:
80+
fe_pe_resin_h2
81+
Chemicals|Resins|Liquids|Other:
82+
filter:
83+
{ technology: [ furnace_methanol_resins ], mode: M1, commodity: methanol, level: final }
84+
short:
85+
fe_pe_resin_meth
86+
6087

6188
Chemicals|High-Value Chemicals|Liquids|Oil|Light:
6289
filter:
@@ -112,6 +139,11 @@ vars:
112139
short:
113140
fe_pe_hvc_coke
114141

142+
Chemicals|Methanol|Electricity:
143+
filter:
144+
{ technology: [meth_h2, meth_ng_ccs], mode: feedstock, commodity: electr, level: secondary }
145+
short:
146+
fe_pe_meth_el
115147

116148
# cement
117149
Non-Metallic Minerals|Cement|Heat:

‎message_ix_models/data/material/reporting/fe_reporting_aggregates.yaml

+73-14
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ level_2:
2222
components:
2323
[ fe_pe_ch_el, fe_pe_cement_el, fe_pe_aluminum_el, fe_pe_steel_el, fe_pe_other_el ]
2424
Gases|Gas:
25-
short: fe_pe_el
25+
short: fe_pe_gas
2626
components:
2727
[ fe_pe_hvc_gas, fe_pe_cement_gas, fe_pe_aluminum_gas, fe_pe_steel_gas, fe_pe_other_gas ]
2828
Gases:
29-
short: fe_pe_el
29+
short: fe_pe_gases
3030
components:
31-
[ fe_pe_hvc_gas, fe_pe_cement_gas, fe_pe_aluminum_gas, fe_pe_steel_gas, fe_pe_other_gas ]
31+
[ fe_pe_hvc_gases, fe_pe_cement_gases, fe_pe_aluminum_gases, fe_pe_steel_gases, fe_pe_other_gases ]
3232
Liquids|Biomass:
3333
short: fe_pe_oil
3434
components:
@@ -61,11 +61,11 @@ level_2:
6161
short: fe_pe_bio
6262
components:
6363
[ fe_pe_hvc_bio, fe_pe_cement_bio, fe_pe_aluminum_bio, fe_pe_other_bio ]
64+
Hydrogen:
65+
short: fe_pe_h2
66+
components:
67+
[ fe_pe_hvc_h2, fe_pe_cement_h2, fe_pe_aluminum_h2, fe_pe_steel_h2, fe_pe_other_h2 ]
6468

65-
# Chemicals:
66-
# short: fe_pe_chem
67-
# components:
68-
# [ fe_pe_hvc_el, fe_pe_hvc_oil, fe_pe_hvc_liq, fe_pe_hvc_solids ]
6969

7070
Non-Metallic Minerals|Cement:
7171
short: fe_pe_cement
@@ -80,13 +80,19 @@ level_2:
8080
Iron and Steel:
8181
short: fe_pe_steel
8282
components:
83-
[ fe_pe_steel_el, fe_pe_steel_liq, fe_pe_steel_sol, fe_pe_steel_gas, fe_pe_steel_h2 ]
83+
[ fe_pe_steel_el, fe_pe_steel_liq, fe_pe_steel_sol, fe_pe_steel_gases, fe_pe_steel_h2 ]
8484

8585
Other Sector:
8686
short: fe_pe_oth
8787
components:
88-
[ fe_pe_other_el, fe_pe_other_liq, fe_pe_other_sol, fe_pe_other_gas, fe_pe_other_h2 ]
88+
[ fe_pe_other_el, fe_pe_other_liq, fe_pe_other_sol, fe_pe_other_gases, fe_pe_other_h2 ]
8989

90+
Chemicals|Other Sector:
91+
short: fe_pe_chem_other
92+
components:
93+
[ fe_pe_resin_el, fe_pe_chem_other_gas, fe_pe_chem_other_oil,
94+
fe_pe_chem_other_eth, fe_pe_chem_other_bio, fe_pe_chem_other_coal,
95+
fe_pe_chem_other_h2 ]
9096

9197
level_1:
9298
Chemicals|High-Value Chemicals|Electricity:
@@ -105,11 +111,59 @@ level_1:
105111
short: fe_pe_hvc_solids
106112
components:
107113
[ fe_pe_hvc_bio, fe_pe_hvc_coal, fe_pe_hvc_coke]
108-
109114
Chemicals|Liquids|Other:
110115
short: fe_pe_chem_oth
111116
components:
112117
[ fe_pe_hvc_oth ]
118+
Chemicals|Liquids|Gases:
119+
short: fe_pe_hvc_gases
120+
components:
121+
[ fe_pe_hvc_gas ]
122+
123+
Chemicals|Other Sector|Electricity:
124+
short: fe_pe_chem_other_el
125+
components:
126+
[ fe_pe_resin_el ]
127+
Chemicals|Other Sector|Gases|Gas:
128+
short: fe_pe_chem_other_gas
129+
components:
130+
[ fe_pe_resin_gas ]
131+
Chemicals|Other Sector|Gases:
132+
short: fe_pe_chem_other_gases
133+
components:
134+
[ fe_pe_resin_gas ]
135+
Chemicals|Other Sector|Liquids|Oil:
136+
short: fe_pe_chem_other_oil
137+
components:
138+
[ fe_pe_resin_oil ]
139+
Chemicals|Other Sector|Liquids|Biomass:
140+
short: fe_pe_chem_other_eth
141+
components:
142+
[ fe_pe_resin_eth ]
143+
Chemicals|Other Sector|Liquids|Other:
144+
short: fe_pe_chem_other_meth
145+
components:
146+
[ fe_pe_resin_meth ]
147+
Chemicals|Other Sector|Liquids:
148+
short: fe_pe_chem_other_liq
149+
components:
150+
[ fe_pe_resin_eth, fe_pe_resin_oil ]
151+
Chemicals|Other Sector|Solids|Biomass:
152+
short: fe_pe_chem_other_bio
153+
components:
154+
[ fe_pe_resin_bio ]
155+
Chemicals|Other Sector|Solids|Coal:
156+
short: fe_pe_chem_other_coal
157+
components:
158+
[ fe_pe_resin_coal ]
159+
Chemicals|Other Sector|Solids:
160+
short: fe_pe_chem_other_sol
161+
components:
162+
[ fe_pe_resin_coal, fe_pe_resin_bio ]
163+
Chemicals|Other Sector|Hydrogen:
164+
short: fe_pe_chem_other_h2
165+
components:
166+
[ fe_pe_resin_h2 ]
113167

114168
# cement
115169
Non-Metallic Minerals|Cement|Electricity:
@@ -128,7 +182,10 @@ level_1:
128182
short: fe_pe_cement_solids
129183
components:
130184
[ fe_pe_cement_bio, fe_pe_cement_coal, fe_pe_cement_coke ]
131-
185+
Non-Metallic Minerals|Cement|Gases:
186+
short: fe_pe_cement_gases
187+
components:
188+
[ fe_pe_cement_gas ]
132189

133190
# aluminum
134191
Non-Ferrous Metals|Aluminium|Electricity:
@@ -151,7 +208,10 @@ level_1:
151208
short: fe_pe_aluminum_bio_tot
152209
components:
153210
[ fe_pe_aluminum_bio, fe_pe_aluminum_bio_eth ]
154-
211+
Non-Ferrous Metals|Aluminium|Gases:
212+
short: fe_pe_aluminum_gases
213+
components:
214+
[ fe_pe_aluminum_gas ]
155215

156216
# TODO: Electricity could be further differentiated by process in fe_reporting.yaml
157217
# iron and steel
@@ -163,7 +223,7 @@ level_1:
163223
# short:
164224
# fe_pe_steel_el
165225
Iron and Steel|Gases:
166-
short: fe_pe_steel_gas
226+
short: fe_pe_steel_gases
167227
components:
168228
[ fe_pe_steel_gas, fe_pe_steel_gases_coal ]
169229
Iron and Steel|Liquids:
@@ -214,4 +274,3 @@ level_1:
214274
components:
215275
[ fe_pe_other_coal, fe_pe_other_bio ]
216276

217-

‎message_ix_models/data/material/reporting/fe_solar_reporting_aggregates.yaml

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# collection of industry specific final energy reporting variables
2+
# grouped by sector
3+
# each variable specifies a list of filter
4+
5+
var:
6+
out
7+
8+
iamc_prefix:
9+
Final Energy|Industry|
10+
11+
common:
12+
unit: GWa
13+
14+
15+
level_1:
16+
Solar:
17+
short: fe_pe_solar
18+
components:
19+
[ fe_pe_other_solar ]

‎message_ix_models/data/material/reporting/fs1_reporting.yaml

+9-3
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,24 @@ common:
1414

1515
vars:
1616
# ammonia
17-
Chemicals|Ammonia|Solids|Coal:
17+
Chemicals|Ammonia|Electricity:
1818
filter:
19-
{ technology: [ coal_NH3, coal_NH3_ccs ], mode: M1, commodity: NH3, level: secondary_material }
19+
{ technology: [ electr_NH3 ], mode: M1, commodity: NH3, level: secondary_material }
2020
short:
21-
fe_fs_nh3_coal
21+
fe_fs_nh3_el
2222

2323
Chemicals|Ammonia|Solids|Biomass:
2424
filter:
2525
{ technology: [ biomass_NH3, biomass_NH3_ccs ], mode: M1, commodity: NH3, level: secondary_material }
2626
short:
2727
fe_fs_nh3_bio
2828

29+
Chemicals|Ammonia|Solids|Coal:
30+
filter:
31+
{ technology: [ coal_NH3, coal_NH3_ccs ], mode: M1, commodity: NH3, level: secondary_material }
32+
short:
33+
fe_fs_nh3_coal
34+
2935
Chemicals|Ammonia|Liquids|Oil:
3036
filter:
3137
{ technology: fueloil_NH3, mode: M1, commodity: NH3, level: secondary_material }

‎message_ix_models/data/material/reporting/prod_reporting.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -272,13 +272,13 @@ vars:
272272

273273

274274
# aluminum
275-
Non-Ferrous Metals|Aluminum|Primary:
275+
Non-Ferrous Metals|Aluminium|Primary:
276276
filter:
277277
{ technology: [prebake_aluminum, soderberg_aluminum], mode: M1, commodity: aluminum, level: final_material }
278278
short:
279279
prod_alu_sec
280280

281-
Non-Ferrous Metals|Aluminum|Secondary:
281+
Non-Ferrous Metals|Aluminium|Secondary:
282282
filter:
283283
{ technology: [secondary_aluminum], mode: M1, commodity: aluminum, level: final_material }
284284
short:

‎message_ix_models/data/material/reporting/prod_reporting_aggregates.yaml

+7-3
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,18 @@ iamc_prefix:
1111
common:
1212
unit: Mt/yr
1313

14+
level_4:
15+
Chemicals:
16+
short: prod_chem
17+
components:
18+
[ prod_hvc, prod_nh3, prod_meth ]
19+
1420
level_3:
1521
Chemicals|High-Value Chemicals:
1622
short: prod_hvc
1723
components:
1824
[ prod_ethy, prod_propy, prod_btx]
1925

20-
2126
level_2:
2227
Chemicals|Ammonia:
2328
short: prod_nh3
@@ -40,7 +45,6 @@ level_2:
4045
components:
4146
[ prod_btx_sc, prod_btx_ref]
4247

43-
4448
level_1:
4549
Chemicals|Ammonia|Gases:
4650
short: prod_nh3_gas_tot
@@ -88,7 +92,7 @@ level_1:
8892
[ prod_clinker_wet, prod_clinker_dry ]
8993

9094
# aluminum
91-
Non-Ferrous Metals|Aluminum:
95+
Non-Ferrous Metals|Aluminium:
9296
short: prod_alu
9397
components:
9498
[ prod_alu_prim, prod_alu_sec ]

0 commit comments

Comments
 (0)