diff --git a/config/config.default.yaml b/config/config.default.yaml index c9ee439b..7e2f7077 100644 --- a/config/config.default.yaml +++ b/config/config.default.yaml @@ -888,6 +888,13 @@ solving: Threads: 8 LpMethod: 2 Crossover: 0 + RelGap: 1.e-6 + Dualize: 0 + copt-gpu: + LpMethod: 6 + GPUMode: 1 + PDLPTol: 1.e-5 + Crossover: 0 cbc-default: {} # Used in CI glpk-default: {} # Used in CI diff --git a/rules/common.smk b/rules/common.smk index 2b8495e1..ef518beb 100644 --- a/rules/common.smk +++ b/rules/common.smk @@ -55,7 +55,7 @@ def dynamic_getter(wildcards, keys, default): scenario_name = wildcards.run if scenario_name not in scenarios: raise ValueError( - f"Scenario {scenario_name} not found in file {config['run']['scenario']['file']}." + f"Scenario {scenario_name} not found in file {config['run']['scenarios']['file']}." ) config_with_scenario = scenario_config(scenario_name) config_with_wildcards = update_config_from_wildcards( @@ -81,7 +81,8 @@ def config_provider(*keys, default=None): def solver_threads(w): solver_options = config_provider("solving", "solver_options")(w) option_set = config_provider("solving", "solver", "options")(w) - threads = solver_options[option_set].get("threads", 4) + solver_option_set = solver_options[option_set] + threads = solver_option_set.get("threads") or solver_option_set.get("Threads") or 4 return threads diff --git a/scripts/prepare_sector_network.py b/scripts/prepare_sector_network.py index 1916c62e..7426c76f 100644 --- a/scripts/prepare_sector_network.py +++ b/scripts/prepare_sector_network.py @@ -688,7 +688,7 @@ def add_co2_tracking(n, costs, options): e_nom_extendable=True, e_nom_max=e_nom_max, capital_cost=options["co2_sequestration_cost"], - marginal_cost=0.1, + marginal_cost=-0.1, bus=sequestration_buses, lifetime=options["co2_sequestration_lifetime"], carrier="co2 sequestered",