Port PSI add interval

src/PowerOperationsModels.jl

@@ -14,6 +14,7 @@ import ProgressMeter
 import PowerSystems
 import PowerSystems: get_component
 import Serialization
+import SparseArrays
 import TimerOutputs
 import InteractiveUtils: methodswith
 

src/ac_transmission_models/AC_branches.jl

@@ -755,26 +755,48 @@ function add_constraints!(
 end
 
 function _make_flow_expressions!(
-    jump_model::JuMP.Model,
     name::String,
     time_steps::UnitRange{Int},
-    ptdf_col::AbstractVector{Float64},
+    ptdf_col::Vector{Float64},
     nodal_balance_expressions::Matrix{JuMP.AffExpr},
 )
     @debug "Making Flow Expression on thread $(Threads.threadid()) for branch $name"
+    nz_idx = [i for i in eachindex(ptdf_col) if abs(ptdf_col[i]) > PTDF_ZERO_TOL]
+    hint = length(nz_idx)
     expressions = Vector{JuMP.AffExpr}(undef, length(time_steps))
     for t in time_steps
-        expressions[t] = JuMP.@expression(
-            jump_model,
-            sum(
-                ptdf_col[i] * nodal_balance_expressions[i, t] for
-                i in 1:length(ptdf_col)
+        acc = IOM.get_hinted_aff_expr(hint)
+        @inbounds for i in nz_idx
+            JuMP.add_to_expression!(acc, ptdf_col[i], nodal_balance_expressions[i, t])
+        end
+        expressions[t] = acc
+    end
+    return name, expressions
+end
+
+function _make_flow_expressions!(
+    name::String,
+    time_steps::UnitRange{Int},
+    ptdf_col::SparseArrays.SparseVector{Float64, Int},
+    nodal_balance_expressions::Matrix{JuMP.AffExpr},
+)
+    @debug "Making Flow Expression on thread $(Threads.threadid()) for branch $name"
+    nz_idx = SparseArrays.nonzeroinds(ptdf_col)
+    nz_val = SparseArrays.nonzeros(ptdf_col)
+    hint = length(nz_idx)
+    expressions = Vector{JuMP.AffExpr}(undef, length(time_steps))
+    for t in time_steps
+        acc = IOM.get_hinted_aff_expr(hint)
+        @inbounds for k in eachindex(nz_idx)
+            JuMP.add_to_expression!(
+                acc,
+                nz_val[k],
+                nodal_balance_expressions[nz_idx[k], t],
             )
-        )
+        end
+        expressions[t] = acc
     end
     return name, expressions
-    # change when using the not concurrent version
-    # return expressions
 end
 
 function _add_expression_to_container!(
@@ -789,7 +811,6 @@ function _add_expression_to_container!(
     name = PSY.get_name(reduction_entry)
     if name in branches
         branch_flow_expr[name, :] .= _make_flow_expressions!(
-            jump_model,
             name,
             time_steps,
             ptdf_col,
@@ -812,7 +833,6 @@ function _add_expression_to_container!(
     for name in names
         if name in branches
             branch_flow_expr[name, :] .= _make_flow_expressions!(
-                jump_model,
                 name,
                 time_steps,
                 ptdf_col,
@@ -837,7 +857,6 @@ function _add_expression_to_container!(
     for name in names
         if name in branches
             branch_flow_expr[name, :] .= _make_flow_expressions!(
-                jump_model,
                 name,
                 time_steps,
                 ptdf_col,
@@ -873,13 +892,10 @@ function add_expressions!(
         time_steps,
     )
 
-    jump_model = get_jump_model(container)
-
-    tasks = map(collect(name_to_arc_map)) do pair
+    tasks = map(name_to_arc_map) do pair
         (name, (arc, _)) = pair
         ptdf_col = ptdf[arc, :]
         Threads.@spawn _make_flow_expressions!(
-            jump_model,
             name,
             time_steps,
             ptdf_col,

src/ac_transmission_models/branch_constructor.jl

@@ -147,13 +147,15 @@ function construct_device!(
         )
     end
 
-    add_branch_parameters!(
-        container,
-        DynamicBranchRatingTimeSeriesParameter,
-        devices,
-        device_model,
-        network_model,
-    )
+    if haskey(get_time_series_names(device_model), DynamicBranchRatingTimeSeriesParameter)
+        add_branch_parameters!(
+            container,
+            DynamicBranchRatingTimeSeriesParameter,
+            devices,
+            device_model,
+            network_model,
+        )
+    end
 
     if haskey(
         get_time_series_names(device_model),
@@ -260,7 +262,7 @@ function construct_device!(
 
         add_constraints!(
             container,
-            PostContingencyEmergencyRateLimitConstrain,
+            PostContingencyEmergencyRateLimitConstraint,
             branches,
             branches_outages,
             device_model,