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

add_electicity: minor fix regarding missing carriers

Browse Source
This commit is contained in:
Fabian 2023-07-03 15:45:19 +02:00
parent 6137a634d4
commit 1f6764d32a
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
scripts/add_electricity.py
View File

@ -2,8 +2,6 @@
# SPDX-FileCopyrightText: : 2017-2023 The PyPSA-Eur Authors # SPDX-FileCopyrightText: : 2017-2023 The PyPSA-Eur Authors
# #
# SPDX-License-Identifier: MIT # SPDX-License-Identifier: MIT
# coding: utf-8
""" """
Adds electrical generators and existing hydro storage units to a base network. Adds electrical generators and existing hydro storage units to a base network.
@ -353,12 +351,12 @@ def update_transmission_costs(n, costs, length_factor=1.0):
def attach_wind_and_solar( def attach_wind_and_solar(
n, costs, input_profiles, carriers, extendable_carriers, line_length_factor=1 n, costs, input_profiles, carriers, extendable_carriers, line_length_factor=1
): ):
n.madd("Carrier", carriers)
for car in carriers: for car in carriers:
if car == "hydro": if car == "hydro":
continue continue
n.add("Carrier", car)
with xr.open_dataset(getattr(input_profiles, "profile_" + car)) as ds: with xr.open_dataset(getattr(input_profiles, "profile_" + car)) as ds:
if ds.indexes["bus"].empty: if ds.indexes["bus"].empty:
continue continue
@ -441,7 +439,7 @@ def attach_conventional_generators(
fuel_price = fuel_price.assign( fuel_price = fuel_price.assign(
OCGT=fuel_price["gas"], CCGT=fuel_price["gas"] OCGT=fuel_price["gas"], CCGT=fuel_price["gas"]
).drop("gas", axis=1) ).drop("gas", axis=1)
missing_carriers = list(carriers - set(fuel_price)) missing_carriers = list(set(carriers) - set(fuel_price))
fuel_price = fuel_price.assign(**costs.fuel[missing_carriers]) fuel_price = fuel_price.assign(**costs.fuel[missing_carriers])
fuel_price = fuel_price.reindex(ppl.carrier, axis=1) fuel_price = fuel_price.reindex(ppl.carrier, axis=1)
fuel_price.columns = ppl.index fuel_price.columns = ppl.index
@ -836,15 +834,16 @@ if __name__ == "__main__":
) )
if "hydro" in renewable_carriers: if "hydro" in renewable_carriers:
para = params.renewable["hydro"] p = params.renewable["hydro"]
carriers = p.pop("carriers", [])
attach_hydro( attach_hydro(
n, n,
costs, costs,
ppl, ppl,
snakemake.input.profile_hydro, snakemake.input.profile_hydro,
snakemake.input.hydro_capacities, snakemake.input.hydro_capacities,
para.pop("carriers", []), carriers,
**para, **p,
) )
estimate_renewable_caps = params.electricity["estimate_renewable_capacities"] estimate_renewable_caps = params.electricity["estimate_renewable_capacities"]