Skip to content

Commit

Permalink
#3489 Use Modelica 4.0.0 (First attempt)
Browse files Browse the repository at this point in the history 
Signed-off-by: Joy El Feghali <[email protected]>
  • Loading branch information
@joyelfeghali
joyelfeghali committed Feb 18, 2025
1 parent 7d62166 commit f95052d
Show file tree
Hide file tree
Showing 87 changed files with 176 additions and 181 deletions.
6 changes: 3 additions & 3 deletions dynawo/sources/ModelicaCompiler/test/ModelicaModel/GeneratorPQ_info.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
{"eqIndex":7,"section":"initial","tag":"assign","defines":["generator.terminal.V.re"],"uses":["$START.generator.terminal.V.re"],"equation":["$START.generator.terminal.V.re"],"source":{"info":{"file":"","lineStart":0,"lineEnd":0,"colStart":0,"colEnd":0},"operations":[{"op":"info","display":"solved","data":["generator.terminal.V.re = $START.generator.terminal.V.re"]},{"op":"info","display":"solved","data":["generator.terminal.V.re = $START.generator.terminal.V.re"]}]}},
{"eqIndex":8,"section":"initial","tag":"assign","defines":["$PRE.generator.running.value"],"uses":["$START.generator.running.value"],"equation":["$START.generator.running.value"],"source":{"info":{"file":"","lineStart":0,"lineEnd":0,"colStart":0,"colEnd":0},"operations":[{"op":"info","display":"solved","data":["$PRE.generator.running.value = $START.generator.running.value"]},{"op":"info","display":"solved","data":["$PRE.generator.running.value = $START.generator.running.value"]}]}},
{"eqIndex":9,"section":"initial","tag":"assign","defines":["$PRE.generator.switchOffSignal1.value"],"uses":["$START.generator.switchOffSignal1.value"],"equation":["$START.generator.switchOffSignal1.value"],"source":{"info":{"file":"","lineStart":0,"lineEnd":0,"colStart":0,"colEnd":0},"operations":[{"op":"info","display":"solved","data":["$PRE.generator.switchOffSignal1.value = $START.generator.switchOffSignal1.value"]},{"op":"info","display":"solved","data":["$PRE.generator.switchOffSignal1.value = $START.generator.switchOffSignal1.value"]}]}},
{"eqIndex":10,"section":"initial","tag":"assign","defines":["generator.UPu"],"uses":["generator.terminal.V.im","generator.terminal.V.re"],"equation":["(generator.terminal.V.re ^ 2.0 + generator.terminal.V.im ^ 2.0) ^ 0.5"],"source":{"info":{"file":"/home/rosiereflo/Projects/devBranch/dynawo/dynawo/install/gcc7/60_OM_1_13_2/Release/shared/dynawo/ddb/Dynawo/Electrical/Machines/BaseClasses.mo","lineStart":45,"lineEnd":45,"colStart":3,"colEnd":38},"within":["Dynawo.Electrical.Machines.GeneratorPQ"],"instance":"generator","operations":[{"op":"info","display":"solved","data":["generator.UPu = (generator.terminal.V.re ^ 2.0 + generator.terminal.V.im ^ 2.0) ^ 0.5"]},{"op":"info","display":"solved","data":["generator.UPu = (generator.terminal.V.re ^ 2.0 + generator.terminal.V.im ^ 2.0) ^ 0.5"]},{"op":"before-after","display":"inline","data":["Modelica.ComplexMath.'abs'(/*.Complex*/(generator.terminal.V))","(generator.terminal.V.re ^ 2.0 + generator.terminal.V.im ^ 2.0) ^ 0.5"]},{"op":"before-after","display":"flattening","data":["UPu = Modelica.ComplexMath.'abs'(terminal.V);","generator.UPu = Modelica.ComplexMath.'abs'(/*.Complex*/(generator.terminal.V));"]}]}},
{"eqIndex":10,"section":"initial","tag":"assign","defines":["generator.UPu"],"uses":["generator.terminal.V.im","generator.terminal.V.re"],"equation":["(generator.terminal.V.re ^ 2.0 + generator.terminal.V.im ^ 2.0) ^ 0.5"],"source":{"info":{"file":"/home/rosiereflo/Projects/devBranch/dynawo/dynawo/install/gcc7/60_OM_1_13_2/Release/shared/dynawo/ddb/Dynawo/Electrical/Machines/BaseClasses.mo","lineStart":45,"lineEnd":45,"colStart":3,"colEnd":38},"within":["Dynawo.Electrical.Machines.GeneratorPQ"],"instance":"generator","operations":[{"op":"info","display":"solved","data":["generator.UPu = (generator.terminal.V.re ^ 2.0 + generator.terminal.V.im ^ 2.0) ^ 0.5"]},{"op":"info","display":"solved","data":["generator.UPu = (generator.terminal.V.re ^ 2.0 + generator.terminal.V.im ^ 2.0) ^ 0.5"]},{"op":"before-after","display":"inline","data":["Modelica.ComplexMath.abs(/*.Complex*/(generator.terminal.V))","(generator.terminal.V.re ^ 2.0 + generator.terminal.V.im ^ 2.0) ^ 0.5"]},{"op":"before-after","display":"flattening","data":["UPu = Modelica.ComplexMath.abs(terminal.V);","generator.UPu = Modelica.ComplexMath.abs(/*.Complex*/(generator.terminal.V));"]}]}},
{"eqIndex":11,"section":"initial","tag":"assign","defines":["$whenCondition10"],"uses":["$PRE.generator.qStatus","generator.UMaxPu","generator.UPu"],"equation":["generator.UPu >= 0.0001 + generator.UMaxPu and $PRE.generator.qStatus <> Dynawo.Electrical.Machines.GeneratorPQ.QStatus.AbsorptionMax"],"source":{"info":{"file":"/home/rosiereflo/Projects/devBranch/dynawo/dynawo/install/gcc7/60_OM_1_13_2/Release/shared/dynawo/ddb/Dynawo/Electrical/Machines/GeneratorPQ.mo","lineStart":47,"lineEnd":47,"colStart":5,"colEnd":36},"within":["Dynawo.Electrical.Machines.GeneratorPQ"],"instance":"generator","operations":[{"op":"info","display":"solved","data":["$whenCondition10 = generator.UPu >= 0.0001 + generator.UMaxPu and $PRE.generator.qStatus <> Dynawo.Electrical.Machines.GeneratorPQ.QStatus.AbsorptionMax"]},{"op":"info","display":"solved","data":["$whenCondition10 = generator.UPu >= 0.0001 + generator.UMaxPu and $PRE.generator.qStatus <> Dynawo.Electrical.Machines.GeneratorPQ.QStatus.AbsorptionMax"]},{"op":"info","display":"scode","data":["qStatus = QStatus.AbsorptionMax;"]}]}},
{"eqIndex":12,"section":"initial","tag":"assign","defines":["$whenCondition9"],"uses":["$PRE.generator.qStatus","generator.UMinPu","generator.UPu"],"equation":["generator.UPu <= -0.0001 + generator.UMinPu and $PRE.generator.qStatus <> Dynawo.Electrical.Machines.GeneratorPQ.QStatus.GenerationMax"],"source":{"info":{"file":"/home/rosiereflo/Projects/devBranch/dynawo/dynawo/install/gcc7/60_OM_1_13_2/Release/shared/dynawo/ddb/Dynawo/Electrical/Machines/GeneratorPQ.mo","lineStart":47,"lineEnd":47,"colStart":5,"colEnd":36},"within":["Dynawo.Electrical.Machines.GeneratorPQ"],"instance":"generator","operations":[{"op":"info","display":"solved","data":["$whenCondition9 = generator.UPu <= -0.0001 + generator.UMinPu and $PRE.generator.qStatus <> Dynawo.Electrical.Machines.GeneratorPQ.QStatus.GenerationMax"]},{"op":"info","display":"solved","data":["$whenCondition9 = generator.UPu <= -0.0001 + generator.UMinPu and $PRE.generator.qStatus <> Dynawo.Electrical.Machines.GeneratorPQ.QStatus.GenerationMax"]},{"op":"info","display":"scode","data":["qStatus = QStatus.AbsorptionMax;"]}]}},
{"eqIndex":13,"section":"initial","tag":"assign","defines":["$whenCondition8"],"uses":["generator.UMinPu","$PRE.generator.qStatus","generator.UMaxPu","generator.UPu"],"equation":["generator.UPu < -0.0001 + generator.UMaxPu and $PRE.generator.qStatus == Dynawo.Electrical.Machines.GeneratorPQ.QStatus.AbsorptionMax or generator.UPu > 0.0001 + generator.UMinPu and $PRE.generator.qStatus == Dynawo.Electrical.Machines.GeneratorPQ.QStatus.GenerationMax"],"source":{"info":{"file":"/home/rosiereflo/Projects/devBranch/dynawo/dynawo/install/gcc7/60_OM_1_13_2/Release/shared/dynawo/ddb/Dynawo/Electrical/Machines/GeneratorPQ.mo","lineStart":47,"lineEnd":47,"colStart":5,"colEnd":36},"within":["Dynawo.Electrical.Machines.GeneratorPQ"],"instance":"generator","operations":[{"op":"info","display":"solved","data":["$whenCondition8 = generator.UPu < -0.0001 + generator.UMaxPu and $PRE.generator.qStatus == Dynawo.Electrical.Machines.GeneratorPQ.QStatus.AbsorptionMax or generator.UPu > 0.0001 + generator.UMinPu and $PRE.generator.qStatus == Dynawo.Electrical.Machines.GeneratorPQ.QStatus.GenerationMax"]},{"op":"info","display":"solved","data":["$whenCondition8 = generator.UPu < -0.0001 + generator.UMaxPu and $PRE.generator.qStatus == Dynawo.Electrical.Machines.GeneratorPQ.QStatus.AbsorptionMax or generator.UPu > 0.0001 + generator.UMinPu and $PRE.generator.qStatus == Dynawo.Electrical.Machines.GeneratorPQ.QStatus.GenerationMax"]},{"op":"info","display":"scode","data":["qStatus = QStatus.AbsorptionMax;"]}]}},
Expand Down Expand Up @@ -106,7 +106,7 @@
{"eqIndex":60,"section":"parameter","tag":"assign","defines":["generator.i0Pu.im"],"uses":[],"equation":["0.0"],"source":{"info":{"file":"/home/rosiereflo/Projects/devBranch/dynawo/dynawo/OpenModelica/Install/lib/omlibrary/Complex 3.2.2.mo","lineStart":5,"lineEnd":5,"colStart":3,"colEnd":76},"within":["Real"],"instance":"generatori0Pu","typeLst":["GeneratorPQ","Dynawo.Electrical.Machines.GeneratorPQ","Dynawo.Types.AC.Current"]}},
{"eqIndex":61,"section":"parameter","tag":"algorithm","equation":["assert(generator.NbSwitchOffSignals >= 1 and generator.NbSwitchOffSignals <= 3, \"Variable violating min/max constraint: 1 <= generator.NbSwitchOffSignals <= 3, has value: \" + String(generator.NbSwitchOffSignals, \"d\"));"],"source":{"info":{"file":"/home/rosiereflo/Projects/devBranch/dynawo/dynawo/install/gcc7/60_OM_1_13_2/Release/shared/dynawo/ddb/Dynawo/Electrical/Controls/Basics/SwitchOff.mo","lineStart":30,"lineEnd":30,"colStart":5,"colEnd":122},"within":["Integer"],"instance":"generator","typeLst":["GeneratorPQ","Dynawo.Electrical.Machines.GeneratorPQ"]}},
{"eqIndex":62,"section":"parameter","tag":"algorithm","equation":["assert(generator.State0 >= Dynawo.Electrical.Constants.state.Open and generator.State0 <= Dynawo.Electrical.Constants.state.Undefined, \"Variable violating min/max constraint: Dynawo.Electrical.Constants.state.Open <= generator.State0 <= Dynawo.Electrical.Constants.state.Undefined, has value: \" + String(generator.State0, \"d\"));"],"source":{"info":{"file":"/home/rosiereflo/Projects/devBranch/dynawo/dynawo/install/gcc7/60_OM_1_13_2/Release/shared/dynawo/ddb/Dynawo/Electrical/Controls/Basics/SwitchOff.mo","lineStart":64,"lineEnd":64,"colStart":5,"colEnd":97},"within":["Dynawo.Electrical.Constants.state"],"instance":"generator","typeLst":["GeneratorPQ","Dynawo.Electrical.Machines.GeneratorPQ"]}},
{"eqIndex":63,"section":"residuals","tag":"assign","defines":["generator.UPu"],"uses":["generator.terminal.V.im","generator.terminal.V.re"],"equation":["(generator.terminal.V.re ^ 2.0 + generator.terminal.V.im ^ 2.0) ^ 0.5"],"source":{"info":{"file":"/home/rosiereflo/Projects/devBranch/dynawo/dynawo/install/gcc7/60_OM_1_13_2/Release/shared/dynawo/ddb/Dynawo/Electrical/Machines/BaseClasses.mo","lineStart":45,"lineEnd":45,"colStart":3,"colEnd":38},"within":["Dynawo.Electrical.Machines.GeneratorPQ"],"instance":"generator","operations":[{"op":"before-after","display":"inline","data":["Modelica.ComplexMath.'abs'(/*.Complex*/(generator.terminal.V))","(generator.terminal.V.re ^ 2.0 + generator.terminal.V.im ^ 2.0) ^ 0.5"]},{"op":"before-after","display":"flattening","data":["UPu = Modelica.ComplexMath.'abs'(terminal.V);","generator.UPu = Modelica.ComplexMath.'abs'(/*.Complex*/(generator.terminal.V));"]}]}},
{"eqIndex":63,"section":"residuals","tag":"assign","defines":["generator.UPu"],"uses":["generator.terminal.V.im","generator.terminal.V.re"],"equation":["(generator.terminal.V.re ^ 2.0 + generator.terminal.V.im ^ 2.0) ^ 0.5"],"source":{"info":{"file":"/home/rosiereflo/Projects/devBranch/dynawo/dynawo/install/gcc7/60_OM_1_13_2/Release/shared/dynawo/ddb/Dynawo/Electrical/Machines/BaseClasses.mo","lineStart":45,"lineEnd":45,"colStart":3,"colEnd":38},"within":["Dynawo.Electrical.Machines.GeneratorPQ"],"instance":"generator","operations":[{"op":"before-after","display":"inline","data":["Modelica.ComplexMath.abs(/*.Complex*/(generator.terminal.V))","(generator.terminal.V.re ^ 2.0 + generator.terminal.V.im ^ 2.0) ^ 0.5"]},{"op":"before-after","display":"flattening","data":["UPu = Modelica.ComplexMath.abs(terminal.V);","generator.UPu = Modelica.ComplexMath.abs(/*.Complex*/(generator.terminal.V));"]}]}},
{"eqIndex":64,"section":"residuals","tag":"assign","defines":["$whenCondition10"],"uses":["generator.qStatus","generator.UMaxPu","generator.UPu"],"equation":["generator.UPu >= 0.0001 + generator.UMaxPu and pre(generator.qStatus) <> Dynawo.Electrical.Machines.GeneratorPQ.QStatus.AbsorptionMax"],"source":{"info":{"file":"/home/rosiereflo/Projects/devBranch/dynawo/dynawo/install/gcc7/60_OM_1_13_2/Release/shared/dynawo/ddb/Dynawo/Electrical/Machines/GeneratorPQ.mo","lineStart":47,"lineEnd":47,"colStart":5,"colEnd":36},"within":["Dynawo.Electrical.Machines.GeneratorPQ"],"instance":"generator","operations":[{"op":"info","display":"scode","data":["qStatus = QStatus.AbsorptionMax;"]}]}},
{"eqIndex":65,"section":"residuals","tag":"assign","defines":["$whenCondition9"],"uses":["generator.qStatus","generator.UMinPu","generator.UPu"],"equation":["generator.UPu <= -0.0001 + generator.UMinPu and pre(generator.qStatus) <> Dynawo.Electrical.Machines.GeneratorPQ.QStatus.GenerationMax"],"source":{"info":{"file":"/home/rosiereflo/Projects/devBranch/dynawo/dynawo/install/gcc7/60_OM_1_13_2/Release/shared/dynawo/ddb/Dynawo/Electrical/Machines/GeneratorPQ.mo","lineStart":47,"lineEnd":47,"colStart":5,"colEnd":36},"within":["Dynawo.Electrical.Machines.GeneratorPQ"],"instance":"generator","operations":[{"op":"info","display":"scode","data":["qStatus = QStatus.AbsorptionMax;"]}]}},
{"eqIndex":66,"section":"residuals","tag":"assign","defines":["$whenCondition8"],"uses":["generator.UMinPu","generator.qStatus","generator.UMaxPu","generator.UPu"],"equation":["generator.UPu < -0.0001 + generator.UMaxPu and pre(generator.qStatus) == Dynawo.Electrical.Machines.GeneratorPQ.QStatus.AbsorptionMax or generator.UPu > 0.0001 + generator.UMinPu and pre(generator.qStatus) == Dynawo.Electrical.Machines.GeneratorPQ.QStatus.GenerationMax"],"source":{"info":{"file":"/home/rosiereflo/Projects/devBranch/dynawo/dynawo/install/gcc7/60_OM_1_13_2/Release/shared/dynawo/ddb/Dynawo/Electrical/Machines/GeneratorPQ.mo","lineStart":47,"lineEnd":47,"colStart":5,"colEnd":36},"within":["Dynawo.Electrical.Machines.GeneratorPQ"],"instance":"generator","operations":[{"op":"info","display":"scode","data":["qStatus = QStatus.AbsorptionMax;"]}]}},
Expand Down Expand Up @@ -162,7 +162,7 @@
"Dynawo.Types.AC.Current$generator$terminal$i",
"Dynawo.Types.AC.Voltage",
"Dynawo.Types.AC.Voltage$generator$terminal$V",
"Modelica.ComplexMath.'abs'",
"Modelica.ComplexMath.abs",
"Modelica.ComplexMath.conj"
]
}
4 changes: 2 additions & 2 deletions dynawo/sources/Models/Modelica/Dynawo/Electrical/BESS/WECC/BESS_INIT.mo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@ equation
sInj0Pu = uInj0Pu * ComplexMath.conj(iInj0Pu);
PInj0Pu = ComplexMath.real(sInj0Pu);
QInj0Pu = ComplexMath.imag(sInj0Pu);
UInj0Pu = ComplexMath.'abs'(uInj0Pu);
UInj0Pu = ComplexMath.abs(uInj0Pu);
UPhaseInj0 = ComplexMath.arg(uInj0Pu);
PF0 = if (not(ComplexMath.'abs'(sInj0Pu) == 0)) then PInj0Pu / ComplexMath.'abs'(sInj0Pu) else 0;
PF0 = if (not(ComplexMath.abs(sInj0Pu) == 0)) then PInj0Pu / ComplexMath.abs(sInj0Pu) else 0;
Id0Pu = Modelica.Math.cos(UPhaseInj0) * iInj0Pu.re + Modelica.Math.sin(UPhaseInj0) * iInj0Pu.im;
Iq0Pu = Modelica.Math.sin(UPhaseInj0) * iInj0Pu.re - Modelica.Math.cos(UPhaseInj0) * iInj0Pu.im;

Expand Down
2 changes: 1 addition & 1 deletion dynawo/sources/Models/Modelica/Dynawo/Electrical/Buses/Bus.mo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ model Bus "Bus"

equation
terminal.i = Complex(0);
UPu = ComplexMath.'abs'(terminal.V);
UPu = ComplexMath.abs(terminal.V);
UPhase = ComplexMath.arg(terminal.V);
U = UPu * UNom;

Expand Down
4 changes: 2 additions & 2 deletions dynawo/sources/Models/Modelica/Dynawo/Electrical/Buses/BusWithInit.mo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ model BusWithInit "Bus with init"

Dynawo.Connectors.ACPower terminal(V(re(start = u0Pu.re), im(start = u0Pu.im)), i(re(start = 0.), im(start = 0.)));

Types.VoltageModulePu UPu(start = ComplexMath.'abs'(u0Pu)) "Voltage amplitude at terminal in pu (base UNom)";
Types.VoltageModulePu UPu(start = ComplexMath.abs(u0Pu)) "Voltage amplitude at terminal in pu (base UNom)";
Types.VoltageModule U "Voltage amplitude at terminal in kV";
Types.Angle UPhase(start = ComplexMath.arg(u0Pu)) "Voltage angle at terminal in rad";
Types.Angle UPhaseDeg(start = ComplexMath.arg(u0Pu) * 180.0 / Constants.pi) "Voltage angle at terminal in degree";
Expand All @@ -30,7 +30,7 @@ model BusWithInit "Bus with init"

equation
terminal.i = Complex(0);
UPu = ComplexMath.'abs'(terminal.V);
UPu = ComplexMath.abs(terminal.V);
UPhase = ComplexMath.arg(terminal.V);
UPhaseDeg = UPhase * 180.0 / Constants.pi;
U = UPu * UNom;
Expand Down
2 changes: 1 addition & 1 deletion dynawo/sources/Models/Modelica/Dynawo/Electrical/Buses/InfiniteBusWithImpedance_INIT.mo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ equation
sTerminal0Pu = Complex(P0Pu, Q0Pu);
sTerminal0Pu = uTerminal0Pu * ComplexMath.conj(iTerminal0Pu);
uTerminal0Pu - uBus0Pu = ZPu * iTerminal0Pu;
UBus0Pu = ComplexMath.'abs'(uBus0Pu);
UBus0Pu = ComplexMath.abs(uBus0Pu);
UPhaseBus0 = ComplexMath.arg(uBus0Pu);

annotation(
Expand Down
10 changes: 5 additions & 5 deletions ...Modelica/Dynawo/Electrical/Controls/IEC/IEC61400/BaseControls/Auxiliaries/Measurements.mo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ model Measurements "Measurement module for wind turbine controls (IEC N°61400-2
Placement(visible = true, transformation(origin = {-160, -120}, extent = {{-20, -20}, {20, 20}}, rotation = 0), iconTransformation(origin = {-110, -60}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));

//Output variables
Modelica.Blocks.Interfaces.RealOutput IFiltPu(start = ComplexMath.'abs'(i0Pu) * SystemBase.SnRef / SNom) "Filtered current module at grid terminal in pu (base UNom, SNom)" annotation(
Modelica.Blocks.Interfaces.RealOutput IFiltPu(start = ComplexMath.abs(i0Pu) * SystemBase.SnRef / SNom) "Filtered current module at grid terminal in pu (base UNom, SNom)" annotation(
Placement(visible = true, transformation(origin = {150, 40}, extent = {{-10, -10}, {10, 10}}, rotation = 0), iconTransformation(origin = {110, 20}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
Modelica.Blocks.Interfaces.RealOutput omegaFiltPu(start = SystemBase.omegaRef0Pu) "Filtered grid angular frequency in pu (base omegaNom)" annotation(
Placement(visible = true, transformation(origin = {150, -120}, extent = {{-10, -10}, {10, 10}}, rotation = 0), iconTransformation(origin = {110, -80}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
Expand All @@ -53,14 +53,14 @@ model Measurements "Measurement module for wind turbine controls (IEC N°61400-2
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)));

//Other variables
Types.CurrentModulePu IWtPu(start = ComplexMath.'abs'(i0Pu) * SystemBase.SnRef / SNom) "Current module at grid terminal in pu (base UNom, SNom)";
Types.CurrentModulePu IWtPu(start = ComplexMath.abs(i0Pu) * SystemBase.SnRef / SNom) "Current module at grid terminal in pu (base UNom, SNom)";
Types.VoltageModulePu UWtPu(start = U0Pu) "Voltage amplitude at grid terminal in pu (base UNom)";

Modelica.Blocks.Continuous.FirstOrder firstOrder(T = tPFilt, y_start = -P0Pu * SystemBase.SnRef / SNom) annotation(
Placement(visible = true, transformation(origin = {90, 120}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
Modelica.Blocks.Continuous.FirstOrder firstOrder1(T = tQFilt, y_start = -Q0Pu * SystemBase.SnRef / SNom) annotation(
Placement(visible = true, transformation(origin = {90, 80}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
Modelica.Blocks.Continuous.FirstOrder firstOrder2(T = tIFilt, y_start = ComplexMath.'abs'(i0Pu) * SystemBase.SnRef / SNom) annotation(
Modelica.Blocks.Continuous.FirstOrder firstOrder2(T = tIFilt, y_start = ComplexMath.abs(i0Pu) * SystemBase.SnRef / SNom) annotation(
Placement(visible = true, transformation(origin = {90, 40}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
Modelica.Blocks.Continuous.FirstOrder firstOrder3(T = tUFilt, y_start = U0Pu) annotation(
Placement(visible = true, transformation(origin = {90, -40}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
Expand Down Expand Up @@ -88,8 +88,8 @@ model Measurements "Measurement module for wind turbine controls (IEC N°61400-2
Dialog(tab = "Operating point"));

equation
UWtPu = ComplexMath.'abs'(uPu);
IWtPu = ComplexMath.'abs'(iPu);
UWtPu = ComplexMath.abs(uPu);
IWtPu = ComplexMath.abs(iPu);

connect(iPu, product.u2) annotation(
Line(points = {{-160, 80}, {-120, 80}, {-120, 106}, {-82, 106}}, color = {85, 170, 255}));
Expand Down
1 change: 0 additions & 1 deletion .../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 @@ -466,7 +466,6 @@ equation

annotation(
preferredView = "diagram",
uses(Modelica(version = "3.2.3")),
Documentation(info = "<html><head></head><body>This generic governor model (CIM name GovCT2) can be used to represent a variety of prime movers controlled by PID governors. For more information, see IEC 61970-302.</body></html>"),
Diagram(coordinateSystem(extent = {{-320, -200}, {320, 220}}), graphics = {Text(origin = {248, -35}, extent = {{-7, -3}, {7, 3}}, textString = "cfe"), Text(origin = {158, -84}, extent = {{-17, -4}, {17, 4}}, textString = "fsr"), Text(origin = {135, -194}, extent = {{-44, -4}, {44, 4}}, textString = "valve stroke"), Text(origin = {85, -184}, extent = {{-30, -4}, {30, 4}}, textString = "governor output"), Rectangle(origin = {70, -20}, lineColor = {0, 91, 127}, lineThickness = 0.75, extent = {{-24, 86}, {24, -86}}), Text(origin = {73, 44}, lineColor = {0, 91, 127}, extent = {{-20, -18}, {20, 18}}, textString = "Low
Value
Expand Down
Loading

0 comments on commit f95052d

Please sign in to comment.