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

Merge pull request #419 from PyPSA/efficiency-based-marginal-costs

Browse Source 
add_electricity: calculate marginal costs from plant efficiency
This commit is contained in:
Fabian Hofmann 2022-09-19 13:50:14 +02:00 committed by GitHub
commit 4361bcdd9d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/release_notes.rst
View File

@ -12,7 +12,7 @@ Upcoming Release
* Individual commits are now tested against pre-commit hooks. This includes black style formatting, sorting of package imports, Snakefile formatting and others. Installation instructions can for the pre-commit can be found `here <https://pre-commit.com/>`_.
* Pre-commit CI is now part of the repository's CI.
* Marginal costs of conventional generators are now taking the plant-specific efficiency into account.
PyPSA-Eur 0.6.0 (10th September 2022)
=====================================

3
scripts/add_electricity.py
View File

@ -369,6 +369,9 @@ def attach_conventional_generators(
.rename(index=lambda s: "C" + str(s))
)
ppl["efficiency"] = ppl.efficiency.fillna(ppl.efficiency_r)
ppl["marginal_cost"] = (
ppl.carrier.map(costs.VOM) + ppl.carrier.map(costs.fuel) / ppl.efficiency
)
logger.info(
"Adding {} generators with capacities [GW] \n{}".format(