Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
125 commits
Select commit Hold shift + click to select a range
fec72b3
Add pytest_{collection_modifyitems,configure} hooks
khaeru Apr 18, 2026
f2040b8
Add .testing.MARK["ci_linux_only"]
khaeru Apr 18, 2026
ab97437
Mark 6 tests "ci_linux_only" to lower GHA run time
khaeru Apr 18, 2026
e0e6256
Rename 9 entries in MARK; adjust usage
khaeru Apr 18, 2026
9af5565
Reverse relationship of {,transport}.testing.MARK
khaeru Apr 18, 2026
37c8129
Rename 5 transport test marks; adjust usage
khaeru Apr 18, 2026
1067aa8
Add .util.pytest.MarkFactory
khaeru Apr 19, 2026
93a5556
Replace transport.testing.make_mark w/ MarkFactory
khaeru Apr 19, 2026
2910a4a
Add growth_{activity,new_cap}_lo for 2 LDV techs
khaeru Apr 19, 2026
6a93fbe
Reduce R12_EEU LDV lifetime 28 → 22 years
khaeru Apr 19, 2026
58baf5f
Improve IEA_Future_of_Trucks
khaeru Apr 20, 2026
1e74323
Add .transport.data.InputVehicle
khaeru Apr 20, 2026
34b3683
Merge energy input data for F RAIL and F ROAD
khaeru Apr 20, 2026
bf63704
Check input values are generated for F usage techs
khaeru Apr 30, 2026
3a4f72e
Update reference to "t::F usage"
khaeru Apr 30, 2026
ac05df6
Remove gdp_ppp key from report/global.yaml
khaeru May 7, 2026
68d1beb
Adjust "Final Energy|Transportation" IAMC vars
khaeru May 7, 2026
fa3fa02
Re-add "LED-SSP2 exo price …" transport scenarios
khaeru May 28, 2026
6f1c205
Correct CL_TRANSPORT_SCENARIO(1.4.0) for #497
khaeru May 28, 2026
6d27cc6
Add #497 to doc/whatsnew
khaeru Apr 15, 2026
f420711
Update "on" conditions for "transport" CI workflow
khaeru May 11, 2026
cbd2294
TEMPORARY Use PR branch for "transport" workflow
khaeru Apr 20, 2026
82d3d3f
TEMP: run SSP2 to check outcomes
r-aneeque May 6, 2026
1ddd8a4
Experimental: 2/3 Wheeler input values
r-aneeque May 7, 2026
68e1bd9
Experimental: add 2-3 wheeler values
r-aneeque May 7, 2026
a1a3067
Experimental: check for electric 2W fixed value
r-aneeque May 8, 2026
5b12aa5
TEMP: Run SSP2 only for experiments
r-aneeque May 8, 2026
019ae7f
TEMP: Add Electric 2W values for better base year calibration
r-aneeque May 8, 2026
fa53eb5
Experimental: Add dynamic constraints on 2Ws tech
r-aneeque May 8, 2026
be9365a
Update input-vehicle.csv
r-aneeque May 8, 2026
8bffd13
Experimental: tighten constraint on electric 2W
r-aneeque May 8, 2026
a3bcec2
Temp: Run SSP2 and tax scenario
r-aneeque May 8, 2026
0160cfe
Experimental: Easing constraints on 2Ws
r-aneeque May 8, 2026
283f2d7
Experimental:" update 2W VKT/yr
r-aneeque May 8, 2026
c3f93d3
TEMP: run SSP2 only
r-aneeque May 8, 2026
d195b53
Update lifetime values for nonLDV
r-aneeque May 18, 2026
2ba380e
Update vkt/year for Non-LDVs
r-aneeque May 18, 2026
ef4e4f0
Check EDITS scenarios
r-aneeque May 21, 2026
2344afb
Check SSP2 for error
r-aneeque May 21, 2026
205b34b
Fix the error on 2W years
r-aneeque May 21, 2026
2b77641
pdt per cap by mode
r-aneeque May 22, 2026
259f7da
Run LED-SSP2 for CircEUlar scenarios
r-aneeque May 27, 2026
3867cb8
Prep SSP2 for CircEUlar runs
r-aneeque May 27, 2026
d25dde5
setup CircEUlar base runs
r-aneeque May 27, 2026
d51a40e
FE values for CT_C_I setup
r-aneeque May 27, 2026
f3de76a
Run LED SSP2 for CircEUlar benchmarking
r-aneeque May 27, 2026
dfd3911
setup Slow scenario
r-aneeque May 27, 2026
ee11b60
Slow_high CircEUlar setup
r-aneeque May 27, 2026
89d93fd
setup narrow scenarios
r-aneeque May 28, 2026
9acbda9
Narrow medium sharing setting
r-aneeque May 28, 2026
a81bb1c
Setup for Narrow-mediumSharing scenarios
r-aneeque May 28, 2026
b969ed1
Update Narrow policy setup
r-aneeque May 28, 2026
235be9c
Setup for Narrow scenarios
r-aneeque May 28, 2026
97b81e9
setting up with for Narrow-medium scenarios
r-aneeque May 28, 2026
23dac52
Update DIGSY-BEST-C for Narrow-MedSharing
r-aneeque May 28, 2026
6fbce5e
For Narrow-medSharing scenario
r-aneeque May 28, 2026
3768e2a
For Narrow-Medium
r-aneeque May 28, 2026
64db632
fix the error on column names
r-aneeque May 28, 2026
ab5a592
Run Narrow-Medium setup with CPolicy
r-aneeque May 28, 2026
1da23a7
update for Combined-medSharing setup
r-aneeque May 28, 2026
2fe9607
Revert to default for SSP2 & LED
r-aneeque May 28, 2026
ee42b06
Revert to default for CircEUlar SSP2 & LED
r-aneeque May 28, 2026
d4dc5ef
Update values for CT_C_I
r-aneeque May 28, 2026
6ff558e
run CircEUlar SSP2 and LED
r-aneeque May 28, 2026
ef3ea96
Setup for CircEUlar Slow scenarios
r-aneeque May 28, 2026
aa80313
Setup for Slow-highLife scenario
r-aneeque May 28, 2026
9ce0570
Run LED policy setup for CircEUlar
r-aneeque May 28, 2026
fa87c1c
Upload file with Freight load factor values
r-aneeque May 29, 2026
7494ae4
fix formatting issues
r-aneeque May 29, 2026
3b8e32e
set up for UPW runs
r-aneeque Jun 2, 2026
1a55897
Values for UPW density-threshold sensitivity check
r-aneeque Jun 2, 2026
cb878b6
setup for UPW-density threshold sensitivity check
r-aneeque Jun 2, 2026
ab3247e
Values for UPW density-threshold sensitivity check
r-aneeque Jun 2, 2026
e7cf51d
Setting up for UPW (SSP2 based)
r-aneeque Jun 2, 2026
a6cde4e
Setting up for UPW-density threshold check
r-aneeque Jun 2, 2026
3b5d4cc
Values for UPW density-bands approach
r-aneeque Jun 2, 2026
22a372b
Values for UPW PT access sensitivity check
r-aneeque Jun 3, 2026
5571ab5
Values for UPW density-threshold sensitivity check
r-aneeque Jun 3, 2026
1288039
Values for UPW density-bands approach
r-aneeque Jun 3, 2026
37e0cb4
Values for UPW PT access sensitivity check
r-aneeque Jun 3, 2026
19ea356
Values for UPW Allin sensitivity check
r-aneeque Jun 4, 2026
98340fa
Values for UPW-BAU
r-aneeque Jun 4, 2026
c23a9d2
Run M SSP2 test
r-aneeque Jun 11, 2026
7d2d0da
test if rename DIGSY to CircEUlar works
r-aneeque Jun 17, 2026
e1ed413
checking if this branch is ready for digsy
r-aneeque Jun 19, 2026
a4d6b3d
Setup for Narrow ref and policy scenarios
r-aneeque Jun 21, 2026
08319b4
Setup for CircEUlar-Narrow
r-aneeque Jun 21, 2026
57a2782
Update elasticity-f values for DIGSY-BEST-C
r-aneeque Jun 21, 2026
c3447e6
Setup for CircEUlar-N values
r-aneeque Jun 21, 2026
09324b2
Values for CircEUlar-N
r-aneeque Jun 21, 2026
7428fa6
Test DIGSY-BEST-C policy run
r-aneeque Jun 21, 2026
41c2f69
Test DIGSY-BEST-C policy run
r-aneeque Jun 21, 2026
9ff6a4a
Experimental: constraints to check Narrow policy
r-aneeque Jun 21, 2026
bf487e7
setup for DIGSY runs
r-aneeque Jun 21, 2026
e098cc1
setup for DIGSY runs
r-aneeque Jun 21, 2026
ca0ec90
setup for DIGSY runs
r-aneeque Jun 21, 2026
7a02a28
setup for DIGSY base runs
r-aneeque Jun 22, 2026
5882959
Scenario files for DIGSY base runs
r-aneeque Jun 22, 2026
2cfd44a
Setup for DIGSY converge runs
r-aneeque Jun 22, 2026
3a04e28
setup for DIGSY converge runs
r-aneeque Jun 22, 2026
c417114
setup for DIGSY converge runs
r-aneeque Jun 22, 2026
b84b502
Merge branch 'transport-runs-2026-w17' of https://github.com/iiasa/me…
r-aneeque Jun 22, 2026
cbde471
Setup for DIGSY base runs
r-aneeque Jun 22, 2026
dd07758
setting one for rechecks
r-aneeque Jun 22, 2026
13c13a9
Setup for BEST-C base
r-aneeque Jun 22, 2026
09cb932
setup for DIGSY-BEST-M
r-aneeque Jun 22, 2026
247868f
Run DIGSY-BEST-S-base
r-aneeque Jun 22, 2026
3687282
Run DIGSY-BEST-S-base
r-aneeque Jun 22, 2026
6cd2fdb
Run DIGSY-BEST-S-converge
r-aneeque Jun 22, 2026
958780a
Run DIGSY-BEST-C-base
r-aneeque Jun 22, 2026
f17f817
Run DIGSY-BEST-C-converge
r-aneeque Jun 22, 2026
4b74ea5
Run DIGSY-BEST-M-base
r-aneeque Jun 22, 2026
b7d3990
Run DIGSY-BEST-M-converge
r-aneeque Jun 22, 2026
d524821
Run WORST-DIGSY-C-base
r-aneeque Jun 22, 2026
0891065
Run DIGSY-WORST-C-base
r-aneeque Jun 22, 2026
a640d1a
Run DIGSY-WORST-C-converge
r-aneeque Jun 22, 2026
776a9a3
Run DIGSY-WORST-M-base
r-aneeque Jun 22, 2026
336f759
Run DIGSY-WORST-M-converge
r-aneeque Jun 22, 2026
6d208af
Run DIGSY-WORST-S-base
r-aneeque Jun 22, 2026
416c033
Run DIGSY-WORST-S-converge
r-aneeque Jun 22, 2026
83027f0
Fix R12_CHN
r-aneeque Jun 23, 2026
786ac85
check if elasticity-f works for scenarios other than SSPs
r-aneeque Jun 24, 2026
4619cce
elasticity-f check
r-aneeque Jun 24, 2026
bef9fb2
Update values based on newer data and data fixes
r-aneeque Jun 25, 2026
c08396e
check with CircEUlar-N values from 2020 onwards
r-aneeque Jun 26, 2026
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
24 changes: 16 additions & 8 deletions .github/workflows/transport.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ env:

# Ref to clone in the workflow.
# Default: use github.ref, e.g. 'main' for the schedule trigger.
ref: "main"
ref: "transport-runs-2026-w17"

# Starting point of the workflow.
#
Expand All @@ -30,18 +30,25 @@ env:
labels: >-
[
"SSP2",
"SSP2 exo price c59e",
"SSP2 tax"
"DIGSY-WORST-C"
]

# Run the workflow…
on:
# Uncomment these lines for debugging, but leave them commented on 'main'
# pull_request:
# branches: [ main ]
# push:
# branches: [ main ]
# …on pushes to certain branches…
push:
branches:
# …with names starting "transport-runs-202…
- transport-runs-202*
# …with names starting "transport/*"
# NB Uncomment this for debugging only.
# - transport/*

# …on a daily schedule
schedule:
- cron: "0 1 * * *" # 01:00 UTC = 02:00 CET = 03:00 CEST

# …if dispatched manually from the GitHub website or CLI
workflow_dispatch: {}

# Cancel previous runs that have not completed
Expand All @@ -58,6 +65,7 @@ jobs:
run: |
echo '{
"ref": "${{ env.ref || github.ref }}",
"remote": "https://github.com/iiasa/message-ix-models.git",
"base": "${{ env.base }}",
"from-step": "${{ env.from-step }}",
"labels": ${{ env.labels }}
Expand Down
11 changes: 11 additions & 0 deletions doc/transport/input.rst
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@ Quick links to each of the data flows:
:data:`~.data.input_cap_new`
:data:`~.data.input_ref_ldv`
:data:`~.data.input_share`
:class:`~.data.InputVehicle`
:class:`~.data.Lifetime`
:data:`~.data.load_factor_f`
:data:`~.data.load_factor_p`
Expand Down Expand Up @@ -233,6 +234,16 @@ Quick links to each of the data flows:
.. autodata:: message_ix_models.model.transport.data.input_cap_new
.. autodata:: message_ix_models.model.transport.data.input_ref_ldv
.. autodata:: message_ix_models.model.transport.data.input_share
.. autoclass:: message_ix_models.model.transport.data.InputVehicle

References:

- `message_data#608 <https://github.com/iiasa/message_data/issues/608>`_.
- https://www.bts.gov/content/energy-intensity-class-i-railroad-freight-service-1
- https://www.bts.gov/content/class-i-rail-freight-fuel-consumption-and-travel-0
- Aredah et al. (2024). `doi: 10.1016/j.apenergy.2023.122411
<https://doi.org/10.1016/j.apenergy.2023.122411>`_

.. autoclass:: message_ix_models.model.transport.data.Lifetime
.. autodata:: message_ix_models.model.transport.data.load_factor_f
.. autodata:: message_ix_models.model.transport.data.load_factor_p
Expand Down
3 changes: 3 additions & 0 deletions doc/whatsnew.rst
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ Next release
- Adjust :mod:`.project.ssp.transport` (:pull:`485`):
- Add stub of :func:`.scenariomip.workflow.generate` (:pull:`394`).
- New guide on HOWTO :doc:`/howto/report` (:pull:`488`).
- Improve :doc:`/transport/index` (:pull:`497`):

.. todo:: Expand.

v2026.4.17
==========
Expand Down
6 changes: 0 additions & 6 deletions message_ix_models/data/report/global.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -747,12 +747,6 @@ general:
args:
units: 'GWa / year'

- key: gdp_ppp
comp: product
inputs:
- GDP
- MERtoPPP

# CH4 emissions from GLOBIOM: select only the subset
- key: land_out:n-s-y-c-l-h:CH4_0
comp: select
Expand Down
760 changes: 640 additions & 120 deletions message_ix_models/data/sdmx/IIASA_ECE_CL_TRANSPORT_SCENARIO(1.4.0).xml

Large diffs are not rendered by default.

13 changes: 13 additions & 0 deletions message_ix_models/data/transport/R12/act-non_ldv.csv
Original file line number Diff line number Diff line change
Expand Up @@ -76,3 +76,16 @@ R12_PAS, conm_ar, 2020, 0.01
R12_RCPA, conm_ar, 2020, 0.01
R12_SAS, conm_ar, 2020, 0.01
R12_WEU, conm_ar, 2020, 0.01
# TEMPORARY: AJ added on 2026-05-046 to address Electric 2W prevalance in 2020
R12_AFR, ELE_moto, 2020, 0.01
R12_CHN, ELE_moto, 2020, 0.015
R12_EEU, ELE_moto, 2020, 0.01
R12_FSU, ELE_moto, 2020, 0.01
R12_LAM, ELE_moto, 2020, 0.01
R12_MEA, ELE_moto, 2020, 0.01
R12_NAM, ELE_moto, 2020, 0.01
R12_PAO, ELE_moto, 2020, 0.015
R12_PAS, ELE_moto, 2020, 0.015
R12_RCPA, ELE_moto, 2020, 0.015
R12_SAS, ELE_moto, 2020, 0.015
R12_WEU, ELE_moto, 2020, 0.01
117 changes: 105 additions & 12 deletions message_ix_models/data/transport/R12/activity-vehicle.csv
Original file line number Diff line number Diff line change
Expand Up @@ -138,15 +138,108 @@ LED, LDV, R12_WEU, 2020, 11700
LED, LDV, R12_WEU, 2050, 14087
LED, LDV, R12_WEU, 2110, 14087

*, AIR, *, 2020, 10000
*, AIR, *, 2110, 10000
*, 2W, *, 2020, 10000
*, 2W, *, 2110, 10000
*, BUS, *, 2020, 10000
*, BUS, *, 2110, 10000
*, P RAIL, *, 2020, 10000
*, P RAIL, *, 2110, 10000
*, F RAIL, *, 2020, 10000
*, F RAIL, *, 2110, 10000
*, F ROAD, *, 2020, 10000
*, F ROAD, *, 2110, 10000
*, AIR, *, 2020, 100000
*, AIR, *, 2110, 100000
*, 2W, *, 2020, 8000
*, 2W, *, 2110, 8000
*, 2W, R12_NAM, 2020, 4000
*, 2W, R12_NAM, 2110, 4000
*, 2W, R12_WEU, 2020, 5000
*, 2W, R12_WEU, 2110, 5000

*, P RAIL, R12_AFR, 2020, 100000
*, P RAIL, R12_AFR, 2110, 100000
*, P RAIL, R12_CHN, 2020, 100000
*, P RAIL, R12_CHN, 2110, 100000
*, P RAIL, R12_EEU, 2020, 100000
*, P RAIL, R12_EEU, 2110, 100000
*, P RAIL, R12_FSU, 2020, 100000
*, P RAIL, R12_FSU, 2110, 100000
*, P RAIL, R12_LAM, 2020, 100000
*, P RAIL, R12_LAM, 2110, 100000
*, P RAIL, R12_MEA, 2020, 100000
*, P RAIL, R12_MEA, 2110, 100000
*, P RAIL, R12_NAM, 2020, 100000
*, P RAIL, R12_NAM, 2110, 100000
*, P RAIL, R12_PAO, 2020, 100000
*, P RAIL, R12_PAO, 2110, 100000
*, P RAIL, R12_PAS, 2020, 100000
*, P RAIL, R12_PAS, 2110, 100000
*, P RAIL, R12_RCPA, 2020, 100000
*, P RAIL, R12_RCPA, 2110, 100000
*, P RAIL, R12_SAS, 2020, 100000
*, P RAIL, R12_SAS, 2110, 100000
*, P RAIL, R12_WEU, 2020, 100000
*, P RAIL, R12_WEU, 2110, 100000
*, BUS, R12_AFR, 2020, 70000
*, BUS, R12_AFR, 2110, 70000
*, BUS, R12_CHN, 2020, 70000
*, BUS, R12_CHN, 2110, 70000
*, BUS, R12_EEU, 2020, 70000
*, BUS, R12_EEU, 2110, 70000
*, BUS, R12_FSU, 2020, 70000
*, BUS, R12_FSU, 2110, 70000
*, BUS, R12_LAM, 2020, 70000
*, BUS, R12_LAM, 2110, 70000
*, BUS, R12_MEA, 2020, 70000
*, BUS, R12_MEA, 2110, 70000
*, BUS, R12_NAM, 2020, 70000
*, BUS, R12_NAM, 2110, 70000
*, BUS, R12_PAO, 2020, 70000
*, BUS, R12_PAO, 2110, 70000
*, BUS, R12_PAS, 2020, 70000
*, BUS, R12_PAS, 2110, 70000
*, BUS, R12_RCPA, 2020, 70000
*, BUS, R12_RCPA, 2110, 70000
*, BUS, R12_SAS, 2020, 70000
*, BUS, R12_SAS, 2110, 70000
*, BUS, R12_WEU, 2020, 70000
*, BUS, R12_WEU, 2110, 70000
*, F ROAD, R12_AFR, 2020, 100000
*, F ROAD, R12_AFR, 2110, 100000
*, F ROAD, R12_CHN, 2020, 100000
*, F ROAD, R12_CHN, 2110, 100000
*, F ROAD, R12_EEU, 2020, 100000
*, F ROAD, R12_EEU, 2110, 100000
*, F ROAD, R12_FSU, 2020, 100000
*, F ROAD, R12_FSU, 2110, 100000
*, F ROAD, R12_LAM, 2020, 100000
*, F ROAD, R12_LAM, 2110, 100000
*, F ROAD, R12_MEA, 2020, 100000
*, F ROAD, R12_MEA, 2110, 100000
*, F ROAD, R12_NAM, 2020, 100000
*, F ROAD, R12_NAM, 2110, 100000
*, F ROAD, R12_PAO, 2020, 100000
*, F ROAD, R12_PAO, 2110, 100000
*, F ROAD, R12_PAS, 2020, 100000
*, F ROAD, R12_PAS, 2110, 100000
*, F ROAD, R12_RCPA, 2020, 100000
*, F ROAD, R12_RCPA, 2110, 100000
*, F ROAD, R12_SAS, 2020, 100000
*, F ROAD, R12_SAS, 2110, 100000
*, F ROAD, R12_WEU, 2020, 100000
*, F ROAD, R12_WEU, 2110, 100000
*, F RAIL, R12_AFR, 2020, 100000
*, F RAIL, R12_AFR, 2110, 100000
*, F RAIL, R12_CHN, 2020, 100000
*, F RAIL, R12_CHN, 2110, 100000
*, F RAIL, R12_EEU, 2020, 100000
*, F RAIL, R12_EEU, 2110, 100000
*, F RAIL, R12_FSU, 2020, 100000
*, F RAIL, R12_FSU, 2110, 100000
*, F RAIL, R12_LAM, 2020, 100000
*, F RAIL, R12_LAM, 2110, 100000
*, F RAIL, R12_MEA, 2020, 100000
*, F RAIL, R12_MEA, 2110, 100000
*, F RAIL, R12_NAM, 2020, 100000
*, F RAIL, R12_NAM, 2110, 100000
*, F RAIL, R12_PAO, 2020, 100000
*, F RAIL, R12_PAO, 2110, 100000
*, F RAIL, R12_PAS, 2020, 100000
*, F RAIL, R12_PAS, 2110, 100000
*, F RAIL, R12_RCPA, 2020, 100000
*, F RAIL, R12_RCPA, 2110, 100000
*, F RAIL, R12_SAS, 2020, 100000
*, F RAIL, R12_SAS, 2110, 100000
*, F RAIL, R12_WEU, 2020, 100000
*, F RAIL, R12_WEU, 2110, 100000
Loading