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.

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

[Bugfix] InflowWind: using derived types to read wind file headers failed when using ifort. #1549

Merged
merged 1 commit into from
Apr 27, 2023
Merged
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
9 changes: 9 additions & 0 deletions modules/inflowwind/src/InflowWind_IO.f90
Original file line number Diff line number Diff line change
Expand Up @@ -493,6 +493,7 @@ subroutine IfW_TurbSim_Init(InitInp, SumFileUnit, G3D, FileDat, ErrStat, ErrMsg)
character(ErrMsgLen) :: TmpErrMsg ! temporary error message

type :: TurbSimHeaderType
sequence
integer(B2Ki) :: FileID
integer(B4Ki) :: NZGrids, NYGrids, NTGrids, NSteps
real(SiKi) :: dz, dy, dt
Expand Down Expand Up @@ -1800,6 +1801,7 @@ subroutine Bladed_ReadHeader0(WindFileUnit, G3D, NativeBladedFmt, ErrStat, ErrMs
character(*), intent(out) :: ErrMsg !< error message

type :: HeaderType
sequence
integer(B2Ki) :: NComp
integer(B2Ki) :: DeltaZ, DeltaY, DeltaX
integer(B2Ki) :: NStepsHalf, MWS10
Expand Down Expand Up @@ -1874,19 +1876,23 @@ subroutine Bladed_ReadHeader1(UnitWind, TI, G3D, NativeBladedFmt, ErrStat, ErrMs
character(*), intent(out) :: ErrMsg !< error message

type :: Turb4Type
sequence
integer(B4Ki) :: NComp
real(SiKi) :: Latitude, RoughLen, RefHeight, TurbInt(3)
end type

type :: Turb78Type
sequence
integer(B4Ki) :: HeaderSize, NComp
end type

type :: Turb7Type
sequence
real(SiKi) :: CoherenceDecay, CoherenceScale
end type

type :: Turb8Type
sequence
real(SiKi) :: dummy1(6)
integer(B4Ki) :: dummy2(3)
real(SiKi) :: dummy3(2)
Expand All @@ -1895,13 +1901,15 @@ subroutine Bladed_ReadHeader1(UnitWind, TI, G3D, NativeBladedFmt, ErrStat, ErrMs
end type

type :: Sub1Type
sequence
real(SiKi) :: DeltaZ, DeltaY, DeltaX
integer(B4Ki) :: NStepsHalf
real(SiKi) :: MeanWS, zLu, yLu, xLu
integer(B4Ki) :: dummy, rnd, NZ, NY
end type

type :: Sub2Type
sequence
real(SiKi) :: zLv, yLv, xLv, zLw, yLw, xLw
end type

Expand Down Expand Up @@ -2205,6 +2213,7 @@ subroutine Bladed_ReadTower(UnitWind, G3D, TwrFileName, ErrStat, ErrMsg)
character(*), intent(out) :: ErrMsg !< a message for errors that occur

type :: HeaderType
sequence
real(SiKi) :: DZ, DX, Zmax
integer(B4Ki) :: NumOutSteps, NumZ
real(SiKi) :: UHub, TI(3)
Expand Down