Merge pull request #3113 from deslaughter/add_ice_tests

Add IceDyn and IceFloe Regression Tests

Author: deslaughter

modules/icedyn/src/IceDyn.f90

@@ -339,14 +339,28 @@ subroutine IceD_InitVars(u, p, x, y, m, Vars, InputFileData, Linearize, ErrStat,
    ! Continuous State Variables
    !----------------------------------------------------------------------------
 
+   call MV_AddVar(Vars%x, "q", FieldTransDisp, DatLoc(IceD_x_q), &
+                  LinNames=["ice mass displacement, m"])
+   call MV_AddVar(Vars%x, "q", FieldTransVel, DatLoc(IceD_x_dqdt), &
+                  LinNames=["first time derivative of ice mass displacement, m/s"])
+
    !----------------------------------------------------------------------------
    ! Input variables
    !----------------------------------------------------------------------------
 
+   call MV_AddMeshVar(Vars%u, "PointMesh", MotionFields, DatLoc(IceD_u_PointMesh), u%PointMesh)
+
    !----------------------------------------------------------------------------
    ! Output variables
    !----------------------------------------------------------------------------
 
+   call MV_AddMeshVar(Vars%y, "PointMesh", LoadFields, DatLoc(IceD_y_PointMesh), y%PointMesh)
+   call MV_AddVar(Vars%y, "WriteOutput", FieldScalar, DatLoc(IceD_y_WriteOutput), &
+                  Flags=VF_WriteOut, &
+                  Num=p%NumOuts, &
+                  LinNames=["IceDisp, m ", "IceForce, N"])
+
+
    !----------------------------------------------------------------------------
    ! Initialization dependent on linearization
    !----------------------------------------------------------------------------

modules/icefloe/src/icefloe/IceFloeBase.F90

@@ -35,7 +35,7 @@ module IceFloeBase
    public
 
 ! This is compared to gravity in FAST, warning if different
-   real(ReKi), parameter :: grav = 9.81
+   real(ReKi), parameter :: grav = 9.80665
 
 !  ice type parameters
    integer(IntKi), parameter :: randomCrush    = 1

modules/icefloe/src/interfaces/FAST/IceFloe.f90

@@ -321,7 +321,7 @@ SUBROUTINE IceFloe_Init( InitInp, u, p, x, xd, z, OtherState, y, m, Interval, In
 
 
    ! set up outputs to write to FAST
-   ! need to know how many legs and whethter loads applied to all or just one set of effective loads
+   ! need to know how many legs and whether loads applied to all or just one set of effective loads
       numOuts = 4*p%numLegs  ! 2 velocities and 2 forces
       if (p%singleLoad .and. p%numLegs > 1) numOuts = 5
       CALL AllocAry( InitOut%WriteOutputHdr, numOuts, 'WriteOutputHdr', ErrStat, ErrMsg )
@@ -350,7 +350,7 @@ SUBROUTINE IceFloe_Init( InitInp, u, p, x, xd, z, OtherState, y, m, Interval, In
       endif
 
       ! Initialize module variables
-      CALL IceFloe_InitVars(u, p, x, y, m, InitOut%Vars, .false., ErrStat, ErrMsg)
+      CALL IceFloe_InitVars(u, p, x, y, m, InitOut, InitOut%Vars, .false., ErrStat, ErrMsg)
       call iceErrorHndlr (iceLog, ErrStat, 'Error in allocation of output memory', 1)
       if (ErrStat >= AbortErrLev) return  
 
@@ -371,12 +371,13 @@ SUBROUTINE IceFloe_Init( InitInp, u, p, x, xd, z, OtherState, y, m, Interval, In
 END SUBROUTINE IceFloe_Init
 
 
-subroutine IceFloe_InitVars(u, p, x, y, m, Vars, Linearize, ErrStat, ErrMsg)
+subroutine IceFloe_InitVars(u, p, x, y, m, InitOut, Vars, Linearize, ErrStat, ErrMsg)
    type(IceFloe_InputType),            intent(inout)  :: u              !< An initial guess for the input; input mesh must be defined
    type(IceFloe_ParameterType),        intent(inout)  :: p              !< Parameters
    type(IceFloe_ContinuousStateType),  intent(inout)  :: x              !< Continuous state
    type(IceFloe_OutputType),           intent(inout)  :: y              !< Initial system outputs (outputs are not calculated;
    type(IceFloe_MiscVarType),          intent(inout)  :: m              !< Misc variables for optimization (not copied in glue code)
+   type(IceFloe_InitOutputType),       intent(in)     :: InitOut        ! Output for initialization routine
    type(ModVarsType),                  intent(inout)  :: Vars           !< Module variables
    logical,                            intent(in)     :: Linearize      !< Flag to initialize linearization variables
    integer(IntKi),                     intent(out)    :: ErrStat        !< Error status of the operation
@@ -385,22 +386,31 @@ subroutine IceFloe_InitVars(u, p, x, y, m, Vars, Linearize, ErrStat, ErrMsg)
    character(*), parameter             :: RoutineName = 'IceFloe_InitVars'
    integer(IntKi)                      :: ErrStat2
    character(ErrMsgLen)                :: ErrMsg2
+   integer(IntKi)                      :: i
 
    ErrStat = ErrID_None
    ErrMsg = ""
 
    !----------------------------------------------------------------------------
    ! Continuous State Variables
    !----------------------------------------------------------------------------
-
+   
    !----------------------------------------------------------------------------
    ! Input variables
    !----------------------------------------------------------------------------
 
+   call MV_AddMeshVar(Vars%u, 'iceMesh', MotionFields, DatLoc(IceFloe_u_iceMesh), u%iceMesh)
+   
    !----------------------------------------------------------------------------
    ! Output variables
    !----------------------------------------------------------------------------
 
+   call MV_AddMeshVar(Vars%y, 'iceMesh', MotionFields, DatLoc(IceFloe_y_iceMesh), y%iceMesh)
+   call MV_AddVar(Vars%y, "WriteOutput", FieldScalar, DatLoc(IceFloe_y_WriteOutput), &
+                  Flags=VF_WriteOut, &
+                  Num=size(y%WriteOutput), &
+                  LinNames=[(WriteOutputLinName(i), i=1,size(y%WriteOutput))])
+
    !----------------------------------------------------------------------------
    ! Initialization dependent on linearization
    !----------------------------------------------------------------------------
@@ -417,6 +427,11 @@ logical function Failed()
       call SetErrStat(ErrStat2, ErrMsg2, ErrStat, ErrMsg, RoutineName) 
       Failed =  ErrStat >= AbortErrLev
    end function Failed
+   function WriteOutputLinName(index) result(name)
+      integer(IntKi), intent(in) :: index
+      character(LinChanLen)      :: name
+      name = InitOut%WriteOutputHdr(index)//', '//trim(InitOut%WriteOutputUnt(index))
+   end function WriteOutputLinName
 end subroutine
 
 !----------------------------------------------------------------------------------------------------------------------------------

reg_tests/CTestList.cmake

@@ -331,6 +331,8 @@ of_regression("SWRT_YFree_VS_WTurb"                    "openfast;elastodyn;aerod
 of_regression("5MW_Land_DLL_WTurb"                     "openfast;elastodyn;aerodyn;servodyn")
 of_regression("5MW_Land_DLL_WTurb_wNacDrag"            "openfast;elastodyn;aerodyn;servodyn")
 of_regression("5MW_OC3Mnpl_DLL_WTurb_WavesIrr"         "openfast;elastodyn;aerodyn;servodyn;hydrodyn;subdyn;offshore")
+of_regression("5MW_OC3Mnpl_DLL_WTurb_WavesIrr_IceDyn"  "openfast;elastodyn;aerodyn;servodyn;hydrodyn;subdyn;icedyn;offshore")
+of_regression("5MW_OC3Mnpl_DLL_WTurb_WavesIrr_IceFloe" "openfast;elastodyn;aerodyn;servodyn;hydrodyn;subdyn;icefloe;offshore")
 of_regression("5MW_OC3Mnpl_DLL_WTurb_WavesIrr_Restart" "openfast;elastodyn;aerodyn;servodyn;hydrodyn;subdyn;offshore;restart")
 of_regression("5MW_OC3Trpd_DLL_WSt_WavesReg"           "openfast;elastodyn;aerodyn;servodyn;hydrodyn;subdyn;offshore")
 # of_regression("5MW_OC4Jckt_DLL_WTurb_WavesIrr_MGrowth" "openfast;elastodyn;aerodyn;servodyn;hydrodyn;subdyn;offshore")