bjoern/pypsa-eur
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' into duplicate-labels-H2-storage

Browse Source
This commit is contained in:
Fabian Hofmann 2024-01-17 22:21:40 +01:00 committed by GitHub
commit 2a82afb154
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
scripts/make_summary.py
View File

@ -521,9 +521,7 @@ def calculate_weighted_prices(n, label, weighted_prices):
if not names.empty:
load += (
n.links_t.p0[names]
.groupby(n.links.loc[names, "bus0"], axis=1)
.sum()
n.links_t.p0[names].T.groupby(n.links.loc[names, "bus0"]).sum().T
)
# Add H2 Store when charging
@ -563,11 +561,10 @@ def calculate_market_values(n, label, market_values):
dispatch = (
n.generators_t.p[gens]
.groupby(n.generators.loc[gens, "bus"], axis=1)
.T.groupby(n.generators.loc[gens, "bus"])
.sum()
.reindex(columns=buses, fill_value=0.0)
.T.reindex(columns=buses, fill_value=0.0)
)
revenue = dispatch * n.buses_t.marginal_price[buses]
market_values.at[tech, label] = revenue.sum().sum() / dispatch.sum().sum()
@ -586,9 +583,9 @@ def calculate_market_values(n, label, market_values):
dispatch = (
n.links_t["p" + i][links]
.groupby(n.links.loc[links, "bus" + i], axis=1)
.T.groupby(n.links.loc[links, "bus" + i])
.sum()
.reindex(columns=buses, fill_value=0.0)
.T.reindex(columns=buses, fill_value=0.0)
)
revenue = dispatch * n.buses_t.marginal_price[buses]

8
scripts/plot_summary.py
View File

@ -154,7 +154,7 @@ def plot_costs():
df = df.drop(to_drop)
logger.info(f"Total system cost of {round(df.sum()[0])} EUR billion per year")
logger.info(f"Total system cost of {round(df.sum().iloc[0])} EUR billion per year")
new_index = preferred_order.intersection(df.index).append(
df.index.difference(preferred_order)
@ -214,7 +214,7 @@ def plot_energy():
df = df.drop(to_drop)
logger.info(f"Total energy of {round(df.sum()[0])} TWh/a")
logger.info(f"Total energy of {round(df.sum().iloc[0])} TWh/a")
if df.empty:
fig, ax = plt.subplots(figsize=(12, 8))
@ -304,7 +304,9 @@ def plot_balances():
df = df.drop(to_drop)
logger.debug(f"Total energy balance for {v} of {round(df.sum()[0],2)} {units}")
logger.debug(
f"Total energy balance for {v} of {round(df.sum().iloc[0],2)} {units}"
)
if df.empty:
continue