From 62887b787033b13d18e40c35fce221f32776344e Mon Sep 17 00:00:00 2001 From: Tom Brown Date: Wed, 25 Mar 2020 14:51:37 +0100 Subject: [PATCH] Move solving memory from Snakefile to config.yaml --- Snakefile | 2 +- config.yaml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Snakefile b/Snakefile index f3e99a86..55814530 100644 --- a/Snakefile +++ b/Snakefile @@ -219,7 +219,7 @@ rule solve_network: memory="logs/" + config['run'] + "/{network}_s{simpl}_{clusters}_lv{lv}_{opts}_{sector_opts}_memory.log" benchmark: "benchmarks/solve_network/{network}_s{simpl}_{clusters}_lv{lv}_{opts}_{sector_opts}" threads: 4 - resources: mem=100000 #memory in MB; 40 GB enough for 45+B+I; 100 GB based on RESI usage for 128 + resources: mem=config['solving']['mem'] # group: "solve" # with group, threads is ignored https://bitbucket.org/snakemake/snakemake/issues/971/group-job-description-does-not-contain script: "scripts/solve_network.py" diff --git a/config.yaml b/config.yaml index 7a57b453..3fc7c8de 100644 --- a/config.yaml +++ b/config.yaml @@ -143,6 +143,7 @@ solving: #solutiontype: 2 # non basic solution, ie no crossover #barrier_convergetol: 1.e-5 #feasopt_tolerance: 1.e-6 + mem: 20000 #memory in MB; 20 GB enough for 50+B+I+H2; 100 GB for 181+B+I+H2 industry: 'DRI_ratio' : 0.5 #ratio of today's blast-furnace steel (60% primary route, 40% secondary) to future assumption (30% primary, 70% secondary), transformed into DRI + electric arc