add blocker cost for subs based on number of transformers

lanl-ansi · Nov 7, 2024 · 673cb52 · 673cb52
1 parent 5646d53
commit 673cb52
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/src/core/data.jl b/src/core/data.jl
@@ -1096,7 +1096,7 @@ function update_cost_multiplier!(data::Dict{String,<:Any})
     end
     if haskey(data, "gmd_ne_blocker")
         for (sub, m) in subs
-            data["gmd_ne_blocker"]["$sub"]["multipler"] = m
+            data["gmd_ne_blocker"]["$sub"]["multiplier"] = m
         end
     end
 end
diff --git a/src/core/objective.jl b/src/core/objective.jl
@@ -7,10 +7,9 @@
 
 "OBJECTIVE: minimize cost of installing GIC blocker"
 function objective_blocker_placement_cost(pm::_PM.AbstractPowerModel)
-
     return JuMP.@objective(pm.model, Min,
         sum(
-            sum( blocker["construction_cost"]*_PM.var(pm, n, :z_blocker, i) for (i,blocker) in nw_ref[:gmd_ne_blocker] )
+            sum( blocker["multiplier"]*blocker["construction_cost"]*_PM.var(pm, n, :z_blocker, i) for (i,blocker) in nw_ref[:gmd_ne_blocker] )
         for (n, nw_ref) in _PM.nws(pm))
     )