From 225863cfb4aa88c1c143443a0d942ad4dc1b692b Mon Sep 17 00:00:00 2001 From: Regis Thedin Date: Mon, 18 Nov 2024 14:45:34 -0500 Subject: [PATCH] Fix for Intel oneAPI compilers (#396) --- ROSCO/src/Controllers.f90 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ROSCO/src/Controllers.f90 b/ROSCO/src/Controllers.f90 index 221dd16b..dc52b865 100644 --- a/ROSCO/src/Controllers.f90 +++ b/ROSCO/src/Controllers.f90 @@ -557,7 +557,7 @@ SUBROUTINE FlapControl(avrSWAP, CntrPar, LocalVar, objInst) LocalVar%Flp_Angle(3) = CntrPar%Flp_Angle ! Initialize controller IF (CntrPar%Flp_Mode == 2) THEN - 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) + 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) ENDIF ! Steady flap angle @@ -570,7 +570,7 @@ SUBROUTINE FlapControl(avrSWAP, CntrPar, LocalVar, objInst) ELSEIF (CntrPar%Flp_Mode == 2) THEN DO K = 1,LocalVar%NumBl ! Find flap angle command - includes an integral term to encourage zero flap angle - 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) + 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) ! Saturation Limits LocalVar%Flp_Angle(K) = saturate(LocalVar%Flp_Angle(K), -CntrPar%Flp_MaxPit, CntrPar%Flp_MaxPit) * R2D END DO @@ -656,7 +656,7 @@ SUBROUTINE ActiveWakeControl(CntrPar, LocalVar, DebugVar) IF (CntrPar%AWC_NumModes == 1) THEN 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) ENDIF - CALL ColemanTransformInverse(AWC_TiltYaw(1), AWC_TiltYaw(2), LocalVar%Azimuth, CntrPar%AWC_harmonic(Imode), 0.0, AWC_angle) + CALL ColemanTransformInverse(AWC_TiltYaw(1), AWC_TiltYaw(2), LocalVar%Azimuth, CntrPar%AWC_harmonic(Imode), 0.0_DbKi, AWC_angle) DO K = 1,LocalVar%NumBl ! Loop through all blades, apply AWC_angle LocalVar%PitCom(K) = LocalVar%PitCom(K) + AWC_angle(K) @@ -725,7 +725,7 @@ SUBROUTINE CableControl(avrSWAP, CntrPar, LocalVar, objInst, ErrVar) DO I_GROUP = 1, CntrPar%CC_Group_N ! Get Actuated deltaL - LocalVar%CC_ActuatedDL(I_GROUP) = SecLPFilter_Vel(LocalVar%CC_DesiredL(I_GROUP),LocalVar%DT,2*PI/CntrPar%CC_ActTau,1.0, & + LocalVar%CC_ActuatedDL(I_GROUP) = SecLPFilter_Vel(LocalVar%CC_DesiredL(I_GROUP),LocalVar%DT,2*PI/CntrPar%CC_ActTau,1.0_DbKi, & LocalVar%FP,LocalVar%iStatus,LocalVar%restart,objInst%instSecLPFV) ! Integrate