OpenFAST · andrew-platt · Mar 1, 2022 · Jan 5, 2022 · Jan 5, 2022 · Jan 6, 2022
diff --git a/docs/OtherSupporting/OutListParameters.xlsx b/docs/OtherSupporting/OutListParameters.xlsx
diff --git a/docs/source/user/aerodyn-aeroacoustics/example/AD15.ipt b/docs/source/user/aerodyn-aeroacoustics/example/AD15.ipt
@@ -1,12 +1,12 @@
-------- AERODYN v15.03.\* INPUT FILE ------------------------------------------------
+------- AERODYN INPUT FILE -----------------------------------------------
 IEA Wind Task 37 land-based reference wind turbine
 ====== General Options ===================================================
 False          Echo        - Echo the input to "<rootname>.AD.ech"? (flag)
 "default"      DT_AA       - Time interval for aerodynamic calculations {or "default"} (s)
 1              WakeMod     - Type of wake/induction model (switch) {0=none, 1=BEMT}
 2              AFAeroMod   - Type of blade airfoil aerodynamics model (switch
-0              TwrPotent   - Type tower influence on wind around the tower (switch)
-False          TwrShadow   - Calculate tower influence on wind (flag)
+0              TwrPotent   - Type of tower influence on wind around the tower (switch)
+0              TwrShadow   - Type of tower influence on wind based on downstream tower shadow (switch) {0=none, 1=Powles model, 2=Eames model}
 False          TwrAero     - Calculate tower aerodynamic loads? (flag)
 False          FrozenWake  - Assume frozen wake during linearization? (flag
 False          CavitCheck  - Perform cavitation check? (flag)

diff --git a/docs/source/user/aerodyn-aeroacoustics/example/AFtab.dat b/docs/source/user/aerodyn-aeroacoustics/example/AFtab.dat
@@ -1,12 +1,12 @@
-! ------------ AirfoilInfo v1.01.x Input File ----------------------------------
+! ------------ AirfoilInfo Input File ------------------------------------------
 ! AeroElasticSE FAST driver
 !
 !
 ! ------------------------------------------------------------------------------
-DEFAULT                  InterpOrd   ! Interpolation order to use for quasi-steady table lookup {1=linear; 3=cubic spline; "default"} [default=3]
+DEFAULT                  InterpOrd   ! Interpolation order to use for quasi-steady table lookup {1=linear; 3=cubic spline; "default"} [default=1]
 1                        NonDimArea  ! The non-dimensional area of the airfoil (area/chord^2) (set to 1.0 if unsure or unneeded)
 @"AF20_Coords.txt"       NumCoords   ! The number of coordinates in the airfoil shape file. Set to zero if coordinates not included.
-AF20_BL.txt              BL_file     ! The file name including the boundary layer characteristics of the profile. Ignored if the aeroacoustic module is not called.
+AF20_BL.txt              BL_file     ! The file name including the boundary layer characteristics of the profile. Optional and ignored if the aeroacoustic module is not called.
 1                        NumTabs     ! Number of airfoil tables in this file.  Each table must have lines for Re and Ctrl.
 ! ------------------------------------------------------------------------------
 ! data for table 1
diff --git a/docs/source/user/aerodyn-aeroacoustics/example/AeroAcousticsInput.dat b/docs/source/user/aerodyn-aeroacoustics/example/AeroAcousticsInput.dat
@@ -1,7 +1,7 @@
-------- AeroAcoustics Module v1.00.* INPUT FILE ------------------------------------------------
+------- AeroAcoustics Module INPUT FILE -------------------------------------------------------------
 IEA task 37 RWT turbine -- https://github.com/IEAWindTask37/IEA-3.4-130-RWT
 ======  General Options  ============================================================================
-False        Echo         - Echo the input to "<rootname>.AD.ech"?  (flag)
+False        Echo         - Echo the input to "<rootname>.AD.NN.ech"?  (flag)
 0.1          DT_AA        - Time interval for aeroacoustics calculations (s), must be a multiple of DT_Aero from AeroDyn15  (or "default")
 0            AAStart      - Time after which the AeroAcoustics module is run (s)
 70           BldPrcnt     - Percentage of the blade span, starting from the tip, that will contribute to the overall noise levels. (float)

diff --git a/docs/source/user/aerodyn/examples/ad_polar_example.dat b/docs/source/user/aerodyn/examples/ad_polar_example.dat
@@ -4,7 +4,7 @@
 ! note that this file uses Marshall Buhl's new input file processing; start all comment lines with !
 ! ------------------------------------------------------------------------------
 "DEFAULT"     InterpOrd         ! Interpolation order to use for quasi-steady table lookup {1=linear; 3=cubic spline; "default"} [default=1]
-0.30          RelThickness  - ! The non-dimensional thickness of the airfoil (thickness/chord) [only used if UAMod=7] [default=0.2] (-)
+0.30          RelThickness      ! The non-dimensional thickness of the airfoil (thickness/chord) [only used if UAMod=7] [default=0.2] (-)
           1   NonDimArea        ! The non-dimensional area of the airfoil (area/chord^2) (set to 1.0 if unsure or unneeded)
 @"DU30_A17_coords.txt"    NumCoords         ! The number of coordinates in the airfoil shape file.  Set to zero if coordinates not included.
 "unused"      BL_file           ! The file name including the boundary layer characteristics of the profile. Unused if the aeroacoustic module is not called.

diff --git a/docs/source/user/aerodyn/examples/ad_primary_example.dat b/docs/source/user/aerodyn/examples/ad_primary_example.dat
@@ -5,8 +5,8 @@ True          Echo               - Echo the input to "<rootname>.AD.ech"?  (flag
 "default"     DTAero             - Time interval for aerodynamic calculations {or "default"} (s)
           1   WakeMod            - Type of wake/induction model (switch) {0=none, 1=BEMT, 2=DBEMT, 3=OLAF}  [WakeMod cannot be 2 or 3 when linearizing]
           1   AFAeroMod          - Type of blade airfoil aerodynamics model (switch) {1=steady model, 2=Beddoes-Leishman unsteady model} [AFAeroMod must be 1 when linearizing]
-          0   TwrPotent          - Type tower influence on wind based on potential flow around the tower (switch) {0=none, 1=baseline potential flow, 2=potential flow with Bak correction}
-          0   TwrShadow          - Calculate tower influence on wind based on downstream tower shadow (switch) {0=none, 1=Powles model, 2=Eames model}
+          0   TwrPotent          - Type of tower influence on wind based on potential flow around the tower (switch) {0=none, 1=baseline potential flow, 2=potential flow with Bak correction}
+          0   TwrShadow          - Type of tower influence on wind based on downstream tower shadow (switch) {0=none, 1=Powles model, 2=Eames model}
 False         TwrAero            - Calculate tower aerodynamic loads? (flag)
 False         FrozenWake         - Assume frozen wake during linearization? (flag) [used only when WakeMod=1 and when linearizing]
 False         CavitCheck         - Perform cavitation check? (flag) [AFAeroMod must be 1 when CavitCheck=true]
@@ -34,7 +34,7 @@ True          TIDrag             - Include the drag term in the tangential-induc
 ======  OLAF -- cOnvecting LAgrangian Filaments (Free Vortex Wake) Theory Options  ================== [used only when WakeMod=3]
 "unused"      OLAFInputFileName - Input file for OLAF [used only when WakeMod=3]
 ======  Beddoes-Leishman Unsteady Airfoil Aerodynamics Options  ===================================== [used only when AFAeroMod=2]
-          1   UAMod              - Unsteady Aero Model Switch (switch) {1=Baseline model (Original), 2=Gonzalez's variant (changes in Cn,Cc,Cm), 3=Minnema/Pierce variant (changes in Cc and Cm)} [used only when AFAeroMod=2]
+          1   UAMod              - Unsteady Aero Model Switch (switch) {1=Baseline model (Original), 2=Gonzalez's variant (changes in Cn,Cc,Cm), 3=Minnema/Pierce variant (changes in Cc and Cm)}, 4=HGM, 5=HGM+vortex, 6=Oye, 7=Boeing-Vertol [used only when AFAeroMod=2]
 FALSE         FLookup            - Flag to indicate whether a lookup for f' will be calculated (TRUE) or whether best-fit exponential equations will be used (FALSE); if FALSE S1-S4 must be provided in airfoil input files (flag) [used only when AFAeroMod=2]
        0.25   UAStartRad         - Starting radius for dynamic stall (fraction of rotor radius) [used only when AFAeroMod=2; if line is missing UAStartRad=0]
        0.95   UAEndRad           - Ending radius for dynamic stall (fraction of rotor radius) [used only when AFAeroMod=2; if line is missing UAEndRad=1]
@@ -62,8 +62,8 @@ True          UseBlCm            - Include aerodynamic pitching moment in calcul
 "Test01_UAE_AeroDyn_blade.dat"    ADBlFile(2)        - Name of file containing distributed aerodynamic properties for Blade #2 (-) [unused if NumBl < 2]
 "Test01_UAE_AeroDyn_blade.dat"    ADBlFile(3)        - Name of file containing distributed aerodynamic properties for Blade #3 (-) [unused if NumBl < 3]
 ======  Tower Influence and Aerodynamics ============================================================= [used only when TwrPotent/=0, TwrShadow/=0, or TwrAero=True]
-          5   NumTwrNds         - Number of tower nodes used in the analysis  (-) [used only when TwrPotent/=0, TwrShadow=True, or TwrAero=True]
-TwrElev        TwrDiam        TwrCd          TwrTI (used only with TwrShadow=2)
+          5   NumTwrNds         - Number of tower nodes used in the analysis  (-) [used only when TwrPotent/=0, TwrShadow/=0, or TwrAero=True]
+TwrElev        TwrDiam        TwrCd          TwrTI           ! [TwrTI used only with TwrShadow=2]
 (m)              (m)           (-)            (-)
 0.0000000E+00  6.0000000E+00  0.0000000E+00  1.0000000E-01
 2.0000000E+01  5.5000000E+00  0.0000000E+00  1.0000000E-01

diff --git a/glue-codes/openfast/src/FAST_Prog.f90 b/glue-codes/openfast/src/FAST_Prog.f90
@@ -57,7 +57,7 @@ PROGRAM FAST
       !+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
       ! determine if this is a restart from checkpoint
       !+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   CALL NWTC_Init() ! open console for writing
+   CALL NWTC_Init() ! initialize NWTC library (set some global constants and if necessary, open console for writing)
    ProgName = 'OpenFAST'
    InputFile = ""
    CheckpointRoot = ""

diff --git a/modules/aerodyn/src/AeroDyn_AllBldNdOuts_IO.f90 b/modules/aerodyn/src/AeroDyn_AllBldNdOuts_IO.f90
@@ -107,7 +107,7 @@ MODULE AeroDyn_AllBldNdOuts_IO
 SUBROUTINE AllBldNdOuts_InitOut( InitOut, p, p_AD, InputFileData, ErrStat, ErrMsg )
 
    TYPE(RotInitOutputType),      INTENT(INOUT)  :: InitOut                          ! output data
-   TYPE(RotParameterType),       INTENT(IN   )  :: p                                ! The module parameters
+   TYPE(RotParameterType),       INTENT(IN   )  :: p                                ! The rotor parameters
    TYPE(AD_ParameterType),       INTENT(IN   )  :: p_AD                             ! The module parameters
    TYPE(RotInputFile),           INTENT(IN   )  :: InputFileData                    ! All the data in the AeroDyn input file (want Blade Span for channel name)
    INTEGER(IntKi),               INTENT(  OUT)  :: ErrStat                          ! The error status code
@@ -168,7 +168,7 @@ END SUBROUTINE AllBldNdOuts_InitOut
 !!       here.
 
 SUBROUTINE Calc_WriteAllBldNdOutput( p, p_AD, u, m, m_AD, y, OtherState, Indx, iRot, ErrStat, ErrMsg )
-   TYPE(RotParameterType),    INTENT(IN   )  :: p                                 ! The module parameters
+   TYPE(RotParameterType),    INTENT(IN   )  :: p                                 ! The rotor parameters
    TYPE(AD_ParameterType),    INTENT(IN   )  :: p_AD                              ! The module parameters
    TYPE(RotInputType),        INTENT(IN   )  :: u                                 ! inputs
    TYPE(RotMiscVarType),      INTENT(IN   )  :: m                                 ! misc variables
@@ -1264,7 +1264,7 @@ SUBROUTINE BldNdOuts_SetOutParam(BldNd_OutList, p, p_AD, ErrStat, ErrMsg )
       ! Passed variables
 
    CHARACTER(ChanLen),        INTENT(IN)     :: BldNd_OutList(:)                        !< The list out user-requested outputs
-   TYPE(RotParameterType),    INTENT(INOUT)  :: p                                 !< The module parameters
+   TYPE(RotParameterType),    INTENT(INOUT)  :: p                                 !< The rotor parameters
    TYPE(AD_ParameterType),    INTENT(INOUT)  :: p_AD                              !< The module parameters
    INTEGER(IntKi),            INTENT(OUT)    :: ErrStat                           !< The error status code
    CHARACTER(*),              INTENT(OUT)    :: ErrMsg                            !< The error message, if an error occurred