Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

HD: Remove extra copy of WaveStMod from Morison #1883

Merged
merged 1 commit into from
Nov 18, 2023
+16 −21
Merged

HD: Remove extra copy of WaveStMod from Morison #1883

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 16 additions & 15 deletions modules/hydrodyn/src/Morison.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1927,14 +1927,15 @@ SUBROUTINE Morison_Init( InitInp, u, p, x, xd, z, OtherState, y, m, Interval, In
p%AMMod = InitInp%AMMod
p%VisMeshes = InitInp%VisMeshes ! visualization mesh for morison elements

! Pointer to SeaState WaveField
p%WaveField => InitInp%WaveField

! Only compute added-mass force up to the free surface if wave stretching is enabled
IF ( p%WaveStMod .EQ. 0_IntKi ) THEN
IF ( p%WaveField%WaveStMod .EQ. 0_IntKi ) THEN
! Setting AMMod to zero just in case. Probably redundant.
p%AMMod = 0_IntKi
END IF

! Pointer to SeaState WaveField
p%WaveField => InitInp%WaveField

ALLOCATE ( p%MOutLst(p%NMOutputs), STAT = errStat2 )
IF ( errStat2 /= 0 ) THEN
Expand Down Expand Up @@ -2636,15 +2637,15 @@ SUBROUTINE Morison_CalcOutput( Time, u, p, x, xd, z, OtherState, y, m, errStat,
m%memberLoads(im)%F_If = 0.0_ReKi

! Determine member submergence status
IF ( p%WaveStMod .EQ. 0_IntKi ) THEN ! No wave stretching - Only need to check the two ends
IF ( p%WaveField%WaveStMod .EQ. 0_IntKi ) THEN ! No wave stretching - Only need to check the two ends
IF ( m%nodeInWater(mem%NodeIndx(1)) .NE. m%nodeInWater(mem%NodeIndx(N+1)) ) THEN
MemSubStat = 1_IntKi ! Member centerline crosses the SWL once
ELSE IF ( m%nodeInWater(mem%NodeIndx(1)) .EQ. 0_IntKi ) THEN
MemSubStat = 3_IntKi ! Member centerline completely above water
ELSE
MemSubStat = 0_IntKi ! Member centerline fully submerged
END IF
ELSE IF ( p%WaveStMod > 0_IntKi ) THEN ! Has wave stretching - Need to check every node
ELSE IF ( p%WaveField%WaveStMod > 0_IntKi ) THEN ! Has wave stretching - Need to check every node
NumFSX = 0_IntKi ! Number of free-surface crossing
DO i = 1, N ! loop through member elements
IF ( m%nodeInWater(mem%NodeIndx(i)) .NE. m%nodeInWater(mem%NodeIndx(i+1)) ) THEN
Expand Down Expand Up @@ -2745,7 +2746,7 @@ SUBROUTINE Morison_CalcOutput( Time, u, p, x, xd, z, OtherState, y, m, errStat,

! ------------------- buoyancy loads: sides: Sections 3.1 and 3.2 ------------------------
IF (mem%MHstLMod == 1) THEN
IF ( p%WaveStMod > 0_IntKi ) THEN ! If wave stretching is enabled, compute buoyancy up to free surface
IF ( p%WaveField%WaveStMod > 0_IntKi ) THEN ! If wave stretching is enabled, compute buoyancy up to free surface
CALL GetTotalWaveElev( Time, pos1, Zeta1, ErrStat2, ErrMsg2 )
CALL GetTotalWaveElev( Time, pos2, Zeta2, ErrStat2, ErrMsg2 )
CALL SetErrStat( ErrStat2, ErrMsg2, ErrStat, ErrMsg, RoutineName )
Expand All @@ -2772,7 +2773,7 @@ SUBROUTINE Morison_CalcOutput( Time, u, p, x, xd, z, OtherState, y, m, errStat,
! Get free surface elevation and normal at the element midpoint (both assumed constant over the element)
posMid = 0.5 * (pos1+pos2)
rMidb = 0.5 * (r1b +r2b )
IF (p%WaveStMod > 0) THEN
IF (p%WaveField%WaveStMod > 0) THEN
CALL GetTotalWaveElev( Time, posMid, ZetaMid, ErrStat2, ErrMsg2 )
CALL SetErrStat( ErrStat2, ErrMsg2, ErrStat, ErrMsg, RoutineName )
CALL GetFreeSurfaceNormal( Time, posMid, rMidb, n_hat, ErrStat2, ErrMsg2 )
Expand Down Expand Up @@ -2912,7 +2913,7 @@ SUBROUTINE Morison_CalcOutput( Time, u, p, x, xd, z, OtherState, y, m, errStat,
!-----------------------------------------------------------------------------------------------------!
! External Hydrodynamic Side Loads - Start !
!-----------------------------------------------------------------------------------------------------!
IF ( p%WaveStMod > 0 .AND. MemSubStat == 1 .AND. (m%NodeInWater(mem%NodeIndx(N+1)).EQ.0_IntKi) ) THEN
IF ( p%WaveField%WaveStMod > 0 .AND. MemSubStat == 1 .AND. (m%NodeInWater(mem%NodeIndx(N+1)).EQ.0_IntKi) ) THEN
!----------------------------Apply load smoothing----------------------------!
! only when:
! 1. wave stretching is enabled
Expand Down Expand Up @@ -3199,7 +3200,7 @@ SUBROUTINE Morison_CalcOutput( Time, u, p, x, xd, z, OtherState, y, m, errStat,
deltalLeft = 0.5_ReKi * mem%dl
ELSE ! Element i-1 crosses the free surface
z2 = m%DispNodePosHdn(3, mem%NodeIndx(i-1))
IF ( p%WaveStMod > 0_IntKi ) THEN ! Wave stretching enabled
IF ( p%WaveField%WaveStMod > 0_IntKi ) THEN ! Wave stretching enabled
zeta1 = m%WaveElev(mem%NodeIndx(i ))
zeta2 = m%WaveElev(mem%NodeIndx(i-1))
ELSE
Expand All @@ -3218,7 +3219,7 @@ SUBROUTINE Morison_CalcOutput( Time, u, p, x, xd, z, OtherState, y, m, errStat,
deltalRight = 0.5_ReKi * mem%dl
ELSE ! Element i crosses the free surface
z2 = m%DispNodePosHdn(3, mem%NodeIndx(i+1))
IF ( p%WaveStMod > 0_IntKi ) THEN ! Wave stretching enabled
IF ( p%WaveField%WaveStMod > 0_IntKi ) THEN ! Wave stretching enabled
zeta1 = m%WaveElev(mem%NodeIndx(i ))
zeta2 = m%WaveElev(mem%NodeIndx(i+1))
ELSE
Expand Down Expand Up @@ -3390,7 +3391,7 @@ SUBROUTINE Morison_CalcOutput( Time, u, p, x, xd, z, OtherState, y, m, errStat,
r2 = mem%RMGB(N+1)
if (mem%i_floor == 0) then ! both ends above or at seabed
! Compute loads on the end plate of node 1
IF (p%WaveStMod > 0) THEN
IF (p%WaveField%WaveStMod > 0) THEN
CALL GetTotalWaveElev( Time, pos1, Zeta1, ErrStat2, ErrMsg2 )
CALL SetErrStat( ErrStat2, ErrMsg2, ErrStat, ErrMsg, RoutineName )
CALL GetFreeSurfaceNormal( Time, pos1, r1, n_hat, ErrStat2, ErrMsg2 )
Expand All @@ -3411,7 +3412,7 @@ SUBROUTINE Morison_CalcOutput( Time, u, p, x, xd, z, OtherState, y, m, errStat,
END IF
END IF
! Compute loads on the end plate of node N+1
IF (p%WaveStMod > 0) THEN
IF (p%WaveField%WaveStMod > 0) THEN
CALL GetTotalWaveElev( Time, pos2, Zeta2, ErrStat2, ErrMsg2 )
CALL SetErrStat( ErrStat2, ErrMsg2, ErrStat, ErrMsg, RoutineName )
CALL GetFreeSurfaceNormal( Time, pos2, r2, n_hat, ErrStat2, ErrMsg2 )
Expand All @@ -3433,7 +3434,7 @@ SUBROUTINE Morison_CalcOutput( Time, u, p, x, xd, z, OtherState, y, m, errStat,
END IF
elseif ( mem%doEndBuoyancy ) then ! The member crosses the seabed line so only the upper end potentially have hydrostatic load
! Only compute the loads on the end plate of node N+1
IF (p%WaveStMod > 0) THEN
IF (p%WaveField%WaveStMod > 0) THEN
CALL GetTotalWaveElev( Time, pos2, Zeta2, ErrStat2, ErrMsg2 )
CALL SetErrStat( ErrStat2, ErrMsg2, ErrStat, ErrMsg, RoutineName )
CALL GetFreeSurfaceNormal( Time, pos2, r2, n_hat, ErrStat2, ErrMsg2 )
Expand Down Expand Up @@ -3558,7 +3559,7 @@ SUBROUTINE GetDisplacedNodePosition( forceDisplaced, pos )
! Use displaced X and Y position
pos(1,:) = pos(1,:) + u%Mesh%TranslationDisp(1,:)
pos(2,:) = pos(2,:) + u%Mesh%TranslationDisp(2,:)
IF ( (p%WaveStMod > 0) .OR. forceDisplaced ) THEN
IF ( (p%WaveField%WaveStMod > 0) .OR. forceDisplaced ) THEN
! Use displaced Z position only when wave stretching is enabled
pos(3,:) = pos(3,:) + u%Mesh%TranslationDisp(3,:)
END IF
Expand Down Expand Up @@ -4204,7 +4205,7 @@ SUBROUTINE Morison_UpdateDiscState( Time, u, p, x, xd, z, OtherState, m, errStat
pos(1) = u%Mesh%TranslationDisp(1,J) + u%Mesh%Position(1,J)
pos(2) = u%Mesh%TranslationDisp(2,J) + u%Mesh%Position(2,J)
END IF
IF (p%WaveStMod > 0 .AND. p%WaveDisp /= 0) THEN ! Wave stretching enabled
IF (p%WaveField%WaveStMod > 0 .AND. p%WaveDisp /= 0) THEN ! Wave stretching enabled
pos(3) = u%Mesh%Position(3,J) + u%Mesh%TranslationDisp(3,J) - p%WaveField%MSL2SWL ! Use the current Z location.
ELSE ! Wave stretching disabled
pos(3) = u%Mesh%Position(3,J) - p%WaveField%MSL2SWL ! We are intentionally using the undisplaced Z position of the node.
Expand Down
1 change: 0 additions & 1 deletion modules/hydrodyn/src/Morison.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,6 @@ typedef ^ ^ INTEGER
typedef ^ ^ Morison_JOutput JOutLst {:} - - "" -
typedef ^ ^ OutParmType OutParam {:} - - "" -
typedef ^ ^ INTEGER NumOuts - - - "" -
typedef ^ ^ INTEGER WaveStMod - - - "" -
typedef ^ ^ SeaSt_WaveFieldType *WaveField - - - "SeaState wave field" -
typedef ^ ^ logical VisMeshes - .false. - "Output visualization meshes" -
#
Expand Down
5 changes: 0 additions & 5 deletions modules/hydrodyn/src/Morison_Types.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,7 +415,6 @@ MODULE Morison_Types
TYPE(Morison_JOutput) , DIMENSION(:), ALLOCATABLE :: JOutLst !< [-]
TYPE(OutParmType) , DIMENSION(:), ALLOCATABLE :: OutParam !< [-]
INTEGER(IntKi) :: NumOuts = 0_IntKi !< [-]
INTEGER(IntKi) :: WaveStMod = 0_IntKi !< [-]
TYPE(SeaSt_WaveFieldType) , POINTER :: WaveField => NULL() !< SeaState wave field [-]
LOGICAL :: VisMeshes = .false. !< Output visualization meshes [-]
END TYPE Morison_ParameterType
Expand Down Expand Up @@ -5564,7 +5563,6 @@ subroutine Morison_CopyParam(SrcParamData, DstParamData, CtrlCode, ErrStat, ErrM
end do
end if
DstParamData%NumOuts = SrcParamData%NumOuts
DstParamData%WaveStMod = SrcParamData%WaveStMod
DstParamData%WaveField => SrcParamData%WaveField
DstParamData%VisMeshes = SrcParamData%VisMeshes
end subroutine
Expand Down Expand Up @@ -5753,7 +5751,6 @@ subroutine Morison_PackParam(Buf, Indata)
end do
end if
call RegPack(Buf, InData%NumOuts)
call RegPack(Buf, InData%WaveStMod)
call RegPack(Buf, associated(InData%WaveField))
if (associated(InData%WaveField)) then
call RegPackPointer(Buf, c_loc(InData%WaveField), PtrInIndex)
Expand Down Expand Up @@ -5996,8 +5993,6 @@ subroutine Morison_UnPackParam(Buf, OutData)
end if
call RegUnpack(Buf, OutData%NumOuts)
if (RegCheckErr(Buf, RoutineName)) return
call RegUnpack(Buf, OutData%WaveStMod)
if (RegCheckErr(Buf, RoutineName)) return
if (associated(OutData%WaveField)) deallocate(OutData%WaveField)
call RegUnpack(Buf, IsAllocAssoc)
if (RegCheckErr(Buf, RoutineName)) return
Expand Down