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.

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

AD15: add nodal outputs for VUnd{xyz}i in global coords #917

Merged
merged 1 commit into from
Feb 17, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Binary file modified docs/OtherSupporting/OutListParameters.xlsx
Binary file not shown.
149 changes: 90 additions & 59 deletions modules/aerodyn/src/AeroDyn_AllBldNdOuts_IO.f90
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ MODULE AeroDyn_AllBldNdOuts_IO
! using the parameters listed in the "OutListParameters.xlsx" Excel file. Any changes to these
! lines should be modified in the Matlab script and/or Excel worksheet as necessary.
! ===================================================================================================
! This code was generated by Write_ChckOutLst.m at 02-Jul-2020 11:33:13.
! This code was generated by Write_ChckOutLst.m at 11-Nov-2021 15:17:59.


! NOTES:
Expand All @@ -39,58 +39,61 @@ MODULE AeroDyn_AllBldNdOuts_IO
INTEGER(IntKi), PARAMETER :: BldNd_VUndx = 1
INTEGER(IntKi), PARAMETER :: BldNd_VUndy = 2
INTEGER(IntKi), PARAMETER :: BldNd_VUndz = 3
INTEGER(IntKi), PARAMETER :: BldNd_VDisx = 4
INTEGER(IntKi), PARAMETER :: BldNd_VDisy = 5
INTEGER(IntKi), PARAMETER :: BldNd_VDisz = 6
INTEGER(IntKi), PARAMETER :: BldNd_STVx = 7
INTEGER(IntKi), PARAMETER :: BldNd_STVy = 8
INTEGER(IntKi), PARAMETER :: BldNd_STVz = 9
INTEGER(IntKi), PARAMETER :: BldNd_VRel = 10
INTEGER(IntKi), PARAMETER :: BldNd_DynP = 11
INTEGER(IntKi), PARAMETER :: BldNd_Re = 12
INTEGER(IntKi), PARAMETER :: BldNd_M = 13
INTEGER(IntKi), PARAMETER :: BldNd_Vindx = 14
INTEGER(IntKi), PARAMETER :: BldNd_Vindy = 15
INTEGER(IntKi), PARAMETER :: BldNd_AxInd = 16
INTEGER(IntKi), PARAMETER :: BldNd_TnInd = 17
INTEGER(IntKi), PARAMETER :: BldNd_Alpha = 18
INTEGER(IntKi), PARAMETER :: BldNd_Theta = 19
INTEGER(IntKi), PARAMETER :: BldNd_Phi = 20
INTEGER(IntKi), PARAMETER :: BldNd_Curve = 21
INTEGER(IntKi), PARAMETER :: BldNd_Cl = 22
INTEGER(IntKi), PARAMETER :: BldNd_Cd = 23
INTEGER(IntKi), PARAMETER :: BldNd_Cm = 24
INTEGER(IntKi), PARAMETER :: BldNd_Cx = 25
INTEGER(IntKi), PARAMETER :: BldNd_Cy = 26
INTEGER(IntKi), PARAMETER :: BldNd_Cn = 27
INTEGER(IntKi), PARAMETER :: BldNd_Ct = 28
INTEGER(IntKi), PARAMETER :: BldNd_Fl = 29
INTEGER(IntKi), PARAMETER :: BldNd_Fd = 30
INTEGER(IntKi), PARAMETER :: BldNd_Mm = 31
INTEGER(IntKi), PARAMETER :: BldNd_Fx = 32
INTEGER(IntKi), PARAMETER :: BldNd_Fy = 33
INTEGER(IntKi), PARAMETER :: BldNd_Fn = 34
INTEGER(IntKi), PARAMETER :: BldNd_Ft = 35
INTEGER(IntKi), PARAMETER :: BldNd_Clrnc = 36
INTEGER(IntKi), PARAMETER :: BldNd_Vx = 37
INTEGER(IntKi), PARAMETER :: BldNd_Vy = 38
INTEGER(IntKi), PARAMETER :: BldNd_GeomPhi = 39
INTEGER(IntKi), PARAMETER :: BldNd_Chi = 40
INTEGER(IntKi), PARAMETER :: BldNd_UA_Flag = 41
INTEGER(IntKi), PARAMETER :: BldNd_CpMin = 42
INTEGER(IntKi), PARAMETER :: BldNd_SgCav = 43
INTEGER(IntKi), PARAMETER :: BldNd_SigCr = 44
INTEGER(IntKi), PARAMETER :: BldNd_Gam = 45
INTEGER(IntKi), PARAMETER :: BldNd_Cl_Static = 46
INTEGER(IntKi), PARAMETER :: BldNd_Cd_Static = 47
INTEGER(IntKi), PARAMETER :: BldNd_Cm_Static = 48
INTEGER(IntKi), PARAMETER :: BldNd_Uin = 49
INTEGER(IntKi), PARAMETER :: BldNd_Uit = 50
INTEGER(IntKi), PARAMETER :: BldNd_Uir = 51
INTEGER(IntKi), PARAMETER :: BldNd_Vundxi = 4
INTEGER(IntKi), PARAMETER :: BldNd_Vundyi = 5
INTEGER(IntKi), PARAMETER :: BldNd_Vundzi = 6
INTEGER(IntKi), PARAMETER :: BldNd_VDisx = 7
INTEGER(IntKi), PARAMETER :: BldNd_VDisy = 8
INTEGER(IntKi), PARAMETER :: BldNd_VDisz = 9
INTEGER(IntKi), PARAMETER :: BldNd_STVx = 10
INTEGER(IntKi), PARAMETER :: BldNd_STVy = 11
INTEGER(IntKi), PARAMETER :: BldNd_STVz = 12
INTEGER(IntKi), PARAMETER :: BldNd_VRel = 13
INTEGER(IntKi), PARAMETER :: BldNd_DynP = 14
INTEGER(IntKi), PARAMETER :: BldNd_Re = 15
INTEGER(IntKi), PARAMETER :: BldNd_M = 16
INTEGER(IntKi), PARAMETER :: BldNd_Vindx = 17
INTEGER(IntKi), PARAMETER :: BldNd_Vindy = 18
INTEGER(IntKi), PARAMETER :: BldNd_AxInd = 19
INTEGER(IntKi), PARAMETER :: BldNd_TnInd = 20
INTEGER(IntKi), PARAMETER :: BldNd_Alpha = 21
INTEGER(IntKi), PARAMETER :: BldNd_Theta = 22
INTEGER(IntKi), PARAMETER :: BldNd_Phi = 23
INTEGER(IntKi), PARAMETER :: BldNd_Curve = 24
INTEGER(IntKi), PARAMETER :: BldNd_Cl = 25
INTEGER(IntKi), PARAMETER :: BldNd_Cd = 26
INTEGER(IntKi), PARAMETER :: BldNd_Cm = 27
INTEGER(IntKi), PARAMETER :: BldNd_Cx = 28
INTEGER(IntKi), PARAMETER :: BldNd_Cy = 29
INTEGER(IntKi), PARAMETER :: BldNd_Cn = 30
INTEGER(IntKi), PARAMETER :: BldNd_Ct = 31
INTEGER(IntKi), PARAMETER :: BldNd_Fl = 32
INTEGER(IntKi), PARAMETER :: BldNd_Fd = 33
INTEGER(IntKi), PARAMETER :: BldNd_Mm = 34
INTEGER(IntKi), PARAMETER :: BldNd_Fx = 35
INTEGER(IntKi), PARAMETER :: BldNd_Fy = 36
INTEGER(IntKi), PARAMETER :: BldNd_Fn = 37
INTEGER(IntKi), PARAMETER :: BldNd_Ft = 38
INTEGER(IntKi), PARAMETER :: BldNd_Clrnc = 39
INTEGER(IntKi), PARAMETER :: BldNd_Vx = 40
INTEGER(IntKi), PARAMETER :: BldNd_Vy = 41
INTEGER(IntKi), PARAMETER :: BldNd_GeomPhi = 42
INTEGER(IntKi), PARAMETER :: BldNd_Chi = 43
INTEGER(IntKi), PARAMETER :: BldNd_UA_Flag = 44
INTEGER(IntKi), PARAMETER :: BldNd_CpMin = 45
INTEGER(IntKi), PARAMETER :: BldNd_SgCav = 46
INTEGER(IntKi), PARAMETER :: BldNd_SigCr = 47
INTEGER(IntKi), PARAMETER :: BldNd_Gam = 48
INTEGER(IntKi), PARAMETER :: BldNd_Cl_Static = 49
INTEGER(IntKi), PARAMETER :: BldNd_Cd_Static = 50
INTEGER(IntKi), PARAMETER :: BldNd_Cm_Static = 51
INTEGER(IntKi), PARAMETER :: BldNd_Uin = 52
INTEGER(IntKi), PARAMETER :: BldNd_Uit = 53
INTEGER(IntKi), PARAMETER :: BldNd_Uir = 54


! The maximum number of output channels which can be output by the code.
INTEGER(IntKi), PARAMETER, PUBLIC :: BldNd_MaxOutPts = 51
INTEGER(IntKi), PARAMETER, PUBLIC :: BldNd_MaxOutPts = 54

!End of code generated by Matlab script
! ===================================================================================================
Expand Down Expand Up @@ -260,6 +263,34 @@ SUBROUTINE Calc_WriteAllBldNdOutput( p, p_AD, u, m, m_AD, y, OtherState, Indx, i



! ***** Disturbed wind velocity in local blade coord system *****
CASE ( BldNd_VUndxi )
DO IdxBlade=1,p%BldNd_BladesOut
DO IdxNode=1,p%NumBlNds
y%WriteOutput( OutIdx ) = u%InflowOnBlade(1,IdxNode,IdxBlade)
OutIdx = OutIdx + 1
END DO
END DO


CASE ( BldNd_VUndyi )
DO IdxBlade=1,p%BldNd_BladesOut
DO IdxNode=1,p%NumBlNds
y%WriteOutput( OutIdx ) = u%InflowOnBlade(2,IdxNode,IdxBlade)
OutIdx = OutIdx + 1
END DO
END DO

CASE ( BldNd_VUndzi )
DO IdxBlade=1,p%BldNd_BladesOut
DO IdxNode=1,p%NumBlNds
y%WriteOutput( OutIdx ) = u%InflowOnBlade(3,IdxNode,IdxBlade)
OutIdx = OutIdx + 1
END DO
END DO



! ***** Disturbed wind velocity in the local blade coordinate system *****
CASE ( BldNd_VDisx )
DO IdxBlade=1,p%BldNd_BladesOut
Expand Down Expand Up @@ -1224,7 +1255,7 @@ END SUBROUTINE AllBldNdOuts_SetParameters
!! the sign is set to 0 if the channel is invalid.
!! It sets assumes the value p%NumOuts has been set before this routine has been called, and it sets the values of p%OutParam here.
!!
!! This routine was generated by Write_ChckOutLst.m using the parameters listed in OutListParameters.xlsx at 02-Jul-2020 11:33:13.
!! This routine was generated by Write_ChckOutLst.m using the parameters listed in OutListParameters.xlsx at 11-Nov-2021 15:17:59.
SUBROUTINE BldNdOuts_SetOutParam(BldNd_OutList, p, p_AD, ErrStat, ErrMsg )
!..................................................................................................................................

Expand All @@ -1249,30 +1280,30 @@ SUBROUTINE BldNdOuts_SetOutParam(BldNd_OutList, p, p_AD, ErrStat, ErrMsg )
CHARACTER(ChanLen) :: OutListTmp ! A string to temporarily hold OutList(I)
CHARACTER(*), PARAMETER :: RoutineName = "BldNdOuts_SetOutParam"

CHARACTER(OutStrLenM1), PARAMETER :: ValidParamAry(51) = (/ & ! This lists the names of the allowed parameters, which must be sorted alphabetically
CHARACTER(OutStrLenM1), PARAMETER :: ValidParamAry(54) = (/ & ! This lists the names of the allowed parameters, which must be sorted alphabetically
"ALPHA ","AXIND ","CD ","CD_STATIC","CHI ","CL ","CLRNC ","CL_STATIC", &
"CM ","CM_STATIC","CN ","CPMIN ","CT ","CURVE ","CX ","CY ", &
"DYNP ","FD ","FL ","FN ","FT ","FX ","FY ","GAM ", &
"GEOMPHI ","M ","MM ","PHI ","RE ","SGCAV ","SIGCR ","STVX ", &
"STVY ","STVZ ","THETA ","TNIND ","UA_FLAG ","UIN ","UIR ","UIT ", &
"VDISX ","VDISY ","VDISZ ","VINDX ","VINDY ","VREL ","VUNDX ","VUNDY ", &
"VUNDZ ","VX ","VY "/)
INTEGER(IntKi), PARAMETER :: ParamIndxAry(51) = (/ & ! This lists the index into AllOuts(:) of the allowed parameters ValidParamAry(:)
"VDISX ","VDISY ","VDISZ ","VINDX ","VINDY ","VREL ","VUNDX ","VUNDXI ", &
"VUNDY ","VUNDYI ","VUNDZ ","VUNDZI ","VX ","VY "/)
INTEGER(IntKi), PARAMETER :: ParamIndxAry(54) = (/ & ! This lists the index into AllOuts(:) of the allowed parameters ValidParamAry(:)
BldNd_Alpha , BldNd_AxInd , BldNd_Cd , BldNd_Cd_Static , BldNd_Chi , BldNd_Cl , BldNd_Clrnc , BldNd_Cl_Static , &
BldNd_Cm , BldNd_Cm_Static , BldNd_Cn , BldNd_CpMin , BldNd_Ct , BldNd_Curve , BldNd_Cx , BldNd_Cy , &
BldNd_DynP , BldNd_Fd , BldNd_Fl , BldNd_Fn , BldNd_Ft , BldNd_Fx , BldNd_Fy , BldNd_Gam , &
BldNd_GeomPhi , BldNd_M , BldNd_Mm , BldNd_Phi , BldNd_Re , BldNd_SgCav , BldNd_SigCr , BldNd_STVx , &
BldNd_STVy , BldNd_STVz , BldNd_Theta , BldNd_TnInd , BldNd_UA_Flag , BldNd_Uin , BldNd_Uir , BldNd_Uit , &
BldNd_VDisx , BldNd_VDisy , BldNd_VDisz , BldNd_Vindx , BldNd_Vindy , BldNd_VRel , BldNd_VUndx , BldNd_VUndy , &
BldNd_VUndz , BldNd_Vx , BldNd_Vy /)
CHARACTER(ChanLen), PARAMETER :: ParamUnitsAry(51) = (/ & ! This lists the units corresponding to the allowed parameters
BldNd_VDisx , BldNd_VDisy , BldNd_VDisz , BldNd_Vindx , BldNd_Vindy , BldNd_VRel , BldNd_VUndx , BldNd_Vundxi , &
BldNd_VUndy , BldNd_Vundyi , BldNd_VUndz , BldNd_Vundzi , BldNd_Vx , BldNd_Vy /)
CHARACTER(ChanLen), PARAMETER :: ParamUnitsAry(54) = (/ & ! This lists the units corresponding to the allowed parameters
"(deg) ","(-) ","(-) ","(-) ","(deg) ","(-) ","(m) ","(-) ", &
"(-) ","(-) ","(-) ","(-) ","(-) ","(deg) ","(-) ","(-) ", &
"(Pa) ","(N/m) ","(N/m) ","(N/m) ","(N/m) ","(N/m) ","(N/m) ","(m^2/s)", &
"(1/0) ","(-) ","(N-m/m)","(deg) ","(-) ","(-) ","(-) ","(m/s) ", &
"(m/s) ","(m/s) ","(deg) ","(-) ","(-) ","(m/s) ","(m/s) ","(m/s) ", &
"(m/s) ","(m/s) ","(m/s) ","(m/s) ","(m/s) ","(m/s) ","(m/s) ","(m/s) ", &
"(m/s) ","(m/s) ","(m/s) "/)
"(m/s) ","(m/s) ","(m/s) ","(m/s) ","(m/s) ","(m/s) "/)


! Initialize values
Expand Down