From 2b68ebadd5b04d2c8efee76cd1441bcce0e56a5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20H=C3=B6rsch?= <jonas.hoersch@kit.edu>
Date: Mon, 22 Oct 2018 23:27:18 +0200
Subject: [PATCH] Update Snakefile and cluster.yaml

---
 Snakefile    | 10 +++++-----
 cluster.yaml |  3 +--
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/Snakefile b/Snakefile
index dfd92b3b..ca2d3283 100644
--- a/Snakefile
+++ b/Snakefile
@@ -1,7 +1,5 @@
 configfile: "config.yaml"
 
-localrules: all # , extract_summaries, plot_network, scenario_comparions
-
 wildcard_constraints:
     lv="[0-9\.]+|inf",
     simpl="[a-zA-Z0-9]*",
@@ -9,8 +7,10 @@ wildcard_constraints:
     sectors="[+a-zA-Z0-9]+",
     opts="[-+a-zA-Z0-9]*"
 
-# rule all:
-#     input: "results/summaries/costs2-summary.csv"
+rule cluster_all_elec_networks:
+    input:
+        expand("networks/elec_s{simpl}_{clusters}_lv{lv}_{opts}.nc",
+               **config['scenario'])
 
 rule solve_all_elec_networks:
     input:
@@ -172,7 +172,7 @@ rule cluster_network:
         network='networks/{network}_s{simpl}.nc',
         regions_onshore="resources/regions_onshore_{network}_s{simpl}.geojson",
         regions_offshore="resources/regions_offshore_{network}_s{simpl}.geojson",
-        clustermaps='resources/clustermaps_{network}_s{simpl}.h5'
+        clustermaps=ancient('resources/clustermaps_{network}_s{simpl}.h5')
     output:
         network='networks/{network}_s{simpl}_{clusters}.nc',
         regions_onshore="resources/regions_onshore_{network}_s{simpl}_{clusters}.geojson",
diff --git a/cluster.yaml b/cluster.yaml
index 11e56e09..0f99a28d 100644
--- a/cluster.yaml
+++ b/cluster.yaml
@@ -5,8 +5,7 @@ feedin_preparation:
   walltime: "12:00:00"
 
 solve_network:
-  walltime: "05:00:00:00"
-  feature: "best"
+  walltime: "02:00:00:00"
 
 solve:
   walltime: "05:00:00:00"