Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Minor shutdown bug fix #49

Merged
merged 1 commit into from
Jun 11, 2021
Merged

Minor shutdown bug fix #49

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions src/Controllers.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,17 +94,18 @@ SUBROUTINE PitchControl(avrSWAP, CntrPar, LocalVar, objInst, DebugVar)
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
Expand Down