Skip to content

Commit

Permalink
#3210 Nb of arguments of logEvent, MultiSwitch with for loop, blank s…
Browse files Browse the repository at this point in the history 
…paces removed

Signed-off-by: Erwan Guichard <erwan.guichard_externe@rte-france.com>
  • Loading branch information
Erwan Guichard committed Jun 18, 2024
1 parent f3a4524 commit 440556d
Show file tree
Hide file tree
Showing 13 changed files with 31 additions and 20 deletions.
2 changes: 1 addition & 1 deletion .../sources/Models/Modelica/Dynawo/Electrical/Controls/IEC/BaseClasses/BaseCurrentLimiter.mo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ partial model BaseCurrentLimiter "Current limitation base module for wind turbin
Placement(visible = true, transformation(origin = {210, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
Modelica.Blocks.Math.Add add1(k1 = -1) annotation(
Placement(visible = true, transformation(origin = {50, -20}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
Dynawo.NonElectrical.Blocks.NonLinear.MultiSwitch switch4(nu = 3) annotation(
Dynawo.NonElectrical.Blocks.NonLinear.MultiSwitch switch4(nu = 3) annotation(
Placement(visible = true, transformation(origin = {130, -106}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));

//Initial parameters
Expand Down
2 changes: 1 addition & 1 deletion dynawo/sources/Models/Modelica/Dynawo/Electrical/Controls/IEC/BaseClasses/BaseQControl.mo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ partial model BaseQControl "Reactive power control base module for wind turbines
Placement(visible = true, transformation(origin = {-286, 14}, extent = {{-6, 6}, {6, -6}}, rotation = 90)));
Modelica.Blocks.Logical.LessThreshold lessThreshold(threshold = UqDipPu) annotation(
Placement(visible = true, transformation(origin = {-210, -100}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
Dynawo.NonElectrical.Blocks.NonLinear.MultiSwitch switch(nu = 5) annotation(
Dynawo.NonElectrical.Blocks.NonLinear.MultiSwitch switch(nu = 5) annotation(
Placement(visible = true, transformation(origin = {-24, 240}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));

//Initial parameters
Expand Down
2 changes: 1 addition & 1 deletion ...ls/Modelica/Dynawo/Electrical/Controls/IEC/BaseControls/Auxiliaries/GridProtection2015.mo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ model GridProtection2015 "Grid protection system for wind turbines (IEC N°61400
Modelica.ComplexBlocks.Interfaces.ComplexOutput uWtPu(re(start = u0Pu.re), im(start = u0Pu.im)) "Complex voltage at grid terminal in pu (base UNom)" annotation(
Placement(visible = true, transformation(origin = {-170, 80}, extent = {{-10, -10}, {10, 10}}, rotation = 0), iconTransformation(origin = {-110, 60}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));

Dynawo.Electrical.Controls.IEC.BaseControls.Auxiliaries.UfMeasurement ufMeasurement(DfMaxPu = DfMaxPu, U0Pu = U0Pu, UPhase0 = UPhase0, tS = tS, tUFilt = tUFilt, tfFilt = tfFilt, u0Pu = u0Pu) annotation(
Dynawo.Electrical.Controls.IEC.BaseControls.Auxiliaries.UfMeasurement ufMeasurement(DfMaxPu = DfMaxPu, U0Pu = U0Pu, UPhase0 = UPhase0, tS = tS, tUFilt = tUFilt, tfFilt = tfFilt, u0Pu = u0Pu) annotation(
Placement(visible = true, transformation(origin = {-129.5, -1}, extent = {{-10, -90}, {10, 90}}, rotation = 0)));

//Initial parameters
Expand Down
6 changes: 3 additions & 3 deletions .../Models/Modelica/Dynawo/Electrical/Controls/IEC/BaseControls/Auxiliaries/UfMeasurement.mo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,11 @@ model UfMeasurement "Measurement module for grid protection (IEC N°61400-27-1:2
Placement(visible = true, transformation(origin = {-18, 40}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
Modelica.Blocks.Math.Add add annotation(
Placement(visible = true, transformation(origin = {134, 34}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
Dynawo.NonElectrical.Blocks.NonLinear.RampLimiter rampLimiter(DuMax = DfMaxPu, DuMin = -DfMaxPu, Y0 = 0, tS = tS) annotation(
Dynawo.NonElectrical.Blocks.NonLinear.RampLimiter rampLimiter(DuMax = DfMaxPu, DuMin = -DfMaxPu, Y0 = 0, tS = tS) annotation(
Placement(visible = true, transformation(origin = {20, 40}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
Modelica.Blocks.Continuous.FirstOrder firstOrder(T = tfFilt, y_start = 0) annotation(
Modelica.Blocks.Continuous.FirstOrder firstOrder(T = tfFilt, y_start = 0) annotation(
Placement(visible = true, transformation(origin = {56, 40}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
Modelica.Blocks.Continuous.FirstOrder firstOrder1(T = tUFilt, y_start = U0Pu) annotation(
Modelica.Blocks.Continuous.FirstOrder firstOrder1(T = tUFilt, y_start = U0Pu) annotation(
Placement(visible = true, transformation(origin = {-18, 74}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));

//Initial parameters
Expand Down
2 changes: 1 addition & 1 deletion ...rces/Models/Modelica/Dynawo/Electrical/Controls/IEC/BaseControls/WT/CurrentLimiter2015.mo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ model CurrentLimiter2015 "Current limitation module for wind turbines (IEC N°61
Modelica.Blocks.Interfaces.RealInput UWTPu(start = U0Pu) "Voltage amplitude at grid terminal in pu (base UNom)" annotation(
Placement(visible = true, transformation(origin = {-320, -80}, extent = {{-20, -20}, {20, 20}}, rotation = 0), iconTransformation(origin = {-110, 40}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));

Modelica.Blocks.Continuous.FirstOrder firstOrder(T = tUFiltcl, y_start = U0Pu) annotation(
Modelica.Blocks.Continuous.FirstOrder firstOrder(T = tUFiltcl, y_start = U0Pu) annotation(
Placement(visible = true, transformation(origin = {-284, -80}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));

equation
Expand Down
2 changes: 1 addition & 1 deletion .../sources/Models/Modelica/Dynawo/Electrical/Controls/IEC/BaseControls/WT/PControl4A2015.mo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ model PControl4A2015 "Active power control module for type 4A wind turbines (IEC
Modelica.Blocks.Interfaces.RealInput UWTPu(start = U0Pu) "Voltage amplitude at grid terminal in pu (base UNom)" annotation(
Placement(visible = true, transformation(origin = {-180, 100}, extent = {{-20, -20}, {20, 20}}, rotation = 0), iconTransformation(origin = {-110, 20}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));

Modelica.Blocks.Continuous.FirstOrder firstOrder(T = tUFiltP4A, y_start = U0Pu) annotation(
Modelica.Blocks.Continuous.FirstOrder firstOrder(T = tUFiltP4A, y_start = U0Pu) annotation(
Placement(visible = true, transformation(origin = {10, 100}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));

equation
Expand Down
2 changes: 1 addition & 1 deletion .../sources/Models/Modelica/Dynawo/Electrical/Controls/IEC/BaseControls/WT/PControl4B2015.mo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ model PControl4B2015 "Active power control module for type 4B wind turbines (IEC

Modelica.Blocks.Continuous.FirstOrder firstOrder(T = tPAero, y_start = -P0Pu * SystemBase.SnRef / SNom) annotation(
Placement(visible = true, transformation(origin = {-20, -140}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
Modelica.Blocks.Continuous.FirstOrder firstOrder1(T = tUFiltP4B, y_start = U0Pu) annotation(
Modelica.Blocks.Continuous.FirstOrder firstOrder1(T = tUFiltP4B, y_start = U0Pu) annotation(
Placement(visible = true, transformation(origin = {10, 100}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
Modelica.Blocks.Math.Product product annotation(
Placement(visible = true, transformation(origin = {-86, -94}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
Expand Down
2 changes: 1 addition & 1 deletion ...wo/sources/Models/Modelica/Dynawo/Electrical/Controls/IEC/BaseControls/WT/QControl2015.mo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ model QControl2015 "Reactive power control module for wind turbines (IEC N°6140
Modelica.Blocks.Interfaces.IntegerOutput fUvrt(start = 0) "Fault status (0: Normal operation, 1: During fault, 2: Post-fault)" annotation(
Placement(visible = true, transformation(origin = {310, -100}, extent = {{-10, -10}, {10, 10}}, rotation = 0), iconTransformation(origin = {110, 20}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));

Modelica.Blocks.Continuous.FirstOrder firstOrder(T = tUFiltQ, y_start = U0Pu) annotation(
Modelica.Blocks.Continuous.FirstOrder firstOrder(T = tUFiltQ, y_start = U0Pu) annotation(
Placement(visible = true, transformation(origin = {-270, -82}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
Modelica.Blocks.Continuous.FirstOrder firstOrder1(T = tPFiltQ, y_start = -P0Pu * SystemBase.SnRef / SNom) annotation(
Placement(visible = true, transformation(origin = {-286, -34}, extent = {{-10, -10}, {10, 10}}, rotation = 90)));
Expand Down
2 changes: 1 addition & 1 deletion ...wo/sources/Models/Modelica/Dynawo/Electrical/Controls/IEC/BaseControls/WT/QLimiter2015.mo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ model QLimiter2015 "Reactive power limitation module for wind turbines (IEC N°6
Modelica.Blocks.Interfaces.RealInput UWTPu(start = U0Pu) "Voltage amplitude at grid terminal in pu (base UNom)" annotation(
Placement(visible = true, transformation(origin = {-140, 60}, extent = {{-20, -20}, {20, 20}}, rotation = 0), iconTransformation(origin = {-110, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));

Dynawo.NonElectrical.Blocks.Continuous.AbsLimRateLimFirstOrderFreeze absLimRateLimFirstOrderFreeze(DyMax = 999, Y0 = U0Pu, YMax = 999, tI = tUFiltql) annotation(
Dynawo.NonElectrical.Blocks.Continuous.AbsLimRateLimFirstOrderFreeze absLimRateLimFirstOrderFreeze(DyMax = 999, Y0 = U0Pu, YMax = 999, tI = tUFiltql) annotation(
Placement(visible = true, transformation(origin = {-70, 60}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
Dynawo.NonElectrical.Blocks.Continuous.AbsLimRateLimFirstOrderFreeze absLimRateLimFirstOrderFreeze1(DyMax = 999, Y0 = -P0Pu * SystemBase.SnRef / SNom, YMax = 999, tI = tPFiltql) annotation(
Placement(visible = true, transformation(origin = {-70, -60}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
Expand Down
2 changes: 1 addition & 1 deletion dynawo/sources/Models/Modelica/Dynawo/Electrical/Wind/IEC/WT/WT4ACurrentSource2015.mo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ model WT4ACurrentSource2015 "Wind Turbine Type 4A model from IEC 61400-27-1:2015
parameter Types.Time tUFiltql "Filter time constant for voltage measurement in s" annotation(
Dialog(tab = "QLimiter"));

Dynawo.Electrical.Controls.IEC.WT.Control4A2015 control4A(DPMaxP4APu = DPMaxP4APu, Udb1Pu = Udb1Pu, Udb2Pu = Udb2Pu, IMaxDipPu = IMaxDipPu, IMaxPu = IMaxPu, IpMax0Pu = IpMax0Pu, IqH1Pu = IqH1Pu, IqMax0Pu = IqMax0Pu, IqMaxPu = IqMaxPu, IqMin0Pu = IqMin0Pu, IqMinPu = IqMinPu, IqPostPu = IqPostPu, Kiq = Kiq, Kiu = Kiu, Kpaw = Kpaw, Kpq = Kpq, Kpqu = Kpqu, Kpu = Kpu, Kqv = Kqv, MdfsLim = MdfsLim, MqG = MqG, MqUvrt = MqUvrt, Mqpri = Mqpri, P0Pu = P0Pu, Q0Pu = Q0Pu, QMax0Pu = QMax0Pu, QMaxPu = QMaxPu, QMin0Pu = QMin0Pu, QMinPu = QMinPu, QlConst = QlConst, RDropPu = RDropPu, SNom = SNom, U0Pu = U0Pu, UMaxPu = UMaxPu, UMinPu = UMinPu, UPhase0 = UPhase0, URef0Pu = URef0Pu, UpquMaxPu = UpquMaxPu, UqDipPu = UqDipPu, XDropPu = XDropPu, XWT0Pu = XWT0Pu, tPFiltQ = tPFiltQ, tPFiltql = tPFiltql, tPOrdP4A = tPOrdP4A, tPost = tPost, tQord = tQord, tS = tS, tUFiltP4A = tUFiltP4A, tUFiltQ = tUFiltQ, tUFiltcl = tUFiltcl, tUFiltql = tUFiltql) annotation(
Dynawo.Electrical.Controls.IEC.WT.Control4A2015 control4A(DPMaxP4APu = DPMaxP4APu, Udb1Pu = Udb1Pu, Udb2Pu = Udb2Pu, IMaxDipPu = IMaxDipPu, IMaxPu = IMaxPu, IpMax0Pu = IpMax0Pu, IqH1Pu = IqH1Pu, IqMax0Pu = IqMax0Pu, IqMaxPu = IqMaxPu, IqMin0Pu = IqMin0Pu, IqMinPu = IqMinPu, IqPostPu = IqPostPu, Kiq = Kiq, Kiu = Kiu, Kpaw = Kpaw, Kpq = Kpq, Kpqu = Kpqu, Kpu = Kpu, Kqv = Kqv, MdfsLim = MdfsLim, MqG = MqG, MqUvrt = MqUvrt, Mqpri = Mqpri, P0Pu = P0Pu, Q0Pu = Q0Pu, QMax0Pu = QMax0Pu, QMaxPu = QMaxPu, QMin0Pu = QMin0Pu, QMinPu = QMinPu, QlConst = QlConst, RDropPu = RDropPu, SNom = SNom, U0Pu = U0Pu, UMaxPu = UMaxPu, UMinPu = UMinPu, UPhase0 = UPhase0, URef0Pu = URef0Pu, UpquMaxPu = UpquMaxPu, UqDipPu = UqDipPu, XDropPu = XDropPu, XWT0Pu = XWT0Pu, tPFiltQ = tPFiltQ, tPFiltql = tPFiltql, tPOrdP4A = tPOrdP4A, tPost = tPost, tQord = tQord, tS = tS, tUFiltP4A = tUFiltP4A, tUFiltQ = tUFiltQ, tUFiltcl = tUFiltcl, tUFiltql = tUFiltql) annotation(
Placement(visible = true, transformation(origin = {-58, -40}, extent = {{-20, -20}, {20, 20}}, rotation = 0)));
Modelica.Blocks.Sources.Constant const(k = 1) annotation(
Placement(visible = true, transformation(origin = {-75, 0}, extent = {{-5, -5}, {5, 5}}, rotation = 0)));
Expand Down
4 changes: 2 additions & 2 deletions dynawo/sources/Models/Modelica/Dynawo/Electrical/Wind/IEC/WT/WT4BCurrentSource2015.mo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,13 +67,13 @@ model WT4BCurrentSource2015 "Wind Turbine Type 4B model from IEC 61400-27-1:2015
parameter Types.Time tUFiltql "Filter time constant for voltage measurement in s" annotation(
Dialog(tab = "QLimiter"));

Dynawo.Electrical.Controls.IEC.WT.Control4B2015 control4B(DPMaxP4BPu = DPMaxP4BPu, Udb1Pu = Udb1Pu, Udb2Pu = Udb2Pu, IMaxDipPu = IMaxDipPu, IMaxPu = IMaxPu, IpMax0Pu = IpMax0Pu, IqH1Pu = IqH1Pu, IqMax0Pu = IqMax0Pu, IqMaxPu = IqMaxPu, IqMin0Pu = IqMin0Pu, IqMinPu = IqMinPu, IqPostPu = IqPostPu, Kiq = Kiq, Kiu = Kiu, Kpaw = Kpaw, Kpq = Kpq, Kpqu = Kpqu, Kpu = Kpu, Kqv = Kqv, MdfsLim = MdfsLim, MqG = MqG, MqUvrt = MqUvrt, Mqpri = Mqpri, P0Pu = P0Pu, Q0Pu = Q0Pu, QMax0Pu = QMax0Pu, QMaxPu = QMaxPu, QMin0Pu = QMin0Pu, QMinPu = QMinPu, QlConst = QlConst, RDropPu = RDropPu, SNom = SNom, U0Pu = U0Pu, UMaxPu = UMaxPu, UMinPu = UMinPu, UPhase0 = UPhase0, URef0Pu = URef0Pu, UpquMaxPu = UpquMaxPu, UqDipPu = UqDipPu, XDropPu = XDropPu, XWT0Pu = XWT0Pu, tPAero = tPAero, tPFiltQ = tPFiltQ, tPFiltql = tPFiltql, tPOrdP4B = tPOrdP4B, tPost = tPost, tQord = tQord, tS = tS, tUFiltP4B = tUFiltP4B, tUFiltQ = tUFiltQ, tUFiltcl = tUFiltcl, tUFiltql = tUFiltql) annotation(
Dynawo.Electrical.Controls.IEC.WT.Control4B2015 control4B(DPMaxP4BPu = DPMaxP4BPu, Udb1Pu = Udb1Pu, Udb2Pu = Udb2Pu, IMaxDipPu = IMaxDipPu, IMaxPu = IMaxPu, IpMax0Pu = IpMax0Pu, IqH1Pu = IqH1Pu, IqMax0Pu = IqMax0Pu, IqMaxPu = IqMaxPu, IqMin0Pu = IqMin0Pu, IqMinPu = IqMinPu, IqPostPu = IqPostPu, Kiq = Kiq, Kiu = Kiu, Kpaw = Kpaw, Kpq = Kpq, Kpqu = Kpqu, Kpu = Kpu, Kqv = Kqv, MdfsLim = MdfsLim, MqG = MqG, MqUvrt = MqUvrt, Mqpri = Mqpri, P0Pu = P0Pu, Q0Pu = Q0Pu, QMax0Pu = QMax0Pu, QMaxPu = QMaxPu, QMin0Pu = QMin0Pu, QMinPu = QMinPu, QlConst = QlConst, RDropPu = RDropPu, SNom = SNom, U0Pu = U0Pu, UMaxPu = UMaxPu, UMinPu = UMinPu, UPhase0 = UPhase0, URef0Pu = URef0Pu, UpquMaxPu = UpquMaxPu, UqDipPu = UqDipPu, XDropPu = XDropPu, XWT0Pu = XWT0Pu, tPAero = tPAero, tPFiltQ = tPFiltQ, tPFiltql = tPFiltql, tPOrdP4B = tPOrdP4B, tPost = tPost, tQord = tQord, tS = tS, tUFiltP4B = tUFiltP4B, tUFiltQ = tUFiltQ, tUFiltcl = tUFiltcl, tUFiltql = tUFiltql) annotation(
Placement(visible = true, transformation(origin = {-58, -40}, extent = {{-20, -20}, {20, 20}}, rotation = 0)));
Dynawo.Electrical.Controls.IEC.BaseControls.Auxiliaries.GridProtection2015 gridProtection( DfMaxPu = DfMaxPu, TabletUoverUwtfilt = TabletUoverUwtfilt, TabletUoverUwtfilt11 = TabletUoverUwtfilt11, TabletUoverUwtfilt12 = TabletUoverUwtfilt12, TabletUoverUwtfilt21 = TabletUoverUwtfilt21, TabletUoverUwtfilt22 = TabletUoverUwtfilt22, TabletUoverUwtfilt31 = TabletUoverUwtfilt31, TabletUoverUwtfilt32 = TabletUoverUwtfilt32, TabletUunderUwtfilt = TabletUunderUwtfilt, TabletUunderUwtfilt11 = TabletUunderUwtfilt11, TabletUunderUwtfilt12 = TabletUunderUwtfilt12, TabletUunderUwtfilt21 = TabletUunderUwtfilt21, TabletUunderUwtfilt22 = TabletUunderUwtfilt22, TabletUunderUwtfilt31 = TabletUunderUwtfilt31, TabletUunderUwtfilt32 = TabletUunderUwtfilt32, Tabletfoverfwtfilt = Tabletfoverfwtfilt, Tabletfoverfwtfilt11 = Tabletfoverfwtfilt11, Tabletfoverfwtfilt12 = Tabletfoverfwtfilt12, Tabletfoverfwtfilt21 = Tabletfoverfwtfilt21, Tabletfoverfwtfilt22 = Tabletfoverfwtfilt22, Tabletfoverfwtfilt31 = Tabletfoverfwtfilt31, Tabletfoverfwtfilt32 = Tabletfoverfwtfilt32, Tabletfunderfwtfilt = Tabletfunderfwtfilt, Tabletfunderfwtfilt11 = Tabletfunderfwtfilt11, Tabletfunderfwtfilt12 = Tabletfunderfwtfilt12, Tabletfunderfwtfilt21 = Tabletfunderfwtfilt21, Tabletfunderfwtfilt22 = Tabletfunderfwtfilt22, Tabletfunderfwtfilt31 = Tabletfunderfwtfilt31, Tabletfunderfwtfilt32 = Tabletfunderfwtfilt32, U0Pu = U0Pu,UOverPu = UOverPu, UPhase0 = UPhase0, UUnderPu = UUnderPu, fOverPu = fOverPu, fUnderPu = fUnderPu, tS = tS, tUFilt = tUFilt, tfFilt = tfFilt, u0Pu = u0Pu) annotation(
Placement(visible = true, transformation(origin = {60, 80}, extent = {{-20, -20}, {20, 20}}, rotation = -90)));
Modelica.ComplexBlocks.ComplexMath.ComplexToPolar complexToPolar annotation(
Placement(visible = true, transformation(origin = {10, 30}, extent = {{10, -10}, {-10, 10}}, rotation = 0)));
Dynawo.Electrical.Controls.IEC.BaseControls.WT.Mechanical mechanical(CdrtPu = CdrtPu, Hgen = Hgen, Hwtr = Hwtr, KdrtPu = KdrtPu, P0Pu = P0Pu, PAg0Pu = PAg0Pu, SNom = SNom) annotation(
Dynawo.Electrical.Controls.IEC.BaseControls.WT.Mechanical mechanical(CdrtPu = CdrtPu, Hgen = Hgen, Hwtr = Hwtr, KdrtPu = KdrtPu, P0Pu = P0Pu, PAg0Pu = PAg0Pu, SNom = SNom) annotation(
Placement(visible = true, transformation(origin = {63, -101}, extent = {{-11, 11}, {11, -11}}, rotation = 0)));
Dynawo.Electrical.Controls.IEC.BaseControls.Auxiliaries.PQCalculus pQCalculus annotation(
Placement(visible = true, transformation(origin = {10, -84}, extent = {{10, -10}, {-10, 10}}, rotation = 0)));
Expand Down
15 changes: 13 additions & 2 deletions dynawo/sources/Models/Modelica/Dynawo/NonElectrical/Blocks/NonLinear/MultiSwitch.mo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ within Dynawo.NonElectrical.Blocks.NonLinear;

block MultiSwitch "Switch between N Real signals"

parameter Integer nu(min=0) = 0 "Number of input connections" annotation(
parameter Integer nu(min = 1) "Number of input connections" annotation(
Dialog(connectorSizing=true), HideResult=true);

Modelica.Blocks.Interfaces.RealVectorInput u[nu] "Connector of Real vector input signal" annotation(
Expand All @@ -24,12 +24,23 @@ block MultiSwitch "Switch between N Real signals"
Modelica.Blocks.Interfaces.RealOutput y "Connector of Real output signal" annotation(
Placement(visible = true, transformation(origin = {110, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0), iconTransformation(origin = {110, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));

protected
Real v[nu];

equation
assert(f + 1 <= nu, "MultiSwitch: Inputs must be consistent. However, there are not enough inputs connected :
f + 1 (= " + String(f + 1) + ") > nu (= " + String(nu) + ")");
assert(f >= 0, "MultiSwitch: f must be positive. However, f = " + String(f));

y = u[f+1];
for i in 1:nu loop
if i == f+1 then
v[i] = u[i];
else
v[i] = 0;
end if;
end for;

y = sum(v);

annotation(
preferredView = "diagram",
Expand Down
8 changes: 4 additions & 4 deletions dynawo/sources/Models/Modelica/Dynawo/Resources/Include/logEvent.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
#include "ModelicaUtilities.h"

extern void addLogEvent1(int key){};
extern void addLogEvent2(int key, const char * arg1, const char * arg2){};
extern void addLogEvent3(int key, const char * arg1, const char * arg2, const char * arg3){};
extern void addLogEvent4(int key, const char * arg1, const char * arg2, const char * arg3, const char * arg4){};
extern void addLogEvent5(int key, const char * arg1, const char * arg2, const char * arg3, const char * arg4, const char * arg5){};
extern void addLogEvent2(int key, const char * arg1){};
extern void addLogEvent3(int key, const char * arg1, const char * arg2){};
extern void addLogEvent4(int key, const char * arg1, const char * arg2, const char * arg3){};
extern void addLogEvent5(int key, const char * arg1, const char * arg2, const char * arg3, const char * arg4){};

extern void addLogEventRaw1(const char * key1){ModelicaMessage(key1);};
extern void addLogEventRaw2(const char * key1,const char * key2){ModelicaMessage(key1);ModelicaMessage(key2);};
Expand Down

0 comments on commit 440556d

Please sign in to comment.