Merge pull request #3 from sjoelund/eachFixes

dietmarw · dietmarw · commit ccf796c1cbcb · 2014-10-13T14:36:35.000+02:00
Add missing each keyword
diff --git a/PowerSystems/AC1ph_DC/Breakers.mo b/PowerSystems/AC1ph_DC/Breakers.mo
@@ -582,7 +582,7 @@ if it is mechanically fully 'open' (after a given opening duration) and the corr
        extends Ports.Port_pn;
        extends Basic.Nominal.NominalVI;
 
-       parameter Real[2] eps(final min={0,0}, unit="1")={1e-4,1e-4}
+       parameter Real[2] eps(final min={0,0}, each unit="1")={1e-4,1e-4}
         "{resistance 'closed', conductance 'open'}";
     protected
        final parameter SI.Resistance epsR=eps[1]*V_nom/I_nom;
diff --git a/PowerSystems/AC3ph/Breakers.mo b/PowerSystems/AC3ph/Breakers.mo
@@ -419,7 +419,7 @@ Electrically the switch is on if it is 'closed', whereas it is switched off, if
       extends PowerSystems.Basic.Nominal.NominalVI;
 
       parameter Integer n=3 "number of independent switches";
-      parameter Real[2] eps(final min={0,0}, unit="1")={1e-4,1e-4}
+      parameter Real[2] eps(final min={0,0}, each unit="1")={1e-4,1e-4}
         "{resistance 'closed', conductance 'open'}";
       SI.Voltage[3] v;
       SI.Current[3] i;
diff --git a/PowerSystems/AC3ph/Drives.mo b/PowerSystems/AC3ph/Drives.mo
@@ -480,13 +480,13 @@ package Drives "AC-drives dqo"
                             annotation (Placement(transformation(extent={{-110,
                 -10},{-90,10}}, rotation=0)));
     Modelica.Blocks.Interfaces.RealOutput[2] i_meas(
-                             final unit="1") "measured current {i_d, i_q} pu"
+                             each final unit="1") "measured current {i_d, i_q} pu"
       annotation (Placement(transformation(
             origin={-60,100},
             extent={{-10,-10},{10,10}},
             rotation=90)));
     Modelica.Blocks.Interfaces.RealInput[2] i_act(
-                             final unit="1") "actuated current {i_d, i_q} pu"
+                             each final unit="1") "actuated current {i_d, i_q} pu"
       annotation (Placement(transformation(
             origin={60,100},
             extent={{10,-10},{-10,10}},
diff --git a/PowerSystems/AC3ph/Generation.mo b/PowerSystems/AC3ph/Generation.mo
@@ -798,13 +798,13 @@ Constant setpoint values can be obtained at (steady-state) initialisation when u
         "rotor generator"          annotation (Placement(transformation(extent=
                 {{-20,-10},{0,10}}, rotation=0)));
       Modelica.Blocks.Interfaces.RealOutput[2] i_meas(
-                               final unit="1") "measured current {i_d, i_q} pu"
+                               each final unit="1") "measured current {i_d, i_q} pu"
         annotation (Placement(transformation(
             origin={60,100},
             extent={{-10,-10},{10,10}},
             rotation=90)));
       Modelica.Blocks.Interfaces.RealInput[2] i_act(
-                               final unit="1") "actuated current {i_d, i_q} pu"
+                               each final unit="1") "actuated current {i_d, i_q} pu"
         annotation (Placement(transformation(
             origin={-60,100},
             extent={{10,-10},{-10,10}},
diff --git a/PowerSystems/AC3ph/Loads.mo b/PowerSystems/AC3ph/Loads.mo
@@ -623,10 +623,10 @@ Consumes the desired active and reactive power at steady state and <b>nominal</b
         "= true if p0 defined by parameter p0_set otherwise by input signal p_set"
         annotation(Evaluate=true, choices(__Dymola_checkBox=true));
 
-      parameter SIpu.Power[2] p0_set(min=0)={sqrt(3),1}/2
+      parameter SIpu.Power[2] p0_set(each min=0)={sqrt(3),1}/2
         "{active, reactive} power, (start val if signal inp)" annotation(Dialog(enable=scType_par));
       parameter SIpu.Resistance r_n=0 "resistance neutral to grd";
-      Modelica.Blocks.Interfaces.RealInput[2] p_set(min=0) if not scType_par
+      Modelica.Blocks.Interfaces.RealInput[2] p_set(each min=0) if not scType_par
         "desired {active, reactive} power"                 annotation (Placement(
             transformation(
             origin={0,100},
diff --git a/PowerSystems/AC3ph/Machines.mo b/PowerSystems/AC3ph/Machines.mo
@@ -408,13 +408,13 @@ The mapping from current demand to voltage demand is based on the steady-state e
         PowerSystems.AC3ph.Machines.Parameters.Synchron3rd_pm par);
 
     Modelica.Blocks.Interfaces.RealOutput[2] i_meas(
-                             final unit="1") "measured current {i_d, i_q} pu"
+                             each final unit="1") "measured current {i_d, i_q} pu"
       annotation (Placement(transformation(
           origin={-60,100},
           extent={{-10,-10},{10,10}},
           rotation=90)));
     Modelica.Blocks.Interfaces.RealInput[2] i_act(
-                             final unit="1") "actuated current {i_d, i_q} pu"
+                             each final unit="1") "actuated current {i_d, i_q} pu"
       annotation (Placement(transformation(
           origin={60,100},
           extent={{10,-10},{-10,10}},
diff --git a/PowerSystems/Basic/Types.mo b/PowerSystems/Basic/Types.mo
@@ -124,7 +124,7 @@ package Types
 "));
   end SInotused;
 
-  type Color = Integer[3] (min=0, max=255) "RGB color" annotation (choices(
+  type Color = Integer[3] (each min=0, each max=255) "RGB color" annotation (choices(
         choice={255,0,0} "{255, 000, 000 }  red",
         choice={255,255,0} "{255, 255, 000}  yellow",
         choice={0,255,0} "{000, 255, 000}  green",
diff --git a/PowerSystems/Control/Exciters.mo b/PowerSystems/Control/Exciters.mo
@@ -167,7 +167,7 @@ package Exciters "Generator Exciters "
   partial block ExciterBase "Exciter base"
     extends PowerSystems.Basic.Icons.Block1;
 
-    parameter SIpu.Voltage[2] v_f_minmax(unit="1")={0, 3}
+    parameter SIpu.Voltage[2] v_f_minmax(each unit="1")={0, 3}
         "{min,max} exciter voltage";
     protected
     outer System system;
@@ -178,7 +178,7 @@ package Exciters "Generator Exciters "
       annotation (Placement(transformation(extent={{-110,-10},{-90,10}},
               rotation=0)));
     Modelica.Blocks.Interfaces.RealInput termVoltage[3](
-                             final unit="1") "terminal voltage pu"
+                             each final unit="1") "terminal voltage pu"
       annotation (Placement(transformation(
             origin={-60,-100},
             extent={{-10,-10},{10,10}},
diff --git a/PowerSystems/Control/Governors.mo b/PowerSystems/Control/Governors.mo
@@ -174,7 +174,7 @@ package Governors "Turbine Governors "
   partial block GovernorBase "Governor base"
     extends PowerSystems.Basic.Icons.Block1;
 
-    parameter SIpu.Power[2] p_minmax(unit="1")={0,2} "{min,max} turbine power";
+    parameter SIpu.Power[2] p_minmax(each unit="1")={0,2} "{min,max} turbine power";
     protected
     outer System system;
     public
diff --git a/PowerSystems/Control/Relays.mo b/PowerSystems/Control/Relays.mo
@@ -10,7 +10,7 @@ package Relays "Relays"
     parameter Boolean ini_state=true "initial state (closed true, open false)"
       annotation(choices(choice=true "closed", choice=false "open"));
     parameter SI.Time t_switch[:]={1} "switching time vector";
-    Modelica.Blocks.Interfaces.BooleanOutput[n] y(start=fill(ini_state, n), fixed=true)
+    Modelica.Blocks.Interfaces.BooleanOutput[n] y(start=fill(ini_state, n), each fixed=true)
       "boolean state of switch (closed:true, open:false)"
       annotation (Placement(transformation(extent={{90,-10},{110,10}}, rotation=
              0)));
@@ -56,9 +56,9 @@ package Relays "Relays"
   block TapChangerRelay "Relay for setting tap-changer "
     extends PowerSystems.Basic.Icons.Block0;
 
-    parameter Integer preset_1[:](min=0)={0}
+    parameter Integer preset_1[:](each min=0)={0}
       "1: index v-levels tap-chg, 0 is nom";
-    parameter Integer preset_2[:](min=0)={0}
+    parameter Integer preset_2[:](each min=0)={0}
       "2: index v-levels tap-chg, 0 is nom";
     parameter SI.Time t_switch_1[:]={1} "1: switching times";
     parameter SI.Time t_switch_2[:]={1} "2:switching times";
diff --git a/PowerSystems/Mechanics/Rotation.mo b/PowerSystems/Mechanics/Rotation.mo
@@ -364,7 +364,7 @@ model TabPosSlopeTorque "Torque using table (position... slope)"
 
   constant SI.Force g_n=Modelica.Constants.g_n;
   parameter SI.Length s_unit=1 "unit of 'position' in tab";
-  parameter Real[2] s_bd(unit="m")={0,1} "{first, last} position in tab";
+  parameter Real[2] s_bd(each unit="m")={0,1} "{first, last} position in tab";
   parameter Integer dirTrack(min=-1,max=1)=+1 "forward or backward track"
     annotation(choices(
     choice=1 "first-pos ---> last-pos", choice=-1 "first-pos <--- last-pos"));
diff --git a/PowerSystems/Semiconductors/Ideal.mo b/PowerSystems/Semiconductors/Ideal.mo
@@ -5,7 +5,7 @@ package Ideal "Custom models"
 record SCparameter "Ideal semiconductor parameters"
   extends Basic.Nominal.NominalDataVI;
 
-  parameter Real[2] eps(final min={0,0}, final unit="1")={1e-4,1e-4}
+  parameter Real[2] eps(each final min={0,0}, each final unit="1")={1e-4,1e-4}
       "{resistance 'on', conductance 'off'}";
   parameter SI.Voltage Vf(final min=0)=0 "forward threshold-voltage" annotation(Evaluate=true);
   parameter SI.Heat Hsw_nom=0 "switching loss at V_nom, I_nom (av on off)"
