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

update ammonia demand data to 2022

Browse Source
This commit is contained in:
lisazeyen 2024-07-29 16:09:38 +02:00
parent aa820fa046
commit 2f3fde26d0
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rules/build_sector.smk
View File

@ -437,7 +437,7 @@ rule build_salt_cavern_potentials:
rule build_ammonia_production: rule build_ammonia_production:
input: input:
usgs="data/bundle/myb1-2021-nitro-ert.xlsx", usgs="data/bundle/myb1-2022-nitro-ert.xlsx",
output: output:
ammonia_production=resources("ammonia_production.csv"), ammonia_production=resources("ammonia_production.csv"),
threads: 1 threads: 1

2
rules/retrieve.smk
View File

@ -67,7 +67,7 @@ if config["enable"]["retrieve"] and config["enable"].get("retrieve_databundle",
rule retrieve_ammonia_demand: rule retrieve_ammonia_demand:
output: output:
"data/bundle/myb1-2021-nitro-ert.xlsx", "data/bundle/myb1-2022-nitro-ert.xlsx",
log: log:
"logs/retrieve_ammonia_demand.log", "logs/retrieve_ammonia_demand.log",
retries: 2 retries: 2

4
scripts/build_ammonia_production.py
View File

@ -43,13 +43,13 @@ if __name__ == "__main__":
skiprows=5, skiprows=5,
header=0, header=0,
index_col=0, index_col=0,
skipfooter=19, skipfooter=7,
na_values=["--"], na_values=["--"],
) )
ammonia.index = cc.convert(ammonia.index, to="iso2") ammonia.index = cc.convert(ammonia.index, to="iso2")
years = [str(i) for i in range(2017, 2022)] years = [str(i) for i in range(2018, 2023)]
ammonia = ammonia.rename(columns=lambda x: str(x))[years] ammonia = ammonia.rename(columns=lambda x: str(x))[years]

2
scripts/build_industrial_production_per_country.py
View File

@ -303,7 +303,7 @@ def separate_basic_chemicals(demand, year):
demand["Ammonia"] = 0.0 demand["Ammonia"] = 0.0
year_to_use = min(max(year, 2017), 2021) year_to_use = min(max(year, 2018), 2022)
if year_to_use != year: if year_to_use != year:
logger.info(f"Using data from {year_to_use} for ammonia production.") logger.info(f"Using data from {year_to_use} for ammonia production.")
demand.loc[there, "Ammonia"] = ammonia.loc[there, str(year_to_use)] demand.loc[there, "Ammonia"] = ammonia.loc[there, str(year_to_use)]