Separated pitch speed setpoint from generator speed setpoint

Ben-Mertz · Sep 6, 2017 · ff6e0d8 · ff6e0d8
1 parent 421316b
commit ff6e0d8
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/DISCON.IN b/DISCON.IN
@@ -1,8 +1,8 @@
-5.0                                       =             User Variable 1: K [Nm/(rad/s)2]
-3.5                                       =             User Variable 2:
-2.3                                       =             User Variable 3:
-0.0                                       =             User Variable 4:
-0.0                                       =             User Variable 5:
+0                                         =             User Variable 1: Yaw control mode (0 = no yaw control, 1 = yaw rate control, 2 = yaw-by-IPC)
+0.005235988                               =             User Variable 2: Yaw rate, [rad/s]
+70.16224                                  =             User Variable 3: VS_CtInSp, cut-in speed, [rad/s]
+15000.0                                   =             User Variable 4: VS_MaxRat, maximum torque change rate, [Nm/s]
+122.909576                                =             User Variable 5: PC_RefSpd, generator speed setpoint for the pitch controller, [rad/s]
 0.0                                       =             User Variable 6:
 0.0                                       =             User Variable 7:
 0.0                                       =             User Variable 8:

diff --git a/PitchGains.IN b/PitchGains.IN
@@ -1,4 +1,7 @@
 14
 0.0706	0.1168	0.1524	0.183	0.2116	0.2385	0.263	0.286	0.308	0.3284	0.3488	0.3691	0.3895	0.4083
 -0.0164	-0.0107	-0.0083	-0.0068	-0.0057	-0.0049	-0.0043	-0.0037	-0.0033	-0.0028	-0.0026	-0.0023	-0.002	-0.0017
--0.0027	-0.0027	-0.0026	-0.0025	-0.0024	-0.0024	-0.0024	-0.0023	-0.0023	-0.0023	-0.0023	-0.0023	-0.0023	-0.0023
+-0.0027	-0.0027	-0.0026	-0.0025	-0.0024	-0.0024	-0.0024	-0.0023	-0.0023	-0.0023	-0.0023	-0.0023	-0.0023	-0.0023
+1
+-4200.0
+-2100.0
diff --git a/Source/DISCON.f90 b/Source/DISCON.f90
@@ -72,7 +72,7 @@ SUBROUTINE DISCON (avrSWAP, aviFAIL, accINFILE, avcOUTNAME, avcMSG) BIND (C, NAM
 REAL(4)						:: PC_MaxRat										! Maximum pitch rate (in absolute value) in pitch controller, [rad/s].
 REAL(4)						:: PC_MinPit										! Minimum physical pitch limit, [rad].
 REAL(4)						:: PC_MinRat										! Minimum pitch rate (in absolute value) in pitch controller, [rad/s].
-REAL(4)						:: PC_RefSpd										! Desired (reference) HSS speed for pitch controller, [rad/s].
+REAL(4), SAVE				:: PC_RefSpd										! Desired (reference) HSS speed for pitch controller, [rad/s].
 REAL(4)						:: PC_RtTq99										! 99% of the rated torque value, using for switching between pitch and torque control, [Nm].
 REAL(4)						:: PC_SetPnt										! Fine pitch angle, [rad].
 REAL(4)						:: PC_SpdErr										! Current speed error (pitch control) [rad/s].
@@ -145,7 +145,6 @@ SUBROUTINE DISCON (avrSWAP, aviFAIL, accINFILE, avcOUTNAME, avcMSG) BIND (C, NAM
 VS_MinOM		= avrSWAP(17)
 VS_MaxOM		= avrSWAP(18)
 VS_RtSpd		= avrSWAP(19)
-PC_RefSpd		= avrSWAP(19)
 GenSpeed		= avrSWAP(20)
 VS_RtTq			= avrSWAP(22)
 Y_MErr			= avrSWAP(24)
@@ -202,6 +201,7 @@ SUBROUTINE DISCON (avrSWAP, aviFAIL, accINFILE, avcOUTNAME, avcMSG) BIND (C, NAM
 	Y_YawRate		= avrSWAP(121)
 	VS_CtInSp		= avrSWAP(122)
 	VS_MaxRat		= avrSWAP(123)
+	PC_RefSpd		= avrSWAP(124)
 
 		! Determine some torque control parameters not specified directly: