Skip to content

Commit a072f79

Browse files
dietmarwdietmarw
committed
Clean up of annotations with ttws
1 parent 632003c commit a072f79

10 files changed

Lines changed: 87 additions & 101 deletions

File tree

‎OpenIPSL/Electrical/Solar/PowerFactory/DIgSILENT/Auxiliary/ActivePowerController.mo‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,15 @@ model ActivePowerController "Controller for the active power of a PV plant"
2222
Modelica.Blocks.Continuous.Integrator tracker(initType = Modelica.Blocks.Types.Init.InitialOutput, k = 1 / 0.1, y_start = id0) annotation (
2323
Placement(transformation(origin = {10, 70}, extent = {{-10, -10}, {10, 10}})));
2424
Modelica.Blocks.Math.Feedback feedback annotation (
25-
Placement(visible = true, transformation(origin = {-30, 70}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
26-
Modelica.Blocks.Nonlinear.Limiter limiter(uMax=yo_max, uMin=yo_min) annotation (Placement(visible=true, transformation(
25+
Placement(transformation(origin = {-30, 70}, extent = {{-10, -10}, {10, 10}})));
26+
Modelica.Blocks.Nonlinear.Limiter limiter(uMax=yo_max, uMin=yo_min) annotation (Placement(transformation(
2727
origin={100,70},
28-
extent={{-10,-10},{10,10}},
29-
rotation=0)));
28+
extent={{-10,-10},{10,10}})));
3029
Modelica.Blocks.Math.Product product annotation (
31-
Placement(visible = true, transformation(origin = {60, 70}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
32-
Modelica.Blocks.Nonlinear.Limiter limiter1(uMax=yo_max, uMin=yo_min) annotation (Placement(visible=true, transformation(
30+
Placement(transformation(origin = {60, 70}, extent = {{-10, -10}, {10, 10}})));
31+
Modelica.Blocks.Nonlinear.Limiter limiter1(uMax=yo_max, uMin=yo_min) annotation (Placement(transformation(
3332
origin={44,-6},
34-
extent={{-10,-10},{10,10}},
35-
rotation=0)));
33+
extent={{-10,-10},{10,10}})));
3634
//protected
3735
Modelica.Blocks.Interfaces.RealOutput yo1 annotation (
3836
Placement(transformation(origin={170,-20}, extent = {{-10, -10}, {10, 10}}), iconTransformation(origin={110,-40}, extent = {{-10, -10}, {10, 10}})));

‎OpenIPSL/Electrical/Solar/PowerFactory/DIgSILENT/Auxiliary/ReactivePowerSupport.mo‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,23 +13,21 @@ model ReactivePowerSupport "Reactive power support for FRT"
1313
Modelica.Blocks.Logical.Switch FRT_characteristic_selection annotation (
1414
Placement(transformation(origin = {98, 0}, extent = {{-10, -10}, {10, 10}})));
1515
Modelica.Blocks.Sources.BooleanConstant FRTCharac(k=i_EEG) annotation (
16-
Placement(visible = true, transformation(origin = {60, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
17-
Modelica.Blocks.Nonlinear.Limiter limiter(uMax=iq_max, uMin=iq_min) annotation (Placement(visible=true, transformation(
16+
Placement(transformation(origin = {60, 0}, extent = {{-10, -10}, {10, 10}})));
17+
Modelica.Blocks.Nonlinear.Limiter limiter(uMax=iq_max, uMin=iq_min) annotation (Placement(transformation(
1818
origin={182,0},
19-
extent={{-10,-10},{10,10}},
20-
rotation=0)));
19+
extent={{-10,-10},{10,10}})));
2120
OpenIPSL.Electrical.Solar.PowerFactory.General.Picdro picdro(Tdrop = if i_EEG then 0 else 0.5, Tpick = 0) annotation (
22-
Placement(visible = true, transformation(origin = {-30, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
21+
Placement(transformation(origin = {-30, 0}, extent = {{-10, -10}, {10, 10}})));
2322
Modelica.Blocks.Logical.GreaterEqualThreshold greaterEqualThreshold(threshold = 0) annotation (
24-
Placement(visible = true, transformation(origin = {-70, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
23+
Placement(transformation(origin = {-70, 0}, extent = {{-10, -10}, {10, 10}})));
2524
Modelica.Blocks.Math.Abs abs annotation (
26-
Placement(visible = true, transformation(origin = {-110, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
27-
Modelica.Blocks.Nonlinear.DeadZone deadZone(uMax=Deadband, uMin=-Deadband) annotation (Placement(visible=true, transformation(
25+
Placement(transformation(origin = {-110, 0}, extent = {{-10, -10}, {10, 10}})));
26+
Modelica.Blocks.Nonlinear.DeadZone deadZone(uMax=Deadband, uMin=-Deadband) annotation (Placement(transformation(
2827
origin={-158,0},
29-
extent={{-10,-10},{10,10}},
30-
rotation=0)));
28+
extent={{-10,-10},{10,10}})));
3129
Modelica.Blocks.Sources.Constant initial_current(k = i0) annotation (
32-
Placement(visible = true, transformation(origin = {110, -50}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
30+
Placement(transformation(origin = {110, -50}, extent = {{-10, -10}, {10, 10}})));
3331
Modelica.Blocks.Math.Add add annotation (
3432
Placement(transformation(origin = {140, 0}, extent = {{-10, -10}, {10, 10}})));
3533
Modelica.Blocks.Math.Gain gain(k = K_FRT) annotation (

‎OpenIPSL/Electrical/Solar/PowerFactory/DIgSILENT/Auxiliary/SLDWindV.mo‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,10 @@ model SLDWindV "Dynamic support during faults"
1717
Modelica.Blocks.Interfaces.RealOutput diq annotation (
1818
Placement(transformation(origin = {110, 0}, extent = {{-10, -10}, {10, 10}}), iconTransformation(origin = {110, 0}, extent = {{-10, -10}, {10, 10}})));
1919
Modelica.Blocks.Math.Division division annotation (
20-
Placement(visible = true, transformation(origin = {-2, -30}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
21-
Modelica.Blocks.Nonlinear.Limiter limiter(uMax=Modelica.Constants.inf, uMin=Deadband) annotation (Placement(visible=true, transformation(
20+
Placement(transformation(origin = {-2, -30}, extent = {{-10, -10}, {10, 10}})));
21+
Modelica.Blocks.Nonlinear.Limiter limiter(uMax=Modelica.Constants.inf, uMin=Deadband) annotation (Placement(transformation(
2222
origin={-30,-30},
23-
extent={{-10,-10},{10,10}},
24-
rotation=0)));
23+
extent={{-10,-10},{10,10}})));
2524
equation
2625
connect(product.y, gain.u) annotation (
2726
Line(points = {{51, 0}, {68, 0}}, color = {0, 0, 127}));

‎OpenIPSL/Electrical/Solar/PowerFactory/DIgSILENT/Controller.mo‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,10 @@ model Controller "Controller for the solar plant"
3232
Modelica.Blocks.Continuous.FirstOrder voltage_measurement_delay(T = Tr, initType = Modelica.Blocks.Types.Init.InitialOutput, y_start = uac0) annotation (
3333
Placement(transformation(origin = {-150, -70}, extent = {{-10, -10}, {10, 10}})));
3434
Modelica.Blocks.Sources.Constant reference_voltage(k = uac0) annotation (
35-
Placement(visible = true, transformation(origin = {-150, -110}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
36-
Modelica.Blocks.Nonlinear.Limiter limiter(uMax=Modelica.Constants.inf, uMin=U_min) annotation (Placement(visible=true, transformation(
35+
Placement(transformation(origin = {-150, -110}, extent = {{-10, -10}, {10, 10}})));
36+
Modelica.Blocks.Nonlinear.Limiter limiter(uMax=Modelica.Constants.inf, uMin=U_min) annotation (Placement(transformation(
3737
origin={-110,90},
38-
extent={{-10,-10},{10,10}},
39-
rotation=0)));
38+
extent={{-10,-10},{10,10}})));
4039
Modelica.Blocks.Math.Feedback feedback1 annotation (
4140
Placement(transformation(origin = {-70, 30}, extent = {{-10, 10}, {10, -10}})));
4241
Modelica.Blocks.Continuous.FirstOrder filter(T = Tr, initType = Modelica.Blocks.Types.Init.SteadyState, y_start = 0) annotation (

‎OpenIPSL/Electrical/Solar/PowerFactory/DIgSILENT/CurrentLimiter.mo‎

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,13 @@ model CurrentLimiter "Limiter of d- and q-axis currents"
1313
Modelica.Blocks.Interfaces.RealOutput idout annotation (
1414
Placement(transformation(origin = {210, 50}, extent = {{-10, -10}, {10, 10}}), iconTransformation(origin = {110, 60}, extent = {{-10, -10}, {10, 10}})));
1515
Modelica.Blocks.Interfaces.RealOutput iqout annotation (
16-
Placement(visible = true, transformation(origin = {210, -50}, extent = {{-10, -10}, {10, 10}}, rotation = 0), iconTransformation(origin = {110, -60}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
17-
Modelica.Blocks.Nonlinear.Limiter dlim_normal_op(uMax=maxAbsCur, uMin=-maxAbsCur) annotation (Placement(visible=true, transformation(
16+
Placement(transformation(origin = {210, -50}, extent = {{-10, -10}, {10, 10}}), iconTransformation(origin = {110, -60}, extent = {{-10, -10}, {10, 10}})));
17+
Modelica.Blocks.Nonlinear.Limiter dlim_normal_op(uMax=maxAbsCur, uMin=-maxAbsCur) annotation (Placement(transformation(
1818
origin={90,70},
19-
extent={{-10,-10},{10,10}},
20-
rotation=0)));
21-
Modelica.Blocks.Nonlinear.Limiter qlim_frt_op(uMax=maxAbsCur, uMin=-maxAbsCur) annotation (Placement(visible=true, transformation(
19+
extent={{-10,-10},{10,10}})));
20+
Modelica.Blocks.Nonlinear.Limiter qlim_frt_op(uMax=maxAbsCur, uMin=-maxAbsCur) annotation (Placement(transformation(
2221
origin={90,-70},
23-
extent={{-10,-10},{10,10}},
24-
rotation=0)));
22+
extent={{-10,-10},{10,10}})));
2523
Modelica.Blocks.Nonlinear.VariableLimiter qlim_normal_op annotation (
2624
Placement(transformation(origin = {90, -120}, extent = {{-10, -10}, {10, 10}})));
2725
Modelica.Blocks.Nonlinear.VariableLimiter dlim_frt_op annotation (
@@ -43,17 +41,15 @@ model CurrentLimiter "Limiter of d- and q-axis currents"
4341
Modelica.Blocks.Math.Pythagoras pythagoras(u1IsHypotenuse = true) annotation (
4442
Placement(transformation(origin = {-64, -170}, extent = {{-10, -10}, {10, 10}})));
4543
Modelica.Blocks.Sources.Constant const1(k = maxAbsCur) annotation (
46-
Placement(visible = true, transformation(origin = {-110, -170}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
47-
Modelica.Blocks.Nonlinear.Limiter limiter(uMax=maxAbsCur, uMin=0) annotation (Placement(visible=true, transformation(
44+
Placement(transformation(origin = {-110, -170}, extent = {{-10, -10}, {10, 10}})));
45+
Modelica.Blocks.Nonlinear.Limiter limiter(uMax=maxAbsCur, uMin=0) annotation (Placement(transformation(
4846
origin={-20,-170},
49-
extent={{-10,-10},{10,10}},
50-
rotation=0)));
47+
extent={{-10,-10},{10,10}})));
5148
OpenIPSL.Electrical.Solar.PowerFactory.General.Picdro picdro(Tdrop = if i_EEG then 0 else 0.5, Tpick = 0) annotation (
52-
Placement(visible = true, transformation(origin = {-10, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
53-
Modelica.Blocks.Nonlinear.DeadZone deadZone(uMax=Deadband, uMin=-Deadband) annotation (Placement(visible=true, transformation(
49+
Placement(transformation(origin = {-10, 0}, extent = {{-10, -10}, {10, 10}})));
50+
Modelica.Blocks.Nonlinear.DeadZone deadZone(uMax=Deadband, uMin=-Deadband) annotation (Placement(transformation(
5451
origin={-130,0},
55-
extent={{-10,-10},{10,10}},
56-
rotation=0)));
52+
extent={{-10,-10},{10,10}})));
5753
Modelica.Blocks.Logical.GreaterEqualThreshold greaterEqualThreshold(threshold = Deadband) annotation (
5854
Placement(transformation(origin = {-50, 0}, extent = {{-10, -10}, {10, 10}})));
5955
Modelica.Blocks.Math.Abs abs annotation (

‎OpenIPSL/Electrical/Solar/PowerFactory/General/StaVmea.mo‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ model StaVmea
66
parameter Types.Angle angle_0;
77
parameter Boolean use_ref_machine_frequency = false;
88
OpenIPSL.Interfaces.PwPin p annotation (
9-
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)));
9+
Placement(transformation(origin = {-110, 0}, extent = {{-10, -10}, {10, 10}}), iconTransformation(origin = {-110, 0}, extent = {{-10, -10}, {10, 10}})));
1010
Modelica.Blocks.Interfaces.RealOutput u annotation (
11-
Placement(visible = true, transformation(origin = {118, 58}, extent = {{-10, -10}, {10, 10}}, rotation = 0), iconTransformation(origin = {110, 50}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
11+
Placement(transformation(origin = {118, 58}, extent = {{-10, -10}, {10, 10}}), iconTransformation(origin = {110, 50}, extent = {{-10, -10}, {10, 10}})));
1212
Modelica.Blocks.Interfaces.RealOutput fe annotation (
13-
Placement(visible = true, transformation(origin = {108, -30}, extent = {{-10, -10}, {10, 10}}, rotation = 0), iconTransformation(origin = {110, -50}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
13+
Placement(transformation(origin = {108, -30}, extent = {{-10, -10}, {10, 10}}), iconTransformation(origin = {110, -50}, extent = {{-10, -10}, {10, 10}})));
1414
Real cosphi(start = cos(angle_0));
1515
Real sinphi(start = sin(angle_0));
1616
Real df(start = 0);
@@ -19,7 +19,7 @@ model StaVmea
1919
Real vy;
2020
Real local_df if not use_ref_machine_frequency;
2121
Modelica.Blocks.Interfaces.RealInput omega if use_ref_machine_frequency annotation (
22-
Placement(visible = true, transformation(origin = {-100, 70}, extent = {{-20, -20}, {20, 20}}, rotation = 0), iconTransformation(origin = {-94, 70}, extent = {{-20, -20}, {20, 20}}, rotation = 0)));
22+
Placement(transformation(origin = {-100, 70}, extent = {{-20, -20}, {20, 20}}), iconTransformation(origin = {-94, 70}, extent = {{-20, -20}, {20, 20}})));
2323
equation
2424
u = sqrt(p.vr ^ 2 + p.vi ^ 2);
2525
if use_ref_machine_frequency then
@@ -46,10 +46,10 @@ equation
4646
p.ii = 0;
4747
p.ir = 0;
4848
annotation (
49-
Icon(graphics = {Rectangle(fillColor = {255, 255, 255}, fillPattern = FillPattern.Solid, extent = {{-100, 100}, {100, -100}}), Text(origin = {0, 90}, extent = {{-100, 10}, {100, -10}}, textString = "StaVmeas"), Text(origin = {0, 50}, extent = {{62, 8}, {100, -10}}, textString = "u"), Text(origin = {0, -50}, extent = {{62, 8}, {100, -10}}, textString = "fe")}, coordinateSystem(initialScale = 0.1)),
49+
Icon(graphics = {Rectangle(fillColor = {255, 255, 255}, fillPattern = FillPattern.Solid, extent = {{-100, 100}, {100, -100}}), Text(origin = {0, 90}, extent = {{-100, 10}, {100, -10}}, textString = "StaVmeas"), Text(origin = {0, 50}, extent = {{62, 8}, {100, -10}}, textString = "u"), Text(origin = {0, -50}, extent = {{62, 8}, {100, -10}}, textString = "fe")}, coordinateSystem()),
5050
Documentation(info="<html>
5151
<p>
52-
StaVmea model in PowerFactory measures voltage and frequency. Frequency in PowerFactory is computed with respect to the frame rorating with frequency equal to the synchronous machine. This is supported via the input omega here. Most of the OpenIPSL examples do not provide omega of the reference machine and thus, if the input is not connected the frequency is computed with respect to the 50Hz reference frame and filtered to simulate the measurement delay.
52+
StaVmea model in PowerFactory measures voltage and frequency. Frequency in PowerFactory is computed with respect to the frame rorating with frequency equal to the synchronous machine. This is supported via the input omega here. Most of the OpenIPSL examples do not provide omega of the reference machine and thus, if the input is not connected the frequency is computed with respect to the 50Hz reference frame and filtered to simulate the measurement delay.
5353
</p>
5454
</html>", revisions="<html>
5555
<table cellspacing=\"1\" cellpadding=\"1\" border=\"1\"><tr>

0 commit comments

Comments
 (0)