Merge pull request #2948 from bjonkman/b/AeroAcoustics

AeroAcoustics code cleanup

Author: andrew-platt

docs/source/user/aerodyn-aeroacoustics/App-usage.rst

@@ -112,20 +112,22 @@ Finally, the set Outputs contains a few options for the output data:
    levels are reported with (True) or without (False) the A-weighting
    correction; see :numref:`aa-sec-ModelUsage`.
 
--  **NAAOutFile** – Integer 1/2/3: flag to set the desired output file. When
+-  **NAAOutFile** – Integer 1/2/3/4: flag to set the desired output file. When
    set to 1, a value of overall sound pressure level at every **DT_AA** time
    step per observer is printed to file. When set to 2, the first output
    is accompanied by a second file where the total sound pressure level
    spectrum is printed per time step per observer. When set to
-   3, the two first outputs are accompanied by a third file where the
+   3, the two first output files are accompanied by a third file where the
    sound pressure level spectrum per noise mechanism is printed per time
    step per observer. When set to 4, a fourth file is generated with the
    values of overall sound pressure levels per node, per blade, 
    per observer, and per time step.
 
--  The following line contains the file name used to store the outputs.
-   The file name is attached with a 1, 2, 3, and 4 flag based on the
-   **NAAOutFile** options.
+-  The following line, **AAOutFile**, contains the root name for the files 
+   used to store the outputs. If set to "default", the default output file
+   root name will be used.
+   The file name is appended with a 1, 2, 3, and 4 flag based on the
+   **NAAOutFile** options. 
 
 The file must be closed by an END command.
 

docs/source/user/aerodyn-aeroacoustics/example/AeroAcousticsInput.dat

@@ -24,6 +24,6 @@ True         RoundedTip   - Logical indicating rounded tip (flag) [Only used if
 ======  Outputs  ====================================================================================
 False              AWeighting  - A-weighting Flag (flag)  
 3                 NrOutFile  - Number of Output files. 1 for Time Dependent Overall SPL, 2 for both 1 and Frequency and Time Dependent SPL as well, or 3 for both 1 and 2 and Acoustics mechanism dependent, 4 for 1-3 and the overall sound pressure levels per blade per node per observer 
-"IEA_LB_RWT-AeroAcoustics_"    AAOutFile   - No Extension needed the resulting file will have .out Name of file containing
+"IEA_LB_RWT-AeroAcoustics_"    AAOutFile   - No Extension needed; the resulting file(s) will end in #.out. Use "Default" to use the default output file name from OpenFAST.
 END of input file (the word "END" must appear in the first 3 columns of this last OutList line)
 ---------------------------------------------------------------------------------------

modules/aerodyn/src/AeroAcoustics.f90

@@ -5,6 +5,7 @@ MODULE TNO
    use NWTC_SLATEC   ! slatec_qk61 -- which is all that is in that library right now.
 
    implicit none
+   PRIVATE
    PUBLIC :: SPL_integrate
 
    INTEGER,       PARAMETER :: TNOKi = ReKi
@@ -63,8 +64,10 @@ function SPL_integrate(Omega,limits,ISSUCTION,   &
    ! Set module values from input
    ISSUCTION_TNO  = ISSUCTION
    Omega_TNO      = real(Omega,TNOKi)
+   
    ! Mach number of segment
    Mach_TNO       = real(Mach,TNOKi)
+   
    ! Atmospheric values
    co       = real(SpdSound,  TNOKi)
    rho      = real(AirDens,   TNOKi)
@@ -158,10 +161,10 @@ FUNCTION f_int1(x2)
 END FUNCTION f_int1
 
 
-FUNCTION f_int2(k1)  ! changed name from 'int2' to avoid conflicts with intrinsic of same name
-   REAL (TNOKi), intent(in)  :: k1
+FUNCTION f_int2(k1_in)  ! changed name from 'int2' to avoid conflicts with intrinsic of same name
+   REAL (TNOKi), intent(in)  :: k1_in
    REAL (TNOKi) :: f_int2
-   f_int2 = Omega_TNO/co/k1*Pressure(k1)
+   f_int2 = Omega_TNO/co/k1_in*Pressure(k1_in)
    RETURN 
 END FUNCTION f_int2
 

modules/aerodyn/src/AeroAcoustics_IO.f90

@@ -234,7 +234,7 @@ SUBROUTINE AllBldNdOuts_InitOut( InitOut, p, InputFileData, ErrStat, ErrMsg )
          ! Populate the header an unit lines for all blades and nodes
          ! First set a counter so we know where in the output array we are in
          ! NOTE: we populate invalid names as well (some names are not valid outputs for certain configurations).  That means we will have zeros in those values.
-      INDX = p%NumOuts + 1       ! p%NumOuts is the number of outputs from the normal AeroDyn output.  The WriteOutput array is sized to p%NumOuts + num(AllBldNdOuts)
+      INDX = p%NumOuts + p%AA%numOuts + 1       ! The WriteOutput array is sized to p%NumOuts + p%AA%numOuts + AllBldNdOuts
 
       DO IdxChan=1,p%BldNd_NumOuts
 
@@ -327,7 +327,7 @@ SUBROUTINE Calc_WriteAllBldNdOutput( p, p_AD, u, m, m_AD, x, y, OtherState, RotI
 
          ! Populate the header an unit lines for all blades and nodes
          ! First set a counter so we know where in the output array we are in
-      iOut = p%NumOuts + 1       ! p%NumOuts is the number of outputs from the normal AeroDyn output.  The WriteOutput array is sized to p%NumOuts + num(AllBldNdOuts)
+      iOut = p%NumOuts + p%AA%numOuts  + 1       ! p%NumOuts is the number of outputs from the normal AeroDyn output.  The WriteOutput array is sized to p%NumOuts + p%AA%numOuts  + num(AllBldNdOuts)
 
 
          ! Case to assign output to this channel and populate based on Indx value (this indicates what the channel is)

modules/aerodyn/src/AeroAcoustics_Registry.txt

@@ -449,17 +449,17 @@ subroutine Init_ADI_ForDriver(iCase, ADI, dvr, FED, dt, needInitIW, errStat, err
       ! UA does not like changes of dt between cases
       if ( .not. EqualRealNos(ADI%p%AD%DT, dt) ) then
          call WrScr('Info: dt is changing between cases, AeroDyn will be re-initialized')
-         call ADI_End( ADI%u(1:1), ADI%p, ADI%x(1), ADI%xd(1), ADI%z(1), ADI%OtherState(1), ADI%y, ADI%m, errStat2, errMsg2); call SetErrStat(errStat2, errMsg2, errStat, errMsg, 'Init_ADI_ForDriver'); if(Failed()) return
-         !call AD_Dvr_DestroyAeroDyn_Data   (AD     , errStat2, errMsg2); call SetErrStat(errStat2, errMsg2, errStat, errMsg, RoutineName)
          needInit=.true.
       endif
       if (ADI%p%AD%Wake_Mod == WakeMod_FVW) then
          call WrScr('[INFO] OLAF is used, AeroDyn will be re-initialized')
          needInit=.true.
       endif
+      
       if (needInit) then
          call ADI_End( ADI%u(1:1), ADI%p, ADI%x(1), ADI%xd(1), ADI%z(1), ADI%OtherState(1), ADI%y, ADI%m, errStat2, errMsg2); call SetErrStat(errStat2, errMsg2, errStat, errMsg, 'Init_ADI_ForDriver'); if(Failed()) return
       endif
+      
    endif
 
    ! if wind profile changed in a combined case, need to re-init