From 9b3e68a6a8c297f40accef7bfa9e2deb6d217dcd Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Fri, 19 Jan 2024 16:58:05 +0100 Subject: [PATCH] correctly retrieve solver threads and add back memory logfile --- rules/solve_overnight.smk | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/rules/solve_overnight.smk b/rules/solve_overnight.smk index a3fed042..ae3a34d4 100644 --- a/rules/solve_overnight.smk +++ b/rules/solve_overnight.smk @@ -22,11 +22,13 @@ rule solve_sector_network: shadow: "shallow" log: - solver=LOGS - + "elec_s{simpl}_{clusters}_l{ll}_{opts}_{sector_opts}_{planning_horizons}_solver.log", - python=LOGS - + "elec_s{simpl}_{clusters}_l{ll}_{opts}_{sector_opts}_{planning_horizons}_python.log", - threads: config["solving"]["solver"].get("threads", 4) + solver=RESULTS + + "logs/elec_s{simpl}_{clusters}_l{ll}_{opts}_{sector_opts}_{planning_horizons}_solver.log", + memory=RESULTS + + "logs/elec_s{simpl}_{clusters}_l{ll}_{opts}_{sector_opts}_{planning_horizons}_memory.log", + python=RESULTS + + "logs/elec_s{simpl}_{clusters}_l{ll}_{opts}_{sector_opts}_{planning_horizons}_python.log", + threads: config["solving"]["solver_options"][config["solving"]["solver"]["options"]].get("threads", 4) resources: mem_mb=config["solving"]["mem"], walltime=config["solving"].get("walltime", "12:00:00"),