diff --git a/config/test/config.electricity.yaml b/config/test/config.electricity.yaml index 6798e38c..e491a767 100644 --- a/config/test/config.electricity.yaml +++ b/config/test/config.electricity.yaml @@ -12,6 +12,8 @@ run: shared_cutouts: true scenario: + weather_year: + - "" clusters: - 5 opts: diff --git a/config/test/config.myopic.yaml b/config/test/config.myopic.yaml index 0bb85ec6..edaccd61 100644 --- a/config/test/config.myopic.yaml +++ b/config/test/config.myopic.yaml @@ -13,6 +13,8 @@ run: foresight: myopic scenario: + weather_year: + - "" ll: - v1.5 clusters: diff --git a/config/test/config.overnight.yaml b/config/test/config.overnight.yaml index a2a0f5a4..3ceda43b 100644 --- a/config/test/config.overnight.yaml +++ b/config/test/config.overnight.yaml @@ -12,6 +12,8 @@ run: scenario: + weather_year: + - "" ll: - v1.5 clusters: diff --git a/rules/build_electricity.smk b/rules/build_electricity.smk index d56484a9..4ecdddae 100644 --- a/rules/build_electricity.smk +++ b/rules/build_electricity.smk @@ -326,7 +326,7 @@ rule add_electricity: costs=config["costs"], input: **{ - f"profile_{tech}": RESOURCES + f"profile{weather_year}_{tech}.nc" + f"profile_{tech}": RESOURCES + "profile{weather_year}" + f"_{tech}.nc" for tech in config["electricity"]["renewable_carriers"] }, **{ diff --git a/rules/build_sector.smk b/rules/build_sector.smk index c430a2ac..26adea50 100644 --- a/rules/build_sector.smk +++ b/rules/build_sector.smk @@ -748,7 +748,7 @@ rule prepare_sector_network: pop_weighted_energy_totals=RESOURCES + "pop_weighted_energy_totals{weather_year}_s{simpl}_{clusters}.csv", pop_weighted_heat_totals=RESOURCES - + "pop_weighted_heat_totals{weather_year}_s{simpl}_{clusters}.csv" + + "pop_weighted_heat_totals{weather_year}_s{simpl}_{clusters}.csv", shipping_demand=RESOURCES + "shipping_demand{weather_year}_s{simpl}_{clusters}.csv", transport_demand=RESOURCES + "transport_demand{weather_year}_s{simpl}_{clusters}.csv", transport_data=RESOURCES + "transport_data{weather_year}_s{simpl}_{clusters}.csv", diff --git a/rules/solve_overnight.smk b/rules/solve_overnight.smk index 86f0724d..6a4c7f7c 100644 --- a/rules/solve_overnight.smk +++ b/rules/solve_overnight.smk @@ -71,31 +71,31 @@ rule solve_operations_network_other_year: "../scripts/solve_operations_network_other_year.py" -rule solve_operations_network_other_year_myopic: - input: - overrides="data/override_component_attrs", - pre=RDIR - + "/prenetworks/elec{weather_year}_s{simpl}_{clusters}_lv{lv}_{opts}_{sector_opts}_{planning_horizons}.nc", - post=RDIR - + "/postnetworks/elec{capacity_year}_s{simpl}_{clusters}_lv{lv}_{opts}_{sector_opts}_{planning_horizons}.nc", - previous=solved_previous_year, - output: - RDIR - + "/operations/elec{capacity_year}_s{simpl}_{clusters}_lv{lv}_{opts}_{sector_opts}_{planning_horizons}_{weather_year}_myopic.nc", - shadow: - "shallow" - log: - solver=RDIR - + "/logs/elec{capacity_year}_s{simpl}_{clusters}_lv{lv}_{opts}_{sector_opts}_{planning_horizons}_{weather_year}_solver.log", - python=RDIR - + "/logs/elec{capacity_year}_s{simpl}_{clusters}_lv{lv}_{opts}_{sector_opts}_{planning_horizons}_{weather_year}_python.log", - threads: 4 - resources: - mem_mb=10000, - benchmark: - ( - RDIR - + "/benchmarks/solve_operations_network_myopic/elec{capacity_year}_s{simpl}_{clusters}_lv{lv}_{opts}_{sector_opts}_{planning_horizons}_{weather_year}" - ) - script: - "../scripts/solve_operations_network_other_year_myopic.py" +# rule solve_operations_network_other_year_myopic: +# input: +# overrides="data/override_component_attrs", +# pre=RDIR +# + "/prenetworks/elec{weather_year}_s{simpl}_{clusters}_lv{lv}_{opts}_{sector_opts}_{planning_horizons}.nc", +# post=RDIR +# + "/postnetworks/elec{capacity_year}_s{simpl}_{clusters}_lv{lv}_{opts}_{sector_opts}_{planning_horizons}.nc", +# previous=solved_previous_year, +# output: +# RDIR +# + "/operations/elec{capacity_year}_s{simpl}_{clusters}_lv{lv}_{opts}_{sector_opts}_{planning_horizons}_{weather_year}_myopic.nc", +# shadow: +# "shallow" +# log: +# solver=RDIR +# + "/logs/elec{capacity_year}_s{simpl}_{clusters}_lv{lv}_{opts}_{sector_opts}_{planning_horizons}_{weather_year}_solver.log", +# python=RDIR +# + "/logs/elec{capacity_year}_s{simpl}_{clusters}_lv{lv}_{opts}_{sector_opts}_{planning_horizons}_{weather_year}_python.log", +# threads: 4 +# resources: +# mem_mb=10000, +# benchmark: +# ( +# RDIR +# + "/benchmarks/solve_operations_network_myopic/elec{capacity_year}_s{simpl}_{clusters}_lv{lv}_{opts}_{sector_opts}_{planning_horizons}_{weather_year}" +# ) +# script: +# "../scripts/solve_operations_network_other_year_myopic.py"