Add OrcaFlex, ExtInfw, ExtLd to module system. Fix spelling in InitVa…

…rs functions

modules/aerodyn/src/AeroDyn.f90

@@ -5592,7 +5592,7 @@ subroutine AD_InitVars(RotNum, u, p, x, z, OtherState, y, m, InitOut, InputFileD
       return
    end if
 
-   ! Add pointers to vars to inititialization output
+   ! Add pointers to vars to initialization output
    InitOut%Vars => p%Vars
 
    ! Create rotor label

modules/beamdyn/src/BeamDyn.f90

@@ -5834,7 +5834,7 @@ subroutine BD_InitVars(u, p, x, y, m, InitOut, Linearize, ErrStat, ErrMsg)
       return
    end if
 
-   ! Add pointers to vars to inititialization output
+   ! Add pointers to vars to initialization output
    InitOut%Vars => p%Vars
 
    !----------------------------------------------------------------------------

modules/externalinflow/src/ExternalInflow.f90

@@ -268,13 +268,20 @@ SUBROUTINE Init_ExtInfw( InitInp, p_FAST, AirDens, u_AD, initOut_AD, y_AD, ExtIn
       !............................................................................................
    CALL AllocAry( InitOut%WriteOutputHdr, 3, 'WriteOutputHdr', ErrStat2, ErrMsg2 ); if (Failed()) return;
    CALL AllocAry( InitOut%WriteOutputUnt, 3, 'WriteOutputUnt', ErrStat2, ErrMsg2 ); if (Failed()) return;
-   CALL AllocAry( ExtInfw%y%WriteOutput,     3, 'WriteOutput',    ErrStat2, ErrMsg2 ); if (Failed()) return;
+   CALL AllocAry( ExtInfw%y%WriteOutput,  3, 'WriteOutput',    ErrStat2, ErrMsg2 ); if (Failed()) return;
 
    InitOut%WriteOutputHdr(1) = 'Wind1VelX'; InitOut%WriteOutputUnt(1) = '(m/s)'
    InitOut%WriteOutputHdr(2) = 'Wind1VelY'; InitOut%WriteOutputUnt(2) = '(m/s)'
    InitOut%WriteOutputHdr(3) = 'Wind1VelZ'; InitOut%WriteOutputUnt(3) = '(m/s)'
    ExtInfw%y%WriteOutput = 0.0_ReKi
 
+      !............................................................................................
+      ! Module Variables
+      !............................................................................................
+
+   call ExtInfw_InitVars(ExtInfw%u, ExtInfw%p, ExtInfw%y, ExtInfw%m, InitOut, .false., ErrStat2, ErrMsg2)
+   if (Failed()) return
+
    InitOut%Ver = ExtInfw_Ver
 
    RETURN
@@ -292,6 +299,62 @@ logical function Failed2()
       endif
    end function Failed2
 END SUBROUTINE Init_ExtInfw
+
+!----------------------------------------------------------------------------------------------------------------------------------
+
+subroutine ExtInfw_InitVars(u, p, y, m, InitOut, Linearize, ErrStat, ErrMsg)
+   type(ExtInfw_InputType),        intent(inout)  :: u           !< An initial guess for the input; input mesh must be defined
+   type(ExtInfw_ParameterType),    intent(inout)  :: p           !< Parameters
+   type(ExtInfw_OutputType),       intent(inout)  :: y           !< Initial system outputs (outputs are not calculated;
+   type(ExtInfw_MiscVarType),      intent(inout)  :: m           !< Misc variables for optimization (not copied in glue code)
+   type(ExtInfw_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 = 'ExtInfw_InitVars'
+   INTEGER(IntKi)          :: ErrStat2
+   CHARACTER(ErrMsgLen)    :: ErrMsg2
+
+   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
+   !----------------------------------------------------------------------------
+
+   !----------------------------------------------------------------------------
+   ! Output variables
+   !----------------------------------------------------------------------------
+
+   !----------------------------------------------------------------------------
+   ! Initialize Variables and Values
+   !----------------------------------------------------------------------------
+
+   CALL MV_InitVarsJac(p%Vars, m%Jac, Linearize, ErrStat2, ErrMsg2); if (Failed()) return
+
+contains
+   logical function Failed()
+      call SetErrStat(ErrStat2, ErrMsg2, ErrStat, ErrMsg, RoutineName) 
+      Failed =  ErrStat >= AbortErrLev
+   end function Failed
+end subroutine
+
 !----------------------------------------------------------------------------------------------------------------------------------
 SUBROUTINE ExtInfw_UpdateFlowField(p_FAST, ExtInfw, ErrStat, ErrMsg)
    TYPE(FAST_ParameterType),       INTENT(IN   )   :: p_FAST      ! Parameters for the glue code

modules/externalinflow/src/ExternalInflow_Registry.txt

@@ -29,8 +29,10 @@ typedef   ExternalInflow/ExtInfw   InitOutputType   CHARACTER(ChanLen)   WriteOu
 typedef   ^                        InitOutputType   CHARACTER(ChanLen)   WriteOutputUnt   {:} - -  "Units of the output-to-file channels"   -
 typedef   ^                        InitOutputType   ProgDesc             Ver                - - -  "This module's name, version, and date"   -
 typedef   ^                        InitOutputType   FlowFieldType       *FlowField          - - -  "Pointer of flow field data type"   - 
+typedef   ^                        InitOutputType   ModVarsType         *Vars               - - -  "Module Variables"
 
 # ..... MiscVars ................................................................................................................
+typedef   ExternalInflow/ExtInfw   ExtInfw_MiscVarType   ModJacType    Jac                      -  - -  "Jacobian matrices and arrays corresponding to module variables"
 typedef   ExternalInflow/ExtInfw   ExtInfw_MiscVarType   MeshType      ActForceMotionsPoints   {:} - -  "point mesh for transferring AeroDyn motions to ExternalInflow  (includes hub+blades+nacelle+tower+tailfin)"   -
 typedef   ExternalInflow/ExtInfw   ExtInfw_MiscVarType   MeshType      ActForceLoadsPoints     {:} - -  "point mesh for transferring AeroDyn distributed loads to ExternalInflow (includes hub+blades+nacelle+tower+tailfin)"   -
 typedef   ExternalInflow/ExtInfw   ExtInfw_MiscVarType   MeshMapType   Line2_to_Point_Loads    {:} - -  "mapping data structure to convert line2 loads to point loads"   -
@@ -39,6 +41,7 @@ typedef   ExternalInflow/ExtInfw   ExtInfw_MiscVarType   FlowFieldType   &FlowFi
 
 
 # ..... Parameters ................................................................................................................
+typedef   ExternalInflow/ExtInfw   ParameterType   ModVarsType &Vars          - - -  "Module Variables"
 typedef   ExternalInflow/ExtInfw   ParameterType   ReKi    AirDens            - - -  "Air density for normalization of loads sent to ExternalInflow"   kg/m^3
 typedef   ExternalInflow/ExtInfw   ParameterType   IntKi   NumBl              - - -  "Number of blades"   -
 typedef   ExternalInflow/ExtInfw   ParameterType   IntKi   NMappings          - - -  "Number of mappings"   -

modules/externalinflow/src/ExternalInflow_Types.f90

@@ -74,6 +74,7 @@ MODULE ExternalInflow_Types
     CHARACTER(ChanLen) , DIMENSION(:), ALLOCATABLE  :: WriteOutputUnt      !< Units of the output-to-file channels [-]
     TYPE(ProgDesc)  :: Ver      !< This module's name, version, and date [-]
     TYPE(FlowFieldType) , POINTER :: FlowField => NULL()      !< Pointer of flow field data type [-]
+    TYPE(ModVarsType) , POINTER :: Vars => NULL()      !< Module Variables [-]
   END TYPE ExtInfw_InitOutputType
 ! =======================
 ! =========  ExtInfw_MiscVarType_C  =======
@@ -82,6 +83,7 @@ MODULE ExternalInflow_Types
   END TYPE ExtInfw_MiscVarType_C
   TYPE, PUBLIC :: ExtInfw_MiscVarType
     TYPE( ExtInfw_MiscVarType_C ) :: C_obj
+    TYPE(ModJacType)  :: Jac      !< Jacobian matrices and arrays corresponding to module variables [-]
     TYPE(MeshType) , DIMENSION(:), ALLOCATABLE  :: ActForceMotionsPoints      !< point mesh for transferring AeroDyn motions to ExternalInflow  (includes hub+blades+nacelle+tower+tailfin) [-]
     TYPE(MeshType) , DIMENSION(:), ALLOCATABLE  :: ActForceLoadsPoints      !< point mesh for transferring AeroDyn distributed loads to ExternalInflow (includes hub+blades+nacelle+tower+tailfin) [-]
     TYPE(MeshMapType) , DIMENSION(:), ALLOCATABLE  :: Line2_to_Point_Loads      !< mapping data structure to convert line2 loads to point loads [-]
@@ -110,6 +112,7 @@ MODULE ExternalInflow_Types
   END TYPE ExtInfw_ParameterType_C
   TYPE, PUBLIC :: ExtInfw_ParameterType
     TYPE( ExtInfw_ParameterType_C ) :: C_obj
+    TYPE(ModVarsType) , POINTER :: Vars => NULL()      !< Module Variables [-]
     REAL(ReKi)  :: AirDens = 0.0_ReKi      !< Air density for normalization of loads sent to ExternalInflow [kg/m^3]
     INTEGER(IntKi)  :: NumBl = 0_IntKi      !< Number of blades [-]
     INTEGER(IntKi)  :: NMappings = 0_IntKi      !< Number of mappings [-]
@@ -457,6 +460,7 @@ subroutine ExtInfw_CopyInitOutput(SrcInitOutputData, DstInitOutputData, CtrlCode
    call SetErrStat(ErrStat2, ErrMsg2, ErrStat, ErrMsg, RoutineName)
    if (ErrStat >= AbortErrLev) return
    DstInitOutputData%FlowField => SrcInitOutputData%FlowField
+   DstInitOutputData%Vars => SrcInitOutputData%Vars
 end subroutine
 
 subroutine ExtInfw_DestroyInitOutput(InitOutputData, ErrStat, ErrMsg)
@@ -477,6 +481,7 @@ subroutine ExtInfw_DestroyInitOutput(InitOutputData, ErrStat, ErrMsg)
    call NWTC_Library_DestroyProgDesc(InitOutputData%Ver, ErrStat2, ErrMsg2)
    call SetErrStat(ErrStat2, ErrMsg2, ErrStat, ErrMsg, RoutineName)
    nullify(InitOutputData%FlowField)
+   nullify(InitOutputData%Vars)
 end subroutine
 
 subroutine ExtInfw_PackInitOutput(RF, Indata)
@@ -499,6 +504,13 @@ subroutine ExtInfw_PackInitOutput(RF, Indata)
          call IfW_FlowField_PackFlowFieldType(RF, InData%FlowField) 
       end if
    end if
+   call RegPack(RF, associated(InData%Vars))
+   if (associated(InData%Vars)) then
+      call RegPackPointer(RF, c_loc(InData%Vars), PtrInIndex)
+      if (.not. PtrInIndex) then
+         call NWTC_Library_PackModVarsType(RF, InData%Vars) 
+      end if
+   end if
    if (RegCheckErr(RF, RoutineName)) return
 end subroutine
 
@@ -533,6 +545,24 @@ subroutine ExtInfw_UnPackInitOutput(RF, OutData)
    else
       OutData%FlowField => null()
    end if
+   if (associated(OutData%Vars)) deallocate(OutData%Vars)
+   call RegUnpack(RF, IsAllocAssoc); if (RegCheckErr(RF, RoutineName)) return
+   if (IsAllocAssoc) then
+      call RegUnpackPointer(RF, Ptr, PtrIdx); if (RegCheckErr(RF, RoutineName)) return
+      if (c_associated(Ptr)) then
+         call c_f_pointer(Ptr, OutData%Vars)
+      else
+         allocate(OutData%Vars,stat=stat)
+         if (stat /= 0) then 
+            call SetErrStat(ErrID_Fatal, 'Error allocating OutData%Vars.', RF%ErrStat, RF%ErrMsg, RoutineName)
+            return
+         end if
+         RF%Pointers(PtrIdx) = c_loc(OutData%Vars)
+         call NWTC_Library_UnpackModVarsType(RF, OutData%Vars) ! Vars 
+      end if
+   else
+      OutData%Vars => null()
+   end if
 end subroutine
 
 SUBROUTINE ExtInfw_C2Fary_CopyInitOutput(InitOutputData, ErrStat, ErrMsg, SkipPointers)
@@ -582,6 +612,9 @@ subroutine ExtInfw_CopyMisc(SrcMiscData, DstMiscData, CtrlCode, ErrStat, ErrMsg)
    character(*), parameter        :: RoutineName = 'ExtInfw_CopyMisc'
    ErrStat = ErrID_None
    ErrMsg  = ''
+   call NWTC_Library_CopyModJacType(SrcMiscData%Jac, DstMiscData%Jac, CtrlCode, ErrStat2, ErrMsg2)
+   call SetErrStat(ErrStat2, ErrMsg2, ErrStat, ErrMsg, RoutineName)
+   if (ErrStat >= AbortErrLev) return
    if (allocated(SrcMiscData%ActForceMotionsPoints)) then
       LB(1:1) = lbound(SrcMiscData%ActForceMotionsPoints, kind=B8Ki)
       UB(1:1) = ubound(SrcMiscData%ActForceMotionsPoints, kind=B8Ki)
@@ -671,6 +704,8 @@ subroutine ExtInfw_DestroyMisc(MiscData, ErrStat, ErrMsg)
    character(*), parameter        :: RoutineName = 'ExtInfw_DestroyMisc'
    ErrStat = ErrID_None
    ErrMsg  = ''
+   call NWTC_Library_DestroyModJacType(MiscData%Jac, ErrStat2, ErrMsg2)
+   call SetErrStat(ErrStat2, ErrMsg2, ErrStat, ErrMsg, RoutineName)
    if (allocated(MiscData%ActForceMotionsPoints)) then
       LB(1:1) = lbound(MiscData%ActForceMotionsPoints, kind=B8Ki)
       UB(1:1) = ubound(MiscData%ActForceMotionsPoints, kind=B8Ki)
@@ -727,6 +762,7 @@ subroutine ExtInfw_PackMisc(RF, Indata)
       call SetErrStat(ErrID_Severe,'C_obj%object cannot be packed.', RF%ErrStat, RF%ErrMsg, RoutineName)
       return
    end if
+   call NWTC_Library_PackModJacType(RF, InData%Jac) 
    call RegPack(RF, allocated(InData%ActForceMotionsPoints))
    if (allocated(InData%ActForceMotionsPoints)) then
       call RegPackBounds(RF, 1, lbound(InData%ActForceMotionsPoints, kind=B8Ki), ubound(InData%ActForceMotionsPoints, kind=B8Ki))
@@ -784,6 +820,7 @@ subroutine ExtInfw_UnPackMisc(RF, OutData)
    integer(B8Ki)   :: PtrIdx
    type(c_ptr)     :: Ptr
    if (RF%ErrStat /= ErrID_None) return
+   call NWTC_Library_UnpackModJacType(RF, OutData%Jac) ! Jac 
    if (allocated(OutData%ActForceMotionsPoints)) deallocate(OutData%ActForceMotionsPoints)
    call RegUnpack(RF, IsAllocAssoc); if (RegCheckErr(RF, RoutineName)) return
    if (IsAllocAssoc) then
@@ -898,9 +935,22 @@ subroutine ExtInfw_CopyParam(SrcParamData, DstParamData, CtrlCode, ErrStat, ErrM
    character(*),    intent(  out) :: ErrMsg
    integer(B8Ki)                  :: LB(1), UB(1)
    integer(IntKi)                 :: ErrStat2
+   character(ErrMsgLen)           :: ErrMsg2
    character(*), parameter        :: RoutineName = 'ExtInfw_CopyParam'
    ErrStat = ErrID_None
    ErrMsg  = ''
+   if (associated(SrcParamData%Vars)) then
+      if (.not. associated(DstParamData%Vars)) then
+         allocate(DstParamData%Vars, stat=ErrStat2)
+         if (ErrStat2 /= 0) then
+            call SetErrStat(ErrID_Fatal, 'Error allocating DstParamData%Vars.', ErrStat, ErrMsg, RoutineName)
+            return
+         end if
+      end if
+      call NWTC_Library_CopyModVarsType(SrcParamData%Vars, DstParamData%Vars, CtrlCode, ErrStat2, ErrMsg2)
+      call SetErrStat(ErrStat2, ErrMsg2, ErrStat, ErrMsg, RoutineName)
+      if (ErrStat >= AbortErrLev) return
+   end if
    DstParamData%AirDens = SrcParamData%AirDens
    DstParamData%C_obj%AirDens = SrcParamData%C_obj%AirDens
    DstParamData%NumBl = SrcParamData%NumBl
@@ -959,9 +1009,17 @@ subroutine ExtInfw_DestroyParam(ParamData, ErrStat, ErrMsg)
    type(ExtInfw_ParameterType), intent(inout) :: ParamData
    integer(IntKi),  intent(  out) :: ErrStat
    character(*),    intent(  out) :: ErrMsg
+   integer(IntKi)                 :: ErrStat2
+   character(ErrMsgLen)           :: ErrMsg2
    character(*), parameter        :: RoutineName = 'ExtInfw_DestroyParam'
    ErrStat = ErrID_None
    ErrMsg  = ''
+   if (associated(ParamData%Vars)) then
+      call NWTC_Library_DestroyModVarsType(ParamData%Vars, ErrStat2, ErrMsg2)
+      call SetErrStat(ErrStat2, ErrMsg2, ErrStat, ErrMsg, RoutineName)
+      deallocate(ParamData%Vars)
+      ParamData%Vars => null()
+   end if
    if (associated(ParamData%forceBldRnodes)) then
       deallocate(ParamData%forceBldRnodes)
       ParamData%forceBldRnodes => null()
@@ -986,6 +1044,13 @@ subroutine ExtInfw_PackParam(RF, Indata)
       call SetErrStat(ErrID_Severe,'C_obj%object cannot be packed.', RF%ErrStat, RF%ErrMsg, RoutineName)
       return
    end if
+   call RegPack(RF, associated(InData%Vars))
+   if (associated(InData%Vars)) then
+      call RegPackPointer(RF, c_loc(InData%Vars), PtrInIndex)
+      if (.not. PtrInIndex) then
+         call NWTC_Library_PackModVarsType(RF, InData%Vars) 
+      end if
+   end if
    call RegPack(RF, InData%AirDens)
    call RegPack(RF, InData%NumBl)
    call RegPack(RF, InData%NMappings)
@@ -1012,6 +1077,24 @@ subroutine ExtInfw_UnPackParam(RF, OutData)
    integer(B8Ki)   :: PtrIdx
    type(c_ptr)     :: Ptr
    if (RF%ErrStat /= ErrID_None) return
+   if (associated(OutData%Vars)) deallocate(OutData%Vars)
+   call RegUnpack(RF, IsAllocAssoc); if (RegCheckErr(RF, RoutineName)) return
+   if (IsAllocAssoc) then
+      call RegUnpackPointer(RF, Ptr, PtrIdx); if (RegCheckErr(RF, RoutineName)) return
+      if (c_associated(Ptr)) then
+         call c_f_pointer(Ptr, OutData%Vars)
+      else
+         allocate(OutData%Vars,stat=stat)
+         if (stat /= 0) then 
+            call SetErrStat(ErrID_Fatal, 'Error allocating OutData%Vars.', RF%ErrStat, RF%ErrMsg, RoutineName)
+            return
+         end if
+         RF%Pointers(PtrIdx) = c_loc(OutData%Vars)
+         call NWTC_Library_UnpackModVarsType(RF, OutData%Vars) ! Vars 
+      end if
+   else
+      OutData%Vars => null()
+   end if
    call RegUnpack(RF, OutData%AirDens); if (RegCheckErr(RF, RoutineName)) return
    OutData%C_obj%AirDens = OutData%AirDens
    call RegUnpack(RF, OutData%NumBl); if (RegCheckErr(RF, RoutineName)) return