Merge branch 'master' into master

This commit is contained in:
Martha Frysztacki 2022-01-13 16:50:57 +01:00 committed by GitHub
commit ba9849b3bb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -232,7 +232,7 @@ rule add_electricity:
log: "logs/add_electricity.log"
benchmark: "benchmarks/add_electricity"
threads: 1
resources: mem=3000
resources: mem=5000
script: "scripts/add_electricity.py"
@ -273,7 +273,7 @@ rule cluster_network:
log: "logs/cluster_network/elec_s{simpl}_{clusters}.log"
benchmark: "benchmarks/cluster_network/elec_s{simpl}_{clusters}"
threads: 1
resources: mem=3000
resources: mem=6000
script: "scripts/cluster_network.py"