Skip to content

Commit 5a77b5f

Browse files
dietmarwdietmarw
committed
Revert dummy changes
1 parent fc35009 commit 5a77b5f

8 files changed

Lines changed: 26 additions & 41 deletions

File tree

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

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,10 @@ model ActivePowerController "Controller for the active power of a PV plant"
2323
Placement(transformation(origin = {10, 70}, extent = {{-10, -10}, {10, 10}})));
2424
Modelica.Blocks.Math.Feedback feedback annotation (
2525
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(
27-
origin={100,70},
28-
extent={{-10,-10},{10,10}})));
26+
Modelica.Blocks.Nonlinear.Limiter limiter(uMax=yo_max, uMin=yo_min) annotation (Placement(transformation(origin={100,70}, extent={{-10,-10},{10,10}})));
2927
Modelica.Blocks.Math.Product product annotation (
3028
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(
32-
origin={44,-6},
33-
extent={{-10,-10},{10,10}})));
29+
Modelica.Blocks.Nonlinear.Limiter limiter1(uMax=yo_max, uMin=yo_min) annotation (Placement(transformation(origin={44,-6}, extent={{-10,-10},{10,10}})));
3430
//protected
3531
Modelica.Blocks.Interfaces.RealOutput yo1 annotation (
3632
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: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,14 @@ model ReactivePowerSupport "Reactive power support for FRT"
1414
Placement(transformation(origin = {98, 0}, extent = {{-10, -10}, {10, 10}})));
1515
Modelica.Blocks.Sources.BooleanConstant FRTCharac(k=i_EEG) annotation (
1616
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(
18-
origin={182,0},
19-
extent={{-10,-10},{10,10}})));
17+
Modelica.Blocks.Nonlinear.Limiter limiter(uMax=iq_max, uMin=iq_min) annotation (Placement(transformation(origin={182,0}, extent={{-10,-10},{10,10}})));
2018
OpenIPSL.Electrical.Solar.PowerFactory.General.Picdro picdro(Tdrop = if i_EEG then 0 else 0.5, Tpick = 0) annotation (
2119
Placement(transformation(origin = {-30, 0}, extent = {{-10, -10}, {10, 10}})));
2220
Modelica.Blocks.Logical.GreaterEqualThreshold greaterEqualThreshold(threshold = 0) annotation (
2321
Placement(transformation(origin = {-70, 0}, extent = {{-10, -10}, {10, 10}})));
2422
Modelica.Blocks.Math.Abs abs annotation (
2523
Placement(transformation(origin = {-110, 0}, extent = {{-10, -10}, {10, 10}})));
26-
Modelica.Blocks.Nonlinear.DeadZone deadZone(uMax=Deadband, uMin=-Deadband) annotation (Placement(transformation(
27-
origin={-158,0},
28-
extent={{-10,-10},{10,10}})));
24+
Modelica.Blocks.Nonlinear.DeadZone deadZone(uMax=Deadband, uMin=-Deadband) annotation (Placement(transformation(origin={-158,0}, extent={{-10,-10},{10,10}})));
2925
Modelica.Blocks.Sources.Constant initial_current(k = i0) annotation (
3026
Placement(transformation(origin = {110, -50}, extent = {{-10, -10}, {10, 10}})));
3127
Modelica.Blocks.Math.Add add annotation (

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,7 @@ model SLDWindV "Dynamic support during faults"
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 (
2020
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(
22-
origin={-30,-30},
23-
extent={{-10,-10},{10,10}})));
21+
Modelica.Blocks.Nonlinear.Limiter limiter(uMax=Modelica.Constants.inf, uMin=Deadband) annotation (Placement(transformation(origin={-30,-30}, extent={{-10,-10},{10,10}})));
2422
equation
2523
connect(product.y, gain.u) annotation (
2624
Line(points = {{51, 0}, {68, 0}}, color = {0, 0, 127}));

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,7 @@ model Controller "Controller for the solar plant"
3333
Placement(transformation(origin = {-150, -70}, extent = {{-10, -10}, {10, 10}})));
3434
Modelica.Blocks.Sources.Constant reference_voltage(k = uac0) annotation (
3535
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(
37-
origin={-110,90},
38-
extent={{-10,-10},{10,10}})));
36+
Modelica.Blocks.Nonlinear.Limiter limiter(uMax=Modelica.Constants.inf, uMin=U_min) annotation (Placement(transformation(origin={-110,90}, extent={{-10,-10},{10,10}})));
3937
Modelica.Blocks.Math.Feedback feedback1 annotation (
4038
Placement(transformation(origin = {-70, 30}, extent = {{-10, 10}, {10, -10}})));
4139
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: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,8 @@ model CurrentLimiter "Limiter of d- and q-axis currents"
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 (
1616
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(
18-
origin={90,70},
19-
extent={{-10,-10},{10,10}})));
20-
Modelica.Blocks.Nonlinear.Limiter qlim_frt_op(uMax=maxAbsCur, uMin=-maxAbsCur) annotation (Placement(transformation(
21-
origin={90,-70},
22-
extent={{-10,-10},{10,10}})));
17+
Modelica.Blocks.Nonlinear.Limiter dlim_normal_op(uMax=maxAbsCur, uMin=-maxAbsCur) annotation (Placement(transformation(origin={90,70}, extent={{-10,-10},{10,10}})));
18+
Modelica.Blocks.Nonlinear.Limiter qlim_frt_op(uMax=maxAbsCur, uMin=-maxAbsCur) annotation (Placement(transformation(origin={90,-70}, extent={{-10,-10},{10,10}})));
2319
Modelica.Blocks.Nonlinear.VariableLimiter qlim_normal_op annotation (
2420
Placement(transformation(origin = {90, -120}, extent = {{-10, -10}, {10, 10}})));
2521
Modelica.Blocks.Nonlinear.VariableLimiter dlim_frt_op annotation (
@@ -42,14 +38,10 @@ model CurrentLimiter "Limiter of d- and q-axis currents"
4238
Placement(transformation(origin = {-64, -170}, extent = {{-10, -10}, {10, 10}})));
4339
Modelica.Blocks.Sources.Constant const1(k = maxAbsCur) annotation (
4440
Placement(transformation(origin = {-110, -170}, extent = {{-10, -10}, {10, 10}})));
45-
Modelica.Blocks.Nonlinear.Limiter limiter(uMax=maxAbsCur, uMin=0) annotation (Placement(transformation(
46-
origin={-20,-170},
47-
extent={{-10,-10},{10,10}})));
41+
Modelica.Blocks.Nonlinear.Limiter limiter(uMax=maxAbsCur, uMin=0) annotation (Placement(transformation(origin={-20,-170}, extent={{-10,-10},{10,10}})));
4842
OpenIPSL.Electrical.Solar.PowerFactory.General.Picdro picdro(Tdrop = if i_EEG then 0 else 0.5, Tpick = 0) annotation (
4943
Placement(transformation(origin = {-10, 0}, extent = {{-10, -10}, {10, 10}})));
50-
Modelica.Blocks.Nonlinear.DeadZone deadZone(uMax=Deadband, uMin=-Deadband) annotation (Placement(transformation(
51-
origin={-130,0},
52-
extent={{-10,-10},{10,10}})));
44+
Modelica.Blocks.Nonlinear.DeadZone deadZone(uMax=Deadband, uMin=-Deadband) annotation (Placement(transformation(origin={-130,0}, extent={{-10,-10},{10,10}})));
5345
Modelica.Blocks.Logical.GreaterEqualThreshold greaterEqualThreshold(threshold = Deadband) annotation (
5446
Placement(transformation(origin = {-50, 0}, extent = {{-10, -10}, {10, 10}})));
5547
Modelica.Blocks.Math.Abs abs annotation (

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,10 @@ model PVArray "Array of PV modules"
1515
Dialog(group = "Parameters of PV Modules"));
1616
parameter Types.Current Isc_stc = 5 "Short-circuit current at Standard Test Conditions" annotation (
1717
Dialog(group = "Parameters of PV Modules"));
18-
parameter SI.LinearTemperatureCoefficient au=-0.0039 "Temperature correction factor (voltage)" annotation (Dialog(group="Parameters of PV Modules"));
19-
parameter SI.LinearTemperatureCoefficient ai=0.0004 "Temperature correction factor (current)" annotation (Dialog(group="Parameters of PV Modules"));
18+
parameter SI.LinearTemperatureCoefficient au = -0.0039 "Temperature correction factor (voltage)" annotation (
19+
Dialog(group = "Parameters of PV Modules"));
20+
parameter SI.LinearTemperatureCoefficient ai = 0.0004 "Temperature correction factor (current)" annotation (
21+
Dialog(group = "Parameters of PV Modules"));
2022
parameter Boolean use_input_E = false;
2123
parameter Boolean use_input_theta = false;
2224
Modelica.Blocks.Interfaces.RealOutput Iarray annotation (

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
within OpenIPSL.Electrical.Solar.PowerFactory.DIgSILENT;
22
model PVModule "Model of a single PV module"
3-
parameter SI.Voltage U0_stc=43.8 "Open-circuit voltage at Standard Test Conditions";
4-
parameter SI.Voltage Umpp_stc=35 "MPP voltage at Standard Test Conditions";
3+
parameter SI.Voltage U0_stc = 43.8 "Open-circuit voltage at Standard Test Conditions";
4+
parameter SI.Voltage Umpp_stc = 35 "MPP voltage at Standard Test Conditions";
55
parameter Types.Current Impp_stc = 4.58 "MPP current at Standard Test Conditions";
66
parameter Types.Current Isc_stc = 5 "Short-circuit current at Standard Test Conditions";
7-
parameter SI.LinearTemperatureCoefficient au=-0.0039 "Temperature correction factor (voltage)";
8-
parameter SI.LinearTemperatureCoefficient ai=0.0004 "Temperature correction factor (current)";
7+
parameter SI.LinearTemperatureCoefficient au = -0.0039 "Temperature correction factor (voltage)";
8+
parameter SI.LinearTemperatureCoefficient ai = 0.0004 "Temperature correction factor (current)";
99
parameter Boolean use_input_E = false "If true irradiance is used as input";
1010
parameter Boolean use_input_theta = false "If true temperature is used as input";
1111
parameter Types.ActivePower P_init "Initial active power (needed only if input E is not used)";
12-
parameter SI.Irradiance E_STC=1000;
13-
parameter SI.Temperature theta_STC=298.15;
12+
parameter SI.Irradiance E_STC = 1000;
13+
parameter SI.Temperature theta_STC = 298.15;
1414
Modelica.Blocks.Interfaces.RealInput U annotation (
1515
Placement(transformation(origin={-100,80}, extent = {{-20, -20}, {20, 20}}), iconTransformation(origin={-90,90}, extent = {{-10, -10}, {10, 10}})));
1616
Modelica.Blocks.Interfaces.RealInput E if use_input_E annotation (

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,12 @@ model PV_Plant "DIgSILENT model of a solar plant"
2626
Dialog(group = "Parameters of PV Modules"));
2727
parameter Types.Current Isc_stc = 5 "Short-circuit current at Standard Test Conditions" annotation (
2828
Dialog(group = "Parameters of PV Modules"));
29-
parameter SI.LinearTemperatureCoefficient au=-0.0039 "Temperature correction factor (voltage)" annotation (Dialog(group="Parameters of PV Modules"));
30-
parameter SI.LinearTemperatureCoefficient ai=0.0004 "Temperature correction factor (current)" annotation (Dialog(group="Parameters of PV Modules"));
31-
parameter SI.Capacitance C=1.5e-3 "Capacity of capacitor on DC busbar" annotation (Dialog(group="DC busbar parameters"));
29+
parameter SI.LinearTemperatureCoefficient au = -0.0039 "Temperature correction factor (voltage)" annotation (
30+
Dialog(group = "Parameters of PV Modules"));
31+
parameter SI.LinearTemperatureCoefficient ai = 0.0004 "Temperature correction factor (current)" annotation (
32+
Dialog(group = "Parameters of PV Modules"));
33+
parameter SI.Capacitance C=1.5e-3 "Capacity of capacitor on DC busbar" annotation (
34+
Dialog(group = "DC busbar parameters"));
3235
parameter Real Kp = 0.005 "Gain, Active Power PI-Controller" annotation (
3336
Dialog(group = "Current Controller Parameters"));
3437
parameter Types.Time Tip = 0.03 "Integration Time Constant, Active Power PI-Ctrl." annotation (

0 commit comments

Comments
 (0)