fix snapshot bugs
This commit is contained in:
parent
7be8cc0773
commit
a14e751ed8
@ -709,11 +709,16 @@ def base_network(
|
|||||||
transformers = _set_electrical_parameters_transformers(transformers, config)
|
transformers = _set_electrical_parameters_transformers(transformers, config)
|
||||||
links = _set_electrical_parameters_links(links, config, links_p_nom)
|
links = _set_electrical_parameters_links(links, config, links_p_nom)
|
||||||
converters = _set_electrical_parameters_converters(converters, config)
|
converters = _set_electrical_parameters_converters(converters, config)
|
||||||
|
snapshots = {
|
||||||
|
"start":config["snapshots"]["start"],
|
||||||
|
"end":config["snapshots"]["end"],
|
||||||
|
"inclusive":config["snapshots"]["inclusive"],
|
||||||
|
}
|
||||||
|
|
||||||
n = pypsa.Network()
|
n = pypsa.Network()
|
||||||
n.name = "PyPSA-Eur"
|
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.madd("Carrier", ["AC", "DC"])
|
||||||
|
|
||||||
n.import_components_from_dataframe(buses, "Bus")
|
n.import_components_from_dataframe(buses, "Bus")
|
||||||
|
@ -148,8 +148,14 @@ if __name__ == "__main__":
|
|||||||
)
|
)
|
||||||
configure_logging(snakemake)
|
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)
|
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)
|
cutout = atlite.Cutout(snakemake.input.cutout).sel(time=time)
|
||||||
|
|
||||||
da = calculate_line_rating(n, cutout)
|
da = calculate_line_rating(n, cutout)
|
||||||
|
@ -211,6 +211,11 @@ if __name__ == "__main__":
|
|||||||
correction_factor = params.get("correction_factor", 1.0)
|
correction_factor = params.get("correction_factor", 1.0)
|
||||||
capacity_per_sqkm = params["capacity_per_sqkm"]
|
capacity_per_sqkm = params["capacity_per_sqkm"]
|
||||||
p_nom_max_meth = params.get("potential", "conservative")
|
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):
|
if isinstance(params.get("corine", {}), list):
|
||||||
params["corine"] = {"grid_codes": params["corine"]}
|
params["corine"] = {"grid_codes": params["corine"]}
|
||||||
@ -223,7 +228,7 @@ if __name__ == "__main__":
|
|||||||
else:
|
else:
|
||||||
client = None
|
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)
|
cutout = atlite.Cutout(snakemake.input.cutout).sel(time=sns)
|
||||||
regions = gpd.read_file(snakemake.input.regions)
|
regions = gpd.read_file(snakemake.input.regions)
|
||||||
assert not regions.empty, (
|
assert not regions.empty, (
|
||||||
|
Loading…
Reference in New Issue
Block a user