Skip to content

Commit 225863c

Browse files
authored
Fix for Intel oneAPI compilers (#396)
1 parent e3b7db7 commit 225863c

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

ROSCO/src/Controllers.f90

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -557,7 +557,7 @@ SUBROUTINE FlapControl(avrSWAP, CntrPar, LocalVar, objInst)
557557
LocalVar%Flp_Angle(3) = CntrPar%Flp_Angle
558558
! Initialize controller
559559
IF (CntrPar%Flp_Mode == 2) THEN
560-
LocalVar%Flp_Angle(K) = PIIController(RootMyb_VelErr(K), 0 - LocalVar%Flp_Angle(K), CntrPar%Flp_Kp, CntrPar%Flp_Ki, 0.05, -CntrPar%Flp_MaxPit , CntrPar%Flp_MaxPit , LocalVar%DT, 0.0, LocalVar%piP, LocalVar%restart, objInst%instPI)
560+
LocalVar%Flp_Angle(K) = PIIController(RootMyb_VelErr(K), 0 - LocalVar%Flp_Angle(K), CntrPar%Flp_Kp, CntrPar%Flp_Ki, 0.05_DbKi, -CntrPar%Flp_MaxPit , CntrPar%Flp_MaxPit , LocalVar%DT, 0.0_DbKi, LocalVar%piP, LocalVar%restart, objInst%instPI)
561561
ENDIF
562562

563563
! Steady flap angle
@@ -570,7 +570,7 @@ SUBROUTINE FlapControl(avrSWAP, CntrPar, LocalVar, objInst)
570570
ELSEIF (CntrPar%Flp_Mode == 2) THEN
571571
DO K = 1,LocalVar%NumBl
572572
! Find flap angle command - includes an integral term to encourage zero flap angle
573-
LocalVar%Flp_Angle(K) = PIIController(-LocalVar%rootMOOPF(K), 0 - LocalVar%Flp_Angle(K), CntrPar%Flp_Kp, CntrPar%Flp_Ki, REAL(0.05,DbKi), -CntrPar%Flp_MaxPit , CntrPar%Flp_MaxPit , LocalVar%DT, 0.0, LocalVar%piP, LocalVar%restart, objInst%instPI)
573+
LocalVar%Flp_Angle(K) = PIIController(-LocalVar%rootMOOPF(K), 0 - LocalVar%Flp_Angle(K), CntrPar%Flp_Kp, CntrPar%Flp_Ki, REAL(0.05,DbKi), -CntrPar%Flp_MaxPit , CntrPar%Flp_MaxPit , LocalVar%DT, 0.0_DbKi, LocalVar%piP, LocalVar%restart, objInst%instPI)
574574
! Saturation Limits
575575
LocalVar%Flp_Angle(K) = saturate(LocalVar%Flp_Angle(K), -CntrPar%Flp_MaxPit, CntrPar%Flp_MaxPit) * R2D
576576
END DO
@@ -656,7 +656,7 @@ SUBROUTINE ActiveWakeControl(CntrPar, LocalVar, DebugVar)
656656
IF (CntrPar%AWC_NumModes == 1) THEN
657657
AWC_TiltYaw(2) = PI/180*CntrPar%AWC_amp(1)*cos(LocalVar%Time*2*PI*CntrPar%AWC_freq(1) + 2*CntrPar%AWC_clockangle(1)*PI/180)
658658
ENDIF
659-
CALL ColemanTransformInverse(AWC_TiltYaw(1), AWC_TiltYaw(2), LocalVar%Azimuth, CntrPar%AWC_harmonic(Imode), 0.0, AWC_angle)
659+
CALL ColemanTransformInverse(AWC_TiltYaw(1), AWC_TiltYaw(2), LocalVar%Azimuth, CntrPar%AWC_harmonic(Imode), 0.0_DbKi, AWC_angle)
660660

661661
DO K = 1,LocalVar%NumBl ! Loop through all blades, apply AWC_angle
662662
LocalVar%PitCom(K) = LocalVar%PitCom(K) + AWC_angle(K)
@@ -725,7 +725,7 @@ SUBROUTINE CableControl(avrSWAP, CntrPar, LocalVar, objInst, ErrVar)
725725
DO I_GROUP = 1, CntrPar%CC_Group_N
726726

727727
! Get Actuated deltaL
728-
LocalVar%CC_ActuatedDL(I_GROUP) = SecLPFilter_Vel(LocalVar%CC_DesiredL(I_GROUP),LocalVar%DT,2*PI/CntrPar%CC_ActTau,1.0, &
728+
LocalVar%CC_ActuatedDL(I_GROUP) = SecLPFilter_Vel(LocalVar%CC_DesiredL(I_GROUP),LocalVar%DT,2*PI/CntrPar%CC_ActTau,1.0_DbKi, &
729729
LocalVar%FP,LocalVar%iStatus,LocalVar%restart,objInst%instSecLPFV)
730730

731731
! Integrate

0 commit comments

Comments
 (0)