Skip to content

Commit

Permalink
Merge pull request #2658 from RyanDavies19/MD_IO_fix
Browse files Browse the repository at this point in the history
openfast_IO MoorDyn compatibility
  • Loading branch information
andrew-platt authored Mar 7, 2025
2 parents 80cfcbc + 608c924 commit 84eff56
Show file tree
Hide file tree
Showing 5 changed files with 254 additions and 101 deletions.
2 changes: 1 addition & 1 deletion modules/moordyn/src/MoorDyn.f90
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ MODULE MoorDyn

PRIVATE

TYPE(ProgDesc), PARAMETER :: MD_ProgDesc = ProgDesc( 'MoorDyn', 'v2.2.2', '2024-01-16' )
TYPE(ProgDesc), PARAMETER :: MD_ProgDesc = ProgDesc( 'MoorDyn', 'v2.3.8', '2025-02-27' )

INTEGER(IntKi), PARAMETER :: wordy = 0 ! verbosity level. >1 = more console output

Expand Down
8 changes: 4 additions & 4 deletions modules/moordyn/src/MoorDyn_IO.f90
Original file line number Diff line number Diff line change
Expand Up @@ -1592,7 +1592,7 @@ SUBROUTINE MDIO_WriteOutputs( Time, p, m, y, ErrStat, ErrMsg )
if ( p%NumOuts > 0_IntKi .and. p%MDUnOut > 0 ) then

! Write the output parameters to the file
Frmt = '(F10.4,'//TRIM(Int2LStr(p%NumOuts))//'(A1,ES15.7E2))' ! should evenutally use user specified format?
Frmt = '(F10.4,'//TRIM(Int2LStr(p%NumOuts))//'(A1,ES15.7))' ! should evenutally use user specified format?

WRITE(p%MDUnOut,Frmt) Time, ( p%Delim, y%WriteOutput(I), I=1,p%NumOuts )
END IF
Expand All @@ -1614,9 +1614,9 @@ SUBROUTINE MDIO_WriteOutputs( Time, p, m, y, ErrStat, ErrMsg )
+ m%LineList(I)%N*SUM(m%LineList(I)%OutFlagList(10:18))

if (m%LineList(I)%OutFlagList(2) == 1) THEN ! if node positions are included, make them using a float format for higher precision
Frmt = '(F10.4,'//TRIM(Int2LStr(3*(m%LineList(I)%N + 1)))//'(A1,ES15.7E2),'//TRIM(Int2LStr(LineNumOuts - 3*(m%LineList(I)%N - 1)))//'(A1,ES15.7E2))'
Frmt = '(F10.4,'//TRIM(Int2LStr(3*(m%LineList(I)%N + 1)))//'(A1,ES15.7),'//TRIM(Int2LStr(LineNumOuts - 3*(m%LineList(I)%N - 1)))//'(A1,ES15.7))'
else
Frmt = '(F10.4,'//TRIM(Int2LStr(LineNumOuts))//'(A1,ES15.7E2))' ! should evenutally use user specified format?
Frmt = '(F10.4,'//TRIM(Int2LStr(LineNumOuts))//'(A1,ES15.7))' ! should evenutally use user specified format?
end if

L = 1 ! start of index of line output file at first entry 12345.7890
Expand Down Expand Up @@ -1773,7 +1773,7 @@ SUBROUTINE MDIO_WriteOutputs( Time, p, m, y, ErrStat, ErrMsg )
+ m%RodList(I)%N*SUM(m%RodList(I)%OutFlagList(12:18))


Frmt = '(F10.4,'//TRIM(Int2LStr(RodNumOuts))//'(A1,ES15.7E2))' ! should evenutally use user specified format?
Frmt = '(F10.4,'//TRIM(Int2LStr(RodNumOuts))//'(A1,ES15.7))' ! should evenutally use user specified format?

L = 1 ! start of index of line output file at first entry

Expand Down
Loading

0 comments on commit 84eff56

Please sign in to comment.