diff --git a/config/benchmarking.default.yaml b/config/benchmarking.default.yaml index 5e66317960..0937ca5117 100644 --- a/config/benchmarking.default.yaml +++ b/config/benchmarking.default.yaml @@ -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 OCGT: slack generator power_generation: diff --git a/scripts/sb/build_statistics.py b/scripts/sb/build_statistics.py index d8ad89673d..800d3778af 100644 --- a/scripts/sb/build_statistics.py +++ b/scripts/sb/build_statistics.py @@ -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, diff --git a/scripts/sb/clean_tyndp_output_benchmark.py b/scripts/sb/clean_tyndp_output_benchmark.py index 67d077c30f..647de6812f 100644 --- a/scripts/sb/clean_tyndp_output_benchmark.py +++ b/scripts/sb/clean_tyndp_output_benchmark.py @@ -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 @@ -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", diff --git a/scripts/sb/clean_tyndp_report_benchmark.py b/scripts/sb/clean_tyndp_report_benchmark.py index b00bc4220e..6f02cbe9a6 100644 --- a/scripts/sb/clean_tyndp_report_benchmark.py +++ b/scripts/sb/clean_tyndp_report_benchmark.py @@ -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"] diff --git a/scripts/sb/clean_tyndp_vp_data.py b/scripts/sb/clean_tyndp_vp_data.py index b4af3341d3..52c669378d 100644 --- a/scripts/sb/clean_tyndp_vp_data.py +++ b/scripts/sb/clean_tyndp_vp_data.py @@ -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)", diff --git a/scripts/sb/plot_benchmark.py b/scripts/sb/plot_benchmark.py index 1e920fe4de..ba0dac05cc 100644 --- a/scripts/sb/plot_benchmark.py +++ b/scripts/sb/plot_benchmark.py @@ -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,