Skip to content

Commit 3fc580c

Browse files
committed
Fixing the type and removing superfluous unit from string
1 parent 3fc616b commit 3fc580c

4 files changed

Lines changed: 58 additions & 58 deletions

File tree

OpenIPSL/Electrical/Controls/PSSE/TG/BaseClasses/WEHGOV/Governor.mo

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -20,36 +20,36 @@ model Governor "WEHGOV governor and hydraulic actuators"
2020
parameter Types.PerUnit GTMXOP=0.1 "Maximum gate opening rate [p.u./s]";
2121
parameter Types.PerUnit GTMXCL=-0.2 "Maximum gate closing rate [p.u./s]";
2222
parameter Types.PerUnit Tg=0.2 "Distribution valve limit";
23-
parameter Types.PerUnit G1=0 "Gate position 1 [pu]";
24-
parameter Types.PerUnit G2=0.25 "Gate position 2 [pu]";
25-
parameter Types.PerUnit G3=0.5 "Gate position 3 [pu]";
26-
parameter Types.PerUnit G4=0.75 "Gate position 4 [pu]";
27-
parameter Types.PerUnit G5=1 "Gate position 5 [pu]";
28-
parameter Types.PerUnit FLWG1=0 "Water flow rate 1 [pu]";
29-
parameter Types.PerUnit FLWG2=0.25 "Water flow rate 2 [pu]";
30-
parameter Types.PerUnit FLWG3=0.5 "Water flow rate 3 [pu]";
31-
parameter Types.PerUnit FLWG4=0.75 "Water flow rate 4 [pu]";
32-
parameter Types.PerUnit FLWG5=1 "Water flow rate 5 [pu]";
33-
parameter Types.PerUnit FLWP1=0 "Water flow rate 1 [pu]";
34-
parameter Types.PerUnit FLWP2=0.2 "Water flow rate 2 [pu]";
35-
parameter Types.PerUnit FLWP3=0.23 "Water flow rate 3 [pu]";
36-
parameter Types.PerUnit FLWP4=0.4 "Water flow rate 4 [pu]";
37-
parameter Types.PerUnit FLWP5=0.6 "Water flow rate 5 [pu]";
38-
parameter Types.PerUnit FLWP6=0.8 "Water flow rate 6 [pu]";
39-
parameter Types.PerUnit FLWP7=0.87 "Water flow rate 7 [pu]";
40-
parameter Types.PerUnit FLWP8=0.9 "Water flow rate 8 [pu]";
41-
parameter Types.PerUnit FLWP9=0.95 "Water flow rate 9 [pu]";
42-
parameter Types.PerUnit FLWP10=1 "Water flow rate 10 [pu]";
43-
parameter Types.PerUnit Pmech1=0 "Mechanical power 1 [pu]";
44-
parameter Types.PerUnit Pmech2=0 "Water flow rate 2 [pu]";
45-
parameter Types.PerUnit Pmech3=0.05 "Water flow rate 3 [pu]";
46-
parameter Types.PerUnit Pmech4=0.35 "Water flow rate 4 [pu]";
47-
parameter Types.PerUnit Pmech5=0.66 "Water flow rate 5 [pu]";
48-
parameter Types.PerUnit Pmech6=0.82 "Water flow rate 6 [pu]";
49-
parameter Types.PerUnit Pmech7=0.85 "Water flow rate 7 [pu]";
50-
parameter Types.PerUnit Pmech8=0.86 "Water flow rate 8 [pu]";
51-
parameter Types.PerUnit Pmech9=0.88 "Water flow rate 9 [pu]";
52-
parameter Types.PerUnit Pmech10=0.9 "Water flow rate 10 [pu]";
23+
parameter Types.PerUnit G1=0 "Gate position 1 ";
24+
parameter Types.PerUnit G2=0.25 "Gate position 2 ";
25+
parameter Types.PerUnit G3=0.5 "Gate position 3 ";
26+
parameter Types.PerUnit G4=0.75 "Gate position 4 ";
27+
parameter Types.PerUnit G5=1 "Gate position 5 ";
28+
parameter Types.PerUnit FLWG1=0 "Water flow rate 1 ";
29+
parameter Types.PerUnit FLWG2=0.25 "Water flow rate 2 ";
30+
parameter Types.PerUnit FLWG3=0.5 "Water flow rate 3 ";
31+
parameter Types.PerUnit FLWG4=0.75 "Water flow rate 4 ";
32+
parameter Types.PerUnit FLWG5=1 "Water flow rate 5 ";
33+
parameter Types.PerUnit FLWP1=0 "Water flow rate 1 ";
34+
parameter Types.PerUnit FLWP2=0.2 "Water flow rate 2 ";
35+
parameter Types.PerUnit FLWP3=0.23 "Water flow rate 3 ";
36+
parameter Types.PerUnit FLWP4=0.4 "Water flow rate 4 ";
37+
parameter Types.PerUnit FLWP5=0.6 "Water flow rate 5 ";
38+
parameter Types.PerUnit FLWP6=0.8 "Water flow rate 6 ";
39+
parameter Types.PerUnit FLWP7=0.87 "Water flow rate 7 ";
40+
parameter Types.PerUnit FLWP8=0.9 "Water flow rate 8 ";
41+
parameter Types.PerUnit FLWP9=0.95 "Water flow rate 9 ";
42+
parameter Types.PerUnit FLWP10=1 "Water flow rate 10 ";
43+
parameter Types.PerUnit Pmech1=0 "Mechanical power 1 ";
44+
parameter Types.PerUnit Pmech2=0 "Water flow rate 2 ";
45+
parameter Types.PerUnit Pmech3=0.05 "Water flow rate 3 ";
46+
parameter Types.PerUnit Pmech4=0.35 "Water flow rate 4 ";
47+
parameter Types.PerUnit Pmech5=0.66 "Water flow rate 5 ";
48+
parameter Types.PerUnit Pmech6=0.82 "Water flow rate 6 ";
49+
parameter Types.PerUnit Pmech7=0.85 "Water flow rate 7 ";
50+
parameter Types.PerUnit Pmech8=0.86 "Water flow rate 8 ";
51+
parameter Types.PerUnit Pmech9=0.88 "Water flow rate 9 ";
52+
parameter Types.PerUnit Pmech10=0.9 "Water flow rate 10 ";
5353

5454
Modelica.Blocks.Interfaces.RealInput SPEED
5555
annotation (Placement(transformation(extent={{-220,-20},{-180,20}}),

OpenIPSL/Electrical/Controls/PSSE/TG/BaseClasses/WEHGOV/Turbine.mo

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,23 @@ within OpenIPSL.Electrical.Controls.PSSE.TG.BaseClasses.WEHGOV;
22
model Turbine "WEHGOV turbine dynamics"
33
parameter Types.ApparentPower S_b=100e6 "System base";
44
parameter Types.ApparentPower M_b=100e6 "System base";
5-
parameter Types.PerUnit G1=0 "Gate position 1 [pu]";
6-
parameter Types.PerUnit G2=0.25 "Gate position 2 [pu]";
7-
parameter Types.PerUnit FLWG1=0 "Water flow rate 1 [pu]";
8-
parameter Types.PerUnit FLWG2=0.25 "Water flow rate 2 [pu]";
9-
parameter Types.PerUnit TW=0.2 "Water time constant [s]";
10-
parameter Types.PerUnit FLWP1=0 "Water flow rate 1 [pu]";
11-
parameter Types.PerUnit FLWP2=0.2 "Water flow rate 2 [pu]";
12-
parameter Types.PerUnit FLWP3=0.23 "Water flow rate 3 [pu]";
13-
parameter Types.PerUnit FLWP4=0.4 "Water flow rate 4 [pu]";
14-
parameter Types.PerUnit FLWP5=0.6 "Water flow rate 5 [pu]";
15-
parameter Types.PerUnit FLWP6=0.8 "Water flow rate 6 [pu]";
16-
parameter Types.PerUnit Pmech1=0 "Mechanical power 1 [pu]";
17-
parameter Types.PerUnit Pmech2=0 "Water flow rate 2 [pu]";
18-
parameter Types.PerUnit Pmech3=0.05 "Water flow rate 3 [pu]";
19-
parameter Types.PerUnit Pmech4=0.35 "Water flow rate 4 [pu]";
20-
parameter Types.PerUnit Pmech5=0.66 "Water flow rate 5 [pu]";
21-
parameter Types.PerUnit Pmech6=0.82 "Water flow rate 6 [pu]";
5+
parameter Types.PerUnit G1=0 "Gate position 1 ";
6+
parameter Types.PerUnit G2=0.25 "Gate position 2 ";
7+
parameter Types.PerUnit FLWG1=0 "Water flow rate 1 ";
8+
parameter Types.PerUnit FLWG2=0.25 "Water flow rate 2 ";
9+
parameter Types.Time TW=0.2 "Water time constant";
10+
parameter Types.PerUnit FLWP1=0 "Water flow rate 1 ";
11+
parameter Types.PerUnit FLWP2=0.2 "Water flow rate 2 ";
12+
parameter Types.PerUnit FLWP3=0.23 "Water flow rate 3 ";
13+
parameter Types.PerUnit FLWP4=0.4 "Water flow rate 4 ";
14+
parameter Types.PerUnit FLWP5=0.6 "Water flow rate 5 ";
15+
parameter Types.PerUnit FLWP6=0.8 "Water flow rate 6 ";
16+
parameter Types.PerUnit Pmech1=0 "Mechanical power 1 ";
17+
parameter Types.PerUnit Pmech2=0 "Water flow rate 2 ";
18+
parameter Types.PerUnit Pmech3=0.05 "Water flow rate 3 ";
19+
parameter Types.PerUnit Pmech4=0.35 "Water flow rate 4 ";
20+
parameter Types.PerUnit Pmech5=0.66 "Water flow rate 5 ";
21+
parameter Types.PerUnit Pmech6=0.82 "Water flow rate 6 ";
2222
parameter Types.PerUnit D_TURB=0 "Turbine damping";
2323

2424
Modelica.Blocks.Interfaces.RealInput Gate_Position( start=sG)

OpenIPSL/Electrical/Controls/PSSE/TG/WEHGOV.mo

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ model WEHGOV "Woodward Electric Hydro Governor Model [PSSE-MODELS]"
2727
parameter Types.PerUnit G2=0.25 "Gate position 2";
2828
parameter Types.PerUnit FLWG1=0 "Water flow rate 1";
2929
parameter Types.PerUnit FLWG2=0.25 "Water flow rate 2";
30-
parameter Types.PerUnit TW=0.2 "Water time constant [s]";
30+
parameter Types.Time TW=0.2 "Water time constant";
3131
parameter Types.PerUnit FLWP1=0 "Water flow rate 1";
3232
parameter Types.PerUnit FLWP2=0.2 "Water flow rate 2";
3333
parameter Types.PerUnit FLWP3=0.23 "Water flow rate 3";

OpenIPSL/Electrical/Controls/PSSE/TG/WSIEG1.mo

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,16 @@ model WSIEG1 "WECC Modified IEEE Type 1 Speed-Governing Model [PSSE-MODELS]"
3333
parameter Types.PerUnit db1=0.0006 "Speed deadband";
3434
parameter Types.PerUnit err=0 "Error deadband";
3535
parameter Types.PerUnit db2=0 "Gate valve deadband";
36-
parameter Types.PerUnit GV1=0 "Gate valve position 1 [pu]";
37-
parameter Types.PerUnit GV2=0.25 "Gate valve position 2 [pu]";
38-
parameter Types.PerUnit GV3=0.5 "Gate valve position 3 [pu]";
39-
parameter Types.PerUnit GV4=0.75 "Gate valve position 4 [pu]";
40-
parameter Types.PerUnit GV5=2 "Gate valve position 5 [pu]";
41-
parameter Types.PerUnit PGV1=0 "Mechanical power 1 [pu]";
42-
parameter Types.PerUnit PGV2=0.25 "Mechanical power 2 [pu]";
43-
parameter Types.PerUnit PGV3=0.5 "Mechanical power 3 [pu]";
44-
parameter Types.PerUnit PGV4=0.75 "Mechanical power 4 [pu]";
45-
parameter Types.PerUnit PGV5=2 "Mechanical power 5 [pu]";
36+
parameter Types.PerUnit GV1=0 "Gate valve position 1 ";
37+
parameter Types.PerUnit GV2=0.25 "Gate valve position 2 ";
38+
parameter Types.PerUnit GV3=0.5 "Gate valve position 3 ";
39+
parameter Types.PerUnit GV4=0.75 "Gate valve position 4 ";
40+
parameter Types.PerUnit GV5=2 "Gate valve position 5 ";
41+
parameter Types.PerUnit PGV1=0 "Mechanical power 1 ";
42+
parameter Types.PerUnit PGV2=0.25 "Mechanical power 2 ";
43+
parameter Types.PerUnit PGV3=0.5 "Mechanical power 3 ";
44+
parameter Types.PerUnit PGV4=0.75 "Mechanical power 4 ";
45+
parameter Types.PerUnit PGV5=2 "Mechanical power 5 ";
4646
parameter Integer Iblock=0;
4747
parameter Integer HP_LP = 1 "Turbine Output Power Selector [1(HP) or 2(LP) or 3(HP+LP)]";
4848
Modelica.Blocks.Interfaces.RealInput SPEED_HP "Machine speed deviation from nominal [pu]"

0 commit comments

Comments
 (0)