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

Merge pull request #941 from lumbric/patch-2

Browse Source 
Fix broken link to mamba installation guide in docs
This commit is contained in:
Fabian Neumann 2024-02-20 12:04:09 +01:00 committed by GitHub
commit bb84ca7d92
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 441 additions and 442 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/installation.rst
View File

@ -31,7 +31,7 @@ Install Python Dependencies
PyPSA-Eur relies on a set of other Python packages to function. PyPSA-Eur relies on a set of other Python packages to function.
We recommend using the package manager `mamba <https://mamba.readthedocs.io/en/latest/>`_ to install them and manage your environments. We recommend using the package manager `mamba <https://mamba.readthedocs.io/en/latest/>`_ to install them and manage your environments.
For instructions for your operating system follow the ``mamba`` `installation guide <https://mamba.readthedocs.io/en/latest/installation.html>`_. For instructions for your operating system follow the ``mamba`` `installation guide <https://mamba.readthedocs.io/en/latest/installation/mamba-installation.html>`_.
You can also use ``conda`` equivalently. You can also use ``conda`` equivalently.
The package requirements are curated in the `envs/environment.yaml <https://github.com/PyPSA/pypsa-eur/blob/master/envs/environment.yaml>`_ file. The package requirements are curated in the `envs/environment.yaml <https://github.com/PyPSA/pypsa-eur/blob/master/envs/environment.yaml>`_ file.

3
scripts/prepare_sector_network.py
View File

@ -3059,8 +3059,7 @@ def add_industry(n, costs):
+ mwh_coal_per_mwh_coke * industrial_demand["coke"] + mwh_coal_per_mwh_coke * industrial_demand["coke"]
) / nhours ) / nhours
p_set.rename(lambda x: x + " coal for industry", p_set.rename(lambda x: x + " coal for industry", inplace=True)
inplace=True)
if not options["regional_coal_demand"]: if not options["regional_coal_demand"]:
p_set = p_set.sum() p_set = p_set.sum()