@@ -1023,12 +1023,12 @@ rule prepare_st_low_res_network:
10231023 + "networks/base_s_{clusters}_{opts}_{sector_opts}_{st_years}.nc" ,
10241024 output :
10251025 st_low_res_prenetwork = RESULTS
1026- + "st_low_res_prenetworks/base_s_{clusters}_{opts}_{sector_opts}_{st_years}.nc" ,
1026+ + "st_low_res_prenetworks/base_s_{clusters}_{opts}_{sector_opts}_{st_years}_eeg_level_{eeg_level} .nc" ,
10271027 resources :
10281028 mem_mb = 16000 ,
10291029 log :
10301030 RESULTS
1031- + "logs/st_low_res_prenetwork_s_{clusters}_{opts}_{sector_opts}_{st_years}.log" ,
1031+ + "logs/st_low_res_prenetwork_s_{clusters}_{opts}_{sector_opts}_{st_years}_eeg_level_{eeg_level} .log" ,
10321032 script :
10331033 "scripts/pypsa-de/prepare_st_low_res_network.py"
10341034
@@ -1042,21 +1042,21 @@ rule solve_st_low_res_network:
10421042 custom_extra_functionality = input_custom_extra_functionality ,
10431043 input :
10441044 st_low_res_prenetwork = RESULTS
1045- + "st_low_res_prenetworks/base_s_{clusters}_{opts}_{sector_opts}_{st_years}.nc" ,
1045+ + "st_low_res_prenetworks/base_s_{clusters}_{opts}_{sector_opts}_{st_years}_eeg_level_{eeg_level} .nc" ,
10461046 co2_totals_name = resources ("co2_totals.csv" ),
10471047 energy_totals = resources ("energy_totals.csv" ),
10481048 output :
10491049 st_low_res_network = RESULTS
1050- + "st_low_res_networks/{sensitivity}/base_s_{clusters}_{opts}_{sector_opts}_{st_years}.nc" ,
1050+ + "st_low_res_networks/{sensitivity}/base_s_{clusters}_{opts}_{sector_opts}_{st_years}_eeg_level_{eeg_level} .nc" ,
10511051 shadow :
10521052 shadow_config
10531053 log :
10541054 solver = RESULTS
1055- + "logs/st_low_res_networks/{sensitivity}/base_s_{clusters}_{opts}_{sector_opts}_{st_years}_solver.log" ,
1055+ + "logs/st_low_res_networks/{sensitivity}/base_s_{clusters}_{opts}_{sector_opts}_{st_years}_eeg_level_{eeg_level} _solver.log" ,
10561056 memory = RESULTS
1057- + "logs/st_low_res_networks/{sensitivity}/base_s_{clusters}_{opts}_{sector_opts}_{st_years}_memory.log" ,
1057+ + "logs/st_low_res_networks/{sensitivity}/base_s_{clusters}_{opts}_{sector_opts}_{st_years}_eeg_level_{eeg_level} _memory.log" ,
10581058 python = RESULTS
1059- + "logs/st_low_res_networks/{sensitivity}/base_s_{clusters}_{opts}_{sector_opts}_{st_years}_python.log" ,
1059+ + "logs/st_low_res_networks/{sensitivity}/base_s_{clusters}_{opts}_{sector_opts}_{st_years}_eeg_level_{eeg_level} _python.log" ,
10601060 threads : solver_threads
10611061 resources :
10621062 mem_mb = config_provider ("solving" , "mem_mb" ),
@@ -1102,25 +1102,28 @@ use rule export_ariadne_variables as export_st_variables with:
11021102 energy_totals = resources ("energy_totals.csv" ),
11031103 st_low_res_networks = expand (
11041104 RESULTS
1105- + "st_low_res_networks/{sensitivity}/base_s_{clusters}_{opts}_{sector_opts}_{st_years}.nc" ,
1105+ + "st_low_res_networks/{sensitivity}/base_s_{clusters}_{opts}_{sector_opts}_{st_years}_eeg_level_{eeg_level} .nc" ,
11061106 ** config ["scenario" ],
11071107 st_years = config_provider ("iiasa_database" , "regret_run" , "st_years" ),
11081108 allow_missing = True ,
11091109 ),
11101110 output :
11111111 exported_variables = RESULTS
1112- + "st_low_res_variables/{sensitivity}/st_low_res_variables .xlsx" ,
1112+ + "st_low_res_variables/{sensitivity}/st_low_res_variables_eeg_level_{eeg_level} .xlsx" ,
11131113 exported_variables_full = RESULTS
1114- + "st_low_res_variables/{sensitivity}/st_low_res_variables_full .xlsx" ,
1114+ + "st_low_res_variables/{sensitivity}/st_low_res_variables_full_eeg_level_{eeg_level} .xlsx" ,
11151115 log :
1116- RESULTS + "logs/st_low_res_variables/{sensitivity}/st_low_res_variables.log" ,
1116+ RESULTS
1117+ + "logs/st_low_res_variables/{sensitivity}/st_low_res_variables_eeg_level_{eeg_level}.log" ,
11171118
11181119
11191120rule st_all :
11201121 input :
11211122 expand (
1122- RESULTS + "st_low_res_variables/{sensitivity}/st_low_res_variables.xlsx" ,
1123+ RESULTS
1124+ + "st_low_res_variables/{sensitivity}/st_low_res_variables_eeg_level_{eeg_level}.xlsx" ,
11231125 sensitivity = get_st_sensitivities ,
1126+ eeg_level = config_provider ("iiasa_database" , "regret_run" , "EEG_levels" ),
11241127 run = config_provider ("run" , "name" ),
11251128 ),
11261129
0 commit comments