Merge pull request #1000 from PyPSA/solving-fixes

adjust resources perfect foresight and solver settings
PyPSA · Apr 3, 2024 · 185bc84 · 185bc84
2 parents d74017e + 3819e64
commit 185bc84
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/config/config.default.yaml b/config/config.default.yaml
@@ -786,7 +786,6 @@ solving:
       PreDual: 0
       GURO_PAR_BARDENSETHRESH: 200
     gurobi-numeric-focus:
-      name: gurobi
       NumericFocus: 3       # Favour numeric stability over speed
       method: 2             # barrier
       crossover: 0          # do not use crossover
@@ -798,7 +797,6 @@ solving:
       threads: 8
       Seed: 123
     gurobi-fallback:        # Use gurobi defaults
-      name: gurobi
       crossover: 0
       method: 2             # barrier
       BarHomogeneous: 1     # Use homogeneous barrier if standard does not converge

diff --git a/rules/solve_perfect.smk b/rules/solve_perfect.smk
@@ -35,7 +35,8 @@ rule add_existing_baseyear:
         planning_horizons=config["scenario"]["planning_horizons"][0],  #only applies to baseyear
     threads: 1
     resources:
-        mem_mb=2000,
+        mem_mb=config_provider("solving", "mem_mb"),
+        runtime=config_provider("solving", "runtime", default="24h"),
     log:
         logs(
             "add_existing_baseyear_elec_s{simpl}_{clusters}_l{ll}_{opts}_{sector_opts}_{planning_horizons}.log"