Fixes to calculated_weighted_prices

This commit is contained in:
Koen van Greevenbroek 2024-02-07 10:55:44 +01:00
parent 1f482f3c92
commit c3d3b5f415

View File

@ -492,7 +492,7 @@ def calculate_weighted_prices(n, label, weighted_prices):
else: else:
suffix = " " + carrier suffix = " " + carrier
buses = n.buses.index[n.buses.index.str[2:] == suffix] buses = n.buses.index[n.buses.index.str[5:] == suffix]
if buses.empty: if buses.empty:
continue continue
@ -503,12 +503,14 @@ def calculate_weighted_prices(n, label, weighted_prices):
else n.loads_t.p_set.reindex(buses, axis=1) else n.loads_t.p_set.reindex(buses, axis=1)
) )
for tech in value: for tech in value:
names = n.links.index[n.links.index.to_series().str[-len(tech) :] == tech] names = n.links.index[
n.links.index.to_series().str[-len(tech) - 5 : -5] == tech
]
if names.empty: if names.empty:
continue continue
load += n.links_t.p0[names].T.groupby(n.links.loc[names, "bus0"]).sum() load += n.links_t.p0[names].T.groupby(n.links.loc[names, "bus0"]).sum().T
# Add H2 Store when charging # Add H2 Store when charging
# if carrier == "H2": # if carrier == "H2":
@ -644,7 +646,7 @@ def calculate_co2_emissions(n, label, df):
emitted = n.generators_t.p[gens.index].mul(em_pu) emitted = n.generators_t.p[gens.index].mul(em_pu)
emitted_grouped = ( emitted_grouped = (
emitted.groupby(level=0).sum().T.groupby(n.generators.carrier).sum().T emitted.groupby(level=0).sum().T.groupby(n.generators.carrier).sum()
) )
df = df.reindex(emitted_grouped.index.union(df.index)) df = df.reindex(emitted_grouped.index.union(df.index))