remove slash

This commit is contained in:
lisazeyen 2023-04-05 10:41:21 +02:00
parent d836970004
commit b9c58db0ba

View File

@ -72,13 +72,13 @@ rule prepare_perfect_foresight:
input: input:
**{ **{
f"network_{year}": RESULTS f"network_{year}": RESULTS
+ "/prenetworks/elec_s{simpl}_{clusters}_l{ll}_{opts}_{sector_opts}_" + "prenetworks/elec_s{simpl}_{clusters}_l{ll}_{opts}_{sector_opts}_"
+ f"{year}.nc" + f"{year}.nc"
for year in config["scenario"]["planning_horizons"][1:] for year in config["scenario"]["planning_horizons"][1:]
}, },
brownfield_network=lambda w: ( brownfield_network=lambda w: (
RESULTS RESULTS
+ "/prenetworks-brownfield/" + "prenetworks-brownfield/"
+ "elec_s{simpl}_{clusters}_l{ll}_{opts}_{sector_opts}_" + "elec_s{simpl}_{clusters}_l{ll}_{opts}_{sector_opts}_"
+ "{}.nc".format(str(config["scenario"]["planning_horizons"][0])) + "{}.nc".format(str(config["scenario"]["planning_horizons"][0]))
), ),
@ -107,12 +107,12 @@ rule solve_sector_network_perfect:
input: input:
overrides="data/override_component_attrs", overrides="data/override_component_attrs",
network=RESULTS network=RESULTS
+ "/prenetworks-brownfield/elec_s{simpl}_{clusters}_l{ll}_{opts}_{sector_opts}_brownfield_all_years.nc", + "prenetworks-brownfield/elec_s{simpl}_{clusters}_l{ll}_{opts}_{sector_opts}_brownfield_all_years.nc",
costs="data/costs_2030.csv", costs="data/costs_2030.csv",
config=RESULTS + "configs/config.yaml", config=RESULTS + "configs/config.yaml",
output: output:
RESULTS RESULTS
+ "/postnetworks/elec_s{simpl}_{clusters}_l{ll}_{opts}_{sector_opts}_brownfield_all_years.nc", + "postnetworks/elec_s{simpl}_{clusters}_l{ll}_{opts}_{sector_opts}_brownfield_all_years.nc",
threads: 4 threads: 4
resources: resources:
mem_mb=config["solving"]["mem"], mem_mb=config["solving"]["mem"],
@ -120,11 +120,11 @@ rule solve_sector_network_perfect:
"shallow" "shallow"
log: log:
solver=RESULTS solver=RESULTS
+ "/logs/elec_s{simpl}_{clusters}_l{ll}_{opts}_{sector_opts}_brownfield_all_years_solver.log", + "logs/elec_s{simpl}_{clusters}_l{ll}_{opts}_{sector_opts}_brownfield_all_years_solver.log",
python=RESULTS python=RESULTS
+ "/logs/elec_s{simpl}_{clusters}_l{ll}_{opts}_{sector_opts}_brownfield_all_years_python.log", + "logs/elec_s{simpl}_{clusters}_l{ll}_{opts}_{sector_opts}_brownfield_all_years_python.log",
memory=RESULTS memory=RESULTS
+ "/logs/elec_s{simpl}_{clusters}_l{ll}_{opts}_{sector_opts}_brownfield_all_years_memory.log", + "logs/elec_s{simpl}_{clusters}_l{ll}_{opts}_{sector_opts}_brownfield_all_years_memory.log",
benchmark: benchmark:
( (
BENCHMARKS BENCHMARKS
@ -150,23 +150,23 @@ rule make_summary_perfect:
costs="data/costs_2020.csv", costs="data/costs_2020.csv",
overrides="data/override_component_attrs", overrides="data/override_component_attrs",
output: output:
nodal_costs=RESULTS + "/csvs/nodal_costs.csv", nodal_costs=RESULTS + "csvs/nodal_costs.csv",
nodal_capacities=RESULTS + "/csvs/nodal_capacities.csv", nodal_capacities=RESULTS + "csvs/nodal_capacities.csv",
nodal_cfs=RESULTS + "/csvs/nodal_cfs.csv", nodal_cfs=RESULTS + "csvs/nodal_cfs.csv",
cfs=RESULTS + "/csvs/cfs.csv", cfs=RESULTS + "csvs/cfs.csv",
costs=RESULTS + "/csvs/costs.csv", costs=RESULTS + "csvs/costs.csv",
capacities=RESULTS + "/csvs/capacities.csv", capacities=RESULTS + "csvs/capacities.csv",
curtailment=RESULTS + "/csvs/curtailment.csv", curtailment=RESULTS + "csvs/curtailment.csv",
capital_cost=RESULTS + "/csvs/capital_cost.csv", capital_cost=RESULTS + "csvs/capital_cost.csv",
energy=RESULTS + "/csvs/energy.csv", energy=RESULTS + "csvs/energy.csv",
supply=RESULTS + "/csvs/supply.csv", supply=RESULTS + "csvs/supply.csv",
supply_energy=RESULTS + "/csvs/supply_energy.csv", supply_energy=RESULTS + "csvs/supply_energy.csv",
prices=RESULTS + "/csvs/prices.csv", prices=RESULTS + "csvs/prices.csv",
weighted_prices=RESULTS + "/csvs/weighted_prices.csv", weighted_prices=RESULTS + "csvs/weighted_prices.csv",
market_values=RESULTS + "/csvs/market_values.csv", market_values=RESULTS + "csvs/market_values.csv",
price_statistics=RESULTS + "/csvs/price_statistics.csv", price_statistics=RESULTS + "csvs/price_statistics.csv",
metrics=RESULTS + "/csvs/metrics.csv", metrics=RESULTS + "csvs/metrics.csv",
co2_emissions=RESULTS + "/csvs/co2_emissions.csv", co2_emissions=RESULTS + "csvs/co2_emissions.csv",
threads: 2 threads: 2
resources: resources:
mem_mb=10000, mem_mb=10000,
@ -189,22 +189,22 @@ rule plot_summary_perfect:
f"costs_{year}": f"data/costs_{year}.csv" f"costs_{year}": f"data/costs_{year}.csv"
for year in config["scenario"]["planning_horizons"] for year in config["scenario"]["planning_horizons"]
}, },
costs_csv=RESULTS + "/csvs/costs.csv", costs_csv=RESULTS + "csvs/costs.csv",
energy=RESULTS + "/csvs/energy.csv", energy=RESULTS + "csvs/energy.csv",
balances=RESULTS + "/csvs/supply_energy.csv", balances=RESULTS + "csvs/supply_energy.csv",
eea="data/eea/UNFCCC_v24.csv", eea="data/eea/UNFCCC_v24.csv",
countries=RESULTS + "/csvs/nodal_capacities.csv", countries=RESULTS + "csvs/nodal_capacities.csv",
co2_emissions=RESULTS + "/csvs/co2_emissions.csv", co2_emissions=RESULTS + "csvs/co2_emissions.csv",
capacities=RESULTS + "/csvs/capacities.csv", capacities=RESULTS + "csvs/capacities.csv",
capital_cost=RESULTS + "/csvs/capital_cost.csv", capital_cost=RESULTS + "csvs/capital_cost.csv",
output: output:
costs1=RESULTS + "/graphs/costs.pdf", costs1=RESULTS + "graphs/costs.pdf",
costs2=RESULTS + "/graphs/costs2.pdf", costs2=RESULTS + "graphs/costs2.pdf",
costs3=RESULTS + "/graphs/total_costs_per_year.pdf", costs3=RESULTS + "graphs/total_costs_per_year.pdf",
# energy="results" + '/' + config['run'] + '/graphs/energy.pdf', # energy="results" + '/' + config['run'] + '/graphs/energy.pdf',
balances=RESULTS + "/graphs/balances-energy.pdf", balances=RESULTS + "graphs/balances-energy.pdf",
co2_emissions=RESULTS + "/graphs/carbon_budget_plot.pdf", co2_emissions=RESULTS + "graphs/carbon_budget_plot.pdf",
capacities=RESULTS + "/graphs/capacities.pdf", capacities=RESULTS + "graphs/capacities.pdf",
threads: 2 threads: 2
resources: resources:
mem_mb=10000, mem_mb=10000,