Update

lanl-ansi · May 9, 2024 · a6b5224 · a6b5224
1 parent 73d174b
commit a6b5224
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/src/form/acp.jl b/src/form/acp.jl
@@ -486,7 +486,7 @@ function constraint_mc_power_balance_capc(pm::AbstractUnbalancedACPModel, nw::In
     cap_state = 1.0
     ncnds = length(terminals)
     Gs = fill(0.0, ncnds, ncnds)
-    Bs = convert(Matrix{JuMP.NonlinearExpr}, JuMP.@expression(pm.model, [idx=1:ncnds, jdx=1:ncnds], 0.0))
+    Bs = Any[0.0 for idx in 1:ncnds, jdx in 1:ncnds]
     for (val, connections) in bus_shunts
         shunt = ref(pm,nw,:shunt,val)
         for (idx,c) in enumerate(connections)

diff --git a/src/form/acr.jl b/src/form/acr.jl
@@ -538,7 +538,7 @@ function constraint_mc_power_balance_capc(pm::AbstractUnbalancedACRModel, nw::In
     # calculate Gs, Bs
     ncnds = length(terminals)
     Gt = fill(0.0, ncnds, ncnds)
-    Bt = convert(Matrix{JuMP.Nonlinear}, JuMP.@expression(pm.model, [idx=1:ncnds, jdx=1:ncnds], 0.0))
+    Bt = Any[0.0 for idx in 1:ncnds, jdx in 1:ncnds]
     for (val, connections) in bus_shunts
         shunt = ref(pm,nw,:shunt,val)
         for (idx,c) in enumerate(connections)

diff --git a/src/form/en_ivr.jl b/src/form/en_ivr.jl
@@ -205,6 +205,7 @@ function constraint_mc_generator_power_delta(pm::AbstractNLExplicitNeutralIVRMod
         push!(qg, JuMP.@expression(pm.model, -vrg[idx]*cig[idx]+vig[idx]*crg[idx]))
     end
 
+    # TODO(odow): refactor as pmin[i] <= pg[i] <= pmax[i]
     JuMP.@constraint(pm.model, [i in 1:nph], pmin[i] <= pg[i])
     JuMP.@constraint(pm.model, [i in 1:nph], pmax[i] >= pg[i])
     JuMP.@constraint(pm.model, [i in 1:nph], qmin[i] <= qg[i])

diff --git a/src/form/ivr.jl b/src/form/ivr.jl
@@ -338,7 +338,7 @@ function constraint_mc_current_balance_capc(pm::AbstractUnbalancedIVRModel, nw::
     # calculate Gs, Bs
     ncnds = length(terminals)
     Gt = fill(0.0, ncnds, ncnds)
-    Bt = convert(Matrix{JuMP.NonlinearExpr}, JuMP.@expression(pm.model, [idx=1:ncnds, jdx=1:ncnds], 0.0))
+    Bt = Any[0.0 for idx in 1:ncnds, jdx in 1:ncnds]
     for (val, connections) in bus_shunts
         shunt = ref(pm,nw,:shunt,val)
         for (idx,c) in enumerate(connections)
@@ -787,6 +787,7 @@ function constraint_mc_generator_power_delta(pm::IVRUPowerModel, nw::Int, id::In
     end
 
     if bounded
+        # TODO(odow): refactor as pmin[i] <= pg[i] <= pmax[i]
         JuMP.@constraint(pm.model, [i in 1:nph], pmin[i] <= pg[i])
         JuMP.@constraint(pm.model, [i in 1:nph], pmax[i] >= pg[i])
         JuMP.@constraint(pm.model, [i in 1:nph], qmin[i] <= qg[i])