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

add_electricity: determine p_nom_extendable when adding conventionals

Browse Source
This commit is contained in:
Fabian 2022-04-27 20:13:36 +02:00
parent da5a5141f8
commit b1edbd7563
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/add_electricity.py
View File

@ -294,7 +294,7 @@ def attach_wind_and_solar(n, costs, input_profiles, technologies, line_length_fa
p_max_pu=ds['profile'].transpose('time', 'bus').to_pandas()) p_max_pu=ds['profile'].transpose('time', 'bus').to_pandas())
def attach_conventional_generators(n, costs, ppl, carriers): def attach_conventional_generators(n, costs, ppl, carriers, extendable_carriers):
_add_missing_carriers_from_costs(n, costs, carriers) _add_missing_carriers_from_costs(n, costs, carriers)
@ -308,6 +308,8 @@ def attach_conventional_generators(n, costs, ppl, carriers):
carrier=ppl.carrier, carrier=ppl.carrier,
bus=ppl.bus, bus=ppl.bus,
p_nom=ppl.p_nom, p_nom=ppl.p_nom,
p_nom_min=ppl.p_nom,
p_nom_extendable=ppl.carrier.isin(extendable_carriers),
efficiency=ppl.efficiency, efficiency=ppl.efficiency,
marginal_cost=ppl.marginal_cost, marginal_cost=ppl.marginal_cost,
capital_cost=0) capital_cost=0)
@ -584,8 +586,9 @@ 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']
carriers = snakemake.config['electricity']['conventional_carriers'] carriers = snakemake.config['electricity']['conventional_carriers']
attach_conventional_generators(n, costs, ppl, carriers) attach_conventional_generators(n, costs, ppl, carriers, extendable_carriers)
carriers = snakemake.config['renewable'] carriers = snakemake.config['renewable']
attach_wind_and_solar(n, costs, snakemake.input, carriers, snakemake.config['lines']['length_factor']) attach_wind_and_solar(n, costs, snakemake.input, carriers, snakemake.config['lines']['length_factor'])
@ -595,9 +598,6 @@ if __name__ == "__main__":
attach_hydro(n, costs, ppl, snakemake.input.profile_hydro, snakemake.input.hydro_capacities, attach_hydro(n, costs, ppl, snakemake.input.profile_hydro, snakemake.input.hydro_capacities,
carriers, **snakemake.config['renewable']['hydro']) carriers, **snakemake.config['renewable']['hydro'])
carriers = snakemake.config['electricity']['extendable_carriers']['Generator']
attach_extendable_generators(n, costs, ppl, carriers)
techs = snakemake.config['electricity'].get('renewable_capacities_from_OPSD', []) techs = snakemake.config['electricity'].get('renewable_capacities_from_OPSD', [])
attach_OPSD_renewables(n, techs) attach_OPSD_renewables(n, techs)