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

Merge branch 'master' into default-res-installations

Browse Source
This commit is contained in:
Fabian Hofmann 2022-09-19 13:50:34 +02:00 committed by GitHub
commit 9d46cf7659
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/release_notes.rst
View File

@ -13,6 +13,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.
* The heuristic distribution of today's renewable installations is now enable per default. * The heuristic distribution of today's renewable installations is now enable per default.
* 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)
===================================== =====================================

2
envs/environment.yaml
View File

@ -46,7 +46,7 @@ dependencies:
# GIS dependencies: # GIS dependencies:
- cartopy - cartopy
- descartes - descartes
- rasterio<=1.2.9 # 1.2.10 creates error https://github.com/PyPSA/atlite/issues/238 - rasterio!=1.2.10
# PyPSA-Eur-Sec Dependencies # PyPSA-Eur-Sec Dependencies
- geopy - geopy

3
scripts/add_electricity.py
View File

@ -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(