From 3d2e02d3bb8d0baebc8196bae3b9d09325b9263c Mon Sep 17 00:00:00 2001
From: Paul Natsuo Kishimoto <mail@paul.kishimoto.name>
Date: Mon, 18 Nov 2024 04:03:50 +0100
Subject: [PATCH] Update data/sdmx/transport-in.xml

---
 message_ix_models/data/sdmx/transport-in.xml | 106 +++++++++++++++++--
 1 file changed, 100 insertions(+), 6 deletions(-)

diff --git a/message_ix_models/data/sdmx/transport-in.xml b/message_ix_models/data/sdmx/transport-in.xml
index cfd944c714..e3b1486137 100644
--- a/message_ix_models/data/sdmx/transport-in.xml
+++ b/message_ix_models/data/sdmx/transport-in.xml
@@ -2,7 +2,7 @@
 <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: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-08-20T16:39:50.850977</mes:Prepared>
+    <mes:Prepared>2024-10-02T14:37:46.206365</mes:Prepared>
     <mes:Source xml:lang="en">Generated by message_ix_models 2024.4.23.dev2473+gd12ad74b9.d20240806</mes:Source>
   </mes:Header>
   <mes:Structures>
@@ -157,6 +157,31 @@ Input data for MESSAGEix-Transport.</com:Description>
           <Ref id="DS_FUEL-EMI-INTENSITY" version="2024.4.23" agencyID="IIASA_ECE" package="datastructure" class="DataStructure"/>
         </str:Structure>
       </str:Dataflow>
+      <str:Dataflow version="2024.4.23" isExternalReference="false" isFinal="false" agencyID="IIASA_ECE" id="DF_LIFETIME" urn="urn:sdmx:org.sdmx.infomodel.datastructure.DataflowDefinition=IIASA_ECE:DF_LIFETIME(2024.4.23)">
+        <com:Name xml:lang="en">Technical lifetime (maximum age) of LDVs</com:Name>
+        <com:Description xml:lang="en">Values are filled forwards. In MESSAGE(V)-Transport, this quantity
+had the additional dimension of driver_type, and values were 20 years for
+driver_type='average', 15 y for 'moderate', and 10 y for 'frequent'.
+
+Input data for MESSAGEix-Transport.</com:Description>
+        <com:Annotations>
+          <com:Annotation id="required-for-build">
+            <com:AnnotationText xml:lang="en">True</com:AnnotationText>
+          </com:Annotation>
+          <com:Annotation id="preferred-units">
+            <com:AnnotationText xml:lang="en">year</com:AnnotationText>
+          </com:Annotation>
+          <com:Annotation id="genno-key">
+            <com:AnnotationText xml:lang="en">lifetime:nl-yv:ldv+exo</com:AnnotationText>
+          </com:Annotation>
+          <com:Annotation id="file-path">
+            <com:AnnotationText xml:lang="en">lifetime-ldv.csv</com:AnnotationText>
+          </com:Annotation>
+        </com:Annotations>
+        <str:Structure>
+          <Ref id="DS_LIFETIME" version="2024.4.23" agencyID="IIASA_ECE" package="datastructure" class="DataStructure"/>
+        </str:Structure>
+      </str:Dataflow>
       <str:Dataflow version="2024.4.23" isExternalReference="false" isFinal="false" agencyID="IIASA_ECE" id="DF_FREIGHT_MODE_SHARE" urn="urn:sdmx:org.sdmx.infomodel.datastructure.DataflowDefinition=IIASA_ECE:DF_FREIGHT_MODE_SHARE(2024.4.23)">
         <com:Name xml:lang="en">Mode shares of freight activity in the model base period</com:Name>
         <com:Description xml:lang="en">Input data for MESSAGEix-Transport.</com:Description>
@@ -439,7 +464,7 @@ Input data for MESSAGEix-Transport.</com:Description>
       </str:Dataflow>
       <str:Dataflow version="2024.4.23" isExternalReference="false" isFinal="false" agencyID="IIASA_ECE" id="DF_TECH_SHARE" urn="urn:sdmx:org.sdmx.infomodel.datastructure.DataflowDefinition=IIASA_ECE:DF_TECH_SHARE(2024.4.23)">
         <com:Name xml:lang="en">Share of total stock for LDV technologies</com:Name>
-        <com:Description xml:lang="en">- Values must sum to 1.
+        <com:Description xml:lang="en">- Values must sum to 1 across the 't' dimension.
 - Technology codes annotated "historical-only: True" (e.g. ICE_L_ptrp) must be omitted
   or have zero values. If not, incompatible/infeasible constraint values are created.
 
@@ -452,7 +477,7 @@ Input data for MESSAGEix-Transport.</com:Description>
             <com:AnnotationText xml:lang="en">dimensionless</com:AnnotationText>
           </com:Annotation>
           <com:Annotation id="genno-key">
-            <com:AnnotationText xml:lang="en">tech share:t:ldv+exo</com:AnnotationText>
+            <com:AnnotationText xml:lang="en">tech share:n-t:ldv+exo</com:AnnotationText>
           </com:Annotation>
           <com:Annotation id="file-path">
             <com:AnnotationText xml:lang="en">ldv-t-share.csv</com:AnnotationText>
@@ -462,6 +487,27 @@ Input data for MESSAGEix-Transport.</com:Description>
           <Ref id="DS_TECH_SHARE" version="2024.4.23" agencyID="IIASA_ECE" package="datastructure" class="DataStructure"/>
         </str:Structure>
       </str:Dataflow>
+      <str:Dataflow version="2024.4.23" isExternalReference="false" isFinal="false" agencyID="IIASA_ECE" id="DF_ACTIVITY" urn="urn:sdmx:org.sdmx.infomodel.datastructure.DataflowDefinition=IIASA_ECE:DF_ACTIVITY(2024.4.23)">
+        <com:Name xml:lang="en">Fixed activity of non-LDV technologies.</com:Name>
+        <com:Description xml:lang="en">Input data for MESSAGEix-Transport.</com:Description>
+        <com:Annotations>
+          <com:Annotation id="required-for-build">
+            <com:AnnotationText xml:lang="en">True</com:AnnotationText>
+          </com:Annotation>
+          <com:Annotation id="preferred-units">
+            <com:AnnotationText xml:lang="en">dimensionless</com:AnnotationText>
+          </com:Annotation>
+          <com:Annotation id="genno-key">
+            <com:AnnotationText xml:lang="en">activity:n-t-y:non-ldv+exo</com:AnnotationText>
+          </com:Annotation>
+          <com:Annotation id="file-path">
+            <com:AnnotationText xml:lang="en">act-non_ldv.csv</com:AnnotationText>
+          </com:Annotation>
+        </com:Annotations>
+        <str:Structure>
+          <Ref id="DS_ACTIVITY" version="2024.4.23" agencyID="IIASA_ECE" package="datastructure" class="DataStructure"/>
+        </str:Structure>
+      </str:Dataflow>
       <str:Dataflow version="2024.4.23" isExternalReference="false" isFinal="false" agencyID="IIASA_ECE" id="DF_LOAD_FACTOR_LDV" urn="urn:sdmx:org.sdmx.infomodel.datastructure.DataflowDefinition=IIASA_ECE:DF_LOAD_FACTOR_LDV(2024.4.23)">
         <com:Name xml:lang="en">Load factor (occupancy) of LDVs</com:Name>
         <com:Description xml:lang="en">Units are implicity passengers per vehicle.
@@ -691,13 +737,13 @@ Input data for MESSAGEix-Transport.</com:Description>
         <str:Concept id="YEAR"/>
         <str:Concept id="COMMODITY"/>
         <str:Concept id="EMISSION"/>
+        <str:Concept id="NODE_LOC"/>
+        <str:Concept id="YEAR_VTG"/>
         <str:Concept id="SOURCE"/>
         <str:Concept id="TIME"/>
         <str:Concept id="VEHICLE_CLASS"/>
         <str:Concept id="SCENARIO"/>
-        <str:Concept id="NODE_LOC"/>
         <str:Concept id="MODE"/>
-        <str:Concept id="YEAR_VTG"/>
         <str:Concept id="ATTITUDE"/>
         <str:Concept id="CENSUS_DIVISION"/>
         <str:Concept id="AREA_TYPE"/>
@@ -833,6 +879,25 @@ Input data for MESSAGEix-Transport.</com:Description>
           <str:MeasureList id=""/>
         </str:DataStructureComponents>
       </str:DataStructure>
+      <str:DataStructure version="2024.4.23" isExternalReference="false" isFinal="false" agencyID="IIASA_ECE" id="DS_LIFETIME" urn="urn:sdmx:org.sdmx.infomodel.datastructure.DataStructureDefinition=IIASA_ECE:DS_LIFETIME(2024.4.23)">
+        <com:Name xml:lang="en">Structure of DF_LIFETIME</com:Name>
+        <str:DataStructureComponents>
+          <str:DimensionList id="">
+            <str:Dimension position="1" id="NODE_LOC">
+              <str:ConceptIdentity>
+                <Ref id="NODE_LOC" maintainableParentVersion="2024.4.23" maintainableParentID="CS_MESSAGE_TRANSPORT" agencyID="IIASA_ECE" package="conceptscheme" class="Concept"/>
+              </str:ConceptIdentity>
+            </str:Dimension>
+            <str:Dimension position="2" id="YEAR_VTG">
+              <str:ConceptIdentity>
+                <Ref id="YEAR_VTG" maintainableParentVersion="2024.4.23" maintainableParentID="CS_MESSAGE_TRANSPORT" agencyID="IIASA_ECE" package="conceptscheme" class="Concept"/>
+              </str:ConceptIdentity>
+            </str:Dimension>
+          </str:DimensionList>
+          <str:AttributeList id=""/>
+          <str:MeasureList id=""/>
+        </str:DataStructureComponents>
+      </str:DataStructure>
       <str:DataStructure version="2024.4.23" isExternalReference="false" isFinal="false" agencyID="IIASA_ECE" id="DS_FREIGHT_MODE_SHARE" urn="urn:sdmx:org.sdmx.infomodel.datastructure.DataStructureDefinition=IIASA_ECE:DS_FREIGHT_MODE_SHARE(2024.4.23)">
         <com:Name xml:lang="en">Structure of DF_FREIGHT_MODE_SHARE</com:Name>
         <str:DataStructureComponents>
@@ -1159,7 +1224,12 @@ Input data for MESSAGEix-Transport.</com:Description>
         <com:Name xml:lang="en">Structure of DF_TECH_SHARE</com:Name>
         <str:DataStructureComponents>
           <str:DimensionList id="">
-            <str:Dimension position="1" id="TECHNOLOGY">
+            <str:Dimension position="1" id="NODE">
+              <str:ConceptIdentity>
+                <Ref id="NODE" maintainableParentVersion="2024.4.23" maintainableParentID="CS_MESSAGE_TRANSPORT" agencyID="IIASA_ECE" package="conceptscheme" class="Concept"/>
+              </str:ConceptIdentity>
+            </str:Dimension>
+            <str:Dimension position="2" id="TECHNOLOGY">
               <str:ConceptIdentity>
                 <Ref id="TECHNOLOGY" maintainableParentVersion="2024.4.23" maintainableParentID="CS_MESSAGE_TRANSPORT" agencyID="IIASA_ECE" package="conceptscheme" class="Concept"/>
               </str:ConceptIdentity>
@@ -1169,6 +1239,30 @@ Input data for MESSAGEix-Transport.</com:Description>
           <str:MeasureList id=""/>
         </str:DataStructureComponents>
       </str:DataStructure>
+      <str:DataStructure version="2024.4.23" isExternalReference="false" isFinal="false" agencyID="IIASA_ECE" id="DS_ACTIVITY" urn="urn:sdmx:org.sdmx.infomodel.datastructure.DataStructureDefinition=IIASA_ECE:DS_ACTIVITY(2024.4.23)">
+        <com:Name xml:lang="en">Structure of DF_ACTIVITY</com:Name>
+        <str:DataStructureComponents>
+          <str:DimensionList id="">
+            <str:Dimension position="1" id="NODE">
+              <str:ConceptIdentity>
+                <Ref id="NODE" maintainableParentVersion="2024.4.23" maintainableParentID="CS_MESSAGE_TRANSPORT" agencyID="IIASA_ECE" package="conceptscheme" class="Concept"/>
+              </str:ConceptIdentity>
+            </str:Dimension>
+            <str:Dimension position="2" id="TECHNOLOGY">
+              <str:ConceptIdentity>
+                <Ref id="TECHNOLOGY" maintainableParentVersion="2024.4.23" maintainableParentID="CS_MESSAGE_TRANSPORT" agencyID="IIASA_ECE" package="conceptscheme" class="Concept"/>
+              </str:ConceptIdentity>
+            </str:Dimension>
+            <str:Dimension position="3" id="YEAR">
+              <str:ConceptIdentity>
+                <Ref id="YEAR" maintainableParentVersion="2024.4.23" maintainableParentID="CS_MESSAGE_TRANSPORT" agencyID="IIASA_ECE" package="conceptscheme" class="Concept"/>
+              </str:ConceptIdentity>
+            </str:Dimension>
+          </str:DimensionList>
+          <str:AttributeList id=""/>
+          <str:MeasureList id=""/>
+        </str:DataStructureComponents>
+      </str:DataStructure>
       <str:DataStructure version="2024.4.23" isExternalReference="false" isFinal="false" agencyID="IIASA_ECE" id="DS_LOAD_FACTOR_LDV" urn="urn:sdmx:org.sdmx.infomodel.datastructure.DataStructureDefinition=IIASA_ECE:DS_LOAD_FACTOR_LDV(2024.4.23)">
         <com:Name xml:lang="en">Structure of DF_LOAD_FACTOR_LDV</com:Name>
         <str:DataStructureComponents>