Merge pull request WISDEM#49 from NREL/develop

Minor shutdown bug fix
nikhar-abbas · Jun 11, 2021 · fe71ce4 · fe71ce4
2 parents af9337b + 72e7076
commit fe71ce4
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/src/Controllers.f90 b/src/Controllers.f90
@@ -98,17 +98,18 @@ SUBROUTINE PitchControl(avrSWAP, CntrPar, LocalVar, objInst, DebugVar, ErrVar)
             LocalVar%PC_MinPit = CntrPar%PC_FinePit
         ENDIF
 
-        ! Shutdown
-        IF (CntrPar%SD_Mode == 1) THEN
-            LocalVar%PC_PitComT = Shutdown(LocalVar, CntrPar, objInst)
-        ENDIF
-
+
         ! FloatingFeedback
         IF (CntrPar%Fl_Mode == 1) THEN
             LocalVar%Fl_PitCom = FloatingFeedback(LocalVar, CntrPar, objInst)
             LocalVar%PC_PitComT = LocalVar%PC_PitComT + LocalVar%Fl_PitCom
         ENDIF
-
+
+        ! Shutdown
+        IF (CntrPar%SD_Mode == 1) THEN
+            LocalVar%PC_PitComT = Shutdown(LocalVar, CntrPar, objInst)
+        ENDIF
+
         ! Saturate collective pitch commands:
         LocalVar%PC_PitComT = saturate(LocalVar%PC_PitComT, LocalVar%PC_MinPit, CntrPar%PC_MaxPit)                    ! Saturate the overall command using the pitch angle limits
         LocalVar%PC_PitComT = ratelimit(LocalVar%PC_PitComT, PitComT_Last, CntrPar%PC_MinRat, CntrPar%PC_MaxRat, LocalVar%DT) ! Saturate the overall command of blade K using the pitch rate limit