Skip to content

Commit

Permalink
#3488 TransferFunction from Dynawo systematically used, simplificatio…
Browse files Browse the repository at this point in the history 
…n of the block (nx <> 0), addition of a parameter for a[1] = 0, nrt references updated

Signed-off-by: Erwan Guichard <erwan.guichard_externe@rte-france.com>
  • Loading branch information
Erwan Guichard committed Dec 5, 2024
1 parent 3a8ddf0 commit 38687ad
Show file tree
Hide file tree
Showing 40 changed files with 13,669 additions and 18,982 deletions.
4 changes: 2 additions & 2 deletions ...ls/Modelica/Dynawo/Electrical/Controls/Frequency/SystemFrequencyResponse/SimplifiedSFR.mo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ model SimplifiedSFR "Simplified system frequency response model, based on the pr
Modelica.Blocks.Interfaces.RealOutput deltaOmegaPu(start = 0) "Incremental speed in pu (base OmegaNom)" annotation(
Placement(visible = true, transformation(origin = {110, -40}, extent = {{-10, -10}, {10, 10}}, rotation = 0), iconTransformation(origin = {110, -40}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));

Modelica.Blocks.Continuous.TransferFunction inertia(a = {2 * H, DPu}, b = {1}) annotation(
Dynawo.NonElectrical.Blocks.Continuous.TransferFunction inertia(a = {2 * H, DPu}, b = {1}) annotation(
Placement(visible = true, transformation(origin = {-22, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
Modelica.Blocks.Continuous.TransferFunction feedbackLoop(a = {R * Tr, R}, b = {Km * Fh * Tr, Km}) annotation(
Dynawo.NonElectrical.Blocks.Continuous.TransferFunction feedbackLoop(a = {R * Tr, R}, b = {Km * Fh * Tr, Km}) annotation(
Placement(visible = true, transformation(origin = {-22, -48}, extent = {{-10, -10}, {10, 10}}, rotation = 180)));
Modelica.Blocks.Math.Gain gain(k = Dynawo.Electrical.SystemBase.fNom) annotation(
Placement(visible = true, transformation(origin = {56, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
Expand Down
2 changes: 1 addition & 1 deletion .../Modelica/Dynawo/Electrical/Controls/IEC/IEC61400/BaseControls/WPP/LinearCommunication.mo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ model LinearCommunication "Linear communication module (IEC N°61400-27-1)"
Modelica.Blocks.Interfaces.RealVectorOutput y[nu] "Connector of Real vector input signal" annotation(
Placement(visible = true, transformation(extent = {{80, 70}, {120, -70}}, rotation = 0), iconTransformation(extent = {{80, 70}, {120, -70}}, rotation = 0)));

Modelica.Blocks.Continuous.TransferFunction leadLag[nu](each a = {tLag, 1}, each b = {tLead, 1}, x_scaled(start = [X0Pu]), x_start = [X0Pu], y_start = X0Pu) annotation(
Dynawo.NonElectrical.Blocks.Continuous.TransferFunction leadLag[nu](each a = {tLag, 1}, each b = {tLead, 1}, x_start = [X0Pu], y_start = X0Pu) annotation(
Placement(visible = true, transformation(origin = {0, 0}, extent = {{-20, -20}, {20, 20}}, rotation = 0)));

//Initial parameter
Expand Down
3 changes: 2 additions & 1 deletion ...dels/Modelica/Dynawo/Electrical/Controls/IEC/IEC61400/BaseControls/WPP/WPPPControl2015.mo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ model WPPPControl2015 "Active power control module for wind power plants (IEC N
Placement(visible = true, transformation(origin = {110, -90}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
Modelica.Blocks.MathBoolean.Or or1(nu = 2) annotation(
Placement(visible = true, transformation(origin = {110, -40}, extent = {{10, -10}, {-10, 10}}, rotation = 0)));
Modelica.Blocks.Continuous.TransferFunction transferFunction(a = {tpfv, 1},b = {tpft, 1}, x_start = {-P0Pu*SystemBase.SnRef/SNom}, y_start = -P0Pu * SystemBase.SnRef / SNom) annotation(
Dynawo.NonElectrical.Blocks.Continuous.TransferFunction transferFunction(a = {tpfv, 1},b = {tpft, 1}, x_start = {-P0Pu*SystemBase.SnRef/SNom}, y_start = -P0Pu * SystemBase.SnRef / SNom) annotation(
Placement(visible = true, transformation(origin = {170, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
Dynawo.NonElectrical.Blocks.Continuous.AbsLimRateLimFeedthroughFreeze absLimRateLimFeedthroughFreeze(DyMax = DPRefMaxPu, DyMin = DPRefMinPu, U0 = -P0Pu*SystemBase.SnRef/SNom, Y0 = -P0Pu*SystemBase.SnRef/SNom, YMax = PRefMaxPu, YMin = PRefMinPu, tS = tS) annotation(
Placement(visible = true, transformation(origin = {204, 0}, extent = {{-10, 10}, {10, -10}}, rotation = 0)));
Expand Down Expand Up @@ -95,6 +95,7 @@ equation
Line(points = {{122, -90}, {204, -90}, {204, -11}}, color = {255, 0, 255}));

annotation(
preferredView = "diagram",
Icon(graphics = {Text(origin = {24, -110}, extent = {{-94, 60}, {48, 12}}, textString = "2015")}),
Diagram(coordinateSystem(extent = {{-160, -100}, {230, 100}})));
end WPPPControl2015;
3 changes: 2 additions & 1 deletion ...dels/Modelica/Dynawo/Electrical/Controls/IEC/IEC61400/BaseControls/WPP/WPPQControl2015.mo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ model WPPQControl2015 "Reactive power control module for wind power plants (IEC
Placement(visible = true, transformation(origin = {-290, -40}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
Dynawo.NonElectrical.Blocks.Continuous.AbsLimRateLimFeedthroughFreezeLimDetection absLimRateLimFeedthroughFreezeLimDetection1(DyMax = DXRefMaxPu, DyMin = DXRefMinPu, U0 = XWT0Pu, Y0 = XWT0Pu, YMax = XRefMaxPu, YMin = XRefMinPu, tS = tS) annotation(
Placement(visible = true, transformation(origin = {326, 100}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
Modelica.Blocks.Continuous.TransferFunction transferFunction1(a = {txfv, 1}, b = {txft, 1}, x_start = {XWT0Pu}, y_start = XWT0Pu) annotation(
Dynawo.NonElectrical.Blocks.Continuous.TransferFunction transferFunction1(a = {txfv, 1}, b = {txft, 1}, x_start = {XWT0Pu}, y_start = XWT0Pu) annotation(
Placement(visible = true, transformation(origin = {296, 100}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
Modelica.Blocks.Sources.BooleanConstant booleanConstant(k = false) annotation(
Placement(visible = true, transformation(origin = {260, 138}, extent = {{-10, -10}, {10, 10}}, rotation = -90)));
Expand Down Expand Up @@ -109,4 +109,5 @@ equation
connect(firstOrder1.y, gain.u) annotation(
Line(points = {{-278, -100}, {-200, -100}, {-200, -72}, {-122, -72}}, color = {0, 0, 127}));

annotation(preferredView = "diagram");
end WPPQControl2015;
8 changes: 4 additions & 4 deletions .../Models/Modelica/Dynawo/Electrical/Controls/Machines/Governors/Standard/Generic/GovCt2.mo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -270,17 +270,17 @@ model GovCt2 "Governor type GovCT2"
Placement(visible = true, transformation(origin = {184, 114}, extent = {{-8, -8}, {8, 8}}, rotation = -180)));
Modelica.Blocks.Math.Product prodOmegaDm annotation(
Placement(visible = true, transformation(origin = {236, 202}, extent = {{8, -8}, {-8, 8}}, rotation = 180)));
Modelica.Blocks.Nonlinear.SlewRateLimiter rateLimitFsrt(Falling = RDownPu, Rising = RUpPu, Td = tDRatelim, strict = false, y_start = initFsrtPu) annotation(
Modelica.Blocks.Nonlinear.SlewRateLimiter rateLimitFsrt(Falling = RDownPu, Rising = RUpPu, Td = tDRatelim, strict = false, y_start = initFsrtPu, y(start = initFsrtPu)) annotation(
Placement(visible = true, transformation(origin = {-4, 40}, extent = {{-8, -8}, {8, 8}}, rotation = 0)));
Modelica.Blocks.Nonlinear.SlewRateLimiter rateLimitPRate(Rising = PRatePu, Td = tDRatelim, y_start = (ValveMaxPu - WFnlPu) * KTurb) annotation(
Modelica.Blocks.Nonlinear.SlewRateLimiter rateLimitPRate(Rising = PRatePu, Td = tDRatelim, y_start = (ValveMaxPu - WFnlPu) * KTurb, y(start = (ValveMaxPu - WFnlPu) * KTurb)) annotation(
Placement(visible = true, transformation(origin = {138, 14}, extent = {{-8, -8}, {8, 8}}, rotation = -90)));
Modelica.Blocks.Logical.Switch switchWFSpd annotation(
Placement(visible = true, transformation(origin = {272, -126}, extent = {{10, -10}, {-10, 10}}, rotation = -90)));
Modelica.Blocks.Tables.CombiTable1Ds tablePLimFromf(extrapolation = Modelica.Blocks.Types.Extrapolation.LastTwoPoints, smoothness = Modelica.Blocks.Types.Smoothness.LinearSegments, table = PLimFromfPoints, tableOnFile = false, verboseRead = false) annotation(
Placement(visible = true, transformation(origin = {138, 38}, extent = {{-10, -10}, {10, 10}}, rotation = -90)));
Modelica.Blocks.Continuous.TransferFunction transferFunctCtB(a = {tB, 1}, b = {tC, 1}, initType = Modelica.Blocks.Types.Init.InitialState, x_start = {initPMechNoLossPu}, y_start = initPMechNoLossPu) annotation(
Dynawo.NonElectrical.Blocks.Continuous.TransferFunction transferFunctCtB(a = {tB, 1}, b = {tC, 1}, x_start = {initPMechNoLossPu}, y_start = initPMechNoLossPu) annotation(
Placement(visible = true, transformation(origin = {254, 106}, extent = {{10, -10}, {-10, 10}}, rotation = -90)));
Modelica.Blocks.Continuous.TransferFunction transferFunctSAtSB(a = {tSB, 1}, b = {tSA, 1}, initType = Modelica.Blocks.Types.Init.InitialOutput, x_start = {initTexPu}, y_start = initTexPu) annotation(
Dynawo.NonElectrical.Blocks.Continuous.TransferFunction transferFunctSAtSB(a = {tSB, 1}, b = {tSA, 1}, x_start = {initTexPu}, y_start = initTexPu) annotation(
Placement(visible = true, transformation(origin = {80, 114}, extent = {{10, -10}, {-10, 10}}, rotation = 0)));

// Initial parameters
Expand Down
2 changes: 1 addition & 1 deletion ...Models/Modelica/Dynawo/Electrical/Controls/Machines/Governors/Standard/Steam/GovSteam1.mo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ Placement(visible = true, transformation(origin = {90, 0}, extent = {{-10, -10},
Placement(visible = true, transformation(origin = {-70, -50}, extent = {{10, 10}, {-10, -10}}, rotation = 0)));
Modelica.Blocks.Logical.Switch switch2 annotation(
Placement(visible = true, transformation(origin = {150, -50}, extent = {{10, 10}, {-10, -10}}, rotation = 180)));
Modelica.Blocks.Continuous.TransferFunction transferFunction(a = {t1, 1}, b = K * {t2, 1}) annotation(
Dynawo.NonElectrical.Blocks.Continuous.TransferFunction transferFunction(a = {t1, 1}, b = K * {t2, 1}) annotation(
Placement(visible = true, transformation(origin = {-270, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));

//Initial parameters
Expand Down
2 changes: 1 addition & 1 deletion ...es/Models/Modelica/Dynawo/Electrical/Controls/Machines/Governors/Standard/Steam/IEEEG1.mo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ model IEEEG1 "Steam turbine governor"
Placement(visible = true, transformation(origin = {-90, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
Modelica.Blocks.Continuous.FirstOrder firstOrder3(T = t7, y_start = PmRef0Pu) annotation(
Placement(visible = true, transformation(origin = {190, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
Modelica.Blocks.Continuous.TransferFunction transferFunction(a = {t1, 1}, b = {t2, 1}) annotation(
Dynawo.NonElectrical.Blocks.Continuous.TransferFunction transferFunction(a = {t1, 1}, b = {t2, 1}) annotation(
Placement(visible = true, transformation(origin = {-230, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
Modelica.Blocks.Math.Sum sum1(k = {K1, K3, K5, K7}, nin = 4) annotation(
Placement(visible = true, transformation(origin = {250, 100}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
Expand Down
4 changes: 2 additions & 2 deletions ...es/Models/Modelica/Dynawo/Electrical/Controls/Machines/Governors/Standard/Steam/IEEEG2.mo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ model IEEEG2 "IEEE governor type IEEEG2"
Placement(visible = true, transformation(origin = {30, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
Modelica.Blocks.Nonlinear.Limiter limiter(homotopyType = Modelica.Blocks.Types.LimiterHomotopy.NoHomotopy, uMax = PMaxPu, uMin = PMinPu) annotation(
Placement(visible = true, transformation(origin = {70, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
Modelica.Blocks.Continuous.TransferFunction transferFunction(a = {t4 / 2, 1}, b = {-t4, 1}, x_scaled(start = {Pm0Pu}), x_start = {Pm0Pu}, y(start = Pm0Pu)) annotation(
Dynawo.NonElectrical.Blocks.Continuous.TransferFunction transferFunction(a = {t4 / 2, 1}, b = {-t4, 1}, x_start = {Pm0Pu}, y_start = Pm0Pu) annotation(
Placement(visible = true, transformation(origin = {110, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
Modelica.Blocks.Continuous.TransferFunction transferFunction1(a = {t3, 1}, b = {t2, 1}) annotation(
Dynawo.NonElectrical.Blocks.Continuous.TransferFunction transferFunction1(a = {t3, 1}, b = {t2, 1}) annotation(
Placement(visible = true, transformation(origin = {-30, -60}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
Modelica.Blocks.Continuous.FirstOrder firstOrder(T = t1) annotation(
Placement(visible = true, transformation(origin = {-70, -60}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
Expand Down
2 changes: 1 addition & 1 deletion ...ces/Models/Modelica/Dynawo/Electrical/Controls/Machines/Governors/Standard/Steam/TGov1.mo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ model TGov1 "IEEE governor type TGOV1"
Modelica.Blocks.Interfaces.RealOutput PmPu(start = Pm0Pu) "Mechanical power in pu (base PNomTurb)" annotation(
Placement(visible = true, transformation(origin = {150, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0), iconTransformation(origin = {110, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));

Modelica.Blocks.Continuous.TransferFunction transferFunction(a = {t3, 1}, b = {t2, 1}, x_scaled(start = {Pm0Pu}), x_start = {Pm0Pu}, y(start = Pm0Pu)) annotation(
Dynawo.NonElectrical.Blocks.Continuous.TransferFunction transferFunction(a = {t3, 1}, b = {t2, 1}, x_start = {Pm0Pu}, y_start = Pm0Pu) annotation(
Placement(visible = true, transformation(origin = {70, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
Modelica.Blocks.Math.Add add(k2 = -1) annotation(
Placement(visible = true, transformation(origin = {-90, -60}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
Expand Down
2 changes: 1 addition & 1 deletion ...ces/Models/Modelica/Dynawo/Electrical/Controls/Machines/Governors/Standard/Steam/TGov3.mo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ model TGov3 "IEEE governor type TGOV3"
Placement(visible = true, transformation(origin = {-200, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
Modelica.Blocks.Math.Feedback feedback1 annotation(
Placement(visible = true, transformation(origin = {80, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
Modelica.Blocks.Continuous.TransferFunction transferFunction(a = {t1, 1}, b = {t2, 1}) annotation(
Dynawo.NonElectrical.Blocks.Continuous.TransferFunction transferFunction(a = {t1, 1}, b = {t2, 1}) annotation(
Placement(visible = true, transformation(origin = {-310, -60}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
Modelica.Blocks.Math.Add add(k2 = -1) annotation(
Placement(visible = true, transformation(origin = {-350, -60}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
Expand Down
2 changes: 1 addition & 1 deletion ...els/Modelica/Dynawo/Electrical/Controls/Machines/OverExcitationLimiters/Standard/Oel5c.mo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ model Oel5c "IEEE (2016) overexcitation limiter type OEL5C model"
Placement(visible = true, transformation(origin = {-160, -140}, extent = {{-10, 10}, {10, -10}}, rotation = 0)));
Modelica.Blocks.Continuous.FirstOrder firstOrder2(T = tF2, k = KScale2, y_start = KScale2 * Vfe0Pu) annotation(
Placement(visible = true, transformation(origin = {-210, -100}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
Dynawo.NonElectrical.Blocks.Continuous.TransferFunction transferFunction(a = {tBOel, 1}, b = {tCOel, 1}, x_start = {KScale1 * Input0Pu}, y_start = KScale1 * Input0Pu) annotation(
Dynawo.NonElectrical.Blocks.Continuous.TransferFunction transferFunction(a = {tBOel, 1}, b = {tCOel, 1}, x_start = {KScale1 * Input0Pu}, y_start = KScale1 * Input0Pu, ZeroA1 = true) annotation(
Placement(visible = true, transformation(origin = {-110, -20}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
Modelica.Blocks.Math.Gain gain(k = KIfdt) annotation(
Placement(visible = true, transformation(origin = {-50, 100}, extent = {{10, -10}, {-10, 10}}, rotation = 0)));
Expand Down
4 changes: 2 additions & 2 deletions ...awo/Electrical/Controls/Machines/PowerSystemStabilizers/Standard/BaseClasses/BasePss1a.mo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@ model BasePss1a "IEEE power system stabilizer type 1A (base model)"

Modelica.Blocks.Nonlinear.Limiter limiter(homotopyType = Modelica.Blocks.Types.LimiterHomotopy.NoHomotopy, uMax = VPssMaxPu, uMin = VPssMinPu) annotation(
Placement(visible = true, transformation(origin = {130, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
Modelica.Blocks.Continuous.TransferFunction transferFunction(a = {t4, 1}, b = {t3, 1}) annotation(
Dynawo.NonElectrical.Blocks.Continuous.TransferFunction transferFunction(a = {t4, 1}, b = {t3, 1}) annotation(
Placement(visible = true, transformation(origin = {90, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
Modelica.Blocks.Continuous.TransferFunction transferFunction1(a = {t2, 1}, b = {t1, 1}) annotation(
Dynawo.NonElectrical.Blocks.Continuous.TransferFunction transferFunction1(a = {t2, 1}, b = {t1, 1}) annotation(
Placement(visible = true, transformation(origin = {50, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
Dynawo.NonElectrical.Blocks.Continuous.SecondOrder secondOrder(A1 = A1, A2 = A2) annotation(
Placement(visible = true, transformation(origin = {10, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
Expand Down
4 changes: 2 additions & 2 deletions ...nawo/Electrical/Controls/Machines/PowerSystemStabilizers/Standard/BaseClasses/BasePss2.mo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,9 @@ model BasePss2 "IEEE power system stabilizer type 2 base model"
Placement(visible = true, transformation(origin = {20, 0}, extent = {{-10, 10}, {10, -10}}, rotation = 0)));
Modelica.Blocks.Math.Gain gain1(k = Ks1) annotation(
Placement(visible = true, transformation(origin = {70, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
Modelica.Blocks.Continuous.TransferFunction transferFunction(a = {t2, 1}, b = {t1, 1}) annotation(
Dynawo.NonElectrical.Blocks.Continuous.TransferFunction transferFunction(a = {t2, 1}, b = {t1, 1}) annotation(
Placement(visible = true, transformation(origin = {110, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
Modelica.Blocks.Continuous.TransferFunction transferFunction1(a = {t4, 1}, b = {t3, 1}) annotation(
Dynawo.NonElectrical.Blocks.Continuous.TransferFunction transferFunction1(a = {t4, 1}, b = {t3, 1}) annotation(
Placement(visible = true, transformation(origin = {150, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
Modelica.Blocks.Nonlinear.Limiter limiter2(homotopyType = Modelica.Blocks.Types.LimiterHomotopy.NoHomotopy, uMax = VPssMaxPu, uMin = VPssMinPu) annotation(
Placement(visible = true, transformation(origin = {270, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
Expand Down
4 changes: 2 additions & 2 deletions ...nawo/Electrical/Controls/Machines/PowerSystemStabilizers/Standard/BaseClasses/BasePss3.mo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,9 @@ model BasePss3 "IEEE power system stabilizer type 3 base model"
Placement(visible = true, transformation(origin = {-130, 60}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
Modelica.Blocks.Math.Add add annotation(
Placement(visible = true, transformation(origin = {-30, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
Dynawo.NonElectrical.Blocks.Continuous.TransferFunction transferFunction(a = {A4, A3, 1}, b = {A2, A1, 1}) annotation(
Dynawo.NonElectrical.Blocks.Continuous.TransferFunction transferFunction(a = {A4, A3, 1}, b = {A2, A1, 1}, ZeroA1 = true) annotation(
Placement(visible = true, transformation(origin = {50, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
Dynawo.NonElectrical.Blocks.Continuous.TransferFunction transferFunction1(a = {A8, A7, 1}, b = {A6, A5, 1}) annotation(
Dynawo.NonElectrical.Blocks.Continuous.TransferFunction transferFunction1(a = {A8, A7, 1}, b = {A6, A5, 1}, ZeroA1 = true) annotation(
Placement(visible = true, transformation(origin = {90, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
Modelica.Blocks.Nonlinear.Limiter limiter2(homotopyType = Modelica.Blocks.Types.LimiterHomotopy.NoHomotopy, uMax = VPssMaxPu, uMin = VPssMinPu) annotation(
Placement(visible = true, transformation(origin = {130, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
Expand Down
2 changes: 1 addition & 1 deletion ...els/Modelica/Dynawo/Electrical/Controls/Machines/PowerSystemStabilizers/Standard/Pss2b.mo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ model Pss2b "IEEE power system stabilizer type 2B"
parameter Types.Time t10 "Third lead time constant in s";
parameter Types.Time t11 "Third lag time constant in s";

Modelica.Blocks.Continuous.TransferFunction transferFunction2(a = {t11, 1}, b = {t10, 1}) annotation(
Dynawo.NonElectrical.Blocks.Continuous.TransferFunction transferFunction2(a = {t11, 1}, b = {t10, 1}) annotation(
Placement(visible = true, transformation(origin = {190, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));

equation
Expand Down
4 changes: 2 additions & 2 deletions ...els/Modelica/Dynawo/Electrical/Controls/Machines/PowerSystemStabilizers/Standard/Pss2c.mo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ model Pss2c "IEEE power system stabilizer type 2C"
parameter Types.Time t12 "Fourth lead time constant in s";
parameter Types.Time t13 "Fourth lag time constant in s";

Modelica.Blocks.Continuous.TransferFunction transferFunction2(a = {t11, 1}, b = {t10, 1}) annotation(
Dynawo.NonElectrical.Blocks.Continuous.TransferFunction transferFunction2(a = {t11, 1}, b = {t10, 1}) annotation(
Placement(visible = true, transformation(origin = {190, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
Modelica.Blocks.Continuous.TransferFunction transferFunction3(a = {t13, 1}, b = {t12, 1}) annotation(
Dynawo.NonElectrical.Blocks.Continuous.TransferFunction transferFunction3(a = {t13, 1}, b = {t12, 1}) annotation(
Placement(visible = true, transformation(origin = {230, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
Modelica.Blocks.Logical.Hysteresis hysteresis(uHigh = PPssOnPu, uLow = PPssOffPu, y(start = PGen0Pu * SystemBase.SnRef / SNom > PPssOffPu)) annotation(
Placement(visible = true, transformation(origin = {-250, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
Expand Down
Loading

0 comments on commit 38687ad

Please sign in to comment.