remove unnecessary conditional equations from transformer models

Author: rfranke

PowerSystems/AC1ph_DC/Transformers.mo

@@ -268,7 +268,8 @@ and eddy current losses.</p>
         annotation(Evaluate=true, Dialog(tab="Initialization"));
       parameter SI.Current i1_start = 0 "start value of primary current"
         annotation(Dialog(tab="Initialization"));
-      parameter SI.Current i2_start = i1_start "start value of secondary current"
+      parameter SI.Current i2_start = i1_start
+        "start value of secondary current"
         annotation(Dialog(tab="Initialization"));
 
       parameter Boolean dynTC=false "enable dynamic tap-changing" annotation(Evaluate=true, choices(__Dymola_checkBox=true));
@@ -308,9 +309,9 @@ and eddy current losses.</p>
         annotation(Evaluate=true);
       final parameter Real[:] W1=cat(1, {1}, par.v_tc1*V_base[1]/par.V_nom[1])   annotation(Evaluate=true);
       final parameter Real[:] W2=cat(1, {1}, par.v_tc2*V_base[2]/par.V_nom[2])*W_nom   annotation(Evaluate=true);
-      Real w1_set=if not use_tap_p then W1[1] else W1[1 + tap_p_internal]
+      Real w1_set=W1[1 + tap_p_internal]
         "1: set voltage ratio to nominal primary";
-      Real w2_set=if not use_tap_n then W2[1] else W2[1 + tap_n_internal]
+      Real w2_set=W2[1 + tap_n_internal]
         "2: set voltage ratio to nominal primary";
 
     initial equation
@@ -355,12 +356,11 @@ and eddy current losses.</p>
             Text(
               extent={{-120,80},{-80,40}},
               lineColor={0,0,0},
-              textString=
-             "1"),
+              textString="1"),
             Text(
               extent={{80,80},{120,40}},
               lineColor={0,0,0},
-              textString=           "2"),
+              textString="2"),
             Line(
               points={{-80,0},{-40,0}},
               color={176,0,0},
@@ -531,11 +531,11 @@ For variable transformer ratio tap changer input needed.</p>
       final parameter Real[:] W2a=cat(1, {1}, par.v_tc2a*V_base[2]/par.V_nom[2])*Wa_nom
                                                                                        annotation(Evaluate=true);
       final parameter Real[:] W2b=cat(1, {1}, par.v_tc2b*V_base[3]/par.V_nom[3])*Wb_nom annotation(Evaluate=true);
-      Real w1_set=if not use_tap_p then W1[1] else W1[1 + tap_p_internal]
+      Real w1_set=W1[1 + tap_p_internal]
         "1: set voltage ratio to nominal primary";
-      Real w2a_set=if not use_tap_n then W2a[1] else W2a[1 + tap_n_internal[1]]
+      Real w2a_set=W2a[1 + tap_n_internal[1]]
         "2a: set voltage ratio to nominal primary";
-      Real w2b_set=if not use_tap_n then W2b[1] else W2b[1 + tap_n_internal[2]]
+      Real w2b_set=W2b[1 + tap_n_internal[2]]
         "2b: set voltage ratio to nominal primary";
 
     initial equation
@@ -583,12 +583,11 @@ For variable transformer ratio tap changer input needed.</p>
             Text(
               extent={{-120,80},{-80,40}},
               lineColor={0,0,0},
-              textString=
-             "1"),
+              textString="1"),
             Text(
               extent={{80,20},{120,-20}},
               lineColor={0,0,0},
-              textString=           "2"),
+              textString="2"),
             Line(
               points={{-80,0},{-40,0}},
               color={176,0,0},

PowerSystems/AC3ph/Transformers.mo

@@ -310,9 +310,11 @@ Delta topology: impedance is defined as winding-impedance (see info package Tran
 
         parameter Boolean stIni_en=true "enable steady-state initial equation"
           annotation(Evaluate=true, Dialog(tab="Initialization"));
-        parameter SI.Current[3] i1_start = zeros(3) "start value of primary current"
+        parameter SI.Current[3] i1_start = zeros(3)
+        "start value of primary current"
           annotation(Dialog(tab="Initialization"));
-        parameter SI.Current[3] i2_start = i1_start "start value of secondary current"
+        parameter SI.Current[3] i2_start = i1_start
+        "start value of secondary current"
           annotation(Dialog(tab="Initialization"));
 
         parameter Boolean dynTC=false "enable dynamic tap-changing" annotation(Evaluate=true, choices(__Dymola_checkBox=true));
@@ -359,9 +361,9 @@ Delta topology: impedance is defined as winding-impedance (see info package Tran
         final parameter SI.Resistance R_n1=par.r_n1*RL_base[1,1];
         final parameter SI.Resistance R_n2=par.r_n2*RL_base[2,1];
         SI.AngularFrequency[2] omega;
-        Real w1_set=if not use_tap_p then W1[1] else W1[1 + tap_p_internal]
+        Real w1_set=W1[1 + tap_p_internal]
         "1: set voltage ratio to nominal primary";
-        Real w2_set=if not use_tap_n then W2[1] else W2[1 + tap_n_internal]
+        Real w2_set=W2[1 + tap_n_internal]
         "2: set voltage ratio to nominal secondary";
 
       initial equation
@@ -662,11 +664,11 @@ For variable transformer ratio tap changer input needed.</p>
     final parameter SI.Resistance R_n2a=par.r_n2a*RL_base[2,1];
     final parameter SI.Resistance R_n2b=par.r_n2b*RL_base[3,1];
     SI.AngularFrequency omega[2];
-    Real w1_set=if not use_tap_p then W1[1] else W1[1 + tap_p_internal]
+    Real w1_set=W1[1 + tap_p_internal]
         "1: set voltage ratio to nominal primary";
-    Real w2a_set=if not use_tap_n then W2a[1] else W2a[1 + tap_n_internal[1]]
+    Real w2a_set=W2a[1 + tap_n_internal[1]]
         "2a: set voltage ratio to nominal secondary";
-    Real w2b_set=if not use_tap_n then W2b[1] else W2b[1 + tap_n_internal[2]]
+    Real w2b_set=W2b[1 + tap_n_internal[2]]
         "2b: set voltage ratio to nominal secondary";
 
   initial equation