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

follow-up to #1312: avoid use of snakemake in industrial_energy_demand_per_country

Browse Source
This commit is contained in:
Fabian Neumann 2024-09-20 09:01:27 +02:00
parent 81da6859ee
commit 9e43aa5b88
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/build_industrial_energy_demand_per_country_today.py
View File

@ -121,7 +121,7 @@ eu27 = cc.EU27as("ISO2").ISO2.tolist()
jrc_names = {"GR": "EL", "GB": "UK"} jrc_names = {"GR": "EL", "GB": "UK"}
def industrial_energy_demand_per_country(country, year, jrc_dir): def industrial_energy_demand_per_country(country, year, jrc_dir, endogenous_ammonia):
jrc_country = jrc_names.get(country, country) jrc_country = jrc_names.get(country, country)
fn = f"{jrc_dir}/{jrc_country}/JRC-IDEES-2021_EnergyBalance_{jrc_country}.xlsx" fn = f"{jrc_dir}/{jrc_country}/JRC-IDEES-2021_EnergyBalance_{jrc_country}.xlsx"
@ -133,7 +133,8 @@ def industrial_energy_demand_per_country(country, year, jrc_dir):
df["hydrogen"] = 0.0 df["hydrogen"] = 0.0
if snakemake.params.ammonia: # ammonia is handled separately
if endogenous_ammonia:
df["ammonia"] = 0.0 df["ammonia"] = 0.0
df["other"] = df["all"] - df.loc[df.index != "all"].sum() df["other"] = df["all"] - df.loc[df.index != "all"].sum()
@ -220,7 +221,10 @@ def industrial_energy_demand(countries, year):
nprocesses = snakemake.threads nprocesses = snakemake.threads
disable_progress = snakemake.config["run"].get("disable_progressbar", False) disable_progress = snakemake.config["run"].get("disable_progressbar", False)
func = partial( func = partial(
industrial_energy_demand_per_country, year=year, jrc_dir=snakemake.input.jrc industrial_energy_demand_per_country,
year=year,
jrc_dir=snakemake.input.jrc,
endogenous_ammonia=snakemake.params.ammonia,
) )
tqdm_kwargs = dict( tqdm_kwargs = dict(
ascii=False, ascii=False,