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

remove numpy import, add release ntoe

Browse Source
This commit is contained in:
Fabian Neumann 2024-02-16 12:13:35 +01:00
parent 4fa504b0db
commit 67484f9cf0
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/release_notes.rst
View File

@ -10,6 +10,10 @@ Release Notes
Upcoming Release Upcoming Release
================ ================
* Include all countries in ammonia production resource. This is so that the full
EU28 ammonia demand can be correctly subtracted in the rule
:mod:`build_industry_sector_ratios`.
* The default configuration ``config/config.default.yaml`` is now automatically * The default configuration ``config/config.default.yaml`` is now automatically
used as a base configuration file and no longer copied to used as a base configuration file and no longer copied to
``config/config.yaml`` on first use. The file ``config/config.yaml`` should be ``config/config.yaml`` on first use. The file ``config/config.yaml`` should be

2
rules/build_sector.smk
View File

@ -392,8 +392,6 @@ rule build_salt_cavern_potentials:
rule build_ammonia_production: rule build_ammonia_production:
params:
countries=config["countries"],
input: input:
usgs="data/bundle-sector/myb1-2017-nitro.xls", usgs="data/bundle-sector/myb1-2017-nitro.xls",
output: output:

4
scripts/build_ammonia_production.py
View File

@ -7,7 +7,6 @@ Build historical annual ammonia production per country in ktonNH3/a.
""" """
import country_converter as coco import country_converter as coco
import numpy as np
import pandas as pd import pandas as pd
cc = coco.CountryConverter() cc = coco.CountryConverter()
@ -26,6 +25,7 @@ if __name__ == "__main__":
header=0, header=0,
index_col=0, index_col=0,
skipfooter=19, skipfooter=19,
na_values=["--"],
) )
ammonia.index = cc.convert(ammonia.index, to="iso2") ammonia.index = cc.convert(ammonia.index, to="iso2")
@ -33,8 +33,6 @@ if __name__ == "__main__":
years = [str(i) for i in range(2013, 2018)] years = [str(i) for i in range(2013, 2018)]
ammonia = ammonia[years] ammonia = ammonia[years]
ammonia.replace("--", np.nan, inplace=True)
ammonia = ammonia.astype(float)
# convert from ktonN to ktonNH3 # convert from ktonN to ktonNH3
ammonia *= 17 / 14 ammonia *= 17 / 14