diff --git a/Snakefile b/Snakefile index 649342a0..fdf2daed 100644 --- a/Snakefile +++ b/Snakefile @@ -285,7 +285,7 @@ rule prepare_res_potentials: ), output: **{ - f"{tech}_{year}_{discountrate}_potential_s{simpl}_{clusters}": f"resources/custom_renewables/{tech}/{tech}_{year}_{discountrate}_potential_s{{simpl}}_{{clusters}}.csv" + f"{tech}_{year}_{discountrate}_potential_s{simpl}_{clusters}": f"resources/custom_renewables/{tech}/{tech}_{year}_{discountrate}_potential_s{simpl}_{clusters}.csv" for tech in config["custom_data"]["renewables"] for year in config["scenario"]["planning_horizons"] for discountrate in config["costs"]["discountrate"] @@ -293,7 +293,7 @@ rule prepare_res_potentials: for clusters in config["scenario"]["clusters"] }, **{ - f"{tech}_{year}_{discountrate}_installable_s{simpl}_{clusters}": f"resources/custom_renewables/{tech}/{tech}_{year}_{discountrate}_installable_s{{simpl}}_{{clusters}}.csv" + f"{tech}_{year}_{discountrate}_installable_s{simpl}_{clusters}": f"resources/custom_renewables/{tech}/{tech}_{year}_{discountrate}_installable_s{simpl}_{clusters}.csv" for tech in config["custom_data"]["renewables"] for year in config["scenario"]["planning_horizons"] for discountrate in config["costs"]["discountrate"] @@ -311,7 +311,7 @@ rule override_respot: countries=config["countries"], input: **{ - f"custom_res_pot_{tech}_{year}_{discountrate}_s{simpl}_{clusters}": f"resources/custom_renewables/{tech}/{tech}_{year}_{discountrate}_potential_s{{simpl}}_{{clusters}}.csv" + f"custom_res_pot_{tech}_{year}_{discountrate}_s{simpl}_{clusters}": f"resources/custom_renewables/{tech}/{tech}_{year}_{discountrate}_potential_s{simpl}_{clusters}.csv" for tech in config["custom_data"]["renewables"] for year in config["scenario"]["planning_horizons"] for discountrate in config["costs"]["discountrate"] @@ -319,7 +319,7 @@ rule override_respot: for clusters in config["scenario"]["clusters"] }, **{ - f"custom_res_ins_{tech}_{year}_{discountrate}_s{simpl}_{clusters}": f"resources/custom_renewables/{tech}/{tech}_{year}_{discountrate}_installable_s{{simpl}}_{{clusters}}.csv" + f"custom_res_ins_{tech}_{year}_{discountrate}_s{simpl}_{clusters}": f"resources/custom_renewables/{tech}/{tech}_{year}_{discountrate}_installable_s{simpl}_{clusters}.csv" for tech in config["custom_data"]["renewables"] for year in config["scenario"]["planning_horizons"] for discountrate in config["costs"]["discountrate"] diff --git a/config.bright_BI.yaml b/config.bright_BI.yaml index 12a0128a..e029eca3 100644 --- a/config.bright_BI.yaml +++ b/config.bright_BI.yaml @@ -69,7 +69,7 @@ export: store: false # [True, False] # specifies wether an export store to balance demand is implemented store_capital_costs: "no_costs" # ["standard_costs", "no_costs"] # specifies the costs of the export store. "standard_costs" takes CAPEX of "hydrogen storage tank type 1 including compressor" export_profile: "constant" # use "ship" or "constant" - constant_nodal_export: True + constant_nodal_export: true ship: ship_capacity: 0.4 # TWh # 0.05 TWh for new ones, 0.003 TWh for Susio Frontier, 0.4 TWh according to Hampp2021: "Corresponds to 11360 t H2 (l) with LHV of 33.3333 Mwh/t_H2. Cihlar et al 2020 based on IEA 2019, Table 3-B" travel_time: 288 # hours # From Agadir to Rotterdam and back (12*24) diff --git a/config.bright_DE.yaml b/config.bright_DE.yaml index 99ae8aa7..b1fbb408 100644 --- a/config.bright_DE.yaml +++ b/config.bright_DE.yaml @@ -69,7 +69,7 @@ export: store: false # [True, False] # specifies wether an export store to balance demand is implemented store_capital_costs: "no_costs" # ["standard_costs", "no_costs"] # specifies the costs of the export store. "standard_costs" takes CAPEX of "hydrogen storage tank type 1 including compressor" export_profile: "constant" # use "ship" or "constant" - constant_nodal_export: True + constant_nodal_export: true ship: ship_capacity: 0.4 # TWh # 0.05 TWh for new ones, 0.003 TWh for Susio Frontier, 0.4 TWh according to Hampp2021: "Corresponds to 11360 t H2 (l) with LHV of 33.3333 Mwh/t_H2. Cihlar et al 2020 based on IEA 2019, Table 3-B" travel_time: 288 # hours # From Agadir to Rotterdam and back (12*24) diff --git a/config.bright_GH.yaml b/config.bright_GH.yaml index b5141b83..3518e6b9 100644 --- a/config.bright_GH.yaml +++ b/config.bright_GH.yaml @@ -69,7 +69,7 @@ export: store: false # [True, False] # specifies wether an export store to balance demand is implemented store_capital_costs: "no_costs" # ["standard_costs", "no_costs"] # specifies the costs of the export store. "standard_costs" takes CAPEX of "hydrogen storage tank type 1 including compressor" export_profile: "constant" # use "ship" or "constant" - constant_nodal_export: True + constant_nodal_export: true ship: ship_capacity: 0.4 # TWh # 0.05 TWh for new ones, 0.003 TWh for Susio Frontier, 0.4 TWh according to Hampp2021: "Corresponds to 11360 t H2 (l) with LHV of 33.3333 Mwh/t_H2. Cihlar et al 2020 based on IEA 2019, Table 3-B" travel_time: 288 # hours # From Agadir to Rotterdam and back (12*24)