Merge pull request #419 from PyPSA/efficiency-based-marginal-costs
add_electricity: calculate marginal costs from plant efficiency
This commit is contained in:
commit
4361bcdd9d
@ -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/>`_.
|
* 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.
|
* 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)
|
PyPSA-Eur 0.6.0 (10th September 2022)
|
||||||
=====================================
|
=====================================
|
||||||
|
@ -369,6 +369,9 @@ def attach_conventional_generators(
|
|||||||
.rename(index=lambda s: "C" + str(s))
|
.rename(index=lambda s: "C" + str(s))
|
||||||
)
|
)
|
||||||
ppl["efficiency"] = ppl.efficiency.fillna(ppl.efficiency_r)
|
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(
|
logger.info(
|
||||||
"Adding {} generators with capacities [GW] \n{}".format(
|
"Adding {} generators with capacities [GW] \n{}".format(
|
||||||
|
Loading…
Reference in New Issue
Block a user