From 02fc334a2e6bd0669babc1d817026c0d0102e702 Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Thu, 14 Mar 2024 18:46:45 +0100 Subject: [PATCH] handle leap days in add_brownfield --- rules/solve_myopic.smk | 1 + scripts/add_brownfield.py | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/rules/solve_myopic.smk b/rules/solve_myopic.smk index 57b8a9d3..eec1aca1 100644 --- a/rules/solve_myopic.smk +++ b/rules/solve_myopic.smk @@ -70,6 +70,7 @@ rule add_brownfield: ), threshold_capacity=config_provider("existing_capacities", " threshold_capacity"), snapshots=config_provider("snapshots"), + drop_leap_day=config_provider("enable", "drop_leap_day"), carriers=config_provider("electricity", "renewable_carriers"), input: unpack(input_profile_tech_brownfield), diff --git a/scripts/add_brownfield.py b/scripts/add_brownfield.py index 1bccf563..c607132c 100644 --- a/scripts/add_brownfield.py +++ b/scripts/add_brownfield.py @@ -14,6 +14,7 @@ import pypsa import xarray as xr from _helpers import ( configure_logging, + get_snapshots set_scenario_config, update_config_from_wildcards, ) @@ -192,7 +193,7 @@ def adjust_renewable_profiles(n, input_profiles, params, year): clustermaps.index = clustermaps.index.astype(str) # temporal clustering - dr = pd.date_range(**params["snapshots"], freq="h") + dr = get_snapshots(params["snapshots"], params["drop_leap_day"]) snapshotmaps = ( pd.Series(dr, index=dr).where(lambda x: x.isin(n.snapshots), pd.NA).ffill() )