adjust battery efficiency. The efficiency in the technology data is given as round trip efficiency

This commit is contained in:
lisazeyen 2021-05-10 16:55:19 +02:00
parent 42a78262d8
commit 5bfc7a49a6

View File

@ -77,16 +77,28 @@ def attach_storageunits(n, costs):
lookup_dispatch = {"H2": "fuel cell", "battery": "battery inverter"} lookup_dispatch = {"H2": "fuel cell", "battery": "battery inverter"}
for carrier in carriers: for carrier in carriers:
n.madd("StorageUnit", buses_i, ' ' + carrier, if carrier=="battery":
bus=buses_i, n.madd("StorageUnit", buses_i, ' ' + carrier,
carrier=carrier, bus=buses_i,
p_nom_extendable=True, carrier=carrier,
capital_cost=costs.at[carrier, 'capital_cost'], p_nom_extendable=True,
marginal_cost=costs.at[carrier, 'marginal_cost'], capital_cost=costs.at[carrier, 'capital_cost'],
efficiency_store=costs.at[lookup_store[carrier], 'efficiency'], marginal_cost=costs.at[carrier, 'marginal_cost'],
efficiency_dispatch=costs.at[lookup_dispatch[carrier], 'efficiency'], efficiency_store=costs.at[lookup_store[carrier], 'efficiency']**0.5,
max_hours=max_hours[carrier], efficiency_dispatch=costs.at[lookup_dispatch[carrier], 'efficiency']**0.5,
cyclic_state_of_charge=True) max_hours=max_hours[carrier],
cyclic_state_of_charge=True)
else:
n.madd("StorageUnit", buses_i, ' ' + carrier,
bus=buses_i,
carrier=carrier,
p_nom_extendable=True,
capital_cost=costs.at[carrier, 'capital_cost'],
marginal_cost=costs.at[carrier, 'marginal_cost'],
efficiency_store=costs.at[lookup_store[carrier], 'efficiency'],
efficiency_dispatch=costs.at[lookup_dispatch[carrier], 'efficiency'],
max_hours=max_hours[carrier],
cyclic_state_of_charge=True)
def attach_stores(n, costs): def attach_stores(n, costs):
@ -142,7 +154,8 @@ def attach_stores(n, costs):
bus0=buses_i, bus0=buses_i,
bus1=b_buses_i, bus1=b_buses_i,
carrier='battery charger', carrier='battery charger',
efficiency=costs.at['battery inverter', 'efficiency'], # the efficiencies are "round trip efficiencies"
efficiency=costs.at['battery inverter', 'efficiency']**0.5,
capital_cost=costs.at['battery inverter', 'capital_cost'], capital_cost=costs.at['battery inverter', 'capital_cost'],
p_nom_extendable=True, p_nom_extendable=True,
marginal_cost=costs.at["battery inverter", "marginal_cost"]) marginal_cost=costs.at["battery inverter", "marginal_cost"])
@ -151,7 +164,7 @@ def attach_stores(n, costs):
bus0=b_buses_i, bus0=b_buses_i,
bus1=buses_i, bus1=buses_i,
carrier='battery discharger', carrier='battery discharger',
efficiency=costs.at['battery inverter','efficiency'], efficiency=costs.at['battery inverter','efficiency']**0.5,
p_nom_extendable=True, p_nom_extendable=True,
marginal_cost=costs.at["battery inverter", "marginal_cost"]) marginal_cost=costs.at["battery inverter", "marginal_cost"])