From a14e751ed86afc669456cde779c2f82a88cf1230 Mon Sep 17 00:00:00 2001 From: virio-andreyana Date: Fri, 15 Sep 2023 12:16:53 +0200 Subject: [PATCH] fix snapshot bugs --- scripts/base_network.py | 7 ++++++- scripts/build_line_rating.py | 8 +++++++- scripts/build_renewable_profiles.py | 7 ++++++- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/scripts/base_network.py b/scripts/base_network.py index b4ac1d8c..f40b0395 100644 --- a/scripts/base_network.py +++ b/scripts/base_network.py @@ -709,11 +709,16 @@ def base_network( transformers = _set_electrical_parameters_transformers(transformers, config) links = _set_electrical_parameters_links(links, config, links_p_nom) converters = _set_electrical_parameters_converters(converters, config) + snapshots = { + "start":config["snapshots"]["start"], + "end":config["snapshots"]["end"], + "inclusive":config["snapshots"]["inclusive"], + } n = pypsa.Network() n.name = "PyPSA-Eur" - n.set_snapshots(pd.date_range(freq="h", **config["snapshots"])) + n.set_snapshots(pd.date_range(freq="h", **snapshots)) n.madd("Carrier", ["AC", "DC"]) n.import_components_from_dataframe(buses, "Bus") diff --git a/scripts/build_line_rating.py b/scripts/build_line_rating.py index 7f842d43..cf6b56c4 100755 --- a/scripts/build_line_rating.py +++ b/scripts/build_line_rating.py @@ -148,8 +148,14 @@ if __name__ == "__main__": ) configure_logging(snakemake) + snapshots = { + "start":snakemake.config["snapshots"]["start"], + "end":snakemake.config["snapshots"]["end"], + "inclusive":snakemake.config["snapshots"]["inclusive"], + } + n = pypsa.Network(snakemake.input.base_network) - time = pd.date_range(freq="h", **snakemake.config["snapshots"]) + time = pd.date_range(freq="h", **snapshots) cutout = atlite.Cutout(snakemake.input.cutout).sel(time=time) da = calculate_line_rating(n, cutout) diff --git a/scripts/build_renewable_profiles.py b/scripts/build_renewable_profiles.py index 7b08325b..863ba4e4 100644 --- a/scripts/build_renewable_profiles.py +++ b/scripts/build_renewable_profiles.py @@ -211,6 +211,11 @@ if __name__ == "__main__": correction_factor = params.get("correction_factor", 1.0) capacity_per_sqkm = params["capacity_per_sqkm"] p_nom_max_meth = params.get("potential", "conservative") + snapshots = { + "start":snakemake.config["snapshots"]["start"], + "end":snakemake.config["snapshots"]["end"], + "inclusive":snakemake.config["snapshots"]["inclusive"], + } if isinstance(params.get("corine", {}), list): params["corine"] = {"grid_codes": params["corine"]} @@ -223,7 +228,7 @@ if __name__ == "__main__": else: client = None - sns = pd.date_range(freq="h", **snakemake.config["snapshots"]) + sns = pd.date_range(freq="h", **snapshots) cutout = atlite.Cutout(snakemake.input.cutout).sel(time=sns) regions = gpd.read_file(snakemake.input.regions) assert not regions.empty, (