From 78d9c61ece96fabd6fe4f65f7b8749b4d624ffc4 Mon Sep 17 00:00:00 2001 From: Fabian Date: Wed, 14 Sep 2022 15:14:30 +0200 Subject: [PATCH] follow up: fix extendable carriers --- scripts/add_electricity.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/scripts/add_electricity.py b/scripts/add_electricity.py index 2145b1e8..9613481d 100755 --- a/scripts/add_electricity.py +++ b/scripts/add_electricity.py @@ -309,7 +309,7 @@ def attach_conventional_generators(n, costs, ppl, carriers, extendable_carriers) bus=ppl.bus, p_nom=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, marginal_cost=ppl.marginal_cost, capital_cost=ppl.capital_cost) @@ -588,12 +588,11 @@ if __name__ == "__main__": 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'] attach_conventional_generators(n, costs, ppl, carriers, extendable_carriers) 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']) if 'hydro' in snakemake.config['renewable']: