Merge remote-tracking branch 'upstream/dev' into f/tight-coupling

OpenFAST · deslaughter · Mar 5, 2024 · Mar 5, 2024 · Mar 5, 2024 · Mar 5, 2024
commit 09cc22338b1df52514a81ca68c1e1f79484ae4be
diff --git a/glue-codes/openfast-cpp/src/OpenFAST.cpp b/glue-codes/openfast-cpp/src/OpenFAST.cpp
@@ -774,10 +774,6 @@ void fast::OpenFAST::init() {
                         &turbineData[iTurb].numBlades,
                         &turbineData[iTurb].azBlendMean,
                         &turbineData[iTurb].azBlendDelta,
-                        &turbineData[iTurb].velMean,
-                        &turbineData[iTurb].windDir,
-                        &turbineData[iTurb].zRef,
-                        &turbineData[iTurb].shearExp,
                         &extld_i_f_FAST[iTurb],
                         &extld_p_f_FAST[iTurb],
                         &extld_o_t_FAST[iTurb],
@@ -1664,10 +1660,6 @@ void fast::OpenFAST::get_turbineParams(int iTurbGlob, turbineDataType & turbData
     turbData.nBRfsiPtsTwr = turbineData[iTurbLoc].nBRfsiPtsTwr;
     turbData.azBlendMean = turbineData[iTurbLoc].azBlendMean;
     turbData.azBlendDelta = turbineData[iTurbLoc].azBlendDelta;
-    turbData.velMean = turbineData[iTurbLoc].velMean;
-    turbData.windDir = turbineData[iTurbLoc].windDir;
-    turbData.zRef = turbineData[iTurbLoc].zRef;
-    turbData.shearExp = turbineData[iTurbLoc].shearExp;
 
 }
 
@@ -2075,10 +2067,6 @@ void fast::OpenFAST::allocateMemory_preInit() {
         turbineData[iTurb].numForcePtsTwr = globTurbineData[iTurbGlob].numForcePtsTwr;
         turbineData[iTurb].azBlendMean = globTurbineData[iTurbGlob].azBlendMean;
         turbineData[iTurb].azBlendDelta = globTurbineData[iTurbGlob].azBlendDelta;
-        turbineData[iTurb].velMean = globTurbineData[iTurbGlob].velMean;
-        turbineData[iTurb].windDir = globTurbineData[iTurbGlob].windDir;
-        turbineData[iTurb].zRef = globTurbineData[iTurbGlob].zRef;
-        turbineData[iTurb].shearExp = globTurbineData[iTurbGlob].shearExp;
 
         velForceNodeData[iTurb].resize(4); // To hold data for 4 time steps
         brFSIData[iTurb].resize(4);

diff --git a/modules/aerodisk/src/AeroDisk_Registry.txt b/modules/aerodisk/src/AeroDisk_Registry.txt
@@ -78,7 +78,7 @@ typedef  ^        InputType         ReKi                 BlPitch           -  -
 
 # ..... Outputs ...................................................................................................................
 # outputs on meshes:
-typedef  ^        OutputType        MeshType             AeroLoads         -  - -   "Mesh containing the forces and moments from the aero loading" -
+typedef  ^        OutputType        MeshType             AeroLoads         -  - -   "Mesh containing the forces and moments from the aero loading (at HubMotion mesh)" -
 #TODO: any mesh for visualization of blades/rotor disk?
 # outputs not on meshes:
 typedef  ^        OutputType        ReKi                 YawErr            -  - -   "Nacelle-yaw error, i.e., the angle about positive Z from the rotor centerline to the rotor-disk-averaged relative wind velocity (ambient + rotor  motion), both projected onto the horizontal plane" rad

diff --git a/modules/aerodisk/src/AeroDisk_Types.f90 b/modules/aerodisk/src/AeroDisk_Types.f90
@@ -98,7 +98,7 @@ MODULE AeroDisk_Types
 ! =======================
 ! =========  ADsk_OutputType  =======
   TYPE, PUBLIC :: ADsk_OutputType
-    TYPE(MeshType)  :: AeroLoads      !< Mesh containing the forces and moments from the aero loading [-]
+    TYPE(MeshType)  :: AeroLoads      !< Mesh containing the forces and moments from the aero loading (at HubMotion mesh) [-]
     REAL(ReKi)  :: YawErr = 0.0_ReKi      !< Nacelle-yaw error, i.e., the angle about positive Z from the rotor centerline to the rotor-disk-averaged relative wind velocity (ambient + rotor  motion), both projected onto the horizontal plane [rad]
     REAL(ReKi)  :: PsiSkew = 0.0_ReKi      !< Azimuth angle (from the nominally vertical axis in the disk plane, Z_disk ) to the vector about which the inflow skew angle is defined, i.e., the angle about positive X_disk  from Z_disk  to the vector about which the positive inflow skew angle is defined  [rad]
     REAL(ReKi)  :: ChiSkew = 0.0_ReKi      !< Inflow skew angle [rad]

diff --git a/modules/aerodyn/src/AeroDyn.f90 b/modules/aerodyn/src/AeroDyn.f90
@@ -3188,7 +3188,7 @@ subroutine SetInputsForBEMT(p, p_AD, u, RotInflow, m, indx, errStat, errMsg)
          ! Determine current azimuth angle and pitch axis vector of blade k, element j
          call Calculate_MeshOrientation_Rel2Hub(u%BladeMotion(k), u%HubMotion, x_hat_disk, m%orientationAnnulus(:,:,:,k), elemPosRelToHub_save=elemPosRelToHub, elemPosRotorProj_save=elemPosRotorProj)
          ! Twist (aero+elastic), Toe, Cant (instantaneous and local), include elastic deformation
-         call TwistToeCant_FromLocalPolar(u%BladeMotion(k), m%orientationAnnulus(:,:,:,k), thetaBladeNds, m%Toe(:,k), m%Cant(:,k))
+         call TwistToeCant_FromLocalPolar(u%BladeMotion(k), m%orientationAnnulus(:,:,:,k), thetaBladeNds(:,k), m%Toe(:,k), m%Cant(:,k))
 
          !..........................
          ! Compute local radius
@@ -3621,7 +3621,7 @@ subroutine SetInputsForFVW(p, u, m, errStat, errMsg)
          elseif (p%rotors(iR)%AeroProjMod==APM_BEM_Polar) then
             do k=1,p%rotors(iR)%numBlades
                call Calculate_MeshOrientation_Rel2Hub(u(tIndx)%rotors(iR)%BladeMotion(k), u(tIndx)%rotors(iR)%HubMotion, x_hat_disk, m%rotors(iR)%orientationAnnulus(:,:,:,k))
-               call TwistToeCant_FromLocalPolar(u(tIndx)%rotors(iR)%BladeMotion(k), m%rotors(iR)%orientationAnnulus(:,:,:,k), thetaBladeNds, m%rotors(iR)%Toe(:,k), m%rotors(iR)%Cant(:,k))
+               call TwistToeCant_FromLocalPolar(u(tIndx)%rotors(iR)%BladeMotion(k), m%rotors(iR)%orientationAnnulus(:,:,:,k), thetaBladeNds(:,k), m%rotors(iR)%Toe(:,k), m%rotors(iR)%Cant(:,k))
             enddo
 
          else if (p%rotors(iR)%AeroProjMod==APM_LiftingLine) then
@@ -4294,7 +4294,7 @@ SUBROUTINE ValidateInputData( InitInp, InputFileData, NumBl, calcCrvAngle, ErrSt
       select case(InputFileData%DBEMT_Mod)
       case (DBEMT_None, DBEMT_frozen, DBEMT_cont_tauConst)
       case default
-         call SetErrStat( ErrID_Fatal, 'DBEMT Mod must be 0 or 3 (continuous formulation with constant tau1) for linearization. Set DBEMT_Mod=0,3.', ErrStat, ErrMsg, RoutineName )
+         call SetErrStat( ErrID_Fatal, 'DBEMT_Mod must be -1 (frozen), 0 (none), or 3 (continuous formulation with constant tau1) for linearization. Set DBEMT_Mod=-1,0,3.', ErrStat, ErrMsg, RoutineName )
       end select
 
       if (InputFileData%NacelleDrag) then

diff --git a/modules/aerodyn/src/BEMT.f90 b/modules/aerodyn/src/BEMT.f90
@@ -636,7 +636,7 @@ subroutine BEMT_Init( InitInp, u, p, x, xd, z, OtherState, AFInfo, y, misc, Inte
    if (errStat >= AbortErrLev) return
 
    InitInp_DBEMT%DBEMT_Mod = p%DBEMT_Mod
-   if ( p%DBEMT_Mod > DBEMT_none ) then
+   if ( p%DBEMT_Mod > DBEMT_none .or. p%DBEMT_Mod == DBEMT_Frozen  ) then
       InitInp_DBEMT%DBEMT_Mod  = p%DBEMT_Mod
       InitInp_DBEMT%numBlades  = p%numBlades 
       InitInp_DBEMT%numNodes   = p%numBladeNodes

diff --git a/modules/aerodyn/src/DBEMT.f90 b/modules/aerodyn/src/DBEMT.f90
@@ -64,9 +64,11 @@ subroutine DBEMT_ValidateInitInp(interval, InitInp, errStat, errMsg)
    errMsg  = ""
 
    if ( interval <= sqrt(epsilon(1.0_ReKi)) ) call SetErrStat( ErrID_Fatal, " The timestep size for DBEMT (interval) must be larger than sqrt(epsilon).", ErrStat, ErrMsg, RoutineName)
-   if ( (InitInp%DBEMT_Mod .ne. DBEMT_tauConst) .and. (InitInp%DBEMT_Mod .ne. DBEMT_tauVaries) .and. (InitInp%DBEMT_Mod .ne. DBEMT_cont_tauConst)) then
-      call SetErrStat( ErrID_Fatal, " DBEMT_Mod must be set to 1, 2, or 3.", ErrStat, ErrMsg, RoutineName)
-   end if
+   select case(InitInp%DBEMT_Mod)
+   case (DBEMT_frozen, DBEMT_tauConst, DBEMT_tauVaries, DBEMT_cont_tauConst)
+   case default
+      call SetErrStat( ErrID_Fatal, " DBEMT_Mod must be set to -1, 1, 2, or 3.", ErrStat, ErrMsg, RoutineName)
+   end select
 
    if (InitInp%numBlades < 1) call SetErrStat( ErrID_Fatal, " InitInp%numBlades must set to 1 or more.", ErrStat, ErrMsg, RoutineName)
    if (InitInp%numNodes < 2) call SetErrStat( ErrID_Fatal, " InitInp%numNodes must set to 2 or more.", ErrStat, ErrMsg, RoutineName)
@@ -922,4 +924,4 @@ subroutine DBEMT_End( u, p, x, OtherState, m, ErrStat, ErrMsg )
 
 END SUBROUTINE DBEMT_End
 
-end module DBEMT
+end module DBEMT
diff --git a/modules/extloads/CMakeLists.txt b/modules/extloads/CMakeLists.txt
@@ -27,7 +27,7 @@ add_library(extloadslib STATIC
 target_include_directories(extloadslib PUBLIC 
   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>  
 )
-target_link_libraries(extloadslib beamdynlib nwtclibs versioninfolib ifwlib)
+target_link_libraries(extloadslib beamdynlib nwtclibs versioninfolib)
 set_target_properties(extloadslib PROPERTIES PUBLIC_HEADER "src/ExtLoadsDX_Types.h")
 
 install(TARGETS extloadslib

diff --git a/modules/extloads/src/ExtLoads.f90 b/modules/extloads/src/ExtLoads.f90
@@ -42,6 +42,36 @@ module ExtLoads
    public :: ExtLd_ConvertInpDataForExtProg        ! Routine to convert Input data for external programs
 
 contains    
+!----------------------------------------------------------------------------------------------------------------------------------   
+!> This subroutine sets the initialization output data structure, which contains data to be returned to the calling program (e.g.,
+!! FAST)   
+subroutine ExtLd_SetInitOut(p, InitOut, errStat, errMsg)
+
+   type(ExtLd_InitOutputType),    intent(inout)  :: InitOut          ! output data
+   type(ExtLd_ParameterType),     intent(in   )  :: p                ! Parameters
+   integer(IntKi),                intent(  out)  :: errStat          ! Error status of the operation
+   character(*),                  intent(  out)  :: errMsg           ! Error message if ErrStat /= ErrID_None
+
+
+      ! Local variables
+   integer(intKi)                               :: ErrStat2          ! temporary Error status
+   character(ErrMsgLen)                         :: ErrMsg2           ! temporary Error message
+   character(*), parameter                      :: RoutineName = 'ExtLd_SetInitOut'
+
+
+
+   integer(IntKi)                               :: i, j, k, f
+   integer(IntKi)                               :: NumCoords
+#ifdef DBG_OUTS
+   integer(IntKi)                               :: m
+   character(5)                                 ::chanPrefix
+#endif   
+      ! Initialize variables for this routine
+
+   errStat = ErrID_None
+   errMsg  = ""
+
+end subroutine ExtLd_SetInitOut
 
 !----------------------------------------------------------------------------------------------------------------------------------   
 !> This routine is called at the start of the simulation to perform initialization steps.
@@ -90,114 +120,40 @@ subroutine ExtLd_Init( InitInp, u, xd, p, y, m, interval, InitOut, ErrStat, ErrM
 
    p%az_blend_mean = InitInp%az_blend_mean
    p%az_blend_delta = InitInp%az_blend_delta
-   p%vel_mean = InitInp%vel_mean
-   p%wind_dir = InitInp%wind_dir
-   p%z_ref = InitInp%z_ref
-   p%shear_exp = InitInp%shear_exp
 
-   !----------------------------------------------------------------------------
-   ! Define and initialize inputs 
-   !----------------------------------------------------------------------------
+      !............................................................................................
+      ! Define and initialize inputs here 
+      !............................................................................................
 
-   call Init_u( u, p, InitInp, ErrStat2, ErrMsg2 ) 
-   if (Failed()) return
+   write(*,*) 'Initializing U '
+
+   call Init_u( u, p, InitInp, errStat2, errMsg2 ) 
+      call SetErrStat( ErrStat2, ErrMsg2, ErrStat, ErrMsg, RoutineName ) 
+      if (ErrStat >= AbortErrLev) return
 
    !----------------------------------------------------------------------------
    ! Initialize misc vars states
    !----------------------------------------------------------------------------
 
    m%az = 0.0 
    m%phi_cfd = 0.0
-
-   !----------------------------------------------------------------------------
-   ! Initialize outputs
-   !----------------------------------------------------------------------------
-
-   ! Initialize outputs after input meshes have been initialized
-   call Init_y(y, u, m, p, ErrStat2, ErrMsg2) 
-   if (Failed()) return
-
-   !----------------------------------------------------------------------------
-   ! Initialize Module Variables
-   !----------------------------------------------------------------------------
-
-   call ExtLd_InitVars(u, p, y, m, InitOut, .false., ErrStat2, ErrMsg2)
-   if (Failed()) return
-
-contains
-   logical function Failed()
-      CALL SetErrStat( ErrStat2, ErrMsg2, ErrStat, ErrMsg, RoutineName )
-      Failed = ErrStat >= AbortErrLev
-   end function Failed
-end subroutine ExtLd_Init
-
-!----------------------------------------------------------------------------------------------------------------------------------   
-subroutine ExtLd_InitVars(u, p, y, m, InitOut, Linearize, ErrStat, ErrMsg)
-   type(ExtLd_InputType),          intent(inout)  :: u           !< An initial guess for the input; input mesh must be defined
-   type(ExtLd_ParameterType),      intent(inout)  :: p           !< Parameters
-   type(ExtLd_OutputType),         intent(inout)  :: y           !< Initial system outputs (outputs are not calculated;
-   type(ExtLd_MiscVarType),        intent(inout)  :: m           !< Misc variables for optimization (not copied in glue code)
-   type(ExtLd_InitOutputType),     intent(inout)  :: InitOut     !< Output for initialization routine
-   logical,                        intent(in   )  :: Linearize   !< Flag to initialize linearization variables
-   integer(IntKi),                 intent(  out)  :: ErrStat     !< Error status of the operation
-   character(*),                   intent(  out)  :: ErrMsg      !< Error message if ErrStat /= ErrID_None
-
-   character(*), parameter :: RoutineName = 'ExtLd_InitVars'
-   INTEGER(IntKi)          :: ErrStat2
-   CHARACTER(ErrMsgLen)    :: ErrMsg2
-
-   integer(IntKi)          :: i
-
-   ErrStat = ErrID_None
-   ErrMsg = ""
-
-   ! Allocate space for variables (deallocate if already allocated)
-   if (associated(p%Vars)) deallocate(p%Vars)
-   allocate(p%Vars, stat=ErrStat2)
-   if (ErrStat2 /= 0) then
-      call SetErrStat(ErrID_Fatal, "Error allocating p%Vars", ErrStat, ErrMsg, RoutineName)
-      return
-   end if
-
-   ! Add pointers to vars to initialization output
-   InitOut%Vars => p%Vars
-
-   !----------------------------------------------------------------------------
-   ! Continuous State Variables
-   !----------------------------------------------------------------------------
-
-   !----------------------------------------------------------------------------
-   ! Input variables
-   !----------------------------------------------------------------------------
 
-   call MV_AddMeshVar(p%Vars%u, "TowerMotion", MotionFields, DatLoc(ExtLd_u_TowerMotion), Mesh=u%TowerMotion) 
-   call MV_AddMeshVar(p%Vars%u, "HubMotion", MotionFields, DatLoc(ExtLd_u_HubMotion), Mesh=u%HubMotion) 
-   call MV_AddMeshVar(p%Vars%u, "NacelleMotion", MotionFields, DatLoc(ExtLd_u_NacelleMotion), Mesh=u%NacelleMotion)
-   do i = 1, size(u%BladeRootMotion)
-      call MV_AddMeshVar(p%Vars%u, "BladeRootMotion"//IdxStr(i), MotionFields, DatLoc(ExtLd_u_BladeRootMotion, i), Mesh=u%BladeRootMotion(i)) 
-   end do
-   do i = 1, size(u%BladeRootMotion)
-      call MV_AddMeshVar(p%Vars%u, "BladeMotion"//IdxStr(i), MotionFields, DatLoc(ExtLd_u_BladeMotion, i), Mesh=u%BladeMotion(i)) 
-   end do
-   call MV_AddMeshVar(p%Vars%u, 'TowerLoadAD', LoadFields, DatLoc(ExtLd_u_TowerLoadAD), Mesh=u%TowerLoadAD)
-   do i = 1, size(u%BladeLoadAD)
-      call MV_AddMeshVar(p%Vars%u, 'BladeLoadAD'//IdxStr(i), LoadFields, DatLoc(ExtLd_u_BladeLoadAD, i), Mesh=u%BladeLoadAD(i))
-   end do
-
-   !----------------------------------------------------------------------------
-   ! Output variables
-   !----------------------------------------------------------------------------
-
-   call MV_AddMeshVar(p%Vars%y, 'TowerLoad', LoadFields, DatLoc(ExtLd_y_TowerLoad), Mesh=y%TowerLoad)
-   do i = 1, size(y%BladeLoad)
-      call MV_AddMeshVar(p%Vars%y, 'BladeLoad'//IdxStr(i), LoadFields, DatLoc(ExtLd_y_BladeLoad, i), Mesh=y%BladeLoad(i))
-   end do
+   write(*,*) 'Initializing y '
 
-   !----------------------------------------------------------------------------
-   ! Initialize Variables and Values
-   !----------------------------------------------------------------------------
-
-   CALL MV_InitVarsJac(p%Vars, m%Jac, Linearize, ErrStat2, ErrMsg2); if (Failed()) return
+      !............................................................................................
+      ! Define outputs here
+      !............................................................................................
+   call Init_y(y, u, m, p, errStat2, errMsg2) ! do this after input meshes have been initialized
+      call SetErrStat( ErrStat2, ErrMsg2, ErrStat, ErrMsg, RoutineName ) 
+      if (ErrStat >= AbortErrLev) return
+
+
+      !............................................................................................
+      ! Define initialization output here
+      !............................................................................................
+   call ExtLd_SetInitOut(p, InitOut, errStat2, errMsg2)
+      call SetErrStat( ErrStat2, ErrMsg2, ErrStat, ErrMsg, RoutineName ) 
+
 
 contains
    logical function Failed()

diff --git a/modules/extloads/src/ExtLoads_Registry.txt b/modules/extloads/src/ExtLoads_Registry.txt
@@ -35,10 +35,6 @@ typedef	^	                InitInputType	ReKi	TwrPos	{:}{:}	-	-	"X-Y-Z reference
 typedef	^	                InitInputType	R8Ki	TwrOrient	{:}{:}{:}	-	-	"DCM reference orientation of tower (3x3 x NumTowerNodes)"	-
 typedef ^                       InitInputType   ReKi    az_blend_mean  -     -       -       "Mean azimuth at which to blend the external and aerodyn loads" - 
 typedef ^                       InitInputType   ReKi    az_blend_delta -     -       -       "The width of the tanh function over which to blend the external and aerodyn loads" - 
-typedef ^                       InitInputType   ReKi    vel_mean        -       -       -       "Mean velocity at reference height" m/s
-typedef ^                       InitInputType   ReKi    wind_dir        -       -       -       "Wind direction"                    degrees
-typedef ^                       InitInputType   ReKi    z_ref           -       -       -       "Reference height for velocity profile"  m
-typedef ^                       InitInputType   ReKi    shear_exp       -       -       -       "Shear exponent" -
 typedef ^                       InitInputType   ReKi    BldChord       {:}{:}   -	-	"Blade chord  (NumBladeNodesMax x NumBlades)"	m
 typedef ^                       InitInputType   ReKi    BldRloc        {:}{:}   -	-	"Radial location of each node along the blade"	m
 typedef ^                       InitInputType   ReKi    TwrDia         {:}   -	-	"Tower diameter (NumTwrNodes)"	m
@@ -84,10 +80,6 @@ typedef	^	ParameterType	Logical	TwrAero	        -	.FALSE.	-	"Flag that tells thi
 typedef ^       ParameterType   IntKi   NumTwrNds      -       -       -       "Number of tower nodes"  -
 typedef ^       ParameterType   ReKi    az_blend_mean  -     -       -       "Mean azimuth at which to blend the external and aerodyn loads" - 
 typedef ^       ParameterType   ReKi    az_blend_delta -     -       -       "The width of the tanh function over which to blend the external and aerodyn loads" - 
-typedef ^       ParameterType   ReKi    vel_mean       -     -       -       "Mean velocity at reference height" m/s
-typedef ^       ParameterType   ReKi    wind_dir       -     -       -       "Wind direction"  m
-typedef ^       ParameterType   ReKi    z_ref          -     -       -       "Reference height for velocity profile" degrees
-typedef ^       ParameterType   ReKi    shear_exp      -     -       -       "Shear exponent" - 
 
 # ..... Inputs ....................................................................................................................
 # Define inputs that are contained on the mesh here:

diff --git a/modules/extloads/src/ExtLoads_Types.f90 b/modules/extloads/src/ExtLoads_Types.f90
@@ -52,10 +52,6 @@ MODULE ExtLoads_Types
     REAL(R8Ki) , DIMENSION(:,:,:), ALLOCATABLE  :: TwrOrient      !< DCM reference orientation of tower (3x3 x NumTowerNodes) [-]
     REAL(ReKi)  :: az_blend_mean = 0.0_ReKi      !< Mean azimuth at which to blend the external and aerodyn loads [-]
     REAL(ReKi)  :: az_blend_delta = 0.0_ReKi      !< The width of the tanh function over which to blend the external and aerodyn loads [-]
-    REAL(ReKi)  :: vel_mean = 0.0_ReKi      !< Mean velocity at reference height [m/s]
-    REAL(ReKi)  :: wind_dir = 0.0_ReKi      !< Wind direction [degrees]
-    REAL(ReKi)  :: z_ref = 0.0_ReKi      !< Reference height for velocity profile [m]
-    REAL(ReKi)  :: shear_exp = 0.0_ReKi      !< Shear exponent [-]
     REAL(ReKi) , DIMENSION(:,:), ALLOCATABLE  :: BldChord      !< Blade chord  (NumBladeNodesMax x NumBlades) [m]
     REAL(ReKi) , DIMENSION(:,:), ALLOCATABLE  :: BldRloc      !< Radial location of each node along the blade [m]
     REAL(ReKi) , DIMENSION(:), ALLOCATABLE  :: TwrDia      !< Tower diameter (NumTwrNodes) [m]
@@ -110,10 +106,6 @@ MODULE ExtLoads_Types
     INTEGER(IntKi)  :: NumTwrNds = 0_IntKi      !< Number of tower nodes [-]
     REAL(ReKi)  :: az_blend_mean = 0.0_ReKi      !< Mean azimuth at which to blend the external and aerodyn loads [-]
     REAL(ReKi)  :: az_blend_delta = 0.0_ReKi      !< The width of the tanh function over which to blend the external and aerodyn loads [-]
-    REAL(ReKi)  :: vel_mean = 0.0_ReKi      !< Mean velocity at reference height [m/s]
-    REAL(ReKi)  :: wind_dir = 0.0_ReKi      !< Wind direction [m]
-    REAL(ReKi)  :: z_ref = 0.0_ReKi      !< Reference height for velocity profile [degrees]
-    REAL(ReKi)  :: shear_exp = 0.0_ReKi      !< Shear exponent [-]
   END TYPE ExtLd_ParameterType
 ! =======================
 ! =========  ExtLd_InputType  =======
@@ -263,10 +255,6 @@ subroutine ExtLd_CopyInitInput(SrcInitInputData, DstInitInputData, CtrlCode, Err
    end if
    DstInitInputData%az_blend_mean = SrcInitInputData%az_blend_mean
    DstInitInputData%az_blend_delta = SrcInitInputData%az_blend_delta
-   DstInitInputData%vel_mean = SrcInitInputData%vel_mean
-   DstInitInputData%wind_dir = SrcInitInputData%wind_dir
-   DstInitInputData%z_ref = SrcInitInputData%z_ref
-   DstInitInputData%shear_exp = SrcInitInputData%shear_exp
    if (allocated(SrcInitInputData%BldChord)) then
       LB(1:2) = lbound(SrcInitInputData%BldChord, kind=B8Ki)
       UB(1:2) = ubound(SrcInitInputData%BldChord, kind=B8Ki)
@@ -381,10 +369,6 @@ subroutine ExtLd_PackInitInput(RF, Indata)
    call RegPackAlloc(RF, InData%TwrOrient)
    call RegPack(RF, InData%az_blend_mean)
    call RegPack(RF, InData%az_blend_delta)
-   call RegPack(RF, InData%vel_mean)
-   call RegPack(RF, InData%wind_dir)
-   call RegPack(RF, InData%z_ref)
-   call RegPack(RF, InData%shear_exp)
    call RegPackAlloc(RF, InData%BldChord)
    call RegPackAlloc(RF, InData%BldRloc)
    call RegPackAlloc(RF, InData%TwrDia)
@@ -417,10 +401,6 @@ subroutine ExtLd_UnPackInitInput(RF, OutData)
    call RegUnpackAlloc(RF, OutData%TwrOrient); if (RegCheckErr(RF, RoutineName)) return
    call RegUnpack(RF, OutData%az_blend_mean); if (RegCheckErr(RF, RoutineName)) return
    call RegUnpack(RF, OutData%az_blend_delta); if (RegCheckErr(RF, RoutineName)) return
-   call RegUnpack(RF, OutData%vel_mean); if (RegCheckErr(RF, RoutineName)) return
-   call RegUnpack(RF, OutData%wind_dir); if (RegCheckErr(RF, RoutineName)) return
-   call RegUnpack(RF, OutData%z_ref); if (RegCheckErr(RF, RoutineName)) return
-   call RegUnpack(RF, OutData%shear_exp); if (RegCheckErr(RF, RoutineName)) return
    call RegUnpackAlloc(RF, OutData%BldChord); if (RegCheckErr(RF, RoutineName)) return
    call RegUnpackAlloc(RF, OutData%BldRloc); if (RegCheckErr(RF, RoutineName)) return
    call RegUnpackAlloc(RF, OutData%TwrDia); if (RegCheckErr(RF, RoutineName)) return
@@ -794,10 +774,6 @@ subroutine ExtLd_CopyParam(SrcParamData, DstParamData, CtrlCode, ErrStat, ErrMsg
    DstParamData%NumTwrNds = SrcParamData%NumTwrNds
    DstParamData%az_blend_mean = SrcParamData%az_blend_mean
    DstParamData%az_blend_delta = SrcParamData%az_blend_delta
-   DstParamData%vel_mean = SrcParamData%vel_mean
-   DstParamData%wind_dir = SrcParamData%wind_dir
-   DstParamData%z_ref = SrcParamData%z_ref
-   DstParamData%shear_exp = SrcParamData%shear_exp
 end subroutine
 
 subroutine ExtLd_DestroyParam(ParamData, ErrStat, ErrMsg)
@@ -843,10 +819,6 @@ subroutine ExtLd_PackParam(RF, Indata)
    call RegPack(RF, InData%NumTwrNds)
    call RegPack(RF, InData%az_blend_mean)
    call RegPack(RF, InData%az_blend_delta)
-   call RegPack(RF, InData%vel_mean)
-   call RegPack(RF, InData%wind_dir)
-   call RegPack(RF, InData%z_ref)
-   call RegPack(RF, InData%shear_exp)
    if (RegCheckErr(RF, RoutineName)) return
 end subroutine
 
@@ -886,10 +858,6 @@ subroutine ExtLd_UnPackParam(RF, OutData)
    call RegUnpack(RF, OutData%NumTwrNds); if (RegCheckErr(RF, RoutineName)) return
    call RegUnpack(RF, OutData%az_blend_mean); if (RegCheckErr(RF, RoutineName)) return
    call RegUnpack(RF, OutData%az_blend_delta); if (RegCheckErr(RF, RoutineName)) return
-   call RegUnpack(RF, OutData%vel_mean); if (RegCheckErr(RF, RoutineName)) return
-   call RegUnpack(RF, OutData%wind_dir); if (RegCheckErr(RF, RoutineName)) return
-   call RegUnpack(RF, OutData%z_ref); if (RegCheckErr(RF, RoutineName)) return
-   call RegUnpack(RF, OutData%shear_exp); if (RegCheckErr(RF, RoutineName)) return
 end subroutine
 
 subroutine ExtLd_CopyInput(SrcInputData, DstInputData, CtrlCode, ErrStat, ErrMsg)

diff --git a/modules/map/src/mapapi.c b/modules/map/src/mapapi.c
@@ -1164,7 +1164,7 @@ MAP_EXTERNCALL void map_set_gravity(MAP_ParameterType_t* p_type, const double gr
 
 MAP_EXTERNCALL void map_set_input_text(MAP_InitInputType_t* init_type, const char* input_txt_line)
 {
-  strncpy(init_type->library_input_str, input_txt_line, 254);
+  MAP_STRNCPY(init_type->library_input_str, input_txt_line, 254);
   init_type->library_input_str[254] = '\0';
 }
 

diff --git a/modules/map/src/mapsys.h b/modules/map/src/mapsys.h
@@ -69,11 +69,13 @@
 #  define map_snprintf _snprintf
 #  define map_strcat(a,b,c) strcat_s(a,b,c)
 #  define MAP_STRCPY(a,b,c) strcpy_s(a,b,c)
+#  define MAP_STRNCPY(a,b,c) strncpy_s(a,c,b,c)
 #else
 #  include <stdbool.h>
 #  define map_snprintf snprintf
 #  define map_strcat(a,b,c) strncat(a,c,b)
 #  define MAP_STRCPY(a,b,c) strcpy(a,c)
+#  define MAP_STRNCPY(a,b,c) strncpy(a,b,c)
 #endif
 
 

diff --git a/modules/openfast-library/src/FAST_Library.f90 b/modules/openfast-library/src/FAST_Library.f90
@@ -529,7 +529,7 @@ end subroutine FAST_Restart
 
 !==================================================================================================================================
 subroutine FAST_ExtLoads_Init(iTurb_c, TMax, InputFileName_c, TurbIDforName, OutFileRoot_c, TurbPosn, AbortErrLev_c, dtDriver_c, dt_c, NumBl_c, &
-     az_blend_mean_c, az_blend_delta_c, vel_mean_c, wind_dir_c, z_ref_c, shear_exp_c, &
+     az_blend_mean_c, az_blend_delta_c, &
      ExtLd_Input_from_FAST, ExtLd_Parameter_from_FAST, ExtLd_Output_to_FAST, SC_DX_Input_from_FAST, SC_DX_Output_to_FAST, ErrStat_c, ErrMsg_c) BIND (C, NAME='FAST_ExtLoads_Init')
    IMPLICIT NONE
 #ifndef IMPLICIT_DLLEXPORT
@@ -545,10 +545,6 @@ subroutine FAST_ExtLoads_Init(iTurb_c, TMax, InputFileName_c, TurbIDforName, Out
    REAL(C_DOUBLE),         INTENT(IN   ) :: dtDriver_c
    REAL(C_DOUBLE),         INTENT(IN   ) :: az_blend_mean_c
    REAL(C_DOUBLE),         INTENT(IN   ) :: az_blend_delta_c
-   REAL(C_DOUBLE),         INTENT(IN   ) :: vel_mean_c
-   REAL(C_DOUBLE),         INTENT(IN   ) :: wind_dir_c
-   REAL(C_DOUBLE),         INTENT(IN   ) :: z_ref_c
-   REAL(C_DOUBLE),         INTENT(IN   ) :: shear_exp_c
    REAL(C_DOUBLE),         INTENT(  OUT) :: dt_c
    INTEGER(C_INT),         INTENT(  OUT) :: AbortErrLev_c
    INTEGER(C_INT),         INTENT(  OUT) :: NumBl_c
@@ -590,10 +586,6 @@ subroutine FAST_ExtLoads_Init(iTurb_c, TMax, InputFileName_c, TurbIDforName, Out
    ExternInitData%DTdriver = dtDriver_c
    ExternInitData%az_blend_mean = az_blend_mean_c
    ExternInitData%az_blend_delta = az_blend_delta_c
-   ExternInitData%vel_mean = vel_mean_c
-   ExternInitData%wind_dir = wind_dir_c
-   ExternInitData%z_ref = z_ref_c
-   ExternInitData%shear_exp = shear_exp_c
 
    CALL FAST_InitializeAll_T( t_initial, 1_IntKi, Turbine(iTurb), ErrStat, ErrMsg, InputFileName, ExternInitData )
 

diff --git a/modules/openfast-library/src/FAST_Library.h b/modules/openfast-library/src/FAST_Library.h
@@ -28,7 +28,7 @@ EXTERNAL_ROUTINE void FAST_ExtInfw_Init(int * iTurb, double *TMax, const char *I
                                         int *ErrStat, char *ErrMsg);
 
 EXTERNAL_ROUTINE void FAST_ExtLoads_Restart(int * iTurb, const char *CheckpointRootName, int *AbortErrLev, double * dt, int * NumBl, int * n_t_global, ExtLdDX_InputType_t* ExtLdDX_Input, ExtLdDX_ParameterType_t* ExtLdDX_Parameter, ExtLdDX_OutputType_t* ExtLdDX_Output, SC_DX_InputType_t* SC_DX_Input, SC_DX_OutputType_t* SC_DX_Output, int *ErrStat, char *ErrMsg);
-EXTERNAL_ROUTINE void FAST_ExtLoads_Init(int * iTurb, double *TMax, const char *InputFileName, int * TurbineID, char *OutFileRoot, float * TurbinePosition, int *AbortErrLev, double * dtDriver, double * dt, int * NumBl, double * az_blend_mean, double * az_blend_delta, double * vel_mean, double * wind_dir, double * z_ref, double * shear_exp, ExtLdDX_InputType_t* ExtLdDX_Input, ExtLdDX_ParameterType_t* ExtLdDX_Parameter, ExtLdDX_OutputType_t* ExtLdDX_Output, SC_DX_InputType_t* SC_DX_Input, SC_DX_OutputType_t* SC_DX_Output, int *ErrStat, char *ErrMsg);
+EXTERNAL_ROUTINE void FAST_ExtLoads_Init(int * iTurb, double *TMax, const char *InputFileName, int * TurbineID, char *OutFileRoot, float * TurbinePosition, int *AbortErrLev, double * dtDriver, double * dt, int * NumBl, double * az_blend_mean, double * az_blend_delta, ExtLdDX_InputType_t* ExtLdDX_Input, ExtLdDX_ParameterType_t* ExtLdDX_Parameter, ExtLdDX_OutputType_t* ExtLdDX_Output, SC_DX_InputType_t* SC_DX_Input, SC_DX_OutputType_t* SC_DX_Output, int *ErrStat, char *ErrMsg);
 EXTERNAL_ROUTINE void FAST_CFD_Solution0(int * iTurb, int *ErrStat, char *ErrMsg);
 EXTERNAL_ROUTINE void FAST_CFD_InitIOarrays_SubStep(int * iTurb, int *ErrStat, char *ErrMsg);
 EXTERNAL_ROUTINE void FAST_CFD_Prework(int * iTurb, int *ErrStat, char *ErrMsg);

diff --git a/modules/openfast-library/src/FAST_Registry.txt b/modules/openfast-library/src/FAST_Registry.txt
@@ -885,10 +885,6 @@ typedef ^   FAST_ExternInitType DbKi    DTdriver        -    -1     -   "Externa
 typedef ^   FAST_ExternInitType Logical TwrAero         -  .false.  -   "Is Tower aerodynamics enabled for ExtLoads module?"
 typedef ^   FAST_ExternInitType ReKi    az_blend_mean   -     -     -   "Mean azimuth at which to blend the external and aerodyn loads" - 
 typedef ^   FAST_ExternInitType ReKi    az_blend_delta  -     -     -   "Mean azimuth at which to blend the external and aerodyn loads" - 
-typedef ^   FAST_ExternInitType ReKi    vel_mean        -     -     -   "Mean velocity at reference height"     m/s
-typedef ^   FAST_ExternInitType ReKi    wind_dir        -     -     -   "Wind direction in compass angle"       degrees
-typedef ^   FAST_ExternInitType ReKi    z_ref           -     -     -   "Reference height for velocity profile" m
-typedef ^   FAST_ExternInitType ReKi    shear_exp       -     -     -   "Shear exponent"                        -
 
 # ..... FAST Turbine Data (one realization) .......................................................................................................
 typedef	^	FAST_TurbineType	IntKi	TurbID	-	1	-	"Turbine ID Number"	-

diff --git a/modules/openfast-library/src/FAST_Solver.f90 b/modules/openfast-library/src/FAST_Solver.f90
@@ -587,88 +587,6 @@ SUBROUTINE IfW_InputSolve( p_FAST, m_FAST, u_IfW, p_IfW, u_AD, OtherSt_AD, y_ED,
 
 END SUBROUTINE IfW_InputSolve
 
-!----------------------------------------------------------------------------------------------------------------------------------
-SUBROUTINE ExtLd_UpdateFlowField( p_FAST, u_AD, m_AD, ExtLd, ErrStat, ErrMsg )
-   type(FAST_ParameterType),  intent(in)     :: p_FAST     !< FAST parameter data
-   type(AD_InputType),        intent(in   )  :: u_AD       !< The inputs to AeroDyn
-   type(AD_MiscvarType),      intent(in   )  :: m_AD       !< AeroDyn MiscVars
-   type(ExtLoads_Data),       intent(in   )  :: ExtLd      !< ExtLoads data
-   integer(IntKi)                            :: ErrStat    !< Error status of the operation
-   character(*)                              :: ErrMsg     !< Error message if ErrStat /= ErrID_None
-
-   !local variables
-   real(ReKi)                                :: z          !< Local 'z' coordinate
-   real(ReKi)                                :: pi         !< Our favorite number
-   integer(IntKi)                            :: j,k        !< Local counter variables
-   integer(IntKi)                            :: NumBl      !< Number of blades
-   integer(IntKi)                            :: iPt        !< Point in the flow field array.  Make sure this order corresponds to what AD15 uses!!!!!!
-
-
-   ErrStat = ErrID_None
-   ErrMsg = ''
-
-   NumBl  = size(u_AD%rotors(1)%BladeMotion)
-
-   iPt=1
-
-   ! Hub
-   if (u_AD%rotors(1)%HubMotion%committed) then
-      ! height
-      z = u_AD%rotors(1)%HubMotion%Position(3,1) + u_AD%rotors(1)%HubMotion%TranslationDisp(3,1)
-      call SetWind(iPt,z);    iPt = iPt + 1
-   endif
-
-   ! Blades
-   do k=1,NumBl
-      do j=1,u_AD%rotors(1)%BladeMotion(k)%nNodes
-         ! height
-         z = u_AD%rotors(1)%BladeMotion(k)%Position(3,j) + u_AD%rotors(1)%BladeMotion(k)%TranslationDisp(3,j)
-         call SetWind(iPt,z);    iPt = iPt + 1
-      end do
-   end do
-
-   !FIXME this should probably be checked against a parameter instead of digging into miscvars of AD
-   ! Tower
-   if ( allocated(m_AD%Inflow(1)%RotInflow(1)%Tower%InflowVel) ) then
-      do j=1,u_AD%rotors(1)%TowerMotion%nNodes
-         ! height
-         z = u_AD%rotors(1)%TowerMotion%Position(3,j) + u_AD%rotors(1)%TowerMotion%TranslationDisp(3,j)
-         call SetWind(iPt,z);    iPt = iPt + 1
-      end do
-   end if
-
-   ! Nacelle
-   if (u_AD%rotors(1)%NacelleMotion%committed) then
-      ! height
-      z = u_AD%rotors(1)%NacelleMotion%Position(3,1) + u_AD%rotors(1)%NacelleMotion%TranslationDisp(3,1)
-      call SetWind(iPt,z);    iPt = iPt + 1
-   endif
-
-   ! Tailfin
-   if (u_AD%rotors(1)%TFinMotion%committed) then
-      ! height
-      z = u_AD%rotors(1)%TFinMotion%Position(3,1) + u_AD%rotors(1)%TFinMotion%TranslationDisp(3,1)
-      call SetWind(iPt,z);    iPt = iPt + 1
-   endif
-
-contains
-   function mean_vel(z_h)
-      real(ReKi) :: z_h       !< height
-      real(ReKi) :: mean_vel  !< mean velocity at height z_h
-      mean_vel = ExtLd%p%vel_mean * ( (z_h/ExtLd%p%z_ref) ** ExtLd%p%shear_exp)
-   end function
-   subroutine SetWind(i,z_h)
-      integer(IntKi) :: i     ! point num
-      real(ReKi)     :: z_h   !< height
-      ExtLd%m%FlowField%Points%Vel(1,iPt) = -mean_vel(z_h) * sin(ExtLd%p%wind_dir * pi / 180.0)
-      ExtLd%m%FlowField%Points%Vel(2,iPt) = -mean_vel(z_h) * cos(ExtLd%p%wind_dir * pi / 180.0)
-      ExtLd%m%FlowField%Points%Vel(3,iPt) = 0.0
-   end subroutine
-END SUBROUTINE ExtLd_UpdateFlowField
-
-
-
-
 !----------------------------------------------------------------------------------------------------------------------------------
 !> This routine sets all the AeroDyn inputs, except for the wind inflow values.
 SUBROUTINE AD_InputSolve_NoIfW( p_FAST, u_AD, y_SrvD, y_ED, y_SED, BD, MeshMapData, ErrStat, ErrMsg )
@@ -961,20 +879,6 @@ SUBROUTINE SrvD_InputSolve( p_FAST, m_FAST, u_SrvD, y_ED, y_SED, y_IfW, y_ExtInf
       if (allocated(u_SrvD%MsrPositionsY))  u_SrvD%MsrPositionsY = 0.0
       if (allocated(u_SrvD%MsrPositionsz))  u_SrvD%MsrPositionsz = 0.0
 
-   ELSE IF (p_FAST%CompAero == Module_ExtLd ) THEN
-
-      pi = acos(-1.0)
-      z = y_ED%HubPtMotion%Position(3,1)
-      mean_vel = p_ExtLd%vel_mean * ( (z/p_ExtLd%z_ref) ** p_ExtLd%shear_exp)
-      u = -mean_vel * sin(p_ExtLd%wind_dir * pi / 180.0)
-      v = -mean_vel * cos(p_ExtLd%wind_dir * pi / 180.0)
-      u_SrvD%HorWindV = mean_vel
-      u_SrvD%WindDir = atan2( v, u)
-      if (allocated(u_SrvD%LidSpeed     ))  u_SrvD%LidSpeed      = 0.0
-      if (allocated(u_SrvD%MsrPositionsX))  u_SrvD%MsrPositionsX = 0.0
-      if (allocated(u_SrvD%MsrPositionsY))  u_SrvD%MsrPositionsY = 0.0
-      if (allocated(u_SrvD%MsrPositionsz))  u_SrvD%MsrPositionsz = 0.0
-
    ELSE  ! No wind inflow
 
       u_SrvD%WindDir  = 0.0
@@ -5199,15 +5103,9 @@ SUBROUTINE CalcOutputs_And_SolveForInputs( n_t_global, this_time, this_state, ca
       CALL AD_InputSolve_NoIfW( p_FAST, AD%Input(1), SrvD%y, ED%y, SED%y, BD, MeshMapData, ErrStat2, ErrMsg2 )
       CALL SetErrStat( ErrStat2, ErrMsg2, ErrStat, ErrMsg, RoutineName )
 
-      CALL ExtLd_UpdateFlowField( p_FAST, AD%Input(1), AD%m, ExtLd, ErrStat2, ErrMsg2 )
-      CALL SetErrStat( ErrStat2, ErrMsg2, ErrStat, ErrMsg, RoutineName )
-
       CALL ExtLd_InputSolve_NoIfW( p_FAST, ExtLd%u, ExtLd%p, ED%y, BD, MeshMapData, ErrStat2, ErrMsg2 )
       CALL SetErrStat( ErrStat2, ErrMsg2, ErrStat, ErrMsg, RoutineName )
 
-      IF ( p_FAST%CompInflow == MODULE_IfW .OR. p_FAST%CompInflow == MODULE_ExtInfw ) THEN
-         CALL SetErrStat(ErrID_Fatal,'p_FAST%CompInflow option not setup to work with ExtLoads module.',ErrStat,ErrMsg,RoutineName)
-      ENDIF
    END IF
 
    IF ( p_FAST%CompInflow == Module_IfW ) THEN
@@ -5632,14 +5530,8 @@ SUBROUTINE SolveOption2c_Inp2AD_SrvD(this_time, this_state, p_FAST, m_FAST, ED,
       !      CALL SetErrStat( ErrStat2, ErrMsg2, ErrStat, ErrMsg, RoutineName ) 
       !   CALL ExtInfw_SetWriteOutput(OpFM)
    END IF
-
-   IF (p_FAST%CompAero == Module_ExtLd ) THEN
-      ! The outputs from ExternalInflow need to be transfered to the FlowField for use by AeroDyn, this seems like the right place
-      call ExtLd_UpdateFlowField( p_FAST, AD%Input(1), AD%m, ExtLd, ErrStat2, ErrMsg2 )
-         call SetErrStat( ErrStat2, ErrMsg2, ErrStat, ErrMsg, RoutineName ) 
-   END IF
-
-
+
+
    IF ( p_FAST%CompServo == Module_SrvD  ) THEN
       CALL SrvD_InputSolve( p_FAST, m_FAST, SrvD%Input(1), ED%y, SED%y, IfW%y, ExtInfw%y, ExtLd%p, BD%y, SD%y, MeshMapData, ErrStat2, ErrMsg2 )
          CALL SetErrStat( ErrStat2, ErrMsg2, ErrStat, ErrMsg, RoutineName )
@@ -5716,13 +5608,6 @@ SUBROUTINE SolveOption2(this_time, this_state, p_FAST, m_FAST, ED, SED, BD, AD,
 
    ELSE IF (p_FAST%CompAero == Module_ExtLd ) THEN
 
-      IF ( p_FAST%CompInflow == MODULE_IfW .OR. p_FAST%CompInflow == MODULE_ExtInfw ) THEN
-         CALL SetErrStat(ErrID_Fatal,'p_FAST%CompInflow option not setup to work with ExtLoads module.',ErrStat,ErrMsg,RoutineName)
-      ENDIF
-
-      CALL ExtLd_UpdateFlowField( p_FAST, AD%Input(1), AD%m, ExtLd, ErrStat2, ErrMsg2 )
-      CALL SetErrStat( ErrStat2, ErrMsg2, ErrStat, ErrMsg, RoutineName )
-
       CALL AD_CalcOutput( this_time, AD%Input(1), AD%p, AD%x(this_state), AD%xd(this_state), AD%z(this_state), &
            AD%OtherSt(this_state), AD%y, AD%m, ErrStat2, ErrMsg2, WriteThisStep )
       CALL SetErrStat( ErrStat2, ErrMsg2, ErrStat, ErrMsg, RoutineName )

diff --git a/modules/openfast-library/src/FAST_Subs.f90 b/modules/openfast-library/src/FAST_Subs.f90
@@ -1954,6 +1954,8 @@ SUBROUTINE ValidateInputData(p, m_FAST, ErrStat, ErrMsg)
    ! No method at the moment for getting disk average velocity from ExtInfw
    if (p%CompAero == Module_ADsk .and. p%CompInflow == MODULE_ExtInfw) call SetErrStat( ErrID_Fatal, 'AeroDisk cannot be used with ExtInflow or the library interface', ErrStat, ErrMsg, RoutineName ) 
 
+   if ((p%CompAero == Module_ExtLd) .and. (p%CompInflow /= Module_IfW) ) call SetErrStat(ErrID_Fatal, 'Inflow module must be used when ExtLoads is used. Change CompAero or CompInflow in the OpenFAST input file.', ErrStat, ErrMsg, RoutineName)
+
    IF (p%CompAero == Module_ADsk .and. p%MHK /= MHK_None) CALL SetErrStat( ErrID_Fatal, 'AeroDisk cannot be used with an MHK turbine. Change CompAero or MHK in the FAST input file.', ErrStat, ErrMsg, RoutineName )
 
    IF (p%MHK /= MHK_None .and. p%MHK /= MHK_FixedBottom .and. p%MHK /= MHK_Floating) CALL SetErrStat( ErrID_Fatal, 'MHK switch is invalid. Set MHK to 0, 1, or 2 in the FAST input file.', ErrStat, ErrMsg, RoutineName )
@@ -4449,18 +4451,14 @@ SUBROUTINE ExtLd_SetInitInput(InitInData_ExtLd, InitOutData_ED, y_ED, InitOutDat
 
    end if
 
-   InitInData_ExtLd%HubPos             = y_ED%HubPtMotion%Position(:,1)
-   InitInData_ExtLd%HubOrient          = y_ED%HubPtMotion%RefOrientation(:,:,1)
+   InitInData_ExtLd%HubPos         = y_ED%HubPtMotion%Position(:,1)
+   InitInData_ExtLd%HubOrient      = y_ED%HubPtMotion%RefOrientation(:,:,1)
 
-   InitInData_ExtLd%NacellePos         = y_ED%NacelleMotion%Position(:,1)
-   InitInData_ExtLd%NacelleOrient      = y_ED%NacelleMotion%RefOrientation(:,:,1)
+   InitInData_ExtLd%NacellePos     = y_ED%NacelleMotion%Position(:,1)
+   InitInData_ExtLd%NacelleOrient  = y_ED%NacelleMotion%RefOrientation(:,:,1)
 
-   InitInData_ExtLd%az_blend_mean = ExternInitData%az_blend_mean
+   InitInData_ExtLd%az_blend_mean  = ExternInitData%az_blend_mean
    InitInData_ExtLd%az_blend_delta = ExternInitData%az_blend_delta
-   InitInData_ExtLd%vel_mean = ExternInitData%vel_mean
-   InitInData_ExtLd%wind_dir = ExternInitData%wind_dir
-   InitInData_ExtLd%z_ref = ExternInitData%z_ref
-   InitInData_ExtLd%shear_exp = ExternInitData%shear_exp
 
    !Interpolate chord from AeroDyn to nodes of the ExtLoads module
    IF (.NOT. ALLOCATED( InitInData_ExtLd%BldChord) ) THEN

diff --git a/modules/openfast-library/src/FAST_Types.f90 b/modules/openfast-library/src/FAST_Types.f90
@@ -895,10 +895,6 @@ MODULE FAST_Types
     LOGICAL  :: TwrAero = .false.      !< Is Tower aerodynamics enabled for ExtLoads module? [-]
     REAL(ReKi)  :: az_blend_mean = 0.0_ReKi      !< Mean azimuth at which to blend the external and aerodyn loads [-]
     REAL(ReKi)  :: az_blend_delta = 0.0_ReKi      !< Mean azimuth at which to blend the external and aerodyn loads [-]
-    REAL(ReKi)  :: vel_mean = 0.0_ReKi      !< Mean velocity at reference height [m/s]
-    REAL(ReKi)  :: wind_dir = 0.0_ReKi      !< Wind direction in compass angle [degrees]
-    REAL(ReKi)  :: z_ref = 0.0_ReKi      !< Reference height for velocity profile [m]
-    REAL(ReKi)  :: shear_exp = 0.0_ReKi      !< Shear exponent [-]
   END TYPE FAST_ExternInitType
 ! =======================
 ! =========  FAST_TurbineType  =======
@@ -16556,10 +16552,6 @@ subroutine FAST_CopyExternInitType(SrcExternInitTypeData, DstExternInitTypeData,
    DstExternInitTypeData%TwrAero = SrcExternInitTypeData%TwrAero
    DstExternInitTypeData%az_blend_mean = SrcExternInitTypeData%az_blend_mean
    DstExternInitTypeData%az_blend_delta = SrcExternInitTypeData%az_blend_delta
-   DstExternInitTypeData%vel_mean = SrcExternInitTypeData%vel_mean
-   DstExternInitTypeData%wind_dir = SrcExternInitTypeData%wind_dir
-   DstExternInitTypeData%z_ref = SrcExternInitTypeData%z_ref
-   DstExternInitTypeData%shear_exp = SrcExternInitTypeData%shear_exp
 end subroutine
 
 subroutine FAST_DestroyExternInitType(ExternInitTypeData, ErrStat, ErrMsg)
@@ -16606,10 +16598,6 @@ subroutine FAST_PackExternInitType(RF, Indata)
    call RegPack(RF, InData%TwrAero)
    call RegPack(RF, InData%az_blend_mean)
    call RegPack(RF, InData%az_blend_delta)
-   call RegPack(RF, InData%vel_mean)
-   call RegPack(RF, InData%wind_dir)
-   call RegPack(RF, InData%z_ref)
-   call RegPack(RF, InData%shear_exp)
    if (RegCheckErr(RF, RoutineName)) return
 end subroutine
 
@@ -16645,10 +16633,6 @@ subroutine FAST_UnPackExternInitType(RF, OutData)
    call RegUnpack(RF, OutData%TwrAero); if (RegCheckErr(RF, RoutineName)) return
    call RegUnpack(RF, OutData%az_blend_mean); if (RegCheckErr(RF, RoutineName)) return
    call RegUnpack(RF, OutData%az_blend_delta); if (RegCheckErr(RF, RoutineName)) return
-   call RegUnpack(RF, OutData%vel_mean); if (RegCheckErr(RF, RoutineName)) return
-   call RegUnpack(RF, OutData%wind_dir); if (RegCheckErr(RF, RoutineName)) return
-   call RegUnpack(RF, OutData%z_ref); if (RegCheckErr(RF, RoutineName)) return
-   call RegUnpack(RF, OutData%shear_exp); if (RegCheckErr(RF, RoutineName)) return
 end subroutine
 
 subroutine FAST_CopyTurbineType(SrcTurbineTypeData, DstTurbineTypeData, CtrlCode, ErrStat, ErrMsg)

diff --git a/modules/simple-elastodyn/src/SED_Registry.txt b/modules/simple-elastodyn/src/SED_Registry.txt
@@ -57,7 +57,7 @@ typedef  ^        InitOutputType    CHARACTER(ChanLen)   WriteOutputUnt   {:} -
 typedef  ^        InitOutputType    ProgDesc             Ver               -  - -   "This module's name, version, and date"   -
 typedef  ^        InitOutputType    IntKi                NumBl             -  - -   "Number of blades on the turbine"   -
 typedef  ^        InitOutputType    ReKi                 BlPitch          {:} - -   "Initial blade pitch angles"   radians
-typedef  ^        InitOutputType    ReKi                 BladeLength       -  - -   "Blade length (for AeroDyn)"   meters
+typedef  ^        InitOutputType    ReKi                 BladeLength       -  - -   "Blade length (for AeroDsk)"   meters
 typedef  ^        InitOutputType    ReKi                 TowerHt           -  - -   "Tower Height"   meters
 typedef  ^        InitOutputType    ReKi                 HubHt             -  - -   "Height of the hub"   meters
 typedef  ^        InitOutputType    ReKi                 PlatformPos      {6} - -   "Initial platform position (6 DOFs)"
@@ -68,7 +68,7 @@ typedef  ^        InitOutputType    ModVarsType          Vars              -  -
 
 # ..... Inputs ....................................................................................................................
 # inputs on meshes:
-typedef  ^        InputType         MeshType             HubPtLoad         -  - -   "AeroDisk maps load to hub" -
+typedef  ^        InputType         MeshType             HubPtLoad         -  - -   "AeroDyn/AeroDisk maps load to hub" -
 # inputs not on meshes:
 typedef  ^        InputType         ReKi                 HSSBrTrqC         -  - -   "Commanded HSS brake torque"     N-m
 typedef  ^        InputType         ReKi                 GenTrq            -  - -   "Electrical generator torque"    N-m
@@ -79,11 +79,11 @@ typedef  ^        InputType         ReKi                 YawRateCom        -  -
 
 # ..... Outputs ...................................................................................................................
 # outputs on meshes:
-typedef  ^        OutputType        MeshType             BladeRootMotion  {:} - -   "For AeroDyn/BeamDyn: motions at the blade roots" -
-typedef  ^        OutputType        MeshType             HubPtMotion       -  - -   "For AeroDyn and Lidar(InflowWind): motions of the hub" -
-typedef  ^        OutputType        MeshType             NacelleMotion     -  - -   "For AeroDyn14 & ServoDyn/TMD: motions of the nacelle." -
-typedef  ^        OutputType        MeshType             TowerLn2Mesh      -  - -   "Tower line2 mesh with positions/orientations/velocities/accelerations"   -
-typedef  ^        OutputType        MeshType             PlatformPtMesh    -  - -   "Platform reference point positions/orientations/velocities/accelerations"   -
+typedef  ^        OutputType        MeshType             BladeRootMotion  {:} - -   "For AeroDyn: motions at the blade roots" -
+typedef  ^        OutputType        MeshType             HubPtMotion       -  - -   "For AeroDyn/AeroDisk: motions of the hub" -
+typedef  ^        OutputType        MeshType             NacelleMotion     -  - -   "For AeroDyn: for aero effects in AD (aero nacelle loads ignored)" -
+typedef  ^        OutputType        MeshType             TowerLn2Mesh      -  - -   "Tower line2 mesh for visualization / Aero tower effects"   -
+typedef  ^        OutputType        MeshType             PlatformPtMesh    -  - -   "Platform reference point for visualization"   -
 #TODO: any mesh for visualization of blades/rotor disk?
 # outputs not on meshes:
 typedef  ^        OutputType        ReKi                 LSSTipPxa         -  - 2pi "Rotor azimuth angle (position)"   radians
@@ -104,7 +104,7 @@ typedef  ^       ContinuousStateType   R8Ki              QT               {:} -
 typedef  ^       ContinuousStateType   ^                 QDT              {:} - -   "Current estimate of QD (velocity matrix) for each degree of freedom"
 
 # Define discrete (nondifferentiable) states here:
-typedef  ^       DiscreteStateType     ReKi             DummyDiscreteState -  - -   "" -
+typedef  ^       DiscreteStateType     ReKi              DummyDiscreteState - - -   "" -
 
 # Define constraint states here:
 typedef  ^       ConstraintStateType   ReKi              DummyConstrState  -  - -   "" -
@@ -116,7 +116,7 @@ typedef  ^        OtherStateType       IntKi             IC         {SED_NMX} -
 typedef  ^        OtherStateType       ReKi              HSSBrTrq          -  - -   "HSSBrTrq from update states; a hack to get this working with a single integrator"   -
 typedef  ^        OtherStateType       ReKi              HSSBrTrqC         -  - -   "Commanded HSS brake torque (adjusted for sign)"   N-m
 typedef  ^        OtherStateType       IntKi             SgnPrvLSTQ        -  - -   "The sign of the low-speed shaft torque from the previous call to RtHS(). NOTE: The low-speed shaft torque is assumed to be positive at the beginning of the run!"   -
-typedef  ^        OtherStateType       IntKi             SgnLSTQ    {SED_NMX} - -   "history of sign of LSTQ"
+typedef  ^        OtherStateType       IntKi             SgnLSTQ    {SED_NMX} - -   "history of sign of LSTQ (for HSS brake)"
 
 
 
@@ -150,10 +150,8 @@ typedef  ^        ParameterType        OutParmType       OutParam         {:} -
 
 # ..... Misc/Optimization variables.................................................................................................
 typedef  ^        MiscVarType          ReKi              AllOuts          {:} - -   "Array of all outputs"                             -
-#typedef  ^        MiscVarType          MeshMapType       mapPtf2Twr        -  - -   "Mesh mapping from Ptfm to Tower line" -
-#typedef  ^        MiscVarType          MeshMapType       mapTwr2Nac        -  - -   "Mesh mapping from Tower to Nacelle" -
-typedef  ^        MiscVarType          MeshMapType       mapNac2Hub        -  - -   "Mesh mapping from Nacelle to Hub" -
-typedef  ^        MiscVarType          MeshMapType       mapHub2Root      {:} - -   "Mesh mapping from Hub to BladeRootMotion" -
+typedef  ^        MiscVarType          MeshMapType       mapNac2Hub        -  - -   "Mesh mapping from Nacelle to Hub (hub rotation overwritten in calc)" -
+typedef  ^        MiscVarType          MeshMapType       mapHub2Root      {:} - -   "Mesh mapping from Hub to BladeRootMotion (blade pitch overwritten in calc)" -
 typedef  ^        MiscVarType          R8Ki              QD2T             {:} - -   "Current estimate of first derivative of QD (acceleration matrix) for each degree of freedom"
 typedef  ^        MiscVarType          ReKi              HubPt_X          {3} - -   "X orientation of hub calculated in CalcOutput -- saving so we don't recalculate a bunch of things to get it in UpdateStates"
 typedef  ^        MiscVarType          ModJacType	            Jac        -  - -   "Values corresponding to module variables"

diff --git a/modules/simple-elastodyn/src/SED_Types.f90 b/modules/simple-elastodyn/src/SED_Types.f90
@@ -78,7 +78,7 @@ MODULE SED_Types
     TYPE(ProgDesc)  :: Ver      !< This module's name, version, and date [-]
     INTEGER(IntKi)  :: NumBl = 0_IntKi      !< Number of blades on the turbine [-]
     REAL(ReKi) , DIMENSION(:), ALLOCATABLE  :: BlPitch      !< Initial blade pitch angles [radians]
-    REAL(ReKi)  :: BladeLength = 0.0_ReKi      !< Blade length (for AeroDyn) [meters]
+    REAL(ReKi)  :: BladeLength = 0.0_ReKi      !< Blade length (for AeroDsk) [meters]
     REAL(ReKi)  :: TowerHt = 0.0_ReKi      !< Tower Height [meters]
     REAL(ReKi)  :: HubHt = 0.0_ReKi      !< Height of the hub [meters]
     REAL(ReKi) , DIMENSION(1:6)  :: PlatformPos = 0.0_ReKi      !< Initial platform position (6 DOFs) [-]
@@ -90,7 +90,7 @@ MODULE SED_Types
 ! =======================
 ! =========  SED_InputType  =======
   TYPE, PUBLIC :: SED_InputType
-    TYPE(MeshType)  :: HubPtLoad      !< AeroDisk maps load to hub [-]
+    TYPE(MeshType)  :: HubPtLoad      !< AeroDyn/AeroDisk maps load to hub [-]
     REAL(ReKi)  :: HSSBrTrqC = 0.0_ReKi      !< Commanded HSS brake torque [N-m]
     REAL(ReKi)  :: GenTrq = 0.0_ReKi      !< Electrical generator torque [N-m]
     REAL(ReKi) , DIMENSION(:), ALLOCATABLE  :: BlPitchCom      !< Commanded blade pitch angles [radians]
@@ -100,11 +100,11 @@ MODULE SED_Types
 ! =======================
 ! =========  SED_OutputType  =======
   TYPE, PUBLIC :: SED_OutputType
-    TYPE(MeshType) , DIMENSION(:), ALLOCATABLE  :: BladeRootMotion      !< For AeroDyn/BeamDyn: motions at the blade roots [-]
-    TYPE(MeshType)  :: HubPtMotion      !< For AeroDyn and Lidar(InflowWind): motions of the hub [-]
-    TYPE(MeshType)  :: NacelleMotion      !< For AeroDyn14 & ServoDyn/TMD: motions of the nacelle. [-]
-    TYPE(MeshType)  :: TowerLn2Mesh      !< Tower line2 mesh with positions/orientations/velocities/accelerations [-]
-    TYPE(MeshType)  :: PlatformPtMesh      !< Platform reference point positions/orientations/velocities/accelerations [-]
+    TYPE(MeshType) , DIMENSION(:), ALLOCATABLE  :: BladeRootMotion      !< For AeroDyn: motions at the blade roots [-]
+    TYPE(MeshType)  :: HubPtMotion      !< For AeroDyn/AeroDisk: motions of the hub [-]
+    TYPE(MeshType)  :: NacelleMotion      !< For AeroDyn: for aero effects in AD (aero nacelle loads ignored) [-]
+    TYPE(MeshType)  :: TowerLn2Mesh      !< Tower line2 mesh for visualization / Aero tower effects [-]
+    TYPE(MeshType)  :: PlatformPtMesh      !< Platform reference point for visualization [-]
     REAL(ReKi)  :: LSSTipPxa = 0.0_ReKi      !< Rotor azimuth angle (position) [radians]
     REAL(ReKi)  :: RotSpeed = 0.0_ReKi      !< Rotor azimuth angular speed [rad/s]
     REAL(ReKi)  :: RotPwr = 0.0_ReKi      !< Rotor power [W]
@@ -140,7 +140,7 @@ MODULE SED_Types
     REAL(ReKi)  :: HSSBrTrq = 0.0_ReKi      !< HSSBrTrq from update states; a hack to get this working with a single integrator [-]
     REAL(ReKi)  :: HSSBrTrqC = 0.0_ReKi      !< Commanded HSS brake torque (adjusted for sign) [N-m]
     INTEGER(IntKi)  :: SgnPrvLSTQ = 0_IntKi      !< The sign of the low-speed shaft torque from the previous call to RtHS(). NOTE: The low-speed shaft torque is assumed to be positive at the beginning of the run! [-]
-    INTEGER(IntKi) , DIMENSION(1:SED_NMX)  :: SgnLSTQ = 0_IntKi      !< history of sign of LSTQ [-]
+    INTEGER(IntKi) , DIMENSION(1:SED_NMX)  :: SgnLSTQ = 0_IntKi      !< history of sign of LSTQ (for HSS brake) [-]
   END TYPE SED_OtherStateType
 ! =======================
 ! =========  SED_ParameterType  =======
@@ -175,8 +175,8 @@ MODULE SED_Types
 ! =========  SED_MiscVarType  =======
   TYPE, PUBLIC :: SED_MiscVarType
     REAL(ReKi) , DIMENSION(:), ALLOCATABLE  :: AllOuts      !< Array of all outputs [-]
-    TYPE(MeshMapType)  :: mapNac2Hub      !< Mesh mapping from Nacelle to Hub [-]
-    TYPE(MeshMapType) , DIMENSION(:), ALLOCATABLE  :: mapHub2Root      !< Mesh mapping from Hub to BladeRootMotion [-]
+    TYPE(MeshMapType)  :: mapNac2Hub      !< Mesh mapping from Nacelle to Hub (hub rotation overwritten in calc) [-]
+    TYPE(MeshMapType) , DIMENSION(:), ALLOCATABLE  :: mapHub2Root      !< Mesh mapping from Hub to BladeRootMotion (blade pitch overwritten in calc) [-]
     REAL(R8Ki) , DIMENSION(:), ALLOCATABLE  :: QD2T      !< Current estimate of first derivative of QD (acceleration matrix) for each degree of freedom [-]
     REAL(ReKi) , DIMENSION(1:3)  :: HubPt_X = 0.0_ReKi      !< X orientation of hub calculated in CalcOutput -- saving so we don't recalculate a bunch of things to get it in UpdateStates [-]
     TYPE(ModJacType)  :: Jac      !< Values corresponding to module variables [-]

diff --git a/openfast_python/openfast_io/FAST_writer.py b/openfast_python/openfast_io/FAST_writer.py
@@ -215,8 +215,8 @@ def write_MainInput(self):
         f.write('{:<22} {:<11} {:}'.format(self.fst_vt['Fst']['UJacSclFact'], 'UJacSclFact', '- Scaling factor used in Jacobians (-)\n'))
         f.write('---------------------- FEATURE SWITCHES AND FLAGS ------------------------------\n')
         f.write('{:<22} {:<11} {:}'.format(self.fst_vt['Fst']['CompElast'], 'CompElast', '- Compute structural dynamics (switch) {1=ElastoDyn; 2=ElastoDyn + BeamDyn for blades}\n'))
-        f.write('{:<22} {:<11} {:}'.format(self.fst_vt['Fst']['CompInflow'], 'CompInflow', '- Compute inflow wind velocities (switch) {0=still air; 1=InflowWind; 2=external from OpenFOAM}\n'))
-        f.write('{:<22} {:<11} {:}'.format(self.fst_vt['Fst']['CompAero'], 'CompAero', '- Compute aerodynamic loads (switch) {0=None; 1=AeroDyn v14; 2=AeroDyn v15}\n'))
+        f.write('{:<22} {:<11} {:}'.format(self.fst_vt['Fst']['CompInflow'], 'CompInflow', '- Compute inflow wind velocities (switch) {0=still air; 1=InflowWind; 2=external from ExtInflow}\n'))
+        f.write('{:<22} {:<11} {:}'.format(self.fst_vt['Fst']['CompAero'], 'CompAero', '- Compute aerodynamic loads (switch) {0=None; 1=AeroDisk; 2=AeroDyn v15; 3=ExtLoads}\n'))
         f.write('{:<22} {:<11} {:}'.format(self.fst_vt['Fst']['CompServo'], 'CompServo', '- Compute control and electrical-drive dynamics (switch) {0=None; 1=ServoDyn}\n'))
         f.write('{:<22} {:<11} {:}'.format(self.fst_vt['Fst']['CompHydro'], 'CompHydro', '- Compute hydrodynamic loads (switch) {0=None; 1=HydroDyn}\n'))
         f.write('{:<22} {:<11} {:}'.format(self.fst_vt['Fst']['CompSub'], 'CompSub', '- Compute sub-structural dynamics (switch) {0=None; 1=SubDyn; 2=External Platform MCKF}\n'))