AA: mod output channel names

Author: bjonkman

modules/aerodyn/src/AeroAcoustics_IO.f90

@@ -580,14 +580,9 @@ function setChannelBldNdPrefix(IdxBlade,IdxNode) result(ChanPrefix)
       INTEGER(IntKi), intent(in)  :: IdxNode                          ! Counter to the blade node we ae on
       CHARACTER(16)               :: ChanPrefix                       ! Name prefix (AeroB#_Z######y_)
 
-#ifdef OUTPUT_CHANNEL_NAMES_WITH_NODE_NUMBERS
-            ! Create the name prefix:
-         WRITE (TmpChar,'(I3.3)')  IdxNode         ! 3 digit number
-         ChanPrefix = 'AB' // TRIM(Num2LStr(IdxBlade)) // 'N' // TRIM(TmpChar)
-#else
-         WRITE (TmpChar,'(I6.6)') NINT( p%BlSpn(IdxNode,IdxBlade) * 1000.0_ReKi) !millimeters
-         ChanPrefix = 'AeroB' // TRIM(Num2LStr(IdxBlade)) // '_Z' // TRIM(TmpChar) // '_'
-#endif    
+         ! Create the name prefix:
+      WRITE (TmpChar,'(I3.3)')  IdxNode         ! 3 digit number
+      ChanPrefix = 'AB' // TRIM(Num2LStr(IdxBlade)) // 'N' // TRIM(TmpChar)
     end function
 
     logical function Failed()

modules/aerodyn/src/AeroDyn_Inflow.f90

@@ -267,7 +267,6 @@ subroutine ADI_CalcOutput(t, u, p, x, xd, z, OtherState, y, m, errStat, errMsg)
 
    integer(IntKi)                :: errStat2
    character(errMsgLen)          :: errMsg2
-   integer(IntKi)                :: node
    character(*), parameter       :: RoutineName = 'ADI_CalcOutput'
    integer :: iWT
    errStat = ErrID_None