Adjust units, order of LED PDT per capita

- Set up full calculation first, then replace/truncate.
- Add a test case and expand checks.
- Relax expectation that .transport.Config.project(navigate=…) is present.

Author: khaeru

message_ix_models/data/transport/R12/pdt-cap.csv

@@ -1,6 +1,6 @@
 # Projected passenger-distance travelled (PDT) per capita
 #
-# Units: km / passenger
+# Units: km / year
 #
 scenario, node,     technology, year, value
 LED,      R12_AFR,  2W,         2020,   360

message_ix_models/model/transport/demand.py

@@ -316,14 +316,22 @@ def prepare_computer(c: Computer) -> None:
 
     config: "Config" = c.graph["context"].transport
 
-    if config.project.get("LED", False):
-        # Select from the file input
-        c.add(pdt_cap, "select", exo.pdt_cap_proj, indexers=dict(scenario="LED"))
-    else:
-        c.apply(pdt_per_capita)
+    # Compute total PDT per capita
+    c.apply(pdt_per_capita)
 
     # Insert a scaling factor that varies according to SSP setting
     c.apply(factor.insert, pdt_cap, name="pdt non-active", target=pdt_cap + "adj")
 
+    # Add other tasks for demand calculation
     c.add_queue(TASKS)
+
+    if config.project.get("LED", False):
+        # Replace certain calculations for LED projected activity
+
+        # Select data from input file: projected PDT per capita
+        c.add(pdt_cap * "t", "select", exo.pdt_cap_proj, indexers=dict(scenario="LED"))
+
+        # Multiply by population for the total
+        c.add(pdt_nyt + "0", "mul", pdt_cap * "t", pop)
+
     c.add("transport_data", __name__, key="transport demand::ixmp")

message_ix_models/model/transport/files.py

@@ -329,7 +329,7 @@ def read_structures() -> "sdmx.message.StructureMessage":
     key="P activity:scenario-n-t-y:exo",
     path="pdt-cap",
     name="Projected passenger-distance travelled (PDT) per capita",
-    units="km / passenger / year",
+    units="km / year",
     required=False,
 )
 

message_ix_models/model/transport/operator.py

@@ -493,7 +493,7 @@ def factor_fv(n: list[str], y: list[int], config: dict) -> "AnyQuantity":
     df.iloc[0, :] = 1.0
 
     # NAVIGATE T3.5 "act" demand-side scenario
-    if T35_POLICY.ACT & config["transport"].project["navigate"]:
+    if T35_POLICY.ACT & config["transport"].project.get("navigate", T35_POLICY.REF):
         years = list(filter(lambda y: y <= 2050, y))
         df.loc[years, "value"] = np.interp(years, [y[0], 2050], [1.0, 0.865])
 
@@ -540,7 +540,7 @@ def _not_disutility(tech):
     df.iloc[0, :] = 1.0
 
     # NAVIGATE T3.5 "tec" demand-side scenario
-    if T35_POLICY.TEC & config["transport"].project["navigate"]:
+    if T35_POLICY.TEC & config["transport"].project.get("navigate", T35_POLICY.REF):
         years = list(filter(partial(gt, 2050), df.index))
 
         # Prepare a dictionary mapping technologies to their respective EI improvement
@@ -586,7 +586,7 @@ def factor_pdt(n: list[str], y: list[int], t: list[str], config: dict) -> "AnyQu
     df.iloc[0, :] = 1.0
 
     # Handle particular scenarios
-    if T35_POLICY.ACT & config["transport"].project["navigate"]:
+    if T35_POLICY.ACT & config["transport"].project.get("navigate", T35_POLICY.REF):
         # NAVIGATE T3.5 "act" demand-side scenario
         years = list(filter(lambda y: y <= 2050, y))
         df.loc[years, "LDV"] = np.interp(years, [y[0], 2050], [1.0, 0.8])

message_ix_models/tests/model/transport/test_build.py

@@ -232,8 +232,7 @@ def test_build_existing(tmp_path, test_context, url, solve=False):
     "votm:n-y": (HasUnits(""),),
     key.price.base: (HasUnits("USD / km"),),
     "cost:n-y-c-t": (HasUnits("USD / km"),),
-    # These units are implied by the test of "transport pdt:*":
-    # "transport pdt:n-y:total" [=] Mm / year
+    demand.pdt_nyt + "0": (HasUnits("passenger km / year"),),
     demand.pdt_nyt + "1": (HasUnits("passenger km / year"),),
     demand.ldv_ny + "total": (HasUnits("Gp km / a"),),
     # FIXME Handle dimensionality instead of exact units
@@ -292,6 +291,7 @@ def test_build_existing(tmp_path, test_context, url, solve=False):
         dict(regions="R11", years="B", options=dict(futures_scenario="debug")),
         dict(regions="R12", years="B"),
         dict(regions="R12", years="B", options=dict(navigate_scenario="act+ele+tec")),
+        dict(regions="R12", years="B", options=dict(project={"LED": True})),
         param(dict(regions="R14", years="B"), marks=MARK[9]),
         param(dict(regions="ISR", years="A"), marks=MARK[3]),
     ),
@@ -320,8 +320,10 @@ def test_debug(
     k = "test_debug"
     result = insert_checks(c, k, CHECKS, common)
 
+    # Show and get a different key
+    # k = key.pdt_cny
+
     # Show what will be computed
-    # k = "pdt:n-y:capita+adj+ssp factor"
     if verbosity:
         print(c.describe(k))