Correct formatting in build_electricity.smk

This commit is contained in:
Koen van Greevenbroek 2024-03-01 15:26:16 +01:00
parent 0c7c0a8585
commit 61d565ec09

View File

@ -428,7 +428,7 @@ rule build_line_rating:
def input_profile_tech(w): def input_profile_tech(w):
return { return {
f"profile_{tech}": resources(f"profile{weather_year}_{tech}.nc") f"profile_{tech}": resources(f"profile{{weather_year}}_{tech}.nc")
for tech in config_provider("electricity", "renewable_carriers")(w) for tech in config_provider("electricity", "renewable_carriers")(w)
} }
@ -463,7 +463,7 @@ rule add_electricity:
else resources("networks/base.nc") else resources("networks/base.nc")
), ),
tech_costs=lambda w: resources( tech_costs=lambda w: resources(
f"costs_{config_provider('costs' , 'year') (w)}.csv" f"costs_{config_provider('costs', 'year') (w)}.csv"
), ),
regions=resources("regions_onshore.geojson"), regions=resources("regions_onshore.geojson"),
powerplants=resources("powerplants.csv"), powerplants=resources("powerplants.csv"),
@ -508,7 +508,7 @@ rule simplify_network:
input: input:
network=resources("networks/elec{weather_year}.nc"), network=resources("networks/elec{weather_year}.nc"),
tech_costs=lambda w: resources( tech_costs=lambda w: resources(
f"costs_{config_provider('costs' , 'year') (w)}.csv" f"costs_{config_provider('costs', 'year') (w)}.csv"
), ),
regions_onshore=resources("regions_onshore.geojson"), regions_onshore=resources("regions_onshore.geojson"),
regions_offshore=resources("regions_offshore.geojson"), regions_offshore=resources("regions_offshore.geojson"),
@ -561,7 +561,7 @@ rule cluster_network:
else [] else []
), ),
tech_costs=lambda w: resources( tech_costs=lambda w: resources(
f"costs_{config_provider('costs' , 'year') (w)}.csv" f"costs_{config_provider('costs', 'year') (w)}.csv"
), ),
output: output:
network=resources("networks/elec{weather_year}_s{simpl}_{clusters}.nc"), network=resources("networks/elec{weather_year}_s{simpl}_{clusters}.nc"),
@ -594,7 +594,7 @@ rule add_extra_components:
input: input:
network=resources("networks/elec{weather_year}_s{simpl}_{clusters}.nc"), network=resources("networks/elec{weather_year}_s{simpl}_{clusters}.nc"),
tech_costs=lambda w: resources( tech_costs=lambda w: resources(
f"costs_{config_provider('costs' , 'year') (w)}.csv" f"costs_{config_provider('costs', 'year') (w)}.csv"
), ),
output: output:
resources("networks/elec{weather_year}_s{simpl}_{clusters}_ec.nc"), resources("networks/elec{weather_year}_s{simpl}_{clusters}_ec.nc"),
@ -628,7 +628,7 @@ rule prepare_network:
input: input:
resources("networks/elec{weather_year}_s{simpl}_{clusters}_ec.nc"), resources("networks/elec{weather_year}_s{simpl}_{clusters}_ec.nc"),
tech_costs=lambda w: resources( tech_costs=lambda w: resources(
f"costs_{config_provider('costs' , 'year') (w)}.csv" f"costs_{config_provider('costs', 'year') (w)}.csv"
), ),
co2_price=lambda w: resources("co2_price.csv") if "Ept" in w.opts else [], co2_price=lambda w: resources("co2_price.csv") if "Ept" in w.opts else [],
output: output: