Hr/add limiters (#376)

* Add current limiters to inner_conrol_models * Fix limiter integration mistakes * Add saturation limiting logic * Add hybrid limiter control logic * Correct sign error hybrid limiter * Remove print * Change PowerSystems version * modify inner control gain * debug * fix mag limiter * change placement of kiv in hyblim * debug load * revert debug --------- Co-authored-by: Rodrigo Henríquez-Auba <rodrigomha@gmail.com>
NREL-Sienna · Jul 8, 2024 · ad1aa65 · ad1aa65
1 parent e3bae17
commit ad1aa65
Show file tree

Hide file tree

Showing 16 changed files with 580 additions and 47 deletions.
diff --git a/src/PowerSimulationsDynamics.jl b/src/PowerSimulationsDynamics.jl
@@ -141,6 +141,7 @@ include("models/inverter_models/frequency_estimator_models.jl")
 include("models/inverter_models/outer_control_models.jl")
 include("models/inverter_models/inner_control_models.jl")
 include("models/inverter_models/converter_models.jl")
+include("models/inverter_models/output_current_limiter_models.jl")
 
 #Injection Models
 include("models/load_models.jl")

diff --git a/src/base/device_wrapper.jl b/src/base/device_wrapper.jl
@@ -102,6 +102,9 @@ function state_port_mappings(
     component_state_mapping = Dict{Int, Vector{Int}}()
     input_port_mapping = Dict{Int, Vector{Int}}()
     for c in PSY.get_dynamic_components(dynamic_device)
+        if c isa PSY.OutputCurrentLimiter
+            continue
+        end
         ix = index(typeof(c))
         component_state_mapping[ix] = _index_local_states(c, device_states)
         input_port_mapping[ix] = _index_port_mapping!(c, device_states)
@@ -228,8 +231,8 @@ function DynamicWrapper(
     sys_base_freq,
 ) where {D <: PSY.DynamicInjection}
     device_states = PSY.get_states(dynamic_device)
-    IS.@assert_op PSY.get_X_th(dynamic_device) == PSY.get_X_th(device)
-    IS.@assert_op PSY.get_R_th(dynamic_device) == PSY.get_R_th(device)
+    # IS.@assert_op PSY.get_X_th(dynamic_device) == PSY.get_X_th(device)
+    # IS.@assert_op PSY.get_R_th(dynamic_device) == PSY.get_R_th(device)
 
     return DynamicWrapper(
         dynamic_device,
@@ -331,6 +334,8 @@ PSY.get_freq_estimator(wrapper::DynamicWrapper{T}) where {T <: PSY.DynamicInvert
     wrapper.device.freq_estimator
 PSY.get_filter(wrapper::DynamicWrapper{T}) where {T <: PSY.DynamicInverter} =
     wrapper.device.filter
+PSY.get_limiter(wrapper::DynamicWrapper{T}) where {T <: PSY.DynamicInverter} =
+    PSY.get_limiter(wrapper.device)
 
 # PSY overloads of specific Dynamic Injectors
 

diff --git a/src/initialization/inverter_components/init_DCside.jl b/src/initialization/inverter_components/init_DCside.jl
@@ -11,7 +11,7 @@ function initialize_DCside!(
     IC <: PSY.InnerControl,
     P <: PSY.FrequencyEstimator,
     F <: PSY.Filter,
-    L <: Union{Nothing, PSY.InverterLimiter},
+    L <: Union{Nothing, PSY.OutputCurrentLimiter},
 }
 
     #Update inner_vars

diff --git a/src/initialization/inverter_components/init_converter.jl b/src/initialization/inverter_components/init_converter.jl
@@ -11,7 +11,7 @@ function initialize_converter!(
     DC <: PSY.DCSource,
     P <: PSY.FrequencyEstimator,
     F <: PSY.Filter,
-    L <: Union{Nothing, PSY.InverterLimiter},
+    L <: Union{Nothing, PSY.OutputCurrentLimiter},
 } end
 
 function initialize_converter!(
@@ -27,7 +27,7 @@ function initialize_converter!(
     DC <: PSY.DCSource,
     P <: PSY.FrequencyEstimator,
     F <: PSY.Filter,
-    L <: Union{Nothing, PSY.InverterLimiter},
+    L <: Union{Nothing, PSY.OutputCurrentLimiter},
 }
     #Get inner vars
     V_R = inner_vars[Vr_cnv_var]
@@ -82,7 +82,7 @@ function initialize_converter!(
     DC <: PSY.DCSource,
     P <: PSY.FrequencyEstimator,
     F <: PSY.Filter,
-    L <: Union{Nothing, PSY.InverterLimiter},
+    L <: Union{Nothing, PSY.OutputCurrentLimiter},
 }
     #Get inner vars
     Vr_filter = inner_vars[Vr_filter_var]

diff --git a/src/initialization/inverter_components/init_filter.jl b/src/initialization/inverter_components/init_filter.jl
@@ -9,7 +9,7 @@ function initialize_filter!(
     IC <: PSY.InnerControl,
     DC <: PSY.DCSource,
     P <: PSY.FrequencyEstimator,
-    L <: Union{Nothing, PSY.InverterLimiter},
+    L <: Union{Nothing, PSY.OutputCurrentLimiter},
 }
     #PowerFlow Data
     P0 = PSY.get_active_power(static)
@@ -101,7 +101,7 @@ function initialize_filter!(
     IC <: PSY.InnerControl,
     DC <: PSY.DCSource,
     P <: PSY.FrequencyEstimator,
-    L <: Union{Nothing, PSY.InverterLimiter},
+    L <: Union{Nothing, PSY.OutputCurrentLimiter},
 }
     #PowerFlow Data
     P0 = PSY.get_active_power(static)

diff --git a/src/initialization/inverter_components/init_frequency_estimator.jl b/src/initialization/inverter_components/init_frequency_estimator.jl
@@ -9,7 +9,7 @@ function initialize_frequency_estimator!(
     IC <: PSY.InnerControl,
     DC <: PSY.DCSource,
     F <: PSY.Filter,
-    L <: Union{Nothing, PSY.InverterLimiter},
+    L <: Union{Nothing, PSY.OutputCurrentLimiter},
 }
     Vr_filter = inner_vars[Vr_filter_var]
     Vi_filter = inner_vars[Vi_filter_var]
@@ -76,7 +76,7 @@ function initialize_frequency_estimator!(
     IC <: PSY.InnerControl,
     DC <: PSY.DCSource,
     F <: PSY.Filter,
-    L <: Union{Nothing, PSY.InverterLimiter},
+    L <: Union{Nothing, PSY.OutputCurrentLimiter},
 }
     Vr_filter = inner_vars[Vr_filter_var]
     Vi_filter = inner_vars[Vi_filter_var]
@@ -139,7 +139,7 @@ function initialize_frequency_estimator!(
     IC <: PSY.InnerControl,
     DC <: PSY.DCSource,
     F <: PSY.Filter,
-    L <: Union{Nothing, PSY.InverterLimiter},
+    L <: Union{Nothing, PSY.OutputCurrentLimiter},
 }
     #Get parameters
     pll_control = PSY.get_freq_estimator(dynamic_device)

diff --git a/src/initialization/inverter_components/init_inner.jl b/src/initialization/inverter_components/init_inner.jl
@@ -11,7 +11,7 @@ function initialize_inner!(
     DC <: PSY.DCSource,
     P <: PSY.FrequencyEstimator,
     F <: PSY.Filter,
-    L <: Union{Nothing, PSY.InverterLimiter},
+    L <: Union{Nothing, PSY.OutputCurrentLimiter},
 }
 
     #Obtain external states inputs for component
@@ -156,7 +156,7 @@ function initialize_inner!(
     DC <: PSY.DCSource,
     P <: PSY.FrequencyEstimator,
     F <: PSY.Filter,
-    L <: Union{Nothing, PSY.InverterLimiter},
+    L <: Union{Nothing, PSY.OutputCurrentLimiter},
 }
 
     #Obtain external states inputs for component
@@ -242,7 +242,7 @@ function initialize_inner!(
     DC <: PSY.DCSource,
     P <: PSY.FrequencyEstimator,
     F <: PSY.Filter,
-    L <: Union{Nothing, PSY.InverterLimiter},
+    L <: Union{Nothing, PSY.OutputCurrentLimiter},
 }
     # Obtain inner variables for component
     Vr_filter = inner_vars[Vr_filter_var]

diff --git a/src/initialization/inverter_components/init_outer.jl b/src/initialization/inverter_components/init_outer.jl
@@ -19,7 +19,7 @@ function initialize_outer!(
     DC <: PSY.DCSource,
     P <: PSY.FrequencyEstimator,
     F <: PSY.Filter,
-    L <: Union{Nothing, PSY.InverterLimiter},
+    L <: Union{Nothing, PSY.OutputCurrentLimiter},
 }
 
     #Obtain external states inputs for component
@@ -86,7 +86,7 @@ function initialize_outer!(
     DC <: PSY.DCSource,
     P <: PSY.FrequencyEstimator,
     F <: PSY.Filter,
-    L <: Union{Nothing, PSY.InverterLimiter},
+    L <: Union{Nothing, PSY.OutputCurrentLimiter},
 }
 
     #Obtain external states inputs for component
@@ -152,7 +152,7 @@ function initialize_outer!(
     DC <: PSY.DCSource,
     P <: PSY.FrequencyEstimator,
     F <: PSY.Filter,
-    L <: Union{Nothing, PSY.InverterLimiter},
+    L <: Union{Nothing, PSY.OutputCurrentLimiter},
 }
 
     #Obtain external states inputs for component
@@ -217,7 +217,7 @@ function initialize_outer!(
     DC <: PSY.DCSource,
     P <: PSY.FrequencyEstimator,
     F <: PSY.Filter,
-    L <: Union{Nothing, PSY.InverterLimiter},
+    L <: Union{Nothing, PSY.OutputCurrentLimiter},
 }
 
     #Obtain external states inputs for component
@@ -301,7 +301,7 @@ function initialize_outer!(
     DC <: PSY.DCSource,
     P <: PSY.FrequencyEstimator,
     F <: PSY.Filter,
-    L <: Union{Nothing, PSY.InverterLimiter},
+    L <: Union{Nothing, PSY.OutputCurrentLimiter},
 }
     # Read inner vars
     Vr_filter = inner_vars[Vr_filter_var]

diff --git a/src/models/device.jl b/src/models/device.jl
@@ -464,7 +464,7 @@ function _update_inner_vars!(
     DC <: PSY.DCSource,
     P <: PSY.FrequencyEstimator,
     F <: PSY.Filter,
-    L <: Union{Nothing, PSY.InverterLimiter},
+    L <: Union{Nothing, PSY.OutputCurrentLimiter},
 }
     return
 end
@@ -490,7 +490,7 @@ function _update_inner_vars!(
     IC <: PSY.InnerControl,
     DC <: PSY.DCSource,
     P <: PSY.FrequencyEstimator,
-    L <: Union{Nothing, PSY.InverterLimiter},
+    L <: Union{Nothing, PSY.OutputCurrentLimiter},
 }
     V_R = inner_vars[Vr_inv_var]
     V_I = inner_vars[Vi_inv_var]
@@ -611,7 +611,7 @@ function _update_inner_vars!(
     IC <: PSY.InnerControl,
     DC <: PSY.DCSource,
     P <: PSY.FrequencyEstimator,
-    L <: Union{Nothing, PSY.InverterLimiter},
+    L <: Union{Nothing, PSY.OutputCurrentLimiter},
 }
     filter_ix = get_local_state_ix(dynamic_device, PSY.LCLFilter)
     filter_states = @view device_states[filter_ix]

diff --git a/src/models/inverter_models/DCside_models.jl b/src/models/inverter_models/DCside_models.jl
@@ -22,7 +22,7 @@ function mdl_DCside_ode!(
     IC <: PSY.InnerControl,
     P <: PSY.FrequencyEstimator,
     F <: PSY.Filter,
-    L <: Union{Nothing, PSY.InverterLimiter},
+    L <: Union{Nothing, PSY.OutputCurrentLimiter},
 }
 
     #Update inner_vars

diff --git a/src/models/inverter_models/converter_models.jl b/src/models/inverter_models/converter_models.jl
@@ -21,7 +21,7 @@ function mdl_converter_ode!(
     DC <: PSY.DCSource,
     P <: PSY.FrequencyEstimator,
     F <: PSY.Filter,
-    L <: Union{Nothing, PSY.InverterLimiter},
+    L <: Union{Nothing, PSY.OutputCurrentLimiter},
 }
 
     #Obtain inner variables for component
@@ -61,7 +61,7 @@ function mdl_converter_ode!(
     IC <: PSY.InnerControl,
     DC <: PSY.DCSource,
     P <: PSY.FrequencyEstimator,
-    L <: Union{Nothing, PSY.InverterLimiter},
+    L <: Union{Nothing, PSY.OutputCurrentLimiter},
 }
     #Obtain inner variables for component
     V_R = inner_vars[Vr_filter_var]
@@ -196,7 +196,7 @@ function mdl_converter_ode!(
     IC <: PSY.InnerControl,
     DC <: PSY.DCSource,
     P <: PSY.FrequencyEstimator,
-    L <: Union{Nothing, PSY.InverterLimiter},
+    L <: Union{Nothing, PSY.OutputCurrentLimiter},
 }
     #Obtain inner variables for component
     V_R = inner_vars[Vr_filter_var]

diff --git a/src/models/inverter_models/filter_models.jl b/src/models/inverter_models/filter_models.jl
@@ -48,7 +48,7 @@ function mdl_filter_ode!(
     IC <: PSY.InnerControl,
     DC <: PSY.DCSource,
     P <: PSY.FrequencyEstimator,
-    L <: Union{Nothing, PSY.InverterLimiter},
+    L <: Union{Nothing, PSY.OutputCurrentLimiter},
 }
 
     #external_ix = get_input_port_ix(dynamic_device, PSY.LCLFilter)
@@ -132,7 +132,7 @@ function mdl_filter_ode!(
     IC <: PSY.InnerControl,
     DC <: PSY.DCSource,
     P <: PSY.FrequencyEstimator,
-    L <: Union{Nothing, PSY.InverterLimiter},
+    L <: Union{Nothing, PSY.OutputCurrentLimiter},
 }
     #Obtain inner variables for component
     basepower = PSY.get_base_power(dynamic_device)

diff --git a/src/models/inverter_models/frequency_estimator_models.jl b/src/models/inverter_models/frequency_estimator_models.jl
@@ -20,7 +20,7 @@ function mdl_freq_estimator_ode!(
     IC <: PSY.InnerControl,
     DC <: PSY.DCSource,
     F <: PSY.Filter,
-    L <: Union{Nothing, PSY.InverterLimiter},
+    L <: Union{Nothing, PSY.OutputCurrentLimiter},
 }
 
     #Obtain external states inputs for component
@@ -88,7 +88,7 @@ function mdl_freq_estimator_ode!(
     IC <: PSY.InnerControl,
     DC <: PSY.DCSource,
     F <: PSY.Filter,
-    L <: Union{Nothing, PSY.InverterLimiter},
+    L <: Union{Nothing, PSY.OutputCurrentLimiter},
 }
 
     #Obtain external states inputs for component
@@ -151,7 +151,7 @@ function mdl_freq_estimator_ode!(
     IC <: PSY.InnerControl,
     DC <: PSY.DCSource,
     F <: PSY.Filter,
-    L <: Union{Nothing, PSY.InverterLimiter},
+    L <: Union{Nothing, PSY.OutputCurrentLimiter},
 }
 
     #Get parameters