From de7cbd4e27885b51f3c5d396e35bd16d4c9962f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20H=C3=B6rsch?= <hoersch@fias.uni-frankfurt.de>
Date: Mon, 19 Feb 2018 10:16:29 +0100
Subject: [PATCH] Several minor fixes

---
 Snakefile                           | 4 ++++
 cluster.yaml                        | 2 +-
 config.yaml                         | 2 +-
 scripts/build_renewable_profiles.py | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/Snakefile b/Snakefile
index 3d053b90..10bb929e 100644
--- a/Snakefile
+++ b/Snakefile
@@ -56,6 +56,8 @@ rule build_bus_regions:
 rule build_renewable_potentials:
     output: "resources/potentials_{technology}.nc"
     script: "scripts/build_renewable_potentials.py"
+    benchmark: "benchmarks/build_renewable_potentials_{technology}"
+    resources: mem_mb=10000
 
 rule build_renewable_profiles:
     input:
@@ -66,6 +68,8 @@ rule build_renewable_profiles:
                                    else "resources/regions_offshore.geojson")
     output:
         profile="resources/profile_{technology}.nc",
+    resources: mem_mb=5000
+    benchmark: "benchmarks/build_renewable_profiles_{technology}"
     script: "scripts/build_renewable_profiles.py"
 
 rule build_hydro_profile:
diff --git a/cluster.yaml b/cluster.yaml
index 1c1cccef..218421d4 100644
--- a/cluster.yaml
+++ b/cluster.yaml
@@ -1,6 +1,6 @@
 __default__:
   partition: x-men
-  name: "pypsa-za.{rule}.{wildcards}"
+  name: "pypsa-eur.{rule}.{wildcards}"
   output: "logs/cluster/{rule}.{wildcards}.out"
   error: "logs/cluster/{rule}.{wildcards}.err"
 solve_network:
diff --git a/config.yaml b/config.yaml
index 6ae7357a..ce21a2b2 100644
--- a/config.yaml
+++ b/config.yaml
@@ -5,7 +5,7 @@ scenario:
   sectors: [E] # ,E+EV,E+BEV,E+BEV+V2G] # [ E+EV, E+BEV, E+BEV+V2G ]
   simpl: ['']
   lv: [1.0, 1.125, 1.25, 1.5, 2.0, 3.0]
-  clusters: [45, 64, 90, 128, 181] #, 256] #, 362] # (2**np.r_[5.5:9:.5]).astype(int)
+  clusters: [45, 64, 90, 128, 181, 256] #, 362] # (2**np.r_[5.5:9:.5]).astype(int)
   opts: [Co2L-3H] #, LC-FL, LC-T, Ep-T, Co2L-T]
 
 countries: ['AL', 'AT', 'BA', 'BE', 'BG', 'CH', 'CZ', 'DE', 'DK', 'EE', 'ES', 'FI', 'FR', 'GB', 'GR', 'HR', 'HU', 'IE', 'IT', 'LT', 'LU', 'LV', 'ME', 'MK', 'NL', 'NO', 'PL', 'PT', 'RO', 'RS', 'SE', 'SI', 'SK'] 
diff --git a/scripts/build_renewable_profiles.py b/scripts/build_renewable_profiles.py
index 0e2dfe8c..217f699a 100644
--- a/scripts/build_renewable_profiles.py
+++ b/scripts/build_renewable_profiles.py
@@ -9,7 +9,7 @@ import geopandas as gpd
 from vresutils import landuse as vlanduse
 import logging
 logger = logging.getLogger(__name__)
-logger.setLevel(level=snakemake.config['logging_level'])
+logging.basicConfig(level=snakemake.config['logging_level'])
 
 config = snakemake.config['renewable'][snakemake.wildcards.technology]