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

follow up: fix extendable carriers

Browse Source
This commit is contained in:
Fabian 2022-09-14 15:14:30 +02:00
parent 59b76d8a99
commit 78d9c61ece
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
scripts/add_electricity.py
View File

@ -309,7 +309,7 @@ def attach_conventional_generators(n, costs, ppl, carriers, extendable_carriers)
bus=ppl.bus, bus=ppl.bus,
p_nom=ppl.p_nom, p_nom=ppl.p_nom,
p_nom_min=ppl.p_nom, p_nom_min=ppl.p_nom,
p_nom_extendable=ppl.carrier.isin(extendable_carriers), p_nom_extendable=ppl.carrier.isin(extendable_carriers['Generator']),
efficiency=ppl.efficiency, efficiency=ppl.efficiency,
marginal_cost=ppl.marginal_cost, marginal_cost=ppl.marginal_cost,
capital_cost=ppl.capital_cost) capital_cost=ppl.capital_cost)
@ -588,12 +588,11 @@ if __name__ == "__main__":
update_transmission_costs(n, costs, snakemake.config['lines']['length_factor']) update_transmission_costs(n, costs, snakemake.config['lines']['length_factor'])
extendable_carriers = snakemake.config['electricity']['extendable_carriers']['Generator'] extendable_carriers = snakemake.config['extendable_carriers']
carriers = snakemake.config['electricity']['conventional_carriers'] carriers = snakemake.config['electricity']['conventional_carriers']
attach_conventional_generators(n, costs, ppl, carriers, extendable_carriers) attach_conventional_generators(n, costs, ppl, carriers, extendable_carriers)
carriers = snakemake.config['renewable'] carriers = snakemake.config['renewable']
extendable_carriers = snakemake.config['extendable_carriers']
attach_wind_and_solar(n, costs, snakemake.input, carriers, extendable_carriers, snakemake.config['lines']['length_factor']) attach_wind_and_solar(n, costs, snakemake.input, carriers, extendable_carriers, snakemake.config['lines']['length_factor'])
if 'hydro' in snakemake.config['renewable']: if 'hydro' in snakemake.config['renewable']: