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

Merge pull request #104 from PyPSA/normpath

Browse Source 
Snakefile: use normpath for solver logs
This commit is contained in:
FabianHofmann 2019-11-22 16:59:26 +01:00 committed by GitHub
commit 7dc9bb2941
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Snakefile
View File

@ -1,3 +1,5 @@
from os.path import normpath
configfile: "config.yaml" configfile: "config.yaml"
COSTS="data/costs.csv" COSTS="data/costs.csv"
@ -234,16 +236,6 @@ rule add_extra_components:
script: "scripts/add_extra_components.py" script: "scripts/add_extra_components.py"
# rule add_sectors:
# input:
# network="networks/elec_{cost}_{resarea}_{opts}.nc",
# emobility="data/emobility"
# output: "networks/sector_{cost}_{resarea}_{sectors}_{opts}.nc"
# benchmark: "benchmarks/add_sectors/sector_{resarea}_{sectors}_{opts}"
# threads: 1
# resources: mem=1000
# script: "scripts/add_sectors.py"
rule prepare_network: rule prepare_network:
input: 'networks/{network}_s{simpl}_{clusters}_ec.nc', tech_costs=COSTS input: 'networks/{network}_s{simpl}_{clusters}_ec.nc', tech_costs=COSTS
output: 'networks/{network}_s{simpl}_{clusters}_ec_l{ll}_{opts}.nc' output: 'networks/{network}_s{simpl}_{clusters}_ec_l{ll}_{opts}.nc'
@ -270,7 +262,7 @@ rule solve_network:
output: "results/networks/{network}_s{simpl}_{clusters}_ec_l{ll}_{opts}.nc" output: "results/networks/{network}_s{simpl}_{clusters}_ec_l{ll}_{opts}.nc"
shadow: "shallow" shadow: "shallow"
log: log:
solver="logs/{network}_s{simpl}_{clusters}_ec_l{ll}_{opts}_solver.log", solver=normpath("logs/{network}_s{simpl}_{clusters}_ec_l{ll}_{opts}_solver.log"),
python="logs/{network}_s{simpl}_{clusters}_ec_l{ll}_{opts}_python.log", python="logs/{network}_s{simpl}_{clusters}_ec_l{ll}_{opts}_python.log",
memory="logs/{network}_s{simpl}_{clusters}_ec_l{ll}_{opts}_memory.log" memory="logs/{network}_s{simpl}_{clusters}_ec_l{ll}_{opts}_memory.log"
benchmark: "benchmarks/solve_network/{network}_s{simpl}_{clusters}_ec_l{ll}_{opts}" benchmark: "benchmarks/solve_network/{network}_s{simpl}_{clusters}_ec_l{ll}_{opts}"
@ -295,7 +287,7 @@ rule solve_operations_network:
output: "results/networks/{network}_s{simpl}_{clusters}_ec_l{ll}_{opts}_op.nc" output: "results/networks/{network}_s{simpl}_{clusters}_ec_l{ll}_{opts}_op.nc"
shadow: "shallow" shadow: "shallow"
log: log:
solver="logs/solve_operations_network/{network}_s{simpl}_{clusters}_ec_l{ll}_{opts}_op_solver.log", solver=normpath("logs/solve_operations_network/{network}_s{simpl}_{clusters}_ec_l{ll}_{opts}_op_solver.log"),
python="logs/solve_operations_network/{network}_s{simpl}_{clusters}_ec_l{ll}_{opts}_op_python.log", python="logs/solve_operations_network/{network}_s{simpl}_{clusters}_ec_l{ll}_{opts}_op_python.log",
memory="logs/solve_operations_network/{network}_s{simpl}_{clusters}_ec_l{ll}_{opts}_op_memory.log" memory="logs/solve_operations_network/{network}_s{simpl}_{clusters}_ec_l{ll}_{opts}_op_memory.log"
benchmark: "benchmarks/solve_operations_network/{network}_s{simpl}_{clusters}_ec_l{ll}_{opts}" benchmark: "benchmarks/solve_operations_network/{network}_s{simpl}_{clusters}_ec_l{ll}_{opts}"