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

handle leap days in temporal clustering

Browse Source
This commit is contained in:
Fabian Neumann 2024-03-14 15:38:36 +01:00
parent a5d0f07fe1
commit 57b487f163
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
rules/build_electricity.smk
View File

@ -588,6 +588,7 @@ rule prepare_network:
costs=config_provider("costs"), costs=config_provider("costs"),
adjustments=config_provider("adjustments", "electricity"), adjustments=config_provider("adjustments", "electricity"),
autarky=config_provider("electricity", "autarky", default={}), autarky=config_provider("electricity", "autarky", default={}),
drop_leap_day=config_provider("enable", "drop_leap_day"),
input: input:
resources("networks/elec_s{simpl}_{clusters}_ec.nc"), resources("networks/elec_s{simpl}_{clusters}_ec.nc"),
tech_costs=lambda w: resources( tech_costs=lambda w: resources(

3
scripts/prepare_network.py
View File

@ -204,6 +204,9 @@ def average_every_nhours(n, offset):
m = n.copy(with_time=False) m = n.copy(with_time=False)
snapshot_weightings = n.snapshot_weightings.resample(offset).sum() snapshot_weightings = n.snapshot_weightings.resample(offset).sum()
sns = snapshot_weightings.index
if snakemake.params.drop_leap_days:
sns = sns[~((sns.month == 2) & (sns.day == 29))]
m.set_snapshots(snapshot_weightings.index) m.set_snapshots(snapshot_weightings.index)
m.snapshot_weightings = snapshot_weightings m.snapshot_weightings = snapshot_weightings

7
scripts/prepare_sector_network.py
View File

@ -812,6 +812,10 @@ def average_every_nhours(n, offset):
m = n.copy(with_time=False) m = n.copy(with_time=False)
snapshot_weightings = n.snapshot_weightings.resample(offset).sum() snapshot_weightings = n.snapshot_weightings.resample(offset).sum()
sns = snapshot_weightings.index
if snakemake.params.drop_leap_days:
sns = sns[~((sns.month == 2) & (sns.day == 29))]
snapshot_weightings = snapshot_weightings.loc[sns]
m.set_snapshots(snapshot_weightings.index) m.set_snapshots(snapshot_weightings.index)
m.snapshot_weightings = snapshot_weightings m.snapshot_weightings = snapshot_weightings
@ -3660,8 +3664,7 @@ if __name__ == "__main__":
solver_name = snakemake.config["solving"]["solver"]["name"] solver_name = snakemake.config["solving"]["solver"]["name"]
resolution = snakemake.params.time_resolution resolution = snakemake.params.time_resolution
drop_leap_day = snakemake.params.drop_leap_day n = set_temporal_aggregation(n, resolution, solver_name)
n = set_temporal_aggregation(n, resolution, solver_name, drop_leap_day)
co2_budget = snakemake.params.co2_budget co2_budget = snakemake.params.co2_budget
if isinstance(co2_budget, str) and co2_budget.startswith("cb"): if isinstance(co2_budget, str) and co2_budget.startswith("cb"):