Skip to content

Commit ebf9ff9

Browse files
khaerukhaeru
committed
Add .transport.data.elasticity_f input data flow
Stub files for R12 and generic configuration.
1 parent bf9eb55 commit ebf9ff9

File tree

4 files changed

+185
-2
lines changed

4 files changed

+185
-2
lines changed

‎doc/transport/input.rst

+9
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,7 @@ Quick links to each of the data flows:
119119
:data:`~.data.class_ldv`
120120
:data:`~.data.disutility`
121121
:data:`~.data.demand_scale`
122+
:data:`~.data.elasticity_f`
122123
:data:`~.data.emi_intensity`
123124
:data:`~.data.energy_other`
124125
:data:`~.data.fuel_emi_intensity`
@@ -177,6 +178,14 @@ Quick links to each of the data flows:
177178
.. autodata:: message_ix_models.model.transport.data.class_ldv
178179
.. autodata:: message_ix_models.model.transport.data.disutility
179180
.. autodata:: message_ix_models.model.transport.data.demand_scale
181+
<<<<<<< HEAD
182+
=======
183+
.. autodata:: message_ix_models.model.transport.data.elasticity_f
184+
.. autodata:: message_ix_models.model.transport.data.elasticity_p
185+
186+
Codes on the ‘scenario’ dimension are partial URNs for codes in the :class:`.SSP_2024` code list.
187+
Used via :func:`.pdt_per_capita`, which interpolates on the |y| dimension.
188+
>>>>>>> c43ad5eb8 (fixup! Add .transport.data.elasticity_f input data flow)
180189

181190
.. _transport-input-emi-intensity:
182191

‎message_ix_models/data/transport/R12/elasticity-f.csv

+154
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,154 @@
1+
# ‘Elasticity’ of freight activity with respect to GDP(PPP)
2+
#
3+
# Units: dimensionless
4+
#
5+
scenario, node, year, value
6+
LED, R12_AFR, 2020, 0.8
7+
LED, R12_AFR, 2110, 0.8
8+
LED, R12_CHN, 2020, 0.8
9+
LED, R12_CHN, 2110, 0.8
10+
LED, R12_EEU, 2020, 0.8
11+
LED, R12_EEU, 2110, 0.8
12+
LED, R12_FSU, 2020, 0.8
13+
LED, R12_FSU, 2110, 0.8
14+
LED, R12_LAM, 2020, 0.8
15+
LED, R12_LAM, 2110, 0.8
16+
LED, R12_MEA, 2020, 0.8
17+
LED, R12_MEA, 2110, 0.8
18+
LED, R12_NAM, 2020, 0.8
19+
LED, R12_NAM, 2110, 0.8
20+
LED, R12_PAO, 2020, 0.8
21+
LED, R12_PAO, 2110, 0.8
22+
LED, R12_PAS, 2020, 0.8
23+
LED, R12_PAS, 2110, 0.8
24+
LED, R12_RCPA, 2020, 0.8
25+
LED, R12_RCPA, 2110, 0.8
26+
LED, R12_SAS, 2020, 0.8
27+
LED, R12_SAS, 2110, 0.8
28+
LED, R12_WEU, 2020, 0.8
29+
LED, R12_WEU, 2110, 0.8
30+
31+
SSP(2024).1, R12_AFR, 2020, 1.0
32+
SSP(2024).1, R12_AFR, 2110, 1.0
33+
SSP(2024).1, R12_CHN, 2020, 1.0
34+
SSP(2024).1, R12_CHN, 2110, 1.0
35+
SSP(2024).1, R12_EEU, 2020, 1.0
36+
SSP(2024).1, R12_EEU, 2110, 1.0
37+
SSP(2024).1, R12_FSU, 2020, 1.0
38+
SSP(2024).1, R12_FSU, 2110, 1.0
39+
SSP(2024).1, R12_LAM, 2020, 1.0
40+
SSP(2024).1, R12_LAM, 2110, 1.0
41+
SSP(2024).1, R12_MEA, 2020, 1.0
42+
SSP(2024).1, R12_MEA, 2110, 1.0
43+
SSP(2024).1, R12_NAM, 2020, 1.0
44+
SSP(2024).1, R12_NAM, 2110, 1.0
45+
SSP(2024).1, R12_PAO, 2020, 1.0
46+
SSP(2024).1, R12_PAO, 2110, 1.0
47+
SSP(2024).1, R12_PAS, 2020, 1.0
48+
SSP(2024).1, R12_PAS, 2110, 1.0
49+
SSP(2024).1, R12_RCPA, 2020, 1.0
50+
SSP(2024).1, R12_RCPA, 2110, 1.0
51+
SSP(2024).1, R12_SAS, 2020, 1.0
52+
SSP(2024).1, R12_SAS, 2110, 1.0
53+
SSP(2024).1, R12_WEU, 2020, 1.0
54+
SSP(2024).1, R12_WEU, 2110, 1.0
55+
56+
SSP(2024).2, R12_AFR, 2020, 1.0
57+
SSP(2024).2, R12_AFR, 2110, 1.0
58+
SSP(2024).2, R12_CHN, 2020, 1.0
59+
SSP(2024).2, R12_CHN, 2110, 1.0
60+
SSP(2024).2, R12_EEU, 2020, 1.0
61+
SSP(2024).2, R12_EEU, 2110, 1.0
62+
SSP(2024).2, R12_FSU, 2020, 1.0
63+
SSP(2024).2, R12_FSU, 2110, 1.0
64+
SSP(2024).2, R12_LAM, 2020, 1.0
65+
SSP(2024).2, R12_LAM, 2110, 1.0
66+
SSP(2024).2, R12_MEA, 2020, 1.0
67+
SSP(2024).2, R12_MEA, 2110, 1.0
68+
SSP(2024).2, R12_NAM, 2020, 1.0
69+
SSP(2024).2, R12_NAM, 2110, 1.0
70+
SSP(2024).2, R12_PAO, 2020, 1.0
71+
SSP(2024).2, R12_PAO, 2110, 1.0
72+
SSP(2024).2, R12_PAS, 2020, 1.0
73+
SSP(2024).2, R12_PAS, 2110, 1.0
74+
SSP(2024).2, R12_RCPA, 2020, 1.0
75+
SSP(2024).2, R12_RCPA, 2110, 1.0
76+
SSP(2024).2, R12_SAS, 2020, 1.0
77+
SSP(2024).2, R12_SAS, 2110, 1.0
78+
SSP(2024).2, R12_WEU, 2020, 1.0
79+
SSP(2024).2, R12_WEU, 2110, 1.0
80+
81+
SSP(2024).3, R12_AFR, 2020, 1.0
82+
SSP(2024).3, R12_AFR, 2110, 1.0
83+
SSP(2024).3, R12_CHN, 2020, 1.0
84+
SSP(2024).3, R12_CHN, 2110, 1.0
85+
SSP(2024).3, R12_EEU, 2020, 1.0
86+
SSP(2024).3, R12_EEU, 2110, 1.0
87+
SSP(2024).3, R12_FSU, 2020, 1.0
88+
SSP(2024).3, R12_FSU, 2110, 1.0
89+
SSP(2024).3, R12_LAM, 2020, 1.0
90+
SSP(2024).3, R12_LAM, 2110, 1.0
91+
SSP(2024).3, R12_MEA, 2020, 1.0
92+
SSP(2024).3, R12_MEA, 2110, 1.0
93+
SSP(2024).3, R12_NAM, 2020, 1.0
94+
SSP(2024).3, R12_NAM, 2110, 1.0
95+
SSP(2024).3, R12_PAO, 2020, 1.0
96+
SSP(2024).3, R12_PAO, 2110, 1.0
97+
SSP(2024).3, R12_PAS, 2020, 1.0
98+
SSP(2024).3, R12_PAS, 2110, 1.0
99+
SSP(2024).3, R12_RCPA, 2020, 1.0
100+
SSP(2024).3, R12_RCPA, 2110, 1.0
101+
SSP(2024).3, R12_SAS, 2020, 1.0
102+
SSP(2024).3, R12_SAS, 2110, 1.0
103+
SSP(2024).3, R12_WEU, 2020, 1.0
104+
SSP(2024).3, R12_WEU, 2110, 1.0
105+
106+
SSP(2024).4, R12_AFR, 2020, 1.0
107+
SSP(2024).4, R12_AFR, 2110, 1.0
108+
SSP(2024).4, R12_CHN, 2020, 1.0
109+
SSP(2024).4, R12_CHN, 2110, 1.0
110+
SSP(2024).4, R12_EEU, 2020, 1.0
111+
SSP(2024).4, R12_EEU, 2110, 1.0
112+
SSP(2024).4, R12_FSU, 2020, 1.0
113+
SSP(2024).4, R12_FSU, 2110, 1.0
114+
SSP(2024).4, R12_LAM, 2020, 1.0
115+
SSP(2024).4, R12_LAM, 2110, 1.0
116+
SSP(2024).4, R12_MEA, 2020, 1.0
117+
SSP(2024).4, R12_MEA, 2110, 1.0
118+
SSP(2024).4, R12_NAM, 2020, 1.0
119+
SSP(2024).4, R12_NAM, 2110, 1.0
120+
SSP(2024).4, R12_PAO, 2020, 1.0
121+
SSP(2024).4, R12_PAO, 2110, 1.0
122+
SSP(2024).4, R12_PAS, 2020, 1.0
123+
SSP(2024).4, R12_PAS, 2110, 1.0
124+
SSP(2024).4, R12_RCPA, 2020, 1.0
125+
SSP(2024).4, R12_RCPA, 2110, 1.0
126+
SSP(2024).4, R12_SAS, 2020, 1.0
127+
SSP(2024).4, R12_SAS, 2110, 1.0
128+
SSP(2024).4, R12_WEU, 2020, 1.0
129+
SSP(2024).4, R12_WEU, 2110, 1.0
130+
131+
SSP(2024).5, R12_AFR, 2020, 1.0
132+
SSP(2024).5, R12_AFR, 2110, 1.0
133+
SSP(2024).5, R12_CHN, 2020, 1.0
134+
SSP(2024).5, R12_CHN, 2110, 1.0
135+
SSP(2024).5, R12_EEU, 2020, 1.0
136+
SSP(2024).5, R12_EEU, 2110, 1.0
137+
SSP(2024).5, R12_FSU, 2020, 1.0
138+
SSP(2024).5, R12_FSU, 2110, 1.0
139+
SSP(2024).5, R12_LAM, 2020, 1.0
140+
SSP(2024).5, R12_LAM, 2110, 1.0
141+
SSP(2024).5, R12_MEA, 2020, 1.0
142+
SSP(2024).5, R12_MEA, 2110, 1.0
143+
SSP(2024).5, R12_NAM, 2020, 1.0
144+
SSP(2024).5, R12_NAM, 2110, 1.0
145+
SSP(2024).5, R12_PAO, 2020, 1.0
146+
SSP(2024).5, R12_PAO, 2110, 1.0
147+
SSP(2024).5, R12_PAS, 2020, 1.0
148+
SSP(2024).5, R12_PAS, 2110, 1.0
149+
SSP(2024).5, R12_RCPA, 2020, 1.0
150+
SSP(2024).5, R12_RCPA, 2110, 1.0
151+
SSP(2024).5, R12_SAS, 2020, 1.0
152+
SSP(2024).5, R12_SAS, 2110, 1.0
153+
SSP(2024).5, R12_WEU, 2020, 1.0
154+
SSP(2024).5, R12_WEU, 2110, 1.0

‎message_ix_models/data/transport/elasticity-f.csv

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# ‘Elasticity’ of freight activity with respect to GDP(PPP)
2+
#
3+
# Units: dimensionless
4+
#
5+
scenario, year, value
6+
SSP(2024).2, 2020, 1.0
7+
SSP(2024).2, 2110, 1.0

‎message_ix_models/model/transport/data.py

+15-2
Original file line numberDiff line numberDiff line change
@@ -374,6 +374,7 @@ def dummy_supply(technologies: list["Code"], info, config) -> dict[str, pd.DataF
374374

375375

376376
def iter_files() -> Iterator[tuple[str, "Dataflow"]]:
377+
"""Iterate over all :class:`Dataflows <.Dataflow>` defined in this module."""
377378
other: set[Dataflow] = set(DATAFLOW.values())
378379

379380
for name, df in globals().items():
@@ -579,6 +580,14 @@ def _input_dataflow(**kwargs) -> "Dataflow":
579580
units="dimensionless",
580581
)
581582

583+
elasticity_f = _input_dataflow(
584+
key="elasticity:scenario-n-y:F+exo",
585+
id="elasticity_f",
586+
path="elasticity-f",
587+
name="‘Elasticity’ of freight activity with respect to GDP(PPP)",
588+
units="dimensionless",
589+
)
590+
582591
# NB This differs from fuel_emi_intensity in including (a) a 't[echnology]' dimension
583592
# and (b) more and non-GHG species.
584593
emi_intensity = _input_dataflow(
@@ -734,8 +743,12 @@ def _input_dataflow(**kwargs) -> "Dataflow":
734743
)
735744

736745
pdt_elasticity = _input_dataflow(
737-
key="pdt elasticity:scenario-n-y:exo",
738-
name="“Elasticity” of PDT-capita with respect to GDP",
746+
key="elasticity:scenario-n-y:P+exo",
747+
path="pdt-elasticity",
748+
name="‘Elasticity’ of PDT per capita with respect to GDP(PPP) per capita",
749+
description="The code that handles this input data flow interpolates on the ‘year’ "
750+
"dimension. The ‘node’ dimension is optional; if not provided, values are broadcast"
751+
" across all existing nodes.",
739752
units="dimensionless",
740753
)
741754

0 commit comments

Comments
 (0)