diff --git a/doc/release_notes.rst b/doc/release_notes.rst index cab8229a..fc58c899 100644 --- a/doc/release_notes.rst +++ b/doc/release_notes.rst @@ -10,6 +10,10 @@ Release Notes 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 used as a base configuration file and no longer copied to ``config/config.yaml`` on first use. The file ``config/config.yaml`` should be diff --git a/rules/build_sector.smk b/rules/build_sector.smk index c25c8673..35a59008 100644 --- a/rules/build_sector.smk +++ b/rules/build_sector.smk @@ -392,8 +392,6 @@ rule build_salt_cavern_potentials: rule build_ammonia_production: - params: - countries=config["countries"], input: usgs="data/bundle-sector/myb1-2017-nitro.xls", output: diff --git a/scripts/build_ammonia_production.py b/scripts/build_ammonia_production.py index 77b33075..e2cf6a7b 100644 --- a/scripts/build_ammonia_production.py +++ b/scripts/build_ammonia_production.py @@ -7,7 +7,6 @@ Build historical annual ammonia production per country in ktonNH3/a. """ import country_converter as coco -import numpy as np import pandas as pd cc = coco.CountryConverter() @@ -26,6 +25,7 @@ if __name__ == "__main__": header=0, index_col=0, skipfooter=19, + na_values=["--"], ) ammonia.index = cc.convert(ammonia.index, to="iso2") @@ -33,8 +33,6 @@ if __name__ == "__main__": years = [str(i) for i in range(2013, 2018)] ammonia = ammonia[years] - ammonia.replace("--", np.nan, inplace=True) - ammonia = ammonia.astype(float) # convert from ktonN to ktonNH3 ammonia *= 17 / 14