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

Merge pull request #1039 from koen-vg/name-suffix-fix

Browse Source 
Fix double space in existing capacities
This commit is contained in:
Fabian Neumann 2024-04-25 18:10:42 +02:00 committed by GitHub
commit a18edcc63c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
rules/build_electricity.smk
View File

@ -433,7 +433,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"),
@ -478,7 +478,7 @@ rule simplify_network:
input: input:
network=resources("networks/elec.nc"), network=resources("networks/elec.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"),
@ -526,7 +526,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_s{simpl}_{clusters}.nc"), network=resources("networks/elec_s{simpl}_{clusters}.nc"),
@ -555,7 +555,7 @@ rule add_extra_components:
input: input:
network=resources("networks/elec_s{simpl}_{clusters}.nc"), network=resources("networks/elec_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_s{simpl}_{clusters}_ec.nc"), resources("networks/elec_s{simpl}_{clusters}_ec.nc"),
@ -590,7 +590,7 @@ rule prepare_network:
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(
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:

2
scripts/add_existing_baseyear.py
View File

@ -310,7 +310,7 @@ def add_power_capacities_installed_before_baseyear(n, grouping_years, costs, bas
n.madd( n.madd(
"Generator", "Generator",
new_capacity.index, new_capacity.index,
suffix=" " + name_suffix, suffix=name_suffix,
bus=new_capacity.index, bus=new_capacity.index,
carrier=generator, carrier=generator,
p_nom=new_capacity, p_nom=new_capacity,