diff --git a/rules/build_sector.smk b/rules/build_sector.smk index 227f64da..0ced9c05 100644 --- a/rules/build_sector.smk +++ b/rules/build_sector.smk @@ -437,7 +437,7 @@ rule build_salt_cavern_potentials: rule build_ammonia_production: input: - usgs="data/bundle/myb1-2021-nitro-ert.xlsx", + usgs="data/bundle/myb1-2022-nitro-ert.xlsx", output: ammonia_production=resources("ammonia_production.csv"), threads: 1 diff --git a/rules/retrieve.smk b/rules/retrieve.smk index 7bf7c680..120c2e1b 100644 --- a/rules/retrieve.smk +++ b/rules/retrieve.smk @@ -67,7 +67,7 @@ if config["enable"]["retrieve"] and config["enable"].get("retrieve_databundle", rule retrieve_ammonia_demand: output: - "data/bundle/myb1-2021-nitro-ert.xlsx", + "data/bundle/myb1-2022-nitro-ert.xlsx", log: "logs/retrieve_ammonia_demand.log", retries: 2 diff --git a/scripts/build_ammonia_production.py b/scripts/build_ammonia_production.py index 83dfde20..e0e2de5e 100644 --- a/scripts/build_ammonia_production.py +++ b/scripts/build_ammonia_production.py @@ -43,13 +43,13 @@ if __name__ == "__main__": skiprows=5, header=0, index_col=0, - skipfooter=19, + skipfooter=7, na_values=["--"], ) 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] diff --git a/scripts/build_industrial_production_per_country.py b/scripts/build_industrial_production_per_country.py index 332627dd..90bf5482 100644 --- a/scripts/build_industrial_production_per_country.py +++ b/scripts/build_industrial_production_per_country.py @@ -303,7 +303,7 @@ def separate_basic_chemicals(demand, year): 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: logger.info(f"Using data from {year_to_use} for ammonia production.") demand.loc[there, "Ammonia"] = ammonia.loc[there, str(year_to_use)]