Merge branch 'master' into develop

Author: ktehranchi

.pre-commit-config.yaml

@@ -2,7 +2,7 @@ exclude: "LICENSE*|repo_data/"
 
 repos:
 - repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v4.6.0
+  rev: v5.0.0
   hooks:
   - id: trailing-whitespace
   - id: end-of-file-fixer
@@ -29,7 +29,7 @@ repos:
   - id: add-trailing-comma
 
 - repo: https://github.com/asottile/pyupgrade
-  rev: v3.17.0
+  rev: v3.18.0
   hooks:
   - id: pyupgrade
     args: [--py39-plus]
@@ -58,7 +58,7 @@ repos:
   - id: blackdoc
 
 - repo: https://github.com/psf/black-pre-commit-mirror
-  rev: 24.8.0
+  rev: 24.10.0
   hooks:
   - id: black
     language_version: python3.11

workflow/repo_data/config/config.common.yaml

@@ -130,6 +130,18 @@ lines:
     500.: "Al/St 560/50 4-bundle 750.0"
     765.: "Al/St 560/50 4-bundle 750.0"
 
+ 
+lines:
+  types: #Temp values, replaced.
+    115.: "Al/St 240/40 2-bundle 220.0"
+    138.: "Al/St 240/40 2-bundle 220.0"
+    161.: "Al/St 240/40 2-bundle 220.0"
+    230.: "Al/St 240/40 2-bundle 220.0"
+    345.: "Al/St 240/40 4-bundle 380.0"
+    500.: "Al/St 560/50 4-bundle 750.0"
+    765.: "Al/St 560/50 4-bundle 750.0"
+ 
+
 # docs :
 offshore_shape:
   use: eez #options are ca_osw, eez

workflow/scripts/cluster_network.py

@@ -150,6 +150,10 @@ def n_bounds(model, *n_id):
         expr=sum((m.n[i] - L.loc[i] * n_clusters) ** 2 for i in L.index),
         sense=po.minimize,
     )
+
+    if solver_name == "highs":
+        solver_name = "ipopt"
+
     opt = po.SolverFactory(solver_name)
     if not opt.has_capability("quadratic_objective"):
         logger.warning(