From 50ed83c3b2e8d1e082943e53947fb2daf7f8c261 Mon Sep 17 00:00:00 2001
From: Jose Daniel Lara <jdlara@berkeley.edu>
Date: Mon, 3 Feb 2020 11:52:50 -0800
Subject: [PATCH] add LITS predicate to ports

---
 src/structs/generator_components/avr.jl                   | 2 +-
 src/structs/generator_components/machine.jl               | 2 +-
 src/structs/generator_components/pss.jl                   | 2 +-
 src/structs/generator_components/shaft.jl                 | 2 +-
 src/structs/inverter_components/converter.jl              | 2 +-
 src/structs/inverter_components/filter.jl                 | 2 +-
 src/structs/inverter_components/frequency_estimator.jl    | 2 +-
 src/structs/inverter_components/outer_control.jl          | 2 +-
 src/structs/inverter_components/voltage_source_control.jl | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/structs/generator_components/avr.jl b/src/structs/generator_components/avr.jl
index 1612e9d..f0548f1 100644
--- a/src/structs/generator_components/avr.jl
+++ b/src/structs/generator_components/avr.jl
@@ -2,7 +2,7 @@ abstract type AVR <: GeneratorComponent end
 
 @def avr_ports begin
       state_input = Vector{Symbol}()
-      inner_input = [V_pss_var, VI_gen_var, VR_gen_var]
+      inner_input = [LITS.V_pss_var, LITS.VI_gen_var, LITS.VR_gen_var]
 end
 
 """
diff --git a/src/structs/generator_components/machine.jl b/src/structs/generator_components/machine.jl
index 849ad6b..dfcbf34 100644
--- a/src/structs/generator_components/machine.jl
+++ b/src/structs/generator_components/machine.jl
@@ -2,7 +2,7 @@ abstract type Machine <: GeneratorComponent end
 
 @def machine_ports begin
     state_input = [:δ, :ω, :Vf]
-    inner_input = [VI_gen_var, VR_gen_var]
+    inner_input = [LITS.VI_gen_var, LITS.VR_gen_var]
 end
 
 
diff --git a/src/structs/generator_components/pss.jl b/src/structs/generator_components/pss.jl
index b0122a9..cf0992f 100644
--- a/src/structs/generator_components/pss.jl
+++ b/src/structs/generator_components/pss.jl
@@ -2,7 +2,7 @@ abstract type PSS <: GeneratorComponent end
 
 @def pss_ports begin
       state_input = [:ω]
-      inner_input = [τe_var, VR_gen_var]
+      inner_input = [LITS.τe_var, LITS.VR_gen_var]
   end
 
 
diff --git a/src/structs/generator_components/shaft.jl b/src/structs/generator_components/shaft.jl
index edf1df7..7df2b54 100644
--- a/src/structs/generator_components/shaft.jl
+++ b/src/structs/generator_components/shaft.jl
@@ -2,7 +2,7 @@ abstract type Shaft <: GeneratorComponent end
 
 @def shaft_ports begin
     state_input = Vector{Int64}()
-    inner_input = [τe_var, τm_var]
+    inner_input = [LITS.τe_var, LITS.τm_var]
 end
 
 
diff --git a/src/structs/inverter_components/converter.jl b/src/structs/inverter_components/converter.jl
index a73341a..0f01181 100644
--- a/src/structs/inverter_components/converter.jl
+++ b/src/structs/inverter_components/converter.jl
@@ -7,7 +7,7 @@ abstract type Converter <: InverterComponent end
 
 @def converter_ports begin
     state_input = Vector{Symbol}()
-    inner_input = [md_var, mq_var, Vdc_var, Vdcnv_var,Vqcnv_var]
+    inner_input = [LITS.md_var, LITS.mq_var, LITS.Vdc_var, LITS.Vdcnv_var, LITS.Vqcnv_var]
 end
 
 """
diff --git a/src/structs/inverter_components/filter.jl b/src/structs/inverter_components/filter.jl
index d0de0d0..4940e1a 100644
--- a/src/structs/inverter_components/filter.jl
+++ b/src/structs/inverter_components/filter.jl
@@ -3,7 +3,7 @@ abstract type Filter <: InverterComponent end
 @def filter_ports begin
     #TODO: If converter has dynamics, need to connect state_input
     state_input = [:δθ_vsm] #[:Vd_c, :Vq_c] #, :Id_c, :Iq_c]
-    inner_input = [VR_inv_var,VI_inv_var,Vdcnv_var,Vqcnv_var,δdqRI_var,Vdo_var,Vqo_var]
+    inner_input = [LITS.VR_inv_var, LITS.VI_inv_var, LITS.Vdcnv_var, LITS.Vqcnv_var, LITS.δdqRI_var, LITS.Vdo_var, LITS.Vqo_var]
 end
 
 """
diff --git a/src/structs/inverter_components/frequency_estimator.jl b/src/structs/inverter_components/frequency_estimator.jl
index 8692a15..1d533cc 100644
--- a/src/structs/inverter_components/frequency_estimator.jl
+++ b/src/structs/inverter_components/frequency_estimator.jl
@@ -3,7 +3,7 @@ abstract type FrequencyEstimator <: InverterComponent end
 @def freq_estimation_ports begin
     state_input = [:vd_cap,:vq_cap, :δθ_vsm]
     #TODO: Move PLL to PCC, i.e. move v_cap (D'Arco v_o), to inner inputs
-    inner_input = [Vdo_var,Vqo_var,δdqRI_var,ω_freq_estimator_var]
+    inner_input = [LITS.Vdo_var, LITS.Vqo_var, LITS.δdqRI_var, LITS.ω_freq_estimator_var]
 end
 
 """
diff --git a/src/structs/inverter_components/outer_control.jl b/src/structs/inverter_components/outer_control.jl
index 2f291b0..4a1f192 100644
--- a/src/structs/inverter_components/outer_control.jl
+++ b/src/structs/inverter_components/outer_control.jl
@@ -5,7 +5,7 @@ abstract type ReativePowerControl end
 
 @def outercontrol_ports begin
     state_input = [:vpll_d, :vpll_q, :ε_pll, :vd_cap, :vq_cap, :id_o, :iq_o]
-    inner_input = [Vdo_var, Vdo_var, ω_freq_estimator_var]
+    inner_input = [LITS.Vdo_var, LITS.Vdo_var, LITS.ω_freq_estimator_var]
 end
 
 """
diff --git a/src/structs/inverter_components/voltage_source_control.jl b/src/structs/inverter_components/voltage_source_control.jl
index 1158c6c..28cd019 100644
--- a/src/structs/inverter_components/voltage_source_control.jl
+++ b/src/structs/inverter_components/voltage_source_control.jl
@@ -2,7 +2,7 @@ abstract type VSControl <: InverterComponent end
 
 @def vscontrol_ports begin
     state_input = [:id_o, :iq_o, :id_c, :iq_c, :vd_cap, :vq_cap]
-    inner_input = [Vdo_var, Vqo_var, v_control_var, ω_control_var]
+    inner_input = [LITS.Vdo_var, LITS.Vqo_var, LITS.v_control_var, LITS.ω_control_var]
 end
 
 """