Skip to content

Commit 7c2c253

Browse files
dietmarwdietmarw
committed
Removes multiple white spaces
1 parent c632bcd commit 7c2c253

22 files changed

Lines changed: 136 additions & 136 deletions

File tree

‎OpenIPSL/Electrical/Renewables/PSSE/BESS.mo‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ extends OpenIPSL.Electrical.Essentials.pfComponent(
1212
final enableS_b=true);
1313

1414
// Parameters for selection
15-
parameter Integer QFunctionality = 0 "BESS Reactive Power Control Options" annotation(Dialog(group= "Reactive Power Control Options"), choices(choice=0 "Constant local PF control", choice=1 "Constant local Q control", choice=2 "Local V control", choice=3 "Local coordinated V/Q control", choice=4 "Plant level Q control", choice=5 "Plant level V control", choice=6 "Plant level Q control + local coordinated V/Q control", choice=7 "Plant level V control + local coordinated V/Q control"));
16-
parameter Integer PFunctionality = 0 "BESS Real Power Control Options" annotation (Dialog(group= "Active Power Control Options", enable=(QFunctionality >=4)), choices(choice=0 "No governor response", choice=1 "Governor response with up and down regulation"));
15+
parameter Integer QFunctionality = 0 "BESS Reactive Power Control Options" annotation(Dialog(group= "Reactive Power Control Options"), choices(choice=0 "Constant local PF control", choice=1 "Constant local Q control", choice=2 "Local V control", choice=3 "Local coordinated V/Q control", choice=4 "Plant level Q control", choice=5 "Plant level V control", choice=6 "Plant level Q control + local coordinated V/Q control", choice=7 "Plant level V control + local coordinated V/Q control"));
16+
parameter Integer PFunctionality = 0 "BESS Real Power Control Options" annotation (Dialog(group= "Active Power Control Options", enable=(QFunctionality >=4)), choices(choice=0 "No governor response", choice=1 "Governor response with up and down regulation"));
1717

1818
replaceable
1919
OpenIPSL.Electrical.Renewables.PSSE.InverterInterface.BaseClasses.BaseREGC
@@ -96,9 +96,9 @@ extends OpenIPSL.Electrical.Essentials.pfComponent(
9696
rotation=270,
9797
origin={60,100})));
9898
protected
99-
parameter Boolean pfflag = (if QFunctionality == 0 then true else false);
100-
parameter Boolean vflag = (if QFunctionality == 3 or QFunctionality == 6 or QFunctionality == 7 then true else false);
101-
parameter Boolean qflag = (if QFunctionality == 2 or QFunctionality == 3 or QFunctionality == 6 or QFunctionality == 7 then true else false);
99+
parameter Boolean pfflag = (if QFunctionality == 0 then true else false);
100+
parameter Boolean vflag = (if QFunctionality == 3 or QFunctionality == 6 or QFunctionality == 7 then true else false);
101+
parameter Boolean qflag = (if QFunctionality == 2 or QFunctionality == 3 or QFunctionality == 6 or QFunctionality == 7 then true else false);
102102
parameter Boolean refflag = (if QFunctionality == 5 or QFunctionality == 7 then true else false);
103103
parameter Boolean fflag = (if PFunctionality == 1 then true else false);
104104
equation
@@ -112,7 +112,7 @@ equation
112112
points={{32.8571,-21.4286},{32.8571,-28},{16,-28},{16,-21.3333}},
113113
color={0,0,127}));
114114
connect(RenewableGenerator.IP0, RenewableController.ip0) annotation (Line(
115-
points={{41.4286,-21.4286},{41.4286,-32},{8,-32},{8,-21.3333}}, color=
115+
points={{41.4286,-21.4286},{41.4286,-32},{8,-32},{8,-21.3333}}, color=
116116
{0,0,127}));
117117
connect(RenewableGenerator.V_0, RenewableController.v0) annotation (Line(
118118
points={{50,-21.4286},{50,-36},{0,-36},{0,-21.3333}}, color={0,0,127}));
@@ -133,7 +133,7 @@ equation
133133
points={{61.4286,21.4286},{61.4286,34},{-30,34},{-30,5.33333},{-21.3333,5.33333}},
134134
color={0,0,127}));
135135
connect(PlantController.Qext, RenewableController.Qext) annotation (Line(
136-
points={{-37,10},{-32,10},{-32,0},{-21.3333,0}}, color={0,
136+
points={{-37,10},{-32,10},{-32,0},{-21.3333,0}}, color={0,
137137
0,127}));
138138
connect(PlantController.Pref, RenewableController.Pref) annotation (Line(
139139
points={{-37,-10},{-34,-10},{-34,-6},{-24,-6},{-24,-5.33333},{-21.3333,-5.33333}},
@@ -184,7 +184,7 @@ equation
184184
Text(
185185
extent={{-40,20},{40,-20}},
186186
lineColor={0,0,0},
187-
textString="%name"), Line(
187+
textString="%name"), Line(
188188
points={{-20,20},{-44,42},{-66,32},{-80,0}},
189189
color={0,0,0},
190190
smooth=Smooth.Bezier), Line(

‎OpenIPSL/Electrical/Renewables/PSSE/ElectricalController/BaseClasses/BaseREECA.mo‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@ partial model BaseREECA "Base renewable energy electrical controller model A"
2626
Modelica.Blocks.Interfaces.RealInput ip0 "Initial Real Current" annotation (Placement(transformation(
2727
extent={{-20,-20},{20,20}},
2828
rotation=90,
29-
origin={120,-320}), iconTransformation(
29+
origin={120,-320}), iconTransformation(
3030
extent={{-20,-20},{20,20}},
3131
rotation=90,
3232
origin={120,-320})));
3333
Modelica.Blocks.Interfaces.RealInput iq0 "Initial Imaginary Current" annotation (Placement(transformation(
3434
extent={{-20,-20},{20,20}},
3535
rotation=90,
36-
origin={240,-320}), iconTransformation(
36+
origin={240,-320}), iconTransformation(
3737
extent={{-20,-20},{20,20}},
3838
rotation=90,
3939
origin={240,-320})));

‎OpenIPSL/Electrical/Renewables/PSSE/ElectricalController/BaseClasses/BaseREECB.mo‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@ partial model BaseREECB "Base renewable energy electrical controller model B"
2525
Modelica.Blocks.Interfaces.RealInput ip0 "Initial Real Current" annotation (Placement(transformation(
2626
extent={{-20,-20},{20,20}},
2727
rotation=90,
28-
origin={120,-320}), iconTransformation(
28+
origin={120,-320}), iconTransformation(
2929
extent={{-20,-20},{20,20}},
3030
rotation=90,
3131
origin={120,-320})));
3232
Modelica.Blocks.Interfaces.RealInput iq0 "Initial Reactive Current" annotation (Placement(transformation(
3333
extent={{-20,-20},{20,20}},
3434
rotation=90,
35-
origin={240,-320}), iconTransformation(
35+
origin={240,-320}), iconTransformation(
3636
extent={{-20,-20},{20,20}},
3737
rotation=90,
3838
origin={240,-320})));

‎OpenIPSL/Electrical/Renewables/PSSE/ElectricalController/BaseClasses/BaseREECC.mo‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ partial model BaseREECC "Base renewable energy electrical controller model C"
99
Modelica.Blocks.Interfaces.RealInput ip0 "Initial Active Current" annotation (Placement(transformation(
1010
extent={{-20,-20},{20,20}},
1111
rotation=90,
12-
origin={120,-320}), iconTransformation(
12+
origin={120,-320}), iconTransformation(
1313
extent={{-20,-20},{20,20}},
1414
rotation=90,
1515
origin={120,-320})));
1616
Modelica.Blocks.Interfaces.RealInput iq0 "Initial Reactive Current" annotation (Placement(transformation(
1717
extent={{-20,-20},{20,20}},
1818
rotation=90,
19-
origin={240,-320}), iconTransformation(
19+
origin={240,-320}), iconTransformation(
2020
extent={{-20,-20},{20,20}},
2121
rotation=90,
2222
origin={240,-320})));

‎OpenIPSL/Electrical/Renewables/PSSE/ElectricalController/BaseClasses/CurrentLimitLogicREECA.mo‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -79,43 +79,43 @@ equation
7979
extent={{-100,100},{100,-100}},
8080
lineColor={28,108,200},
8181
fillColor={255,255,255},
82-
fillPattern=FillPattern.None), Text(
82+
fillPattern=FillPattern.None), Text(
8383
extent={{-60,40},{60,-40}},
8484
lineColor={28,108,200},
8585
lineThickness=0.5,
8686
fillColor={28,108,200},
8787
fillPattern=FillPattern.Solid,
88-
textString="CLL REECA"), Text(
88+
textString="CLL REECA"), Text(
8989
extent={{52,80},{92,40}},
9090
lineColor={28,108,200},
9191
lineThickness=0.5,
9292
fillColor={28,108,200},
9393
fillPattern=FillPattern.Solid,
94-
textString="IQCMD"), Text(
94+
textString="IQCMD"), Text(
9595
extent={{52,-40},{92,-80}},
9696
lineColor={28,108,200},
9797
lineThickness=0.5,
9898
fillColor={28,108,200},
9999
fillPattern=FillPattern.Solid,
100-
textString="IPCMD"), Text(
100+
textString="IPCMD"), Text(
101101
extent={{-90,80},{-50,40}},
102102
lineColor={28,108,200},
103103
lineThickness=0.5,
104104
fillColor={28,108,200},
105105
fillPattern=FillPattern.Solid,
106-
textString="VDL1"), Text(
106+
textString="VDL1"), Text(
107107
extent={{-90,-40},{-50,-80}},
108108
lineColor={28,108,200},
109109
lineThickness=0.5,
110110
fillColor={28,108,200},
111111
fillPattern=FillPattern.Solid,
112-
textString="VDL2"), Text(
112+
textString="VDL2"), Text(
113113
extent={{42,106},{82,66}},
114114
lineColor={28,108,200},
115115
lineThickness=0.5,
116116
fillColor={28,108,200},
117117
fillPattern=FillPattern.Solid,
118-
textString="IQMIN"), Text(
118+
textString="IQMIN"), Text(
119119
extent={{-78,106},{-38,66}},
120120
lineColor={28,108,200},
121121
lineThickness=0.5,

‎OpenIPSL/Electrical/Renewables/PSSE/ElectricalController/BaseClasses/CurrentLimitLogicREECB.mo‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -66,43 +66,43 @@ equation
6666
annotation (Icon(coordinateSystem(preserveAspectRatio=false), graphics={
6767
Rectangle(
6868
extent={{-100,100},{100,-100}},
69-
lineColor={28,108,200}), Text(
69+
lineColor={28,108,200}), Text(
7070
extent={{-60,40},{60,-40}},
7171
lineColor={28,108,200},
7272
lineThickness=0.5,
7373
fillColor={28,108,200},
7474
fillPattern=FillPattern.Solid,
75-
textString="CLL REECB"), Text(
75+
textString="CLL REECB"), Text(
7676
extent={{-80,106},{-40,66}},
7777
lineColor={28,108,200},
7878
lineThickness=0.5,
7979
fillColor={28,108,200},
8080
fillPattern=FillPattern.Solid,
81-
textString="IQMIN"), Text(
81+
textString="IQMIN"), Text(
8282
extent={{40,106},{80,66}},
8383
lineColor={28,108,200},
8484
lineThickness=0.5,
8585
fillColor={28,108,200},
8686
fillPattern=FillPattern.Solid,
87-
textString="IQMAX"), Text(
87+
textString="IQMAX"), Text(
8888
extent={{-78,-68},{-38,-108}},
8989
lineColor={28,108,200},
9090
lineThickness=0.5,
9191
fillColor={28,108,200},
9292
fillPattern=FillPattern.Solid,
93-
textString="IPMIN"), Text(
93+
textString="IPMIN"), Text(
9494
extent={{40,-68},{80,-108}},
9595
lineColor={28,108,200},
9696
lineThickness=0.5,
9797
fillColor={28,108,200},
9898
fillPattern=FillPattern.Solid,
99-
textString="IPMAX"), Text(
99+
textString="IPMAX"), Text(
100100
extent={{52,70},{92,30}},
101101
lineColor={28,108,200},
102102
lineThickness=0.5,
103103
fillColor={28,108,200},
104104
fillPattern=FillPattern.Solid,
105-
textString="IQCMD"), Text(
105+
textString="IQCMD"), Text(
106106
extent={{50,-30},{90,-70}},
107107
lineColor={28,108,200},
108108
lineThickness=0.5,

‎OpenIPSL/Electrical/Renewables/PSSE/ElectricalController/BaseClasses/CurrentLimitLogicREECC.mo‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ model CurrentLimitLogicREECC "Current limit logic for REECC"
2929
extent={{-13.3335,-13.3336},{26.6673,26.6664}},
3030
rotation=180,
3131
origin={126.667,66.6664})));
32-
Modelica.Blocks.Interfaces.RealInput Ipcmd(start = start_ir) annotation (Placement(
32+
Modelica.Blocks.Interfaces.RealInput Ipcmd(start = start_ir) annotation (Placement(
3333
transformation(
3434
extent={{-20,-20},{20,20}},
3535
rotation=180,
@@ -68,43 +68,43 @@ equation
6868
extent={{-100,100},{100,-100}},
6969
lineColor={28,108,200},
7070
fillColor={255,255,255},
71-
fillPattern=FillPattern.None), Text(
71+
fillPattern=FillPattern.None), Text(
7272
extent={{-60,40},{60,-40}},
7373
lineColor={28,108,200},
7474
lineThickness=0.5,
7575
fillColor={28,108,200},
7676
fillPattern=FillPattern.Solid,
77-
textString="CLL REECC"), Text(
77+
textString="CLL REECC"), Text(
7878
extent={{52,80},{92,40}},
7979
lineColor={28,108,200},
8080
lineThickness=0.5,
8181
fillColor={28,108,200},
8282
fillPattern=FillPattern.Solid,
83-
textString="IQCMD"), Text(
83+
textString="IQCMD"), Text(
8484
extent={{52,-40},{92,-80}},
8585
lineColor={28,108,200},
8686
lineThickness=0.5,
8787
fillColor={28,108,200},
8888
fillPattern=FillPattern.Solid,
89-
textString="IPCMD"), Text(
89+
textString="IPCMD"), Text(
9090
extent={{-90,80},{-50,40}},
9191
lineColor={28,108,200},
9292
lineThickness=0.5,
9393
fillColor={28,108,200},
9494
fillPattern=FillPattern.Solid,
95-
textString="VDL1"), Text(
95+
textString="VDL1"), Text(
9696
extent={{-90,-40},{-50,-80}},
9797
lineColor={28,108,200},
9898
lineThickness=0.5,
9999
fillColor={28,108,200},
100100
fillPattern=FillPattern.Solid,
101-
textString="VDL2"), Text(
101+
textString="VDL2"), Text(
102102
extent={{-68,98},{-28,58}},
103103
lineColor={28,108,200},
104104
lineThickness=0.5,
105105
fillColor={28,108,200},
106106
fillPattern=FillPattern.Solid,
107-
textString="IQMIN"), Text(
107+
textString="IQMIN"), Text(
108108
extent={{52,98},{92,58}},
109109
lineColor={28,108,200},
110110
lineThickness=0.5,
@@ -117,7 +117,7 @@ The pseudo-code for the current limit logic in the REECC electrical controller d
117117
if Pqflag = true:
118118
Ipmax = min(VDL2_out, Imax);
119119
Ipmin = -Ipmax;
120-
Iqmax = min(VDL1_out, sqrt(Imax^2 Ipcmd^2);
120+
Iqmax = min(VDL1_out, sqrt(Imax^2 Ipcmd^2);
121121
Iqmin = -Iqmax;
122122
end
123123

‎OpenIPSL/Electrical/Renewables/PSSE/ElectricalController/BaseClasses/PIwithNoVariableLimiter.mo‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ model PIwithNoVariableLimiter "PI with no variable limiter controller for WECC e
66
parameter SI.PerUnit V_RMAX "Maximum regulator output";
77
parameter SI.PerUnit V_RMIN "Minimum regulator output";
88
parameter Real y_start "Starting output value for the integrator";
9-
Modelica.Blocks.Continuous.Integrator integral(
9+
Modelica.Blocks.Continuous.Integrator integral(
1010
k=K_I,
1111
use_reset=false,
1212
initType=Modelica.Blocks.Types.Init.InitialOutput,
@@ -43,10 +43,10 @@ equation
4343
connect(reset_switch.u1,realExpression. y)
4444
annotation (Line(points={{-42,48},{-54,48},{-54,80},{-59,80}},
4545
color={0,0,127}));
46-
connect(reset_switch.u3,u) annotation (Line(points={{-42,32},{-60,32},{-60,-60},{-120,-60}},
46+
connect(reset_switch.u3,u) annotation (Line(points={{-42,32},{-60,32},{-60,-60},{-120,-60}},
4747
color={0,0,127}));
4848
connect(reset_switch.y,integral. u)
49-
annotation (Line(points={{-19,40},{-2,40}}, color={0,0,127}));
49+
annotation (Line(points={{-19,40},{-2,40}}, color={0,0,127}));
5050
connect(proportional.u,u)
5151
annotation (Line(points={{-2,-60},{-120,-60}},
5252
color={0,0,127}));

‎OpenIPSL/Electrical/Renewables/PSSE/ElectricalController/BaseClasses/PIwithVariableLimiter.mo‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ model PIwithVariableLimiter "PI with variable limiter controller for WECC electr
44
parameter Real K_P "Voltage regulator proportional gain";
55
parameter Real K_I "Voltage regulator integral gain";
66
parameter Real y_start "Starting output value for the integrator";
7-
Modelica.Blocks.Continuous.Integrator integral(
7+
Modelica.Blocks.Continuous.Integrator integral(
88
k=K_I,
99
use_reset=false,
1010
initType=Modelica.Blocks.Types.Init.InitialOutput,
@@ -53,10 +53,10 @@ equation
5353
connect(reset_switch.u1,realExpression. y)
5454
annotation (Line(points={{-42,48},{-54,48},{-54,80},{-59,80}},
5555
color={0,0,127}));
56-
connect(reset_switch.u3,u) annotation (Line(points={{-42,32},{-60,32},{-60,-60},{-120,-60}},
56+
connect(reset_switch.u3,u) annotation (Line(points={{-42,32},{-60,32},{-60,-60},{-120,-60}},
5757
color={0,0,127}));
5858
connect(reset_switch.y,integral. u)
59-
annotation (Line(points={{-19,40},{-2,40}}, color={0,0,127}));
59+
annotation (Line(points={{-19,40},{-2,40}}, color={0,0,127}));
6060
connect(proportional.u,u)
6161
annotation (Line(points={{-2,-60},{-120,-60}},
6262
color={0,0,127}));

0 commit comments

Comments
 (0)