Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
408 changes: 292 additions & 116 deletions modules/moordyn/src/MoorDyn.f90

Large diffs are not rendered by default.

50 changes: 34 additions & 16 deletions modules/moordyn/src/MoorDyn_IO.f90
Original file line number Diff line number Diff line change
Expand Up @@ -785,8 +785,8 @@ SUBROUTINE MDIO_ProcessOutList(OutList, p, m, y, InitOut, ErrStat, ErrMsg )


! calculate number of output entries (excluding time) to write for this line
LineNumOuts = 3*(m%LineList(I)%N + 1)*SUM(m%LineList(I)%OutFlagList(2:6)) &
+ (m%LineList(I)%N + 1)*SUM(m%LineList(I)%OutFlagList(7:9)) &
LineNumOuts = 3*(m%LineList(I)%N + 1)*SUM(m%LineList(I)%OutFlagList(2:7)) &
+ (m%LineList(I)%N + 1)*SUM(m%LineList(I)%OutFlagList(8:9)) &
+ m%LineList(I)%N*SUM(m%LineList(I)%OutFlagList(10:18))

ALLOCATE(m%LineList(I)%LineWrOutput( 1 + LineNumOuts), STAT = ErrStat)
Expand Down Expand Up @@ -934,8 +934,8 @@ SUBROUTINE MDIO_OpenOutput( MD_ProgDesc, p, m, InitOut, ErrStat, ErrMsg )


! calculate number of output entries (excluding time) to write for this line
LineNumOuts = 3*(m%LineList(I)%N + 1)*SUM(m%LineList(I)%OutFlagList(2:6)) &
+ (m%LineList(I)%N + 1)*SUM(m%LineList(I)%OutFlagList(7:9)) &
LineNumOuts = 3*(m%LineList(I)%N + 1)*SUM(m%LineList(I)%OutFlagList(2:7)) &
+ (m%LineList(I)%N + 1)*SUM(m%LineList(I)%OutFlagList(8:9)) &
+ m%LineList(I)%N*SUM(m%LineList(I)%OutFlagList(10:18))

if (wordy > 2) PRINT *, LineNumOuts, " output channels"
Expand Down Expand Up @@ -966,12 +966,17 @@ SUBROUTINE MDIO_OpenOutput( MD_ProgDesc, p, m, InitOut, ErrStat, ErrMsg )
WRITE(m%LineList(I)%LineUnOut,'('//TRIM(Int2LStr((3+3*m%LineList(I)%N)))//'(A1,A15))', advance='no', IOSTAT=ErrStat2) &
( p%Delim, 'Node'//TRIM(Int2Lstr(J))//'bx', p%Delim, 'Node'//TRIM(Int2Lstr(J))//'by', p%Delim, 'Node'//TRIM(Int2Lstr(J))//'bz', J=0,(m%LineList(I)%N) )
END IF

IF (m%LineList(I)%OutFlagList(7) == 1) THEN
WRITE(m%LineList(I)%LineUnOut,'('//TRIM(Int2LStr((3+3*m%LineList(I)%N)))//'(A1,A15))', advance='no', IOSTAT=ErrStat2) &
( p%Delim, 'Node'//TRIM(Int2Lstr(J))//'Vx', p%Delim, 'Node'//TRIM(Int2Lstr(J))//'Vy', p%Delim, 'Node'//TRIM(Int2Lstr(J))//'Vz', J=0,(m%LineList(I)%N) ) ! TODO adjust these when force to internal nodes
END IF

IF (m%LineList(I)%OutFlagList(8) == 1) THEN
WRITE(m%LineList(I)%LineUnOut,'('//TRIM(Int2LStr((m%LineList(I)%N)))//'(A1,A15))', advance='no', IOSTAT=ErrStat2) &
( p%Delim, 'Node'//TRIM(Int2Lstr(J))//'Wz', J=0,(m%LineList(I)%N) )
END IF
IF (m%LineList(I)%OutFlagList(8) == 1) THEN
IF (m%LineList(I)%OutFlagList(9) == 1) THEN
WRITE(m%LineList(I)%LineUnOut,'('//TRIM(Int2LStr((m%LineList(I)%N)))//'(A1,A15))', advance='no', IOSTAT=ErrStat2) &
( p%Delim, 'Node'//TRIM(Int2Lstr(J))//'Kurv', J=0,(m%LineList(I)%N) )
END IF
Expand Down Expand Up @@ -1023,12 +1028,16 @@ SUBROUTINE MDIO_OpenOutput( MD_ProgDesc, p, m, InitOut, ErrStat, ErrMsg )
WRITE(m%LineList(I)%LineUnOut,'('//TRIM(Int2LStr((3+3*m%LineList(I)%N)))//'(A1,A15))', advance='no', IOSTAT=ErrStat2) &
( p%Delim, '(N)', p%Delim, '(N)', p%Delim, '(N)', J=0,(m%LineList(I)%N) )
END IF

IF (m%LineList(I)%OutFlagList(7) == 1) THEN
WRITE(m%LineList(I)%LineUnOut,'('//TRIM(Int2LStr((3+3*m%LineList(I)%N)))//'(A1,A15))', advance='no', IOSTAT=ErrStat2) &
( p%Delim, '(N)', p%Delim, '(N)', p%Delim, '(N)', J=0,(m%LineList(I)%N) )
END IF

IF (m%LineList(I)%OutFlagList(8) == 1) THEN
WRITE(m%LineList(I)%LineUnOut,'('//TRIM(Int2LStr((m%LineList(I)%N)))//'(A1,A15))', advance='no', IOSTAT=ErrStat2) &
( p%Delim, '(Nup)', J=0,(m%LineList(I)%N) )
END IF
IF (m%LineList(I)%OutFlagList(8) == 1) THEN
IF (m%LineList(I)%OutFlagList(9) == 1) THEN
WRITE(m%LineList(I)%LineUnOut,'('//TRIM(Int2LStr((m%LineList(I)%N)))//'(A1,A15))', advance='no', IOSTAT=ErrStat2) &
( p%Delim, '(1/m)', J=0,(m%LineList(I)%N) )
END IF
Expand Down Expand Up @@ -1669,22 +1678,31 @@ SUBROUTINE MDIO_WriteOutputs( Time, p, m, y, ErrStat, ErrMsg )
END DO
END IF

! Node VIV force
IF (m%LineList(I)%OutFlagList(7) == 1) THEN
DO J = 0,m%LineList(I)%N
DO K = 1,3
m%LineList(I)%LineWrOutput(L) = m%LineList(I)%Lf(K,J)
L = L+1
END DO
END DO
END IF

! Node weights
IF (m%LineList(I)%OutFlagList(7) == 1) THEN
IF (m%LineList(I)%OutFlagList(8) == 1) THEN
DO J = 0,m%LineList(I)%N
m%LineList(I)%LineWrOutput(L) = m%LineList(I)%W(3,J)
L = L+1
END DO
END IF

! ! Node curvatures
! IF (m%LineList(I)%OutFlagList(8) == 1) THEN
! DO J = 0,m%LineList(I)%N
! m%LineList(I)%LineWrOutput(L) = m%LineList(I)%W(3,J)
! L = L+1
! END DO
! END IF
! Node curvatures
IF (m%LineList(I)%OutFlagList(9) == 1) THEN
DO J = 0,m%LineList(I)%N
m%LineList(I)%LineWrOutput(L) = m%LineList(I)%Kurv(J)
L = L+1
END DO
END IF


! Segment tension force (excludes damping term, just EA)
Expand Down
Loading