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

add_electricity: calculate marginal costs from plant efficiency
PyPSA · Sep 19, 2022 · 4361bcd · 4361bcd
2 parents 85b1f96 + e2a4140
commit 4361bcd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/doc/release_notes.rst b/doc/release_notes.rst
@@ -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)
 =====================================

diff --git a/scripts/add_electricity.py b/scripts/add_electricity.py
@@ -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(