Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
16c06f0
Add pytest_{collection_modifyitems,configure} hooks
khaeru Apr 18, 2026
a3fd92e
Add .testing.MARK["ci_linux_only"]
khaeru Apr 18, 2026
3d4379a
Mark 6 tests "ci_linux_only" to lower GHA run time
khaeru Apr 18, 2026
7f95f17
Rename 9 entries in MARK; adjust usage
khaeru Apr 18, 2026
89e8c0c
Reverse relationship of {,transport}.testing.MARK
khaeru Apr 18, 2026
a4a3a1c
Rename 5 transport test marks; adjust usage
khaeru Apr 18, 2026
c98c444
Add .util.pytest.MarkFactory
khaeru Apr 19, 2026
117658a
Replace transport.testing.make_mark w/ MarkFactory
khaeru Apr 19, 2026
534d872
Add growth_{activity,new_cap}_lo for 2 LDV techs
khaeru Apr 19, 2026
0a5b16b
Reduce R12_EEU LDV lifetime 28 → 22 years
khaeru Apr 19, 2026
a90abc5
Improve IEA_Future_of_Trucks
khaeru Apr 20, 2026
58b0ac3
Add .transport.data.InputVehicle
khaeru Apr 20, 2026
c1f7482
Merge energy input data for F RAIL and F ROAD
khaeru Apr 20, 2026
aac36cb
Check input values are generated for F usage techs
khaeru Apr 30, 2026
2eaf396
Update reference to "t::F usage"
khaeru Apr 30, 2026
ed638d7
Remove gdp_ppp key from report/global.yaml
khaeru May 7, 2026
bc8d906
Adjust "Final Energy|Transportation" IAMC vars
khaeru May 7, 2026
225d3ea
Re-add "LED-SSP2 exo price …" transport scenarios
khaeru May 28, 2026
493cfbf
Drop .transport.Config.ldv_stock_method and usage
khaeru Jun 2, 2026
a3de8ad
Add .transport.key.coord.yv_1plus
khaeru Jun 2, 2026
4339d2a
Improve docstrings of transport data classes/files
khaeru Jun 2, 2026
28302dc
Define globals in .transport.vehicle
khaeru Jun 2, 2026
5489812
Improve .transport.vehicle.capacity_factor()
khaeru Jun 2, 2026
267823a
Include data from ldv-new-capacity.csv
khaeru Jun 2, 2026
5216677
Add StructureFactory.maintainable() helper method
khaeru Jun 16, 2026
6e48035
Ensure URNs for items in StructureFactory.get()
khaeru Jun 16, 2026
7ee50b7
Convert .digsy.get_cl_scenario to StructureFactory
khaeru Jun 16, 2026
3fd6540
Convert .edits.get_cl_scenario to StructureFactory
khaeru Jun 16, 2026
33c6a86
Add .transport.Config.project_scenario_code
khaeru Jun 16, 2026
cf371ad
Rename CL_TRANSPORT_SCENARIO→CL_SCENARIO_TRANSPORT
khaeru Jun 16, 2026
5191283
Drop .transport.Config.set_futures_scenario() etc.
khaeru Jun 16, 2026
0b0d8e3
Silence deprecation warning in .edits.gen_demand()
khaeru Jun 16, 2026
a54023f
Add .transport_futures.CL_SCENARIO_FUTURES
khaeru Jun 16, 2026
2379f64
Consolidate tests of .transport.config.Config
khaeru Jun 16, 2026
2d80295
Correct CL_TRANSPORT_SCENARIO(1.4.0) for #497
khaeru May 28, 2026
78915c1
Add CL_SCENARIO_CIRCEULAR
khaeru May 5, 2026
cf27fe6
Add .util.(_re.)Substitutions utility class
khaeru Jun 18, 2026
e3344b9
Handle CircEUlar scenario code in transport.Config
khaeru Jun 16, 2026
f5b798f
Add GLOMIS scenario data files
r-aneeque Jun 18, 2026
f932285
Update input cap new files to include Non-LDV materials
r-aneeque Jun 18, 2026
4e89252
Update lifetime values for CircEUlar scenarios
r-aneeque Jun 18, 2026
740dc1b
Update vehicle activity files to include Circeular scenarios
r-aneeque Jun 18, 2026
86808ec
Add load factor for F Rail and F Road
r-aneeque Jun 18, 2026
c90a2df
Add fuel economy folder in R12
r-aneeque Jun 18, 2026
db2eaf0
Use transport input_cap_new per CircEUlar scenario
khaeru Jun 19, 2026
6d949d2
Update SDMX files for #497
khaeru May 28, 2026
402b0fe
Expand docstring of .transport.check.insert()
khaeru Jun 18, 2026
d51dd81
Add #497 to doc/whatsnew
khaeru Apr 15, 2026
e8d621d
Update aluminum labels
r-aneeque Jun 23, 2026
287a57c
Fix the typos
r-aneeque Jun 23, 2026
282870e
Rename LABEL_STEM_A → LABEL_SUBS["A"], add B and C
khaeru Jun 24, 2026
9198f04
Add Config.label, mapped values to "scenario::all"
khaeru Jun 24, 2026
a45c2d7
Use LABEL_SUBS in .data.{ActivityVehicle,Lifetime}
khaeru Jun 24, 2026
f4cb0f0
Use LABEL_SUBS in .freight.demand
khaeru Jun 24, 2026
1d73ebe
Adjust 'scenario' coords in elasticity-f.csv
khaeru Jun 24, 2026
bc99fb0
Remove unused "indexers:scenario:LED"
khaeru Jun 24, 2026
85e6ea6
Add K.coord.scenario_label_{ABC}
khaeru Jun 24, 2026
cead021
Reference K.coord.scenario_* where possible
khaeru Jun 24, 2026
e4324a4
Simplify LoadFactorLDV handling of DIGSY, tests
khaeru Jun 25, 2026
6795551
Update 2025 values based on newer data
r-aneeque Jun 25, 2026
a9bb2a1
Fix typo
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
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 @@ -20,6 +20,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
2,125 changes: 2,125 additions & 0 deletions message_ix_models/data/boku/glomis-material/CircEUlar-A 2e17.csv

Large diffs are not rendered by default.

2,125 changes: 2,125 additions & 0 deletions message_ix_models/data/boku/glomis-material/CircEUlar-S 2e17.csv

Large diffs are not rendered by default.

2,125 changes: 2,125 additions & 0 deletions message_ix_models/data/boku/glomis-material/CircEUlar-S.csv

Large diffs are not rendered by default.

2,125 changes: 2,125 additions & 0 deletions message_ix_models/data/boku/glomis-material/CircEular-A.csv

Large diffs are not rendered by default.

2,125 changes: 2,125 additions & 0 deletions message_ix_models/data/boku/glomis-material/Circular-N 2e17.csv

Large diffs are not rendered by default.

2,125 changes: 2,125 additions & 0 deletions message_ix_models/data/boku/glomis-material/Circular-N.csv

Large diffs are not rendered by default.

2,125 changes: 2,125 additions & 0 deletions message_ix_models/data/boku/glomis-material/LED-SSP2.csv

Large diffs are not rendered by default.

2,125 changes: 2,125 additions & 0 deletions message_ix_models/data/boku/glomis-material/SSP2-R 2e17.csv

Large diffs are not rendered by default.

2,125 changes: 2,125 additions & 0 deletions message_ix_models/data/boku/glomis-material/SSP2-R.csv

Large diffs are not rendered by default.

307 changes: 307 additions & 0 deletions message_ix_models/data/boku/glomis-stock/CircEUlar-A 2e17.csv

Large diffs are not rendered by default.

307 changes: 307 additions & 0 deletions message_ix_models/data/boku/glomis-stock/CircEUlar-S 2e17.csv

Large diffs are not rendered by default.

307 changes: 307 additions & 0 deletions message_ix_models/data/boku/glomis-stock/CircEUlar-S.csv

Large diffs are not rendered by default.

307 changes: 307 additions & 0 deletions message_ix_models/data/boku/glomis-stock/CircEular-A.csv

Large diffs are not rendered by default.

307 changes: 307 additions & 0 deletions message_ix_models/data/boku/glomis-stock/Circular-N 2e17.csv

Large diffs are not rendered by default.

307 changes: 307 additions & 0 deletions message_ix_models/data/boku/glomis-stock/Circular-N.csv

Large diffs are not rendered by default.

307 changes: 307 additions & 0 deletions message_ix_models/data/boku/glomis-stock/LED-SSP2.csv

Large diffs are not rendered by default.

307 changes: 307 additions & 0 deletions message_ix_models/data/boku/glomis-stock/SSP2-R 2e17.csv

Large diffs are not rendered by default.

307 changes: 307 additions & 0 deletions message_ix_models/data/boku/glomis-stock/SSP2-R.csv

Large diffs are not rendered by default.

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
22 changes: 22 additions & 0 deletions message_ix_models/data/sdmx/IIASA_ECE_CL_SCENARIO_DIGSY(0.2.0).xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<?xml version='1.0' encoding='utf-8'?>
<mes:Structure xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:com="http://www.sdmx.org/resources/sdmxml/schemas/v2_1/common" xmlns:data="http://www.sdmx.org/resources/sdmxml/schemas/v2_1/data/structurespecific" xmlns:footer="http://www.sdmx.org/resources/sdmxml/schemas/v2_1/message/footer" xmlns:gen="http://www.sdmx.org/resources/sdmxml/schemas/v2_1/data/generic" xmlns:md_ss="http://www.sdmx.org/resources/sdmxml/schemas/v2_1/metadata/structurespecific" xmlns:md="http://www.sdmx.org/resources/sdmxml/schemas/v2_1/metadata/generic" xmlns:mes="http://www.sdmx.org/resources/sdmxml/schemas/v2_1/message" xmlns:reg="http://www.sdmx.org/resources/sdmxml/schemas/v2_1/registry" xmlns:str="http://www.sdmx.org/resources/sdmxml/schemas/v2_1/structure">
<mes:Header>
<mes:ID>none</mes:ID>
<mes:Test>false</mes:Test>
<mes:Prepared>2026-06-16T15:15:24.904611</mes:Prepared>
<mes:Sender id="none"/>
<mes:Source xml:lang="en">Generated by message_ix_models 2026.4.18.dev116+g63d32e6eb.d20260603</mes:Source>
</mes:Header>
<mes:Structures>
<str:Codelists>
<str:Codelist isExternalReference="false" isFinal="true" agencyID="IIASA_ECE" version="0.2.0" id="CL_SCENARIO_DIGSY" urn="urn:sdmx:org.sdmx.infomodel.codelist.Codelist=IIASA_ECE:CL_SCENARIO_DIGSY(0.2.0)">
<str:Code id="BASE" urn="urn:sdmx:org.sdmx.infomodel.codelist.Code=IIASA_ECE:CL_SCENARIO_DIGSY(0.2.0).BASE"/>
<str:Code id="BEST-C" urn="urn:sdmx:org.sdmx.infomodel.codelist.Code=IIASA_ECE:CL_SCENARIO_DIGSY(0.2.0).BEST-C"/>
<str:Code id="BEST-S" urn="urn:sdmx:org.sdmx.infomodel.codelist.Code=IIASA_ECE:CL_SCENARIO_DIGSY(0.2.0).BEST-S"/>
<str:Code id="WORST-C" urn="urn:sdmx:org.sdmx.infomodel.codelist.Code=IIASA_ECE:CL_SCENARIO_DIGSY(0.2.0).WORST-C"/>
<str:Code id="WORST-S" urn="urn:sdmx:org.sdmx.infomodel.codelist.Code=IIASA_ECE:CL_SCENARIO_DIGSY(0.2.0).WORST-S"/>
<str:Code id="_Z" urn="urn:sdmx:org.sdmx.infomodel.codelist.Code=IIASA_ECE:CL_SCENARIO_DIGSY(0.2.0)._Z"/>
</str:Codelist>
</str:Codelists>
</mes:Structures>
</mes:Structure>
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<?xml version='1.0' encoding='utf-8'?>
<mes:Structure xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:com="http://www.sdmx.org/resources/sdmxml/schemas/v2_1/common" xmlns:data="http://www.sdmx.org/resources/sdmxml/schemas/v2_1/data/structurespecific" xmlns:footer="http://www.sdmx.org/resources/sdmxml/schemas/v2_1/message/footer" xmlns:gen="http://www.sdmx.org/resources/sdmxml/schemas/v2_1/data/generic" xmlns:md_ss="http://www.sdmx.org/resources/sdmxml/schemas/v2_1/metadata/structurespecific" xmlns:md="http://www.sdmx.org/resources/sdmxml/schemas/v2_1/metadata/generic" xmlns:mes="http://www.sdmx.org/resources/sdmxml/schemas/v2_1/message" xmlns:reg="http://www.sdmx.org/resources/sdmxml/schemas/v2_1/registry" xmlns:str="http://www.sdmx.org/resources/sdmxml/schemas/v2_1/structure">
<mes:Header>
<mes:ID>none</mes:ID>
<mes:Test>false</mes:Test>
<mes:Prepared>2026-06-16T15:27:26.647846</mes:Prepared>
<mes:Sender id="none"/>
<mes:Source xml:lang="en">Generated by message_ix_models 2026.4.18.dev116+g63d32e6eb.d20260603</mes:Source>
</mes:Header>
<mes:Structures>
<str:Codelists>
<str:Codelist isExternalReference="false" isFinal="true" agencyID="IIASA_ECE" version="0.2.0" id="CL_SCENARIO_EDITS_MCE" urn="urn:sdmx:org.sdmx.infomodel.codelist.Codelist=IIASA_ECE:CL_SCENARIO_EDITS_MCE(0.2.0)">
<str:Code id="CA" urn="urn:sdmx:org.sdmx.infomodel.codelist.Code=IIASA_ECE:CL_SCENARIO_EDITS_MCE(0.2.0).CA"/>
<str:Code id="HA" urn="urn:sdmx:org.sdmx.infomodel.codelist.Code=IIASA_ECE:CL_SCENARIO_EDITS_MCE(0.2.0).HA"/>
<str:Code id="_Z" urn="urn:sdmx:org.sdmx.infomodel.codelist.Code=IIASA_ECE:CL_SCENARIO_EDITS_MCE(0.2.0)._Z"/>
</str:Codelist>
</str:Codelists>
</mes:Structures>
</mes:Structure>
34 changes: 34 additions & 0 deletions message_ix_models/data/sdmx/IIASA_ECE_CL_SCENARIO_FUTURES(1.0).xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<?xml version='1.0' encoding='utf-8'?>
<mes:Structure xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:com="http://www.sdmx.org/resources/sdmxml/schemas/v2_1/common" xmlns:data="http://www.sdmx.org/resources/sdmxml/schemas/v2_1/data/structurespecific" xmlns:footer="http://www.sdmx.org/resources/sdmxml/schemas/v2_1/message/footer" xmlns:gen="http://www.sdmx.org/resources/sdmxml/schemas/v2_1/data/generic" xmlns:md_ss="http://www.sdmx.org/resources/sdmxml/schemas/v2_1/metadata/structurespecific" xmlns:md="http://www.sdmx.org/resources/sdmxml/schemas/v2_1/metadata/generic" xmlns:mes="http://www.sdmx.org/resources/sdmxml/schemas/v2_1/message" xmlns:reg="http://www.sdmx.org/resources/sdmxml/schemas/v2_1/registry" xmlns:str="http://www.sdmx.org/resources/sdmxml/schemas/v2_1/structure">
<mes:Header>
<mes:ID>none</mes:ID>
<mes:Test>false</mes:Test>
<mes:Prepared>2026-06-16T17:16:54.307803</mes:Prepared>
<mes:Sender id="none"/>
<mes:Source xml:lang="en">Generated by message_ix_models 2026.4.18.dev116+g63d32e6eb.d20260603</mes:Source>
</mes:Header>
<mes:Structures>
<str:Codelists>
<str:Codelist isExternalReference="false" isFinal="true" agencyID="IIASA_ECE" version="1.0" id="CL_SCENARIO_FUTURES" urn="urn:sdmx:org.sdmx.infomodel.codelist.Codelist=IIASA_ECE:CL_SCENARIO_FUTURES(1.0)">
<str:Code id="BASE" urn="urn:sdmx:org.sdmx.infomodel.codelist.Code=IIASA_ECE:CL_SCENARIO_FUTURES(1.0).BASE">
<com:Name xml:lang="en">Base scenario</com:Name>
</str:Code>
<str:Code id="A___" urn="urn:sdmx:org.sdmx.infomodel.codelist.Code=IIASA_ECE:CL_SCENARIO_FUTURES(1.0).A___">
<com:Name xml:lang="en">Activity</com:Name>
</str:Code>
<str:Code id="AS__" urn="urn:sdmx:org.sdmx.infomodel.codelist.Code=IIASA_ECE:CL_SCENARIO_FUTURES(1.0).AS__">
<com:Name xml:lang="en">Activity, structure</com:Name>
</str:Code>
<str:Code id="ASI_" urn="urn:sdmx:org.sdmx.infomodel.codelist.Code=IIASA_ECE:CL_SCENARIO_FUTURES(1.0).ASI_">
<com:Name xml:lang="en">Activity, structure, intensity</com:Name>
</str:Code>
<str:Code id="ASIF" urn="urn:sdmx:org.sdmx.infomodel.codelist.Code=IIASA_ECE:CL_SCENARIO_FUTURES(1.0).ASIF">
<com:Name xml:lang="en">Activity, structure, intensity, fuels</com:Name>
</str:Code>
<str:Code id="DEBUG" urn="urn:sdmx:org.sdmx.infomodel.codelist.Code=IIASA_ECE:CL_SCENARIO_FUTURES(1.0).DEBUG">
<com:Name xml:lang="en">Additional scenario for debugging</com:Name>
</str:Code>
</str:Codelist>
</str:Codelists>
</mes:Structures>
</mes:Structure>
Loading
Loading