Merge pull request #392 from iiasa/transport/2025-w32

Transport improvements from 2025-W32

Author: khaeru

.github/workflows/transport.yaml

@@ -36,6 +36,10 @@ env:
       "SSP4 policy",
       "SSP5",
       "SSP5 policy",
+      "DIGSY-BEST-C",
+      "DIGSY-BEST-S",
+      "DIGSY-WORST-C",
+      "DIGSY-WORST-S",
       "EDITS-CA",
       "EDITS-HA",
       "LED-SSP1",

doc/whatsnew.rst

@@ -6,6 +6,20 @@ Next release
 
 - Improve and extend :doc:`/material/index` (:pull:`418`).
   See :doc:`version 1.2.0 </material/v1.2.0>` for details.
+- Improve :mod:`.model.transport` (:pull:`392`).
+
+  - New properties :attr:`.transport.Config.code` and
+    :attr:`.transport.Config.label`.
+  - New base class :class:`.MultiFile`
+    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.
+  - Add technology dimension to :data:`.elasticity_f`.
+  - Document :class:`.ScenarioCodeAnnotations`.
+
+- Extend :mod:`.digsy.structure.SCENARIO` (:pull:`392`).
+- :class:`.ItemSchemeEnumType` automatically creates aliases
+  for SDMX item scheme members with "-" in their IDs (:pull:`392`).
 - Expand :doc:`develop` documentation (:pull:`423`)
   with material previously in :mod:`message_data` docs.
 
@@ -121,7 +135,7 @@ Base model and variants
   - Update input data for :data:`.act_non_ldv`,
     :data:`.activity_freight`,
     :data:`.elasticity_f`,
-    :data:`.load_factor_ldv`,
+    :py:`load_factor_ldv`,
     passenger mode share,
     :data:`.pdt_cap`,
     :data:`.pdt_cap_ref`, and
@@ -285,7 +299,7 @@ Update :doc:`/transport/index` (:pull:`259`, :pull:`289`, :pull:`300`, :pull:`32
   :data:`.speed`.
 - Add LED-specific parametrization for :data:`.activity_ldv`,
   :data:`.lifetime_ldv`,
-  :data:`.load_factor_ldv`, and
+  :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.

message_ix_models/data/sdmx/IIASA_ECE_CL_TRANSPORT_SCENARIO(1.2.0).xml

@@ -12,47 +12,47 @@
 # Units: dimensionless
 #
 node,    technology, value
-R11_AFR, ROAD,       0.767
-R11_AFR, RAIL,       0.003
-R11_AFR, WATER,      0.221
-R11_AFR, AIR,        0.009
-R11_CPA, ROAD,       0.310
-R11_CPA, RAIL,       0.200
-R11_CPA, WATER,      0.480
-R11_CPA, AIR,        0.020
-R11_EEU, ROAD,       0.680
-R11_EEU, RAIL,       0.270
-R11_EEU, WATER,      0.050
-R11_EEU, AIR,        0.0
-R11_FSU, ROAD,       0.080
-R11_FSU, RAIL,       0.900
-R11_FSU, WATER,      0.020
-R11_FSU, AIR,        0.0
-R11_LAM, ROAD,       0.344
-R11_LAM, RAIL,       0.007
-R11_LAM, WATER,      0.648
-R11_LAM, AIR,        0.001
-R11_MEA, ROAD,       0.965
-R11_MEA, RAIL,       0.019
-R11_MEA, WATER,      0.0
-R11_MEA, AIR,        0.016
-R11_NAM, ROAD,       0.590
-R11_NAM, RAIL,       0.350
-R11_NAM, WATER,      0.0
-R11_NAM, AIR,        0.060
-R11_PAO, ROAD,       0.700
-R11_PAO, RAIL,       0.285
-R11_PAO, WATER,      0.0149
-R11_PAO, AIR,        0.01
-R11_PAS, ROAD,       0.747
-R11_PAS, RAIL,       0.011
-R11_PAS, WATER,      0.240
-R11_PAS, AIR,        0.002
-R11_SAS, ROAD,       0.600
-R11_SAS, RAIL,       0.380
-R11_SAS, WATER,      0.019
-R11_SAS, AIR,        0.001
-R11_WEU, ROAD,       0.750
-R11_WEU, RAIL,       0.190
-R11_WEU, WATER,      0.059
-R11_WEU, AIR,        0.001
+R11_AFR, F ROAD,     0.767
+R11_AFR, F RAIL,     0.003
+R11_AFR, F WATER,    0.221
+R11_AFR, F AIR,      0.009
+R11_CPA, F ROAD,     0.310
+R11_CPA, F RAIL,     0.200
+R11_CPA, F WATER,    0.480
+R11_CPA, F AIR,      0.020
+R11_EEU, F ROAD,     0.680
+R11_EEU, F RAIL,     0.270
+R11_EEU, F WATER,    0.050
+R11_EEU, F AIR,      0.0
+R11_FSU, F ROAD,     0.080
+R11_FSU, F RAIL,     0.900
+R11_FSU, F WATER,    0.020
+R11_FSU, F AIR,      0.0
+R11_LAM, F ROAD,     0.344
+R11_LAM, F RAIL,     0.007
+R11_LAM, F WATER,    0.648
+R11_LAM, F AIR,      0.001
+R11_MEA, F ROAD,     0.965
+R11_MEA, F RAIL,     0.019
+R11_MEA, F WATER,    0.0
+R11_MEA, F AIR,      0.016
+R11_NAM, F ROAD,     0.590
+R11_NAM, F RAIL,     0.350
+R11_NAM, F WATER,    0.0
+R11_NAM, F AIR,      0.060
+R11_PAO, F ROAD,     0.700
+R11_PAO, F RAIL,     0.285
+R11_PAO, F WATER,    0.0149
+R11_PAO, F AIR,      0.01
+R11_PAS, F ROAD,     0.747
+R11_PAS, F RAIL,     0.011
+R11_PAS, F WATER,    0.240
+R11_PAS, F AIR,      0.002
+R11_SAS, F ROAD,     0.600
+R11_SAS, F RAIL,     0.380
+R11_SAS, F WATER,    0.019
+R11_SAS, F AIR,      0.001
+R11_WEU, F ROAD,     0.750
+R11_WEU, F RAIL,     0.190
+R11_WEU, F WATER,    0.059
+R11_WEU, F AIR,      0.001