Transport improvements from 2024-W49

.github/workflows/transport.yaml

@@ -3,7 +3,7 @@ name: MESSAGEix-Transport
 env:
   # The repository, ref (branch), and workflow file name to dispatch
   target-repo: iiasa/message_data
-  target-ref: dev
+  target-ref: enh/transport-2024-W47
   target-workflow: transport
 
   # Starting point of the workflow.
@@ -18,8 +18,8 @@ env:
 
 on:
   # Uncomment these lines for debugging, but leave them commented on 'main'
-  # pull_request:
-  #   branches: [ main ]
+  pull_request:
+    branches: [ main ]
   # push:
   #   branches: [ main ]
   schedule:

doc/Makefile

@@ -3,7 +3,7 @@
 
 # You can set these variables from the command line, and also
 # from the environment for the first two.
-SPHINXOPTS    ?=
+SPHINXOPTS    ?= --jobs=auto
 SPHINXBUILD   ?= sphinx-build
 SOURCEDIR     = .
 BUILDDIR      = _build

doc/api/data-sources.rst

@@ -63,16 +63,16 @@ The data:
 
 The approach to handling proprietary data is the same as in :mod:`.project.advance` and :mod:`.project.ssp`:
 
-- Copies of the data are stored in the (private) :mod:`message_data` repository using Git LFS.
+- Copies of the data are stored in the (private) `message-static-data` repository using Git LFS.
   This respository is accessible only to users who have a license for the data.
 - :mod:`message_ix_models` contains only a ‘fuzzed’ version of the data (same structure, random values) for testing purposes.
 - Non-IIASA users must obtain their own license to access and use the data; obtain the data themselves; and place it on the system where they use :mod:`message_ix_models`.
 
 The module :mod:`message_ix_models.tools.iea.web` attempts to detect and support both the providers/formats described below.
 The code supports using data from any of the above locations and formats, in multiple ways:
 
-- Use :func:`.tools.iea.web.load_data` to load data as :class:`pandas.DataFrame` and apply further pandas processing.
-- Use :class:`.IEA_EWEB` via :func:`.tools.exo_data.prepare_computer` to use the data in :mod:`genno` structured calculations.
+- Use :class:`.IEA_EWEB` via :func:`.exo_data.prepare_computer` to use the data in :mod:`genno` structured calculations.
+- Use :func:`.iea.web.load_data` to load data as :class:`pandas.DataFrame` and apply further processing using pandas.
 
 The **documentation** for the `2023 edition <https://iea.blob.core.windows.net/assets/0acb1453-1221-421b-9131-632ce71a4c1a/WORLDBAL_Documentation.pdf>`__ of the IEA source/format is publicly available.
 
@@ -82,8 +82,8 @@ Structure
 The data have the following conceptual dimensions, each enumerated by a different list of codes:
 
 - ``FLOW``, ``PRODUCT``: for both of these, the lists of codes appearing in the data are the same from 2021 and 2023 inclusive.
-- ``COUNTRY``: The data provided by IEA directly contain codes that are all caps, abbreviated country names, for instance "DOMINICANR".
-  The data provided by the OECD contain ISO 3166-1 alpha-3 codes, for instance "DOM".
+- ``COUNTRY``: The data provided by IEA directly contain codes that are all caps, abbreviated country names, for instance 'DOMINICANR'.
+  The data provided by the OECD contain ISO 3166-1 alpha-3 codes, for instance 'DOM'.
   In both cases, there are additional labels denoting country groupings; these are defined in the documentation linked above.
 
   Changes visible in these lists include:
@@ -98,8 +98,9 @@ The data have the following conceptual dimensions, each enumerated by a differen
     - New codes: GNQ, MDG, MKD, RWA, SWZ, UGA.
     - Removed: EQGUINEA, GREENLAND, MALI, MBURKINAFA, MCHAD, MMADAGASCA, MMAURITANI, MPALESTINE, MRWANDA, MUGANDA, NORTHMACED.
 
-- TIME: always a year.
-- MEASURE: unit of measurement, either "TJ" or "ktoe".
+  See the :py:`transform=...` source keyword argument and :meth:`.IEA_EWEB.transform` for different methods of handling this dimension.
+- ``TIME``: always a year.
+- ``UNIT_MEASURE`` (not labeled): unit of measurement, either 'TJ' or 'ktoe'.
 
 :mod:`message_ix_models` is packaged with SDMX structure data (stored in :file:`message_ix_models/data/sdmx/`) comprising code lists extracted from the raw data for the COUNTRY, FLOW, and PRODUCT dimensions.
 These can be used with other package utilities, for instance:

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

@@ -2,131 +2,158 @@
 <mes:Structure xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:com="http://www.sdmx.org/resources/sdmxml/schemas/v2_1/common" xmlns:md="http://www.sdmx.org/resources/sdmxml/schemas/v2_1/metadata/generic" xmlns:md_ss="http://www.sdmx.org/resources/sdmxml/schemas/v2_1/metadata/structurespecific" xmlns:data="http://www.sdmx.org/resources/sdmxml/schemas/v2_1/data/structurespecific" xmlns:str="http://www.sdmx.org/resources/sdmxml/schemas/v2_1/structure" xmlns:mes="http://www.sdmx.org/resources/sdmxml/schemas/v2_1/message" xmlns:gen="http://www.sdmx.org/resources/sdmxml/schemas/v2_1/data/generic" xmlns:footer="http://www.sdmx.org/resources/sdmxml/schemas/v2_1/message/footer">
   <mes:Header>
     <mes:Test>false</mes:Test>
-    <mes:Prepared>2024-11-18T11:40:00.804051</mes:Prepared>
-    <mes:Source xml:lang="en">Generated by message_ix_models 2024.4.23.dev2473+gd12ad74b9.d20240806</mes:Source>
+    <mes:Prepared>2024-12-03T21:18:35.564011</mes:Prepared>
+    <mes:Source xml:lang="en">Generated by message_ix_models 2024.8.7.dev455+gd9d66fa40.d20241203</mes:Source>
   </mes:Header>
   <mes:Structures>
     <str:Codelists>
       <str:Codelist isExternalReference="none" isFinal="none" agencyID="IIASA_ECE" version="1.0.0" id="CL_TRANSPORT_SCENARIO" urn="urn:sdmx:org.sdmx.infomodel.codelist.Codelist=IIASA_ECE:CL_TRANSPORT_SCENARIO(1.0.0)">
         <str:Code id="SSP1">
           <com:Annotations>
             <com:Annotation id="SSP-URN">
-              <com:AnnotationText xml:lang="en">urn:sdmx:org.sdmx.infomodel.codelist.Code=ICONICS:SSP(2024).1</com:AnnotationText>
+              <com:AnnotationText xml:lang="en">'urn:sdmx:org.sdmx.infomodel.codelist.Code=ICONICS:SSP(2024).1'</com:AnnotationText>
             </com:Annotation>
             <com:Annotation id="is-LED-scenario">
               <com:AnnotationText xml:lang="en">False</com:AnnotationText>
             </com:Annotation>
             <com:Annotation id="EDITS-activity-id">
               <com:AnnotationText xml:lang="en">None</com:AnnotationText>
             </com:Annotation>
+            <com:Annotation id="base-scenario-URL">
+              <com:AnnotationText xml:lang="en">'ixmp://ixmp-dev/SSP_SSP1_v1.1/baseline_DEFAULT_step_13'</com:AnnotationText>
+            </com:Annotation>
           </com:Annotations>
         </str:Code>
         <str:Code id="SSP2">
           <com:Annotations>
             <com:Annotation id="SSP-URN">
-              <com:AnnotationText xml:lang="en">urn:sdmx:org.sdmx.infomodel.codelist.Code=ICONICS:SSP(2024).2</com:AnnotationText>
+              <com:AnnotationText xml:lang="en">'urn:sdmx:org.sdmx.infomodel.codelist.Code=ICONICS:SSP(2024).2'</com:AnnotationText>
             </com:Annotation>
             <com:Annotation id="is-LED-scenario">
               <com:AnnotationText xml:lang="en">False</com:AnnotationText>
             </com:Annotation>
             <com:Annotation id="EDITS-activity-id">
               <com:AnnotationText xml:lang="en">None</com:AnnotationText>
             </com:Annotation>
+            <com:Annotation id="base-scenario-URL">
+              <com:AnnotationText xml:lang="en">'ixmp://ixmp-dev/SSP_SSP2_v1.1/baseline_DEFAULT_step_13'</com:AnnotationText>
+            </com:Annotation>
           </com:Annotations>
         </str:Code>
         <str:Code id="SSP3">
           <com:Annotations>
             <com:Annotation id="SSP-URN">
-              <com:AnnotationText xml:lang="en">urn:sdmx:org.sdmx.infomodel.codelist.Code=ICONICS:SSP(2024).3</com:AnnotationText>
+              <com:AnnotationText xml:lang="en">'urn:sdmx:org.sdmx.infomodel.codelist.Code=ICONICS:SSP(2024).3'</com:AnnotationText>
             </com:Annotation>
             <com:Annotation id="is-LED-scenario">
               <com:AnnotationText xml:lang="en">False</com:AnnotationText>
             </com:Annotation>
             <com:Annotation id="EDITS-activity-id">
               <com:AnnotationText xml:lang="en">None</com:AnnotationText>
             </com:Annotation>
+            <com:Annotation id="base-scenario-URL">
+              <com:AnnotationText xml:lang="en">'ixmp://ixmp-dev/SSP_SSP3_v1.1/baseline_DEFAULT_step_13'</com:AnnotationText>
+            </com:Annotation>
           </com:Annotations>
         </str:Code>
         <str:Code id="SSP4">
           <com:Annotations>
             <com:Annotation id="SSP-URN">
-              <com:AnnotationText xml:lang="en">urn:sdmx:org.sdmx.infomodel.codelist.Code=ICONICS:SSP(2024).4</com:AnnotationText>
+              <com:AnnotationText xml:lang="en">'urn:sdmx:org.sdmx.infomodel.codelist.Code=ICONICS:SSP(2024).4'</com:AnnotationText>
             </com:Annotation>
             <com:Annotation id="is-LED-scenario">
               <com:AnnotationText xml:lang="en">False</com:AnnotationText>
             </com:Annotation>
             <com:Annotation id="EDITS-activity-id">
               <com:AnnotationText xml:lang="en">None</com:AnnotationText>
             </com:Annotation>
+            <com:Annotation id="base-scenario-URL">
+              <com:AnnotationText xml:lang="en">'ixmp://ixmp-dev/SSP_SSP4_v1.1/baseline_DEFAULT_step_13'</com:AnnotationText>
+            </com:Annotation>
           </com:Annotations>
         </str:Code>
         <str:Code id="SSP5">
           <com:Annotations>
             <com:Annotation id="SSP-URN">
-              <com:AnnotationText xml:lang="en">urn:sdmx:org.sdmx.infomodel.codelist.Code=ICONICS:SSP(2024).5</com:AnnotationText>
+              <com:AnnotationText xml:lang="en">'urn:sdmx:org.sdmx.infomodel.codelist.Code=ICONICS:SSP(2024).5'</com:AnnotationText>
             </com:Annotation>
             <com:Annotation id="is-LED-scenario">
               <com:AnnotationText xml:lang="en">False</com:AnnotationText>
             </com:Annotation>
             <com:Annotation id="EDITS-activity-id">
               <com:AnnotationText xml:lang="en">None</com:AnnotationText>
             </com:Annotation>
+            <com:Annotation id="base-scenario-URL">
+              <com:AnnotationText xml:lang="en">'ixmp://ixmp-dev/SSP_SSP5_v1.1/baseline_DEFAULT_step_13'</com:AnnotationText>
+            </com:Annotation>
           </com:Annotations>
         </str:Code>
         <str:Code id="LED-SSP1">
           <com:Name xml:lang="en">Low Energy Demand/High-with-Low scenario with SSP1 demographics</com:Name>
           <com:Annotations>
             <com:Annotation id="SSP-URN">
-              <com:AnnotationText xml:lang="en">urn:sdmx:org.sdmx.infomodel.codelist.Code=ICONICS:SSP(2024).1</com:AnnotationText>
+              <com:AnnotationText xml:lang="en">'urn:sdmx:org.sdmx.infomodel.codelist.Code=ICONICS:SSP(2024).1'</com:AnnotationText>
             </com:Annotation>
             <com:Annotation id="is-LED-scenario">
               <com:AnnotationText xml:lang="en">True</com:AnnotationText>
             </com:Annotation>
             <com:Annotation id="EDITS-activity-id">
               <com:AnnotationText xml:lang="en">None</com:AnnotationText>
             </com:Annotation>
+            <com:Annotation id="base-scenario-URL">
+              <com:AnnotationText xml:lang="en">'ixmp://ixmp-dev/SSP_SSP1_v1.1/baseline_DEFAULT_step_13'</com:AnnotationText>
+            </com:Annotation>
           </com:Annotations>
         </str:Code>
         <str:Code id="LED-SSP2">
           <com:Name xml:lang="en">Low Energy Demand/High-with-Low scenario with SSP2 demographics</com:Name>
           <com:Annotations>
             <com:Annotation id="SSP-URN">
-              <com:AnnotationText xml:lang="en">urn:sdmx:org.sdmx.infomodel.codelist.Code=ICONICS:SSP(2024).2</com:AnnotationText>
+              <com:AnnotationText xml:lang="en">'urn:sdmx:org.sdmx.infomodel.codelist.Code=ICONICS:SSP(2024).2'</com:AnnotationText>
             </com:Annotation>
             <com:Annotation id="is-LED-scenario">
               <com:AnnotationText xml:lang="en">True</com:AnnotationText>
             </com:Annotation>
             <com:Annotation id="EDITS-activity-id">
               <com:AnnotationText xml:lang="en">None</com:AnnotationText>
             </com:Annotation>
+            <com:Annotation id="base-scenario-URL">
+              <com:AnnotationText xml:lang="en">'ixmp://ixmp-dev/SSP_SSP2_v1.1/baseline_DEFAULT_step_13'</com:AnnotationText>
+            </com:Annotation>
           </com:Annotations>
         </str:Code>
         <str:Code id="EDITS-CA">
           <com:Name xml:lang="en">EDITS scenario with ITF PASTA 'CA' activity</com:Name>
           <com:Annotations>
             <com:Annotation id="SSP-URN">
-              <com:AnnotationText xml:lang="en">urn:sdmx:org.sdmx.infomodel.codelist.Code=ICONICS:SSP(2024).2</com:AnnotationText>
+              <com:AnnotationText xml:lang="en">'urn:sdmx:org.sdmx.infomodel.codelist.Code=ICONICS:SSP(2024).2'</com:AnnotationText>
             </com:Annotation>
             <com:Annotation id="is-LED-scenario">
               <com:AnnotationText xml:lang="en">False</com:AnnotationText>
             </com:Annotation>
             <com:Annotation id="EDITS-activity-id">
               <com:AnnotationText xml:lang="en">'CA'</com:AnnotationText>
             </com:Annotation>
+            <com:Annotation id="base-scenario-URL">
+              <com:AnnotationText xml:lang="en">'ixmp://ixmp-dev/SSP_SSP2_v1.1/baseline_DEFAULT_step_13'</com:AnnotationText>
+            </com:Annotation>
           </com:Annotations>
         </str:Code>
         <str:Code id="EDITS-HA">
           <com:Name xml:lang="en">EDITS scenario with ITF PASTA 'HA' activity</com:Name>
           <com:Annotations>
             <com:Annotation id="SSP-URN">
-              <com:AnnotationText xml:lang="en">urn:sdmx:org.sdmx.infomodel.codelist.Code=ICONICS:SSP(2024).2</com:AnnotationText>
+              <com:AnnotationText xml:lang="en">'urn:sdmx:org.sdmx.infomodel.codelist.Code=ICONICS:SSP(2024).2'</com:AnnotationText>
             </com:Annotation>
             <com:Annotation id="is-LED-scenario">
               <com:AnnotationText xml:lang="en">False</com:AnnotationText>
             </com:Annotation>
             <com:Annotation id="EDITS-activity-id">
               <com:AnnotationText xml:lang="en">'HA'</com:AnnotationText>
             </com:Annotation>
+            <com:Annotation id="base-scenario-URL">
+              <com:AnnotationText xml:lang="en">'ixmp://ixmp-dev/SSP_SSP2_v1.1/baseline_DEFAULT_step_13'</com:AnnotationText>
+            </com:Annotation>
           </com:Annotations>
         </str:Code>
       </str:Codelist>

message_ix_models/data/transport/R12/act-non_ldv.csv

@@ -2,9 +2,22 @@
 #
 # Units: dimensionless
 #
-node,    technology, year, value
-R12_AFR, FCg_bus, 2020, 0.01
-R12_AFR, ICG_bus, 2020, 0.01
-R12_AFR,  FR_ICG, 2020, 0.0001
-R12_AFR,  FR_FCg, 2020, 0.00001
-R12_NAM,  FR_FCg, 2020, 0.001
+node,     technology, year, value
+R12_AFR,  FCg_bus,    2020, 0.01
+R12_AFR,  ICG_bus,    2020, 0.01
+R12_AFR,   FR_ICG,    2020, 0.0001
+R12_AFR,   FR_FCg,    2020, 0.00001
+R12_NAM,   FR_FCg,    2020, 0.001
+# PNK: Added 2024-12-04 to address high methanol use in 2020
+R12_AFR,  conm_ar,    2020, 0.01
+R12_CHN,  conm_ar,    2020, 0.01
+R12_EEU,  conm_ar,    2020, 0.01
+R12_FSU,  conm_ar,    2020, 0.01
+R12_LAM,  conm_ar,    2020, 0.01
+R12_MEA,  conm_ar,    2020, 0.01
+R12_NAM,  conm_ar,    2020, 0.01
+R12_PAO,  conm_ar,    2020, 0.01
+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

message_ix_models/data/transport/R12/config.yaml

@@ -31,39 +31,38 @@ node to census_division:
 
 minimum activity:
   # Source: manually calculated from scale-1.csv for
-  # ixmp://ixmp-dev/MESSAGEix-GLOBIOM 1.1-T-R12 ci nightly/SSP_2024.2 baseline#73
-  # and #76. In those scenarios, all the minimum-activity values were set to 0.01.
-  # The resulting scale factors indicate the mismatch vs. expected energy input per
+  # ixmp://ixmp-dev/MESSAGEix-GLOBIOM 1.1-T-R12 ci nightly/SSP_2024.2 baseline#547
+  # In those scenarios, all the minimum-activity values were set to 0.01. The
+  # resulting scale factors indicate the mismatch vs. expected energy input per
   # IEA EWEB. These values are computed to make those scale factors come out near
   # 1.0.
   # TODO reduce or remove these once technology activities are calibrated directly
-  - [R12_AFR, ROAD, ethanol, 0.0780]
-  - [R12_CHN, RAIL, electr, 2.33]
-  - [R12_CHN, ROAD, ethanol, 5.36]
-  - [R12_CHN, ROAD, gas, 23.1]
-  - [R12_EEU, RAIL, electr, 0.219]
-  - [R12_EEU, ROAD, gas, 0.260]
-  - [R12_FSU, RAIL, electr, 1.42]
-  - [R12_FSU, RAIL, lightoil, 1.833]
-  - [R12_FSU, ROAD, electr, 0.121]
-  - [R12_FSU, ROAD, gas, 3.68]
-  - [R12_LAM, RAIL, electr, 0.102]
-  - [R12_LAM, RAIL, lightoil, 0.615]
-  - [R12_LAM, ROAD, gas, 3.94]
-  - [R12_MEA, RAIL, electr, 0.0566]
-  - [R12_MEA, RAIL, lightoil, 0.0928]
-  - [R12_MEA, ROAD, gas, 6.40]
-  - [R12_NAM, RAIL, electr, 0.111]
-  - [R12_PAO, RAIL, electr, 0.493]
-  - [R12_PAO, ROAD, gas, 0.0861]
-  - [R12_PAS, RAIL, electr, 0.184]
-  - [R12_PAS, ROAD, gas, 2.21]
-  - [R12_RCPA, RAIL, lightoil, 0.00849]
-  - [R12_RCPA, ROAD, gas, 0.0198]
-  - [R12_SAS, RAIL, electr, 0.442]
-  - [R12_SAS, ROAD, gas, 3.643]
-  - [R12_WEU, RAIL, electr, 1.03]
-  - [R12_WEU, ROAD, gas, 1.58]
+  - [R12_AFR,  RAIL,  lightoil, 0.028]
+  - [R12_CHN,  RAIL,  electr,   2.329]
+  - [R12_CHN,  ROAD,  electr,   0.036]
+  - [R12_CHN,  ROAD,  ethanol,  0.073]
+  - [R12_CHN,  ROAD,  gas,      0.292]
+  - [R12_EEU,  RAIL,  electr,   0.210]
+  - [R12_EEU,  ROAD,  gas,      0.020]
+  - [R12_FSU,  RAIL,  electr,   1.553]
+  - [R12_FSU,  RAIL,  lightoil, 0.046]
+  - [R12_FSU,  ROAD,  gas,      0.406]
+  - [R12_LAM,  RAIL,  electr,   0.100]
+  - [R12_LAM,  RAIL,  lightoil, 0.135]
+  - [R12_MEA,  RAIL,  electr,   0.055]
+  - [R12_MEA,  ROAD,  gas,      0.240]
+  - [R12_NAM,  RAIL,  electr,   0.175]
+  - [R12_NAM,  RAIL,  lightoil, 0.500]
+  - [R12_PAO,  RAIL,  electr,   0.492]
+  - [R12_PAO,  ROAD,  ethanol,  0.059]
+  - [R12_PAS,  RAIL,  electr,   0.197]
+  - [R12_PAS,  ROAD,  gas,      0.178]
+  - [R12_RCPA, ROAD,  ethanol,  0.130]
+  - [R12_SAS,  RAIL,  electr,   0.457]
+  - [R12_SAS,  ROAD,  ethanol,  0.070]
+  - [R12_SAS,  ROAD,  gas,      0.057]
+  - [R12_WEU,  RAIL,  electr,   1.168]
+  - [R12_WEU,  ROAD,  gas,      0.049]
 
 share weight convergence:
   # Settings from MESSAGE (V)-Transport

message_ix_models/data/transport/R12/freight-activity.csv

@@ -15,10 +15,10 @@ R12_CHN,  8753.3
 R12_EEU,   388.6
 R12_FSU,   810.4
 R12_LAM,  3100.6
-R12_MEA,  1210.1
+R12_MEA,  1110.1
 R12_NAM,  5148.9
 R12_PAO,   763.1
 R12_PAS,  2800.3
 R12_RCPA,  700.1
 R12_SAS,  1221.9
-R12_WEU,  3497.0
+R12_WEU,  3000

message_ix_models/data/transport/R12/freight-mode-share-ref.csv

@@ -27,9 +27,9 @@ R12_LAM,  RAIL,       0.007
 R12_LAM,  WATER,      0.648
 R12_LAM,  AIR,        0.001
 R12_MEA,  ROAD,       0.965
-R12_MEA,  RAIL,       0.019
+R12_MEA,  RAIL,       0.025
 R12_MEA,  WATER,      0.0
-R12_MEA,  AIR,        0.016
+R12_MEA,  AIR,        0.01
 R12_NAM,  ROAD,       0.590
 R12_NAM,  RAIL,       0.350
 R12_NAM,  WATER,      0.0

message_ix_models/data/transport/R12/mode-share/default.csv

@@ -39,10 +39,10 @@ R12_LAM,  BUS,        0.36
 R12_LAM,  LDV,        0.50
 R12_LAM,  RAIL,       0.01
 R12_MEA,  2W,         0.05
-R12_MEA,  AIR,        0.13
+R12_MEA,  AIR,        0.11
 R12_MEA,  BUS,        0.38
-R12_MEA,  LDV,        0.43
-R12_MEA,  RAIL,       0.01
+R12_MEA,  LDV,        0.445
+R12_MEA,  RAIL,       0.015
 R12_NAM,  2W,         0.005
 R12_NAM,  AIR,        0.12
 R12_NAM,  BUS,        0.06
@@ -64,12 +64,12 @@ R12_RCPA, BUS,        0.30
 R12_RCPA, LDV,        0.16
 R12_RCPA, RAIL,       0.30
 R12_SAS,  2W,         0.24
-R12_SAS,  AIR,        0.07
-R12_SAS,  BUS,        0.33
-R12_SAS,  LDV,        0.20
+R12_SAS,  AIR,        0.04
+R12_SAS,  BUS,        0.34
+R12_SAS,  LDV,        0.22
 R12_SAS,  RAIL,       0.16
 R12_WEU,  2W,         0.02
-R12_WEU,  AIR,        0.11
+R12_WEU,  AIR,        0.09
 R12_WEU,  BUS,        0.07
-R12_WEU,  LDV,        0.70
-R12_WEU,  RAIL,       0.10
+R12_WEU,  LDV,        0.71
+R12_WEU,  RAIL,       0.11