bjoern/pypsa-eur
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Several minor fixes

Browse Source
This commit is contained in:
Jonas Hörsch 2018-02-19 10:16:29 +01:00
parent 825c2342fc
commit de7cbd4e27
4 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Snakefile
View File

@ -56,6 +56,8 @@ rule build_bus_regions:
rule build_renewable_potentials: rule build_renewable_potentials:
output: "resources/potentials_{technology}.nc" output: "resources/potentials_{technology}.nc"
script: "scripts/build_renewable_potentials.py" script: "scripts/build_renewable_potentials.py"
benchmark: "benchmarks/build_renewable_potentials_{technology}"
resources: mem_mb=10000
rule build_renewable_profiles: rule build_renewable_profiles:
input: input:
@ -66,6 +68,8 @@ rule build_renewable_profiles:
else "resources/regions_offshore.geojson") else "resources/regions_offshore.geojson")
output: output:
profile="resources/profile_{technology}.nc", profile="resources/profile_{technology}.nc",
resources: mem_mb=5000
benchmark: "benchmarks/build_renewable_profiles_{technology}"
script: "scripts/build_renewable_profiles.py" script: "scripts/build_renewable_profiles.py"
rule build_hydro_profile: rule build_hydro_profile:

2
cluster.yaml
View File

@ -1,6 +1,6 @@
__default__: __default__:
partition: x-men partition: x-men
name: "pypsa-za.{rule}.{wildcards}" name: "pypsa-eur.{rule}.{wildcards}"
output: "logs/cluster/{rule}.{wildcards}.out" output: "logs/cluster/{rule}.{wildcards}.out"
error: "logs/cluster/{rule}.{wildcards}.err" error: "logs/cluster/{rule}.{wildcards}.err"
solve_network: solve_network:

2
config.yaml
View File

@ -5,7 +5,7 @@ scenario:
sectors: [E] # ,E+EV,E+BEV,E+BEV+V2G] # [ E+EV, E+BEV, E+BEV+V2G ] sectors: [E] # ,E+EV,E+BEV,E+BEV+V2G] # [ E+EV, E+BEV, E+BEV+V2G ]
simpl: [''] simpl: ['']
lv: [1.0, 1.125, 1.25, 1.5, 2.0, 3.0] 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] 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'] 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']

2
scripts/build_renewable_profiles.py
View File

@ -9,7 +9,7 @@ import geopandas as gpd
from vresutils import landuse as vlanduse from vresutils import landuse as vlanduse
import logging import logging
logger = logging.getLogger(__name__) 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] config = snakemake.config['renewable'][snakemake.wildcards.technology]