Skip to content

Commit

Permalink
* nemo/scenarios.py (re_plus_ccs): Prefer unpacking operator to list
Browse files Browse the repository at this point in the history
  concatenation.
  (re_plus_fossil): Likewise.
  (re_plus_nuclear): Likewise.
  • Loading branch information
bje- committed Dec 20, 2024
1 parent 4f9365c commit 82dfd48
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions nemo/scenarios.py
Original file line number Diff line number Diff line change
Expand Up @@ -222,24 +222,24 @@ def re_plus_ccs(context):
ccgt = CCGT(WILDCARD, 0)
ccgt_ccs = CCGT_CCS(WILDCARD, 0)
ocgt = OCGT(WILDCARD, 0)
context.generators = [coal, coal_ccs, ccgt, ccgt_ccs] + \
context.generators[:-4] + [ocgt]
context.generators = \
[coal, coal_ccs, ccgt, ccgt_ccs, *context.generators[:-4],
ocgt]


def re_plus_fossil(context):
"""Mostly renewables with some fossil augmentation."""
re100(context)
context.generators = \
[Black_Coal(WILDCARD, 0), CCGT(WILDCARD, 0)] + \
context.generators[:-4] + [OCGT(WILDCARD, 0)]
[Black_Coal(WILDCARD, 0), CCGT(WILDCARD, 0),
*context.generators[:-4], OCGT(WILDCARD, 0)]


def re_plus_nuclear(context):
"""Renewables with nuclear and OCGT peakers."""
re100(context)
context.generators = \
[Nuclear(WILDCARD, 0)] + context.generators + \
[OCGT(WILDCARD, 0)]
[Nuclear(WILDCARD, 0), *context.generators, OCGT(WILDCARD, 0)]


def re100_dsp(context):
Expand Down

0 comments on commit 82dfd48

Please sign in to comment.