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

Merge branch 'master' of github.com:PyPSA/pypsa-eur-sec

Browse Source
This commit is contained in:
Fabian Neumann 2021-07-01 20:22:20 +02:00
commit de46177e1a
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/release_notes.rst
View File

@ -59,6 +59,7 @@ Future release
* New dependencies: ``tqdm``, ``atlite>=0.2.4``, ``pytz`` and ``geopy`` (optional). * New dependencies: ``tqdm``, ``atlite>=0.2.4``, ``pytz`` and ``geopy`` (optional).
These are included in the environment specifications of PyPSA-Eur. These are included in the environment specifications of PyPSA-Eur.
* Consistent use of ``__main__`` block and further unspecific code cleaning. * Consistent use of ``__main__`` block and further unspecific code cleaning.
* Distinguish costs for home battery storage and inverter from utility-scale battery costs.

4
scripts/prepare_sector_network.py
View File

@ -787,7 +787,7 @@ def insert_electricity_distribution_grid(n, costs):
e_cyclic=True, e_cyclic=True,
e_nom_extendable=True, e_nom_extendable=True,
carrier="home battery", carrier="home battery",
capital_cost=costs.at['battery storage', 'fixed'], capital_cost=costs.at['home battery storage', 'fixed'],
lifetime=costs.at['battery storage', 'lifetime'] lifetime=costs.at['battery storage', 'lifetime']
) )
@ -797,7 +797,7 @@ def insert_electricity_distribution_grid(n, costs):
bus1=nodes + " home battery", bus1=nodes + " home battery",
carrier="home battery charger", carrier="home battery charger",
efficiency=costs.at['battery inverter', 'efficiency']**0.5, efficiency=costs.at['battery inverter', 'efficiency']**0.5,
capital_cost=costs.at['battery inverter', 'fixed'], capital_cost=costs.at['home battery inverter', 'fixed'],
p_nom_extendable=True, p_nom_extendable=True,
lifetime=costs.at['battery inverter', 'lifetime'] lifetime=costs.at['battery inverter', 'lifetime']
) )