Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Transport improvements from 2025-W09 #300

Draft
wants to merge 48 commits into
base: main
Choose a base branch
from
+2,874 −2,356
Draft

Transport improvements from 2025-W09 #300

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
733bced
TEMPORARY Enable "transport" CI workflow for PR
khaeru Feb 24, 2025
d7c2738
Add check of LDV energy input
khaeru Feb 26, 2025
a85ccc2
Use genno.Keys in .transport.ldv
khaeru Feb 27, 2025
35df38d
Handle >1 dimensions in broadcast_wildcard()
khaeru Feb 28, 2025
a68d431
Fix handling multiple dims in MappingAdapter
khaeru Feb 28, 2025
63253a4
Handle input share of LDV PHEV technology
khaeru Feb 28, 2025
c137ea5
Add .transport.operator.indexer_scenario()
khaeru Feb 28, 2025
90617a7
Improve docstring, comments in test_debug()
khaeru Feb 28, 2025
d9daa89
Update SSP 1 ldv speed.csv
r-aneeque Mar 10, 2025
6b9eca9
Experimental pdt-elasticity values for SSP1.csv
r-aneeque Mar 10, 2025
bea700d
Add 'y' dimension to .transport.exo.pdt_elasticity
khaeru Mar 10, 2025
bee2848
Update R12_SAS pdt-cap
r-aneeque Mar 11, 2025
abae0ea
LED-SSP1 mode speeds
r-aneeque Mar 11, 2025
a6c4c0e
TEMPORARY limit runs to SSP 1 & SSP 2
r-aneeque Mar 11, 2025
da8f2c6
remove white spaces
r-aneeque Mar 11, 2025
4462840
Move .transport…ExogenousDataFile to .util.sdmx.Dataflow
khaeru Mar 11, 2025
4b9b764
Remove .util.sdmx.make_dataflow()
khaeru Mar 11, 2025
c102885
Add Dataflow._update_doc() to generate docstrings
khaeru Mar 12, 2025
43c182f
Consolidate data flows in .transport.data
khaeru Mar 12, 2025
2c54781
Ensure "c::transport+base" items are str
khaeru Mar 12, 2025
be40603
Add get_version(with_dev=...) argument
khaeru Mar 12, 2025
6c6201f
Adjust for ixmp/message_ix 3.7.0; Python 3.9
khaeru Mar 12, 2025
99a3755
Speed setting for LED SSP 1
r-aneeque Mar 13, 2025
ca3b6fb
Update pdt-elasticity values for SSP 1 & SSP 2
r-aneeque Mar 13, 2025
12d0a96
TEMPORARY Run SSP 1 only
r-aneeque Mar 13, 2025
9cf1085
REVERT SSP 1 speeds
r-aneeque Mar 13, 2025
af4d1ef
remove R12_NAM share weight convergence
r-aneeque Mar 13, 2025
dfc5169
Experimental swc for R12_NAM
r-aneeque Mar 13, 2025
079f6a4
Update pdt-elasticity values for SSP 1
r-aneeque Mar 13, 2025
371752b
Experimental swc for R12_NAM
r-aneeque Mar 13, 2025
d5b20c6
Update speed for SSP1 RAIL
r-aneeque Mar 13, 2025
7cbb455
Experimental pdt-elasticity values for SSP1 GN (except NAM)
r-aneeque Mar 13, 2025
6700827
Experimental swc for R12_NAM blank
r-aneeque Mar 14, 2025
0d99ef0
Revert back last changes (blank, WEU) to R12_NAM swc
r-aneeque Mar 14, 2025
e5858fe
Experimental: AIR speed mode in certain regions in SSP 1
r-aneeque Mar 14, 2025
797df23
LED SSP 1 speeds
r-aneeque Mar 14, 2025
cb72c4d
correct LED SSP1 speeds
r-aneeque Mar 14, 2025
04552a1
Revert Speeds back to SSP1
r-aneeque Mar 14, 2025
b07905f
Update pdt-elasticity for SSP2
r-aneeque Mar 14, 2025
069d3b8
Update transport to run SSP 2 only
r-aneeque Mar 14, 2025
e39f025
correction for pdt-elasticity SSP2
r-aneeque Mar 14, 2025
f34c0a6
Update pdt-elasticity for SSP 3
r-aneeque Mar 14, 2025
25b4869
TEMPORARY Run SSP3 only
r-aneeque Mar 14, 2025
4e3db92
fix the SSP3 value for R12_RCPA
r-aneeque Mar 14, 2025
201b613
Update pdt-elasticity for SSP 4
r-aneeque Mar 14, 2025
9a048ea
Update load-factor-ldv for SSP differtiation
r-aneeque Mar 15, 2025
7b9e381
Update pdt-cap for LED SSP1
r-aneeque Mar 15, 2025
6de5497
run all SSPs baseline version
r-aneeque Mar 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 4 additions & 12 deletions .github/workflows/transport.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,30 +27,22 @@ env:
labels: >-
[
"SSP1",
"SSP1 policy",
"SSP2",
"SSP2 policy",
"SSP3",
"SSP3 policy",
"SSP4",
"SSP4 policy",
"SSP5",
"SSP5 policy",
"EDITS-CA",
"EDITS-HA",
"LED-SSP1",
"LED-SSP2"
"LED-SSP1"
]

# Currently disabled:
# [
#
#
# ]

on:
# Uncomment these lines for debugging, but leave them commented on 'main'
# pull_request:
# branches: [ main ]
pull_request:
branches: [ main ]
# push:
# branches: [ main ]
schedule:
Expand Down
2 changes: 1 addition & 1 deletion doc/conf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"sphinx.ext.viewcode",
# Others
"genno.compat.sphinx.rewrite_refs",
# "ixmp.util.sphinx_linkcode_github",
# "ixmp.util.sphinx_linkcode_github", # TODO Address build errors, then enable
"sphinxcontrib.bibtex",
]

Expand Down
307 changes: 158 additions & 149 deletions doc/transport/input.rst
View file
Open in desktop

Large diffs are not rendered by default.

15 changes: 15 additions & 0 deletions doc/transport/output.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,21 @@ Plots
:class:`.VarCost`
Variable costs.

Data flows
==========

Quick links to each of the data flows:
:data:`~.data.activity_passenger`
:data:`~.data.activity_vehicle`
:data:`~.data.fe_transport`
:data:`~.data.gdp_in`
:data:`~.data.population_in`

.. autodata:: message_ix_models.model.transport.data.activity_passenger
.. autodata:: message_ix_models.model.transport.data.activity_vehicle
.. autodata:: message_ix_models.model.transport.data.fe_transport
.. autodata:: message_ix_models.model.transport.data.gdp_in
.. autodata:: message_ix_models.model.transport.data.population_in

Quantities
==========
Expand Down
2 changes: 1 addition & 1 deletion message_ix_models/data/transport/R12/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ share weight convergence:
R12_FSU: [R12_NAM, R12_WEU]
R12_LAM: [R12_NAM, R12_WEU]
R12_MEA: [R12_NAM, R12_WEU]
R12_NAM: [R12_NAM]
R12_NAM: [R12_NAM, R12_WEU]
R12_PAO: [R12_PAO, R12_WEU]
R12_PAS: [R12_PAO, R12_WEU]
R12_SAS: [R12_PAO, R12_NAM]
Expand Down
3 changes: 0 additions & 3 deletions message_ix_models/data/transport/R12/ldv-new-capacity.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@
# They are derived from (1) an IEA EV data set and (2) data from the OICA
# website.
#
# - Values up to 2015 are used for historical_new_capacity.
# - Values from 2020 onwards are used for both bound_new_capacity_{lo,up}.
#
# Units: Mvehicle
#
# - The following are from iea_ev_bound_new_capacity_ev.csv.
Expand Down
1 change: 0 additions & 1 deletion message_ix_models/data/transport/R12/lifetime-ldv.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
#
# Units: year
#
#
node_loc, year_vtg, value
R12_AFR, 1990, 25
R12_CHN, 1990, 15
Expand Down
243 changes: 120 additions & 123 deletions message_ix_models/data/transport/R12/load-factor-ldv.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,138 +3,135 @@
# Source: Duplicate of R11/load-factor-ldv.csv; R12_CHN and R12_RCPA values
# filled from R11_CPA.
#
# - The code that handles this file interpolates on the ‘year’
# dimension.
#
# Units: dimensionless
#
# (Implicitly passengers per vehicle.)
#
scenario, node, year, value
SSP(2024).1, R12_AFR, 2020, 2.1
SSP(2024).1, R12_AFR, 2110, 1.892
SSP(2024).1, R12_CHN, 2020, 1.75
SSP(2024).1, R12_CHN, 2110, 1.75
SSP(2024).1, R12_EEU, 2020, 1.643
SSP(2024).1, R12_EEU, 2110, 1.643
SSP(2024).1, R12_FSU, 2020, 1.807
SSP(2024).1, R12_FSU, 2110, 1.807
SSP(2024).1, R12_LAM, 2020, 1.807
SSP(2024).1, R12_LAM, 2110, 1.807
SSP(2024).1, R12_MEA, 2020, 1.807
SSP(2024).1, R12_MEA, 2110, 1.807
SSP(2024).1, R12_NAM, 2110, 1.53
SSP(2024).1, R12_NAM, 2020, 1.53
SSP(2024).1, R12_PAO, 2110, 1.72
SSP(2024).1, R12_PAO, 2020, 1.72
SSP(2024).1, R12_PAS, 2020, 1.807
SSP(2024).1, R12_PAS, 2110, 1.807
SSP(2024).1, R12_RCPA, 2020, 1.892
SSP(2024).1, R12_RCPA, 2110, 1.892
SSP(2024).1, R12_SAS, 2020, 2
SSP(2024).1, R12_SAS, 2110, 1.892
SSP(2024).1, R12_WEU, 2020, 1.65
SSP(2024).1, R12_WEU, 2110, 1.65
SSP(2024).1, R12_AFR,2020,2.1
SSP(2024).1, R12_AFR,2110,1.8
SSP(2024).1, R12_CHN,2020,1.75
SSP(2024).1, R12_CHN,2110,1.8
SSP(2024).1, R12_EEU,2020,1.643
SSP(2024).1, R12_EEU,2110,1.8
SSP(2024).1, R12_FSU,2020,1.807
SSP(2024).1, R12_FSU,2110,1.8
SSP(2024).1, R12_LAM,2020,1.807
SSP(2024).1, R12_LAM,2110,1.8
SSP(2024).1, R12_MEA,2020,1.807
SSP(2024).1, R12_MEA,2110,1.8
SSP(2024).1, R12_NAM,2110,1.53
SSP(2024).1, R12_NAM,2020,1.8
SSP(2024).1, R12_PAO,2110,1.72
SSP(2024).1, R12_PAO,2020,1.8
SSP(2024).1, R12_PAS,2020,1.807
SSP(2024).1, R12_PAS,2110,1.8
SSP(2024).1, R12_RCPA,2020,1.892
SSP(2024).1, R12_RCPA,2110,1.8
SSP(2024).1, R12_SAS,2020,2
SSP(2024).1, R12_SAS,2110,1.8
SSP(2024).1, R12_WEU,2020,1.65
SSP(2024).1, R12_WEU,2110,1.8

SSP(2024).2, R12_AFR, 2020, 2.1
SSP(2024).2, R12_AFR, 2110, 1.892
SSP(2024).2, R12_CHN, 2020, 1.75
SSP(2024).2, R12_CHN, 2110, 1.75
SSP(2024).2, R12_EEU, 2020, 1.643
SSP(2024).2, R12_EEU, 2110, 1.643
SSP(2024).2, R12_FSU, 2020, 1.807
SSP(2024).2, R12_FSU, 2110, 1.807
SSP(2024).2, R12_LAM, 2020, 1.807
SSP(2024).2, R12_LAM, 2110, 1.807
SSP(2024).2, R12_MEA, 2020, 1.807
SSP(2024).2, R12_MEA, 2110, 1.807
SSP(2024).2, R12_NAM, 2110, 1.53
SSP(2024).2, R12_NAM, 2020, 1.53
SSP(2024).2, R12_PAO, 2110, 1.72
SSP(2024).2, R12_PAO, 2020, 1.72
SSP(2024).2, R12_PAS, 2020, 1.807
SSP(2024).2, R12_PAS, 2110, 1.807
SSP(2024).2, R12_RCPA, 2020, 1.892
SSP(2024).2, R12_RCPA, 2110, 1.892
SSP(2024).2, R12_SAS, 2020, 2
SSP(2024).2, R12_SAS, 2110, 1.892
SSP(2024).2, R12_WEU, 2020, 1.65
SSP(2024).2, R12_WEU, 2110, 1.65
SSP(2024).2, R12_AFR,2020,2.1
SSP(2024).2, R12_AFR,2110,1.7
SSP(2024).2, R12_CHN,2020,1.75
SSP(2024).2, R12_CHN,2110,1.5
SSP(2024).2, R12_EEU,2020,1.643
SSP(2024).2, R12_EEU,2110,1.5
SSP(2024).2, R12_FSU,2020,1.807
SSP(2024).2, R12_FSU,2110,1.5
SSP(2024).2, R12_LAM,2020,1.807
SSP(2024).2, R12_LAM,2110,1.65
SSP(2024).2, R12_MEA,2020,1.807
SSP(2024).2, R12_MEA,2110,1.65
SSP(2024).2, R12_NAM,2110,1.53
SSP(2024).2, R12_NAM,2020,1.5
SSP(2024).2, R12_PAO,2110,1.72
SSP(2024).2, R12_PAO,2020,1.5
SSP(2024).2, R12_PAS,2020,1.807
SSP(2024).2, R12_PAS,2110,1.5
SSP(2024).2, R12_RCPA,2020,1.892
SSP(2024).2, R12_RCPA,2110,1.65
SSP(2024).2, R12_SAS,2020,2
SSP(2024).2, R12_SAS,2110,1.7
SSP(2024).2, R12_WEU,2020,1.65
SSP(2024).2, R12_WEU,2110,1.5

SSP(2024).3, R12_AFR, 2020, 2.1
SSP(2024).3, R12_AFR, 2110, 1.892
SSP(2024).3, R12_CHN, 2020, 1.75
SSP(2024).3, R12_CHN, 2110, 1.75
SSP(2024).3, R12_EEU, 2020, 1.643
SSP(2024).3, R12_EEU, 2110, 1.643
SSP(2024).3, R12_FSU, 2020, 1.807
SSP(2024).3, R12_FSU, 2110, 1.807
SSP(2024).3, R12_LAM, 2020, 1.807
SSP(2024).3, R12_LAM, 2110, 1.807
SSP(2024).3, R12_MEA, 2020, 1.807
SSP(2024).3, R12_MEA, 2110, 1.807
SSP(2024).3, R12_NAM, 2110, 1.53
SSP(2024).3, R12_NAM, 2020, 1.53
SSP(2024).3, R12_PAO, 2110, 1.72
SSP(2024).3, R12_PAO, 2020, 1.72
SSP(2024).3, R12_PAS, 2020, 1.807
SSP(2024).3, R12_PAS, 2110, 1.807
SSP(2024).3, R12_RCPA, 2020, 1.892
SSP(2024).3, R12_RCPA, 2110, 1.892
SSP(2024).3, R12_SAS, 2020, 2
SSP(2024).3, R12_SAS, 2110, 1.892
SSP(2024).3, R12_WEU, 2020, 1.65
SSP(2024).3, R12_WEU, 2110, 1.65
SSP(2024).3, R12_AFR,2020,2.1
SSP(2024).3, R12_AFR,2110,1.5
SSP(2024).3, R12_CHN,2020,1.75
SSP(2024).3, R12_CHN,2110,1.5
SSP(2024).3, R12_EEU,2020,1.643
SSP(2024).3, R12_EEU,2110,1.5
SSP(2024).3, R12_FSU,2020,1.807
SSP(2024).3, R12_FSU,2110,1.5
SSP(2024).3, R12_LAM,2020,1.807
SSP(2024).3, R12_LAM,2110,1.5
SSP(2024).3, R12_MEA,2020,1.807
SSP(2024).3, R12_MEA,2110,1.5
SSP(2024).3, R12_NAM,2110,1.53
SSP(2024).3, R12_NAM,2020,1.5
SSP(2024).3, R12_PAO,2110,1.72
SSP(2024).3, R12_PAO,2020,1.5
SSP(2024).3, R12_PAS,2020,1.807
SSP(2024).3, R12_PAS,2110,1.5
SSP(2024).3, R12_RCPA,2020,1.892
SSP(2024).3, R12_RCPA,2110,1.5
SSP(2024).3, R12_SAS,2020,2
SSP(2024).3, R12_SAS,2110,1.5
SSP(2024).3, R12_WEU,2020,1.65
SSP(2024).3, R12_WEU,2110,1.5

SSP(2024).4, R12_AFR, 2020, 2.1
SSP(2024).4, R12_AFR, 2110, 1.892
SSP(2024).4, R12_CHN, 2020, 1.75
SSP(2024).4, R12_CHN, 2110, 1.75
SSP(2024).4, R12_EEU, 2020, 1.643
SSP(2024).4, R12_EEU, 2110, 1.643
SSP(2024).4, R12_FSU, 2020, 1.807
SSP(2024).4, R12_FSU, 2110, 1.807
SSP(2024).4, R12_LAM, 2020, 1.807
SSP(2024).4, R12_LAM, 2110, 1.807
SSP(2024).4, R12_MEA, 2020, 1.807
SSP(2024).4, R12_MEA, 2110, 1.807
SSP(2024).4, R12_NAM, 2110, 1.53
SSP(2024).4, R12_NAM, 2020, 1.53
SSP(2024).4, R12_PAO, 2110, 1.72
SSP(2024).4, R12_PAO, 2020, 1.72
SSP(2024).4, R12_PAS, 2020, 1.807
SSP(2024).4, R12_PAS, 2110, 1.807
SSP(2024).4, R12_RCPA, 2020, 1.892
SSP(2024).4, R12_RCPA, 2110, 1.892
SSP(2024).4, R12_SAS, 2020, 2
SSP(2024).4, R12_SAS, 2110, 1.892
SSP(2024).4, R12_WEU, 2020, 1.65
SSP(2024).4, R12_WEU, 2110, 1.65
SSP(2024).4, R12_AFR,2020,2.1
SSP(2024).4, R12_AFR,2110,1.8
SSP(2024).4, R12_CHN,2020,1.75
SSP(2024).4, R12_CHN,2110,1.7
SSP(2024).4, R12_EEU,2020,1.643
SSP(2024).4, R12_EEU,2110,1.7
SSP(2024).4, R12_FSU,2020,1.807
SSP(2024).4, R12_FSU,2110,1.8
SSP(2024).4, R12_LAM,2020,1.807
SSP(2024).4, R12_LAM,2110,1.8
SSP(2024).4, R12_MEA,2020,1.807
SSP(2024).4, R12_MEA,2110,1.8
SSP(2024).4, R12_NAM,2110,1.53
SSP(2024).4, R12_NAM,2020,1.7
SSP(2024).4, R12_PAO,2110,1.72
SSP(2024).4, R12_PAO,2020,1.7
SSP(2024).4, R12_PAS,2020,1.807
SSP(2024).4, R12_PAS,2110,1.8
SSP(2024).4, R12_RCPA,2020,1.892
SSP(2024).4, R12_RCPA,2110,1.8
SSP(2024).4, R12_SAS,2020,2
SSP(2024).4, R12_SAS,2110,1.8
SSP(2024).4, R12_WEU,2020,1.65
SSP(2024).4, R12_WEU,2110,1.7

SSP(2024).5, R12_AFR, 2020, 2.1
SSP(2024).5, R12_AFR, 2110, 1.892
SSP(2024).5, R12_CHN, 2020, 1.75
SSP(2024).5, R12_CHN, 2110, 1.75
SSP(2024).5, R12_EEU, 2020, 1.643
SSP(2024).5, R12_EEU, 2110, 1.643
SSP(2024).5, R12_FSU, 2020, 1.807
SSP(2024).5, R12_FSU, 2110, 1.807
SSP(2024).5, R12_LAM, 2020, 1.807
SSP(2024).5, R12_LAM, 2110, 1.807
SSP(2024).5, R12_MEA, 2020, 1.807
SSP(2024).5, R12_MEA, 2110, 1.807
SSP(2024).5, R12_NAM, 2110, 1.53
SSP(2024).5, R12_NAM, 2020, 1.53
SSP(2024).5, R12_PAO, 2110, 1.72
SSP(2024).5, R12_PAO, 2020, 1.72
SSP(2024).5, R12_PAS, 2020, 1.807
SSP(2024).5, R12_PAS, 2110, 1.807
SSP(2024).5, R12_RCPA, 2020, 1.892
SSP(2024).5, R12_RCPA, 2110, 1.892
SSP(2024).5, R12_SAS, 2020, 2
SSP(2024).5, R12_SAS, 2110, 1.892
SSP(2024).5, R12_WEU, 2020, 1.65
SSP(2024).5, R12_WEU, 2110, 1.65
SSP(2024).5, R12_AFR,2020,2.1
SSP(2024).5, R12_AFR,2110,1.5
SSP(2024).5, R12_CHN,2020,1.75
SSP(2024).5, R12_CHN,2110,1.5
SSP(2024).5, R12_EEU,2020,1.643
SSP(2024).5, R12_EEU,2110,1.5
SSP(2024).5, R12_FSU,2020,1.807
SSP(2024).5, R12_FSU,2110,1.5
SSP(2024).5, R12_LAM,2020,1.807
SSP(2024).5, R12_LAM,2110,1.5
SSP(2024).5, R12_MEA,2020,1.807
SSP(2024).5, R12_MEA,2110,1.5
SSP(2024).5, R12_NAM,2110,1.53
SSP(2024).5, R12_NAM,2020,1.5
SSP(2024).5, R12_PAO,2110,1.72
SSP(2024).5, R12_PAO,2020,1.5
SSP(2024).5, R12_PAS,2020,1.807
SSP(2024).5, R12_PAS,2110,1.5
SSP(2024).5, R12_RCPA,2020,1.892
SSP(2024).5, R12_RCPA,2110,1.5
SSP(2024).5, R12_SAS,2020,2
SSP(2024).5, R12_SAS,2110,1.5
SSP(2024).5, R12_WEU,2020,1.65
SSP(2024).5, R12_WEU,2110,1.5

# “Global South”
LED, R12_AFR, 2020, 2.100
Expand Down
2 changes: 1 addition & 1 deletion message_ix_models/data/transport/R12/pdt-cap-ref.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ R12_PAS, 8000
R12_CHN, 8700
R12_EEU, 13000
R12_WEU, 15000
R12_SAS, 3500
R12_SAS, 4000
R12_LAM, 7000
R12_AFR, 3000
R12_MEA, 6500
Expand Down
Loading
Loading