From 745df4d2c1b1908c924cce36995c732880c7004e Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Mon, 22 Jul 2024 15:22:32 +0200 Subject: [PATCH 1/4] fix typo --- rules/common.smk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rules/common.smk b/rules/common.smk index 2b8495e1..a7131334 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( From 877ca3eb449cf61db376433883956ca74b34e7e2 Mon Sep 17 00:00:00 2001 From: lisazeyen <35347358+lisazeyen@users.noreply.github.com> Date: Mon, 22 Jul 2024 16:44:26 +0200 Subject: [PATCH 2/4] change sign sequestration store marginal cost (#1174) --- scripts/prepare_sector_network.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/prepare_sector_network.py b/scripts/prepare_sector_network.py index 53b811aa..b86f9557 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", From b8b92ace64f7f99d6e0697385f85647eb65e2946 Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Mon, 22 Jul 2024 17:35:50 +0200 Subject: [PATCH 3/4] common.smk: make solver_threads also look for capitalised 'Threads' --- rules/common.smk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rules/common.smk b/rules/common.smk index a7131334..ef518beb 100644 --- a/rules/common.smk +++ b/rules/common.smk @@ -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 From f11f8d86134aaa38b5bb696e79a7ad4b9fb6ebef Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Mon, 22 Jul 2024 21:51:37 +0200 Subject: [PATCH 4/4] solver settings: add copt-gpu setings for pdlp solver --- config/config.default.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/config/config.default.yaml b/config/config.default.yaml index 0af34734..d1d13065 100644 --- a/config/config.default.yaml +++ b/config/config.default.yaml @@ -879,6 +879,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