maybe_adjust_cost_and_potentials: cover all flags
This commit is contained in:
parent
799ed06940
commit
725a0ef8c0
@ -3346,7 +3346,7 @@ def remove_h2_network(n):
|
|||||||
|
|
||||||
def maybe_adjust_costs_and_potentials(n, opts):
|
def maybe_adjust_costs_and_potentials(n, opts):
|
||||||
for o in opts:
|
for o in opts:
|
||||||
flags = ["+e", "+p", "+m"]
|
flags = ["+e", "+p", "+m", "+c"]
|
||||||
if all(flag not in o for flag in flags):
|
if all(flag not in o for flag in flags):
|
||||||
continue
|
continue
|
||||||
oo = o.split("+")
|
oo = o.split("+")
|
||||||
@ -3361,7 +3361,12 @@ def maybe_adjust_costs_and_potentials(n, opts):
|
|||||||
suptechs = map(lambda c: c.split("-", 2)[0], carrier_list)
|
suptechs = map(lambda c: c.split("-", 2)[0], carrier_list)
|
||||||
if oo[0].startswith(tuple(suptechs)):
|
if oo[0].startswith(tuple(suptechs)):
|
||||||
carrier = oo[0]
|
carrier = oo[0]
|
||||||
attr_lookup = {"p": "p_nom_max", "e": "e_nom_max", "c": "capital_cost"}
|
attr_lookup = {
|
||||||
|
"p": "p_nom_max",
|
||||||
|
"e": "e_nom_max",
|
||||||
|
"c": "capital_cost",
|
||||||
|
"m": "marginal_cost",
|
||||||
|
}
|
||||||
attr = attr_lookup[oo[1][0]]
|
attr = attr_lookup[oo[1][0]]
|
||||||
factor = float(oo[1][1:])
|
factor = float(oo[1][1:])
|
||||||
# beware if factor is 0 and p_nom_max is np.inf, 0*np.inf is nan
|
# beware if factor is 0 and p_nom_max is np.inf, 0*np.inf is nan
|
||||||
|
Loading…
Reference in New Issue
Block a user