Skip to content
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

Remove sector_opts and duplicated CHP plants #1328

Merged
merged 5 commits into from
Sep 26, 2024
Merged

Remove sector_opts and duplicated CHP plants #1328

Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ba41f4d
remove sector_opts; drop german chp plants from ppm
cpschau Sep 24, 2024
ea604a3
use options variable
cpschau Sep 24, 2024
3070212
apply filter only when german_chp.csv is present
lindnemi Sep 26, 2024
ce49251
Merge branch 'ariadne2' into remove_sector_opts
lindnemi Sep 26, 2024
5b8b8d9
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Sep 26, 2024
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
20 changes: 9 additions & 11 deletions scripts/add_existing_baseyear.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,12 +161,9 @@ def add_power_capacities_installed_before_baseyear(n, grouping_years, costs, bas

# If heat is considered, add CHPs in the add_heating_capacities function.
# Assume that all oil power plants are not CHPs.
if "H" in snakemake.wildcards.sector_opts.split("-"):
if options["heating"]:
df_agg = df_agg.query("Set != 'CHP'")
elif (
"I" not in snakemake.wildcards.sector_opts.split("-")
and "Industry" in df_agg.columns
):
elif not options["industry"] and "Industry" in df_agg.columns:
df_agg["Industry"].fillna(False, inplace=True)
df_agg.query("not Industry", inplace=True)

Expand Down Expand Up @@ -492,6 +489,7 @@ def add_chp_plants(n, grouping_years, costs, baseyear, clustermaps):
ppl = pd.read_csv(snakemake.input.powerplants, index_col=0)

if snakemake.input.get("custom_powerplants"):
ppl = ppl.query("~(Set == 'CHP' and Country == 'DE')")
lindnemi marked this conversation as resolved.
Show resolved Hide resolved
ppl = add_custom_powerplants(ppl, snakemake.input.custom_powerplants, True)

# drop assets which are already phased out / decommissioned
Expand All @@ -517,7 +515,7 @@ def add_chp_plants(n, grouping_years, costs, baseyear, clustermaps):

# check if the CHPs were read in from MaStR for Germany
if "Capacity_thermal" in chp.columns:
if "I" not in snakemake.wildcards.sector_opts.split("-"):
if not options["industry"]:
chp.query("Industry == False", inplace=True)

thermal_capacity_b = ~chp.Capacity_thermal.isna()
Expand Down Expand Up @@ -1054,13 +1052,13 @@ def set_defaults(n):

snakemake = mock_snakemake(
"add_existing_baseyear",
configfiles="config/test/config.myopic.yaml",
simpl="",
clusters="5",
ll="v1.5",
clusters=27,
opts="",
sector_opts="",
planning_horizons=2030,
ll="vopt",
sector_opts="none",
planning_horizons="2020",
run="KN2045_Bal_v4",
)

configure_logging(snakemake)
Expand Down