|
20 | 20 | from message_ix_models.util.graphviz import HAS_GRAPHVIZ
|
21 | 21 |
|
22 | 22 | from . import Config
|
| 23 | +from .operator import indexer_scenario |
23 | 24 | from .structure import get_technology_groups
|
24 | 25 |
|
25 | 26 | if TYPE_CHECKING:
|
@@ -291,6 +292,8 @@ def add_exogenous_data(c: Computer, info: ScenarioInfo) -> None:
|
291 | 292 | ("groups::iea to transport", itemgetter(0), "groups::iea eweb"),
|
292 | 293 | ("groups::transport to iea", itemgetter(1), "groups::iea eweb"),
|
293 | 294 | ("indexers::iea to transport", itemgetter(2), "groups::iea eweb"),
|
| 295 | + ("indexers:scenario", partial(indexer_scenario, with_LED=False), "config"), |
| 296 | + ("indexers:scenario:LED", partial(indexer_scenario, with_LED=True), "config"), |
294 | 297 | ("n::ex world", "nodes_ex_world", "n"),
|
295 | 298 | (
|
296 | 299 | "n:n:ex world",
|
@@ -395,14 +398,12 @@ def add_structure(c: Computer) -> None:
|
395 | 398 | # - `Static` tasks
|
396 | 399 | # - Single 'dynamic' tasks based on config, info, spec, and/or t_groups
|
397 | 400 | # - Multiple static and dynamic tasks generated in loops etc.
|
398 |
| - tasks = list(STRUCTURE_STATIC) + [ |
| 401 | + tasks: list[tuple] = list(STRUCTURE_STATIC) + [ |
399 | 402 | ("c::transport", quote(spec.add.set["commodity"])),
|
400 | 403 | ("c::transport+base", quote(spec.add.set["commodity"] + info.set["commodity"])),
|
401 | 404 | ("cg", quote(spec.add.set["consumer_group"])),
|
402 | 405 | ("indexers:cg", spec.add.set["consumer_group indexers"]),
|
403 | 406 | ("nodes", quote(info.set["node"])),
|
404 |
| - # TODO Use "LED" where appropriate |
405 |
| - ("indexers:scenario", quote(dict(scenario=repr(config.ssp).split(":")[1]))), |
406 | 407 | ("t::transport", quote(spec.add.set["technology"])),
|
407 | 408 | ("t::transport agg", quote(dict(t=t_groups))),
|
408 | 409 | ("t::transport all", quote(dict(t=spec.add.set["technology"]))),
|
|
0 commit comments