Transport improvements for 2026-W04

.github/workflows/transport.yaml

@@ -6,6 +6,10 @@ env:
   target-ref: dev
   target-workflow: transport
 
+  # Ref to clone in the workflow.
+  # Default: use github.ref, e.g. 'main' for the schedule trigger.
+  ref: "main"
+
   # Starting point of the workflow.
   #
   # Use this value to build from a certain scenario:
@@ -22,40 +26,14 @@ env:
   # 'mix-models transport run'. Each label triggers 1 job in the target-repo/
   # target-workflow.
   #
-  # - Delete lines to disable some runs.
   # - Ensure there is NO trailing comma on the last line.
   labels: >-
     [
-      "SSP1",
-      "SSP1 exo price",
-      "SSP1 tax",
       "SSP2",
-      "SSP2 exo price",
-      "SSP2 tax",
-      "SSP3",
-      "SSP3 exo price",
-      "SSP3 tax",
-      "SSP4",
-      "SSP4 exo price",
-      "SSP4 tax",
-      "SSP5",
-      "SSP5 exo price",
-      "SSP5 tax",
-      "DIGSY-BEST-C",
-      "DIGSY-BEST-S",
-      "DIGSY-WORST-C",
-      "DIGSY-WORST-S",
-      "EDITS-CA",
-      "EDITS-HA",
-      "LED-SSP1",
-      "LED-SSP2"
+      "SSP2 exo price c59e",
+      "SSP2 tax"
     ]
 
-  # Currently disabled:
-  # [
-  #
-  # ]
-
 on:
   # Uncomment these lines for debugging, but leave them commented on 'main'
   # pull_request:
@@ -79,7 +57,7 @@ jobs:
     - name: Assemble JSON payload
       run: |
         echo '{
-          "ref": "${{ github.ref }}",
+          "ref": "${{ env.ref || github.ref }}",
           "base": "${{ env.base }}",
           "from-step": "${{ env.from-step }}",
           "labels": ${{ env.labels }}

doc/transport/input.rst

@@ -113,7 +113,7 @@ The :program:`git` history of files, or the GitHub "blame" view can also be used
 Quick links to each of the data flows:
 :data:`~.data.act_non_ldv`
 :data:`~.data.activity_freight`
-:data:`~.data.activity_ldv`
+:class:`~.data.ActivityVehicle`
 :data:`~.data.age_ldv`
 :data:`~.data.cap_new_ldv`
 :data:`~.data.class_ldv`
@@ -136,9 +136,10 @@ Quick links to each of the data flows:
 :data:`~.data.input_cap_new`
 :data:`~.data.input_ref_ldv`
 :data:`~.data.input_share`
-:data:`~.data.lifetime_ldv`
-:data:`~.data.load_factor_ldv`
-:data:`~.data.load_factor_nonldv`
+:class:`~.data.Lifetime`
+:data:`~.data.load_factor_f`
+:data:`~.data.load_factor_p`
+:class:`~.data.LoadFactorLDV`
 :data:`~.data.mer_to_ppp`
 :data:`~.data.mode_share_freight`
 :data:`~.data.pdt_cap_proj`
@@ -153,7 +154,7 @@ Quick links to each of the data flows:
 
 .. autodata:: message_ix_models.model.transport.data.act_non_ldv
 .. autodata:: message_ix_models.model.transport.data.activity_freight
-.. autodata:: message_ix_models.model.transport.data.activity_ldv
+.. autoclass:: message_ix_models.model.transport.data.ActivityVehicle
 
    node = R12_AFR [1]_
      Obtained from literature, based on estimates from South Africa. The reported value for South Africa is lower (18000 km/year, `source <https://blog.sbtjapan.com/car-info/what-mileage-is-good-for-a-used-car#:~:text=Average%20Mileage%20in%20South%20Africa,is%20just%20a%20general%20guideline>`__) than the one for Kenya (22000 km/year, `source <https://www.changing-transport.org/wp-content/uploads/2019_Updated-transport-data-in-Kenya.pdf>`__).
@@ -232,8 +233,10 @@ 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
-.. autodata:: message_ix_models.model.transport.data.lifetime_ldv
-.. autodata:: message_ix_models.model.transport.data.load_factor_ldv
+.. 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
+.. autoclass:: message_ix_models.model.transport.data.LoadFactorLDV
 
    The code that handles this file interpolates on the |y| dimension.
 
@@ -243,8 +246,7 @@ Quick links to each of the data flows:
 
    .. todo:: Transcribe the method into this document.
 
-.. autodata:: message_ix_models.model.transport.data.load_factor_nonldv
-.. autodata:: message_ix_models.model.transport.data.mer_to_ppp
+   .. autodata:: message_ix_models.model.transport.data.mer_to_ppp
 .. autodata:: message_ix_models.model.transport.data.mode_share_freight
 
 .. _transport-pdt-cap-proj:

doc/transport/output.rst

@@ -20,13 +20,13 @@ Data flows
 
 Quick links to each of the data flows:
 :data:`~.data.activity_passenger`
-:data:`~.data.activity_vehicle`
+:data:`~.data.activity_vehicle_out`
 :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.activity_vehicle_out
 .. 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

doc/whatsnew.rst

@@ -4,18 +4,89 @@ What's new
 Next release
 ============
 
-- :mod:`message_ix_models` supports and is tested against `Pandas 3.0.0 <https://pandas.pydata.org/pandas-docs/stable/whatsnew/v3.0.0.html>`_,
+- :mod:`message_ix_models` supports and is tested against
+  `Pandas 3.0.0 <https://pandas.pydata.org/pandas-docs/stable/whatsnew/v3.0.0.html>`_,
   released 2026-01-21 (:pull:`470`).
-- New module :mod:`tools.bilateralize <message_ix_models.tools.bilateralize>`
+- New module :mod:`.tools.bilateralize`
   to change scenarios to a bilateral representation of trade (:pull:`438`).
-
-- Add reduced basin filtering for water module with ``--reduced-basin`` and
-  demand/supply stress-based selection via ``--basin-selection stress``
-  (:pull:`432`, :issue:`414`).
-
-- Fix water module parameter bugs and refactor cooling (:pull:`405`):
-  infrastructure M1/Mf mode fixes, regional average shares for cooling allocation,
-  water supply level hierarchy corrections, and test suite improvements.
+- New function :func:`.workflow.from_codelist` (:pull:`471`)
+  to generate a :class:`.Workflow` from a list of SDMX codes
+  by inspection of their IDs and annotations.
+- Improve :mod:`~message_ix_models.report` (:pull:`471`):
+
+  - :func:`~.report.report` updates the :class:`.Context`
+    with additional keyword arguments.
+  - New reporting operator :func:`.broadcast_wildcard2`.
+  - New utility :func:`.report.util.store_write_ts`,
+    generalized from :py:`transport.report.add_iamc_store_write()`.
+
+- New class :class:`.testing.check.InRange` (:pull:`471`).
+- :meth:`.ConfigHelper.update` canonicalizes arguments;
+  accepts an optional ConfigHelper or dict as first positional argument (:pull:`471`).
+- :meth:`.Context.update` invokes :meth:`.ConfigHelper.update` on sub-instances (:pull:`471`).
+- Improve :doc:`/transport/index` (:pull:`471`):
+
+  - Update data flows:
+
+    - :class:`.ActivityVehicle`: new :class:`.ExoDataSource` class
+      inclusive of all modes and technologies;
+      replaces :py:`ldv_activity` that was specific to LDVs.
+    - :data:`.activity_vehicle_out`: rename from :py:`activity_vehicle`.
+    - :class:`.Lifetime`: new :class:`.ExoDataSource` class,
+      replaces :py:`lifetime_Ldv` that was specific to LDVs.
+    - :data:`.load_factor_f`: new.
+      This data flow is kept separate from :data:`.load_factor_p` because the units
+      of activity/service differ (tonne- vs. passenger-kilometre).
+    - :class:`.LoadFactorLDV`: add units "passenger / vehicle".
+    - :data:`.load_factor_p`: rename from :py:`load_factor_non_ldv`.
+    - :data:`.freight_activity`: change units Gt km → Gt km / year.
+
+  - Expand transport technology code list:
+
+    - Distinguish names and reporting aliases for all vehicle technologies.
+    - Add ``ntnu-vmi-technology`` annotations for :mod:`.transport.material`.
+
+  - New functions and methods:
+
+    :meth:`.transport.config.Config.get_target_url`
+    replacing :py:`transport.workflow.scenario_url()`,
+
+    :func:`.transport.material.get_groups`, and
+
+    :func:`~.transport.structure.get_commodity_groups`.
+
+  - Harmonize :mod:`genno` keys used for structural information,
+    coordinates, etc. during build and reporting in :mod:`.transport.key`.
+  - New CLI command :program:`mix-models transport export-price`.
+  - Bump Codelist=IIASA_ECE:CL_TRANSPORT_SCENARIO to version 1.4.0.
+
+    - Add additional exogenous price trajectories.
+    - Bump :attr:`.CL_SCENARIO.base_url` to v6.5 of the ScenarioMIP scenarios.
+
+  - Add and apply :data:`.transport.material.OUTPUT_SHARE`.
+  - Improve reporting output (:mod:`.transport.report`):
+    align IAMC ‘variable’ codes with common definitions.
+  - New module :mod:`.transport.vehicle` for operational parameters
+    (capacity factor, technical lifetime) and stock of vehicles,
+    both passenger and freight.
+
+    - Transfer and generalize stock-related calculations from :mod:`.transport.ldv`.
+    - Remove module :py:`transport.stock`.
+
+  - New function :func:`.transport.workflow.add_steps` adds
+    transport-related steps to any Workflow
+    given a Code with :class:`.ScenarioCodeAnnotations`.
+
+- Improve :doc:`/water/index`:
+
+  - Add reduced basin filtering with :program:`--reduced-basin`
+    and demand/supply stress-based selection via :program:`--basin-selection stress`
+    (:pull:`432`, :issue:`414`).
+  - Fix parameter bugs and refactor cooling (:pull:`405`):
+    infrastructure M1/Mf mode fixes,
+    regional average shares for cooling allocation,
+    water supply level hierarchy corrections,
+    and test suite improvements.
 
 v2026.1.15
 ==========
@@ -75,7 +146,7 @@ Projects and model variants
 ---------------------------
 
 - Add :doc:`/project/circeular` code list :class:`~.circeular.structure.CL_TRANSPORT_SCENARIO` (:pull:`447`).
-- Improve :mod:`.model.transport` (:pull:`447`).
+- Improve :doc:`/transport/index` (:pull:`447`).
 
   - Add :meth:`Config.use_modules <.transport.config.Config.use_modules>`.
   - Bump Codelist=IIASA_ECE:CL_TRANSPORT_SCENARIO to version 1.3.0.
@@ -119,7 +190,7 @@ v2025.10.31
     to read input data from distinct files according to scenario label.
   - New :class:`LoadFactorLDV`, replacing :py:`load_factor_ldv`
     and allowing a distinct file according to scenario label.
-  - New submodule :mod:`~.transport.stock` and input data flow :data:`.stock_cap`.
+  - New submodule :py:`transport.stock` and input data flow :data:`.stock_cap`.
   - Add technology dimension to :data:`.elasticity_f`.
   - Document :class:`.ScenarioCodeAnnotations`.
 
@@ -408,15 +479,16 @@ Update :doc:`/transport/index` (:pull:`259`, :pull:`289`, :pull:`300`, :pull:`32
   :data:`.mode_share_freight`,
   :data:`.pdt_cap_ref`, and
   :data:`.speed`.
-- Add LED-specific parametrization for :data:`.activity_ldv`,
+- Add LED-specific parametrization for :class:`activity_ldv <.ActivityVehicle>`,
   :data:`.lifetime_ldv`,
   :py:`load_factor_ldv`, and
   :data:`.pdt_cap_proj`.
 - Drop :file:`base-scenario-url.json`; store base scenario URLs in :ref:`CL_TRANSPORT_SCENARIO`.
 - Generate SDMX-ML structural metadata, including data flow definitions, and SDMX-{CSV,ML} data outputs for certain reported quantities.
 
   - New input data flow :data:`.input_share`.
-  - Add :py:`scenario` dimension to :data:`.activity_ldv`, :data:`.lifetime_ldv`, input data flow and files.
+  - Add :py:`scenario` dimension to :class:`activity_ldv <.ActivityVehicle>`,
+    :data:`.lifetime_ldv`, input data flow and files.
 - Expand use of fixed/shared keys from :mod:`.transport.key`.
 - Improve documentation:
 

message_ix_models/cli.py

@@ -206,7 +206,9 @@ def _log_threads(k: int, n: int):
     try:
         __import__(name)
     except ImportError as e:
-        print(e)
+        print(f"{name} not available: {e}")
+        continue
+
     cmd = getattr(sys.modules[name], "cli")
 
     # Avoid replacing message-ix-models CLI with message_data CLI

message_ix_models/data/commodity.yaml

@@ -112,7 +112,8 @@ fueloil:
   iea-eweb-product: [BITUMEN, PARWAX, PETCOKE, RESFUEL]
 
 gas:
-  name: Natural Gas
+  name: Natural gas
+  report: Gas
   units: GWa
   ipcc-1996-name: "Natural Gas (Dry)"
   iea-eweb-product: [NATGAS]