correctly retrieve solver threads and add back memory logfile

This commit is contained in:
Fabian Neumann 2024-01-19 16:58:05 +01:00
parent 67cf85ce04
commit 9b3e68a6a8

View File

@ -22,11 +22,13 @@ rule solve_sector_network:
shadow: shadow:
"shallow" "shallow"
log: log:
solver=LOGS solver=RESULTS
+ "elec_s{simpl}_{clusters}_l{ll}_{opts}_{sector_opts}_{planning_horizons}_solver.log", + "logs/elec_s{simpl}_{clusters}_l{ll}_{opts}_{sector_opts}_{planning_horizons}_solver.log",
python=LOGS memory=RESULTS
+ "elec_s{simpl}_{clusters}_l{ll}_{opts}_{sector_opts}_{planning_horizons}_python.log", + "logs/elec_s{simpl}_{clusters}_l{ll}_{opts}_{sector_opts}_{planning_horizons}_memory.log",
threads: config["solving"]["solver"].get("threads", 4) 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: resources:
mem_mb=config["solving"]["mem"], mem_mb=config["solving"]["mem"],
walltime=config["solving"].get("walltime", "12:00:00"), walltime=config["solving"].get("walltime", "12:00:00"),