Skip to content

fix: changed dsr and demand shedding benchmarking #645

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AndreasHD11 merged 2 commits into from
Apr 22, 2026
Merged

fix: changed dsr and demand shedding benchmarking #645

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
58d6838
fix: changed dsr and demand shedding benchmarking
AndreasHD11 Apr 17, 2026
4093f9d
removing load from capacity benchmark
AndreasHD11 Apr 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion config/benchmarking.default.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,6 @@ benchmarking:
other-non-res-oil-shale: chp and small thermal
other-non-res-oil-shale-old: chp and small thermal
other-non-res-oil-shale-new: chp and small thermal
load: demand shedding
Copy link
Copy Markdown
Member

@tgilon tgilon Apr 20, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This does not remove the load from the benchmark (see the figure in the description, in which load is still present). It only removes the mapping.

OCGT: slack generator

power_generation:
Expand Down
2 changes: 1 addition & 1 deletion scripts/sb/build_statistics.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ def compute_benchmark(
).loc[lambda df: ~df.index.get_level_values("carrier").isin(exclusions)]
elif table == "power_capacity":
grouper = ["carrier"]
exclusions = ["electricity distribution grid", "DC", "DC_OH"]
exclusions = ["electricity distribution grid", "DC", "DC_OH", "load"]
df = (
n.statistics.optimal_capacity(
bus_carrier=elec_bus_carrier,
Expand Down
8 changes: 5 additions & 3 deletions scripts/sb/clean_tyndp_output_benchmark.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,10 @@
"Battery Storage charge (load)": "battery charge (load)",
"Hydrogen CCGT": "hydrogen-ccgt",
"Hydrogen Fuel Cell": "hydrogen-fuel-cell",
"Demand Side Response Explicit": "demand shedding",
"Demand Side Response Implicit": "demand shedding",
# DSR and load shedding
"Demand Side Response Explicit": "dsr",
"Demand Side Response Implicit": "dsr",
"Unserved energy [GWh]": "demand shedding",
# Curtailment/"dump energy"
"Dump energy [GWh]": "dumped energy",
# Hydrogen_demand
Expand Down Expand Up @@ -111,7 +113,7 @@
"power_capacity": ["Yearly Outputs", "Installed Capacities [MW]"],
"power_generation": [
"Yearly Outputs",
["Annual generation [GWh]", "Dump energy [GWh]"],
["Annual generation [GWh]", "Dump energy [GWh]", "Unserved energy [GWh]"],
],
"electricity_demand": [
"Yearly Outputs",
Expand Down
6 changes: 6 additions & 0 deletions scripts/sb/clean_tyndp_report_benchmark.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,12 @@ def clean_data_for_benchmarking(table: str, df: pd.DataFrame) -> pd.DataFrame:
"oil (incl. biofuels)",
)

df = _group_labels(
df,
["demand shedding"],
"dsr",
)

if table == "power_generation":
df = df[df.carrier != "total generation"]

Expand Down
4 changes: 2 additions & 2 deletions scripts/sb/clean_tyndp_vp_data.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@
EU27_MAP = pd.Series(cc.EU27as("ISO2").ISO2.to_list(), index=EU27_COUNTRIES)

CARRIER_MAP = {
"Demand Side Response Explicit": "demand shedding",
"Demand Side Response Explicit": "dsr",
"DRES Solar PV": "solar",
"DRES Wind Off": "wind offshore",
"DRES Wind On": "wind onshore",
"DSR": "demand shedding",
"DSR": "dsr",
"Gas": "methane (incl. biofuels)",
"Gas CCGT": "methane (incl. biofuels)",
"Gas CCGT CCS": "methane (incl. biofuels)",
Expand Down
2 changes: 1 addition & 1 deletion scripts/sb/plot_benchmark.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ def _plot_scenario_comparison(
fig, ax = plt.subplots(figsize=(FIGURE_WIDTH_DEFAULT, FIGURE_HEIGHT_DEFAULT))

bar_colors = [bench_colors.get(col, "grey") for col in idx]
df[idx].plot.bar(
df[idx].clip(lower=0).plot.bar(
ax=ax,
color=bar_colors,
width=0.7,
Expand Down
Loading