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

Merge pull request #690 from PyPSA/fix/safe-add-carriers

Browse Source 
Prevent attempt to re-add existing carriers.
This commit is contained in:
Fabian Neumann 2023-06-30 14:50:45 +02:00 committed by GitHub
commit 662492a23e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/release_notes.rst
View File

@ -16,6 +16,8 @@ Upcoming Release
* Bugfix: Correct typo in the CPLEX solver configuration in ``config.default.yaml``.
* Bugfix: Error in ``add_electricity`` where carriers were added multiple times to the network, resulting in a non-unique carriers error.
* Renamed script file from PyPSA-EUR ``build_load_data`` to ``build_electricity_demand`` and ``retrieve_load_data`` to ``retrieve_electricity_demand``.
* Fix docs readthedocs built

21
scripts/add_electricity.py
View File

@ -123,6 +123,15 @@ def calculate_annuity(n, r):
return 1 / n
def add_missing_carriers(n, carriers):
"""
Function to add missing carriers to the network without raising errors.
"""
missing_carriers = set(carriers) - set(n.carriers.index)
if len(missing_carriers) > 0:
n.madd("Carrier", missing_carriers)
def sanitize_carriers(n, config):
"""
Sanitize the carrier information in a PyPSA Network object.
@ -152,9 +161,7 @@ def sanitize_carriers(n, config):
for c in n.iterate_components():
if "carrier" in c.df:
missing_carrier = set(c.df.carrier.unique()) - set(n.carriers.index) - {""}
if len(missing_carrier):
n.madd("Carrier", missing_carrier)
add_missing_carriers(n, c.df)
carrier_i = n.carriers.index
nice_names = (
@ -354,7 +361,7 @@ def update_transmission_costs(n, costs, length_factor=1.0):
def attach_wind_and_solar(
n, costs, input_profiles, carriers, extendable_carriers, line_length_factor=1
):
n.madd("Carrier", carriers)
add_missing_carriers(n, carriers)
for car in carriers:
if car == "hydro":
@ -416,7 +423,7 @@ def attach_conventional_generators(
conventional_inputs,
):
carriers = list(set(conventional_carriers) | set(extendable_carriers["Generator"]))
n.madd("Carrier", carriers)
add_missing_carriers(n, carriers)
add_co2_emissions(n, costs, carriers)
ppl = (
@ -473,7 +480,7 @@ def attach_conventional_generators(
def attach_hydro(n, costs, ppl, profile_hydro, hydro_capacities, carriers, **params):
n.madd("Carrier", carriers)
add_missing_carriers(n, carriers)
add_co2_emissions(n, costs, carriers)
ppl = (
@ -606,7 +613,7 @@ def attach_extendable_generators(n, costs, ppl, carriers):
logger.warning(
"The function `attach_extendable_generators` is deprecated in v0.5.0."
)
n.madd("Carrier", carriers)
add_missing_carriers(n, carriers)
add_co2_emissions(n, costs, carriers)
for tech in carriers: