Introduce pitch controller flag

Ben-Mertz · Sep 18, 2019 · 8b13796 · 8b13796
1 parent d1af1f3
commit 8b13796
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/Source/ControllerBlocks.f90 b/Source/ControllerBlocks.f90
@@ -51,11 +51,10 @@ SUBROUTINE StateMachine(CntrPar, LocalVar)
 
         ! Operational States
         ELSE
-            IF ((CntrPar%VS_ControlMode == 0) .AND. (LocalVar%GenTq >= CntrPar%PC_RtTq99)) THEN
+            ! Pitch controller state machine
+            IF (CntrPar%PC_ControlMode == 1) THEN
                 LocalVar%PC_State = 1
-            ELSEIF ((CntrPar%VS_ControlMode == 1) .AND. (LocalVar%GenArTq >= CntrPar%VS_ArSatTq*0.99)) THEN
-                LocalVar%PC_State = 2
-            ELSE
+            ELSE 
                 LocalVar%PC_State = 0
             END IF
 

diff --git a/Source/DRC_Types.f90 b/Source/DRC_Types.f90
@@ -22,6 +22,7 @@ MODULE DRC_Types
     REAL(4), DIMENSION(:), ALLOCATABLE  :: IPC_aziOffset                ! Phase offset added to the azimuth angle for the individual pitch controller, [rad].
     REAL(4)                             :: IPC_CornerFreqAct            ! Corner frequency of the first-order actuators model, to induce a phase lag in the IPC signal {0: Disable}, [rad/s]
 
+    INTEGER(4)                          :: PC_ControlMode               ! Blade pitch control mode {0: No pitch, fix to fine pitch, 1: active PI blade pitch control}
     INTEGER(4)                          :: PC_GS_n                      ! Amount of gain-scheduling table entries
     REAL(4), DIMENSION(:), ALLOCATABLE  :: PC_GS_angles                 ! Gain-schedule table: pitch angles
     REAL(4), DIMENSION(:), ALLOCATABLE  :: PC_GS_KP                     ! Gain-schedule table: pitch controller kp gains

diff --git a/Source/ReadSetParameters.f90 b/Source/ReadSetParameters.f90
@@ -31,6 +31,7 @@ SUBROUTINE ReadControlParameterFileSub(CntrPar)
         READ(UnControllerParameters, *) CntrPar%F_NotchType
         READ(UnControllerParameters, *) CntrPar%IPC_ControlMode
         READ(UnControllerParameters, *) CntrPar%VS_ControlMode
+        READ(UnControllerParameters, *) CntrPar%PC_ControlMode
         READ(UnControllerParameters, *) CntrPar%Y_ControlMode        
         READ(UnControllerParameters, *)