Skip to content

Commit

Permalink
Merge pull request #643 from andrew-platt/f/AD15_InputFileHandling
Browse files Browse the repository at this point in the history 
AD: Support primary input parsing through file and strings
  • Loading branch information
@andrew-platt
andrew-platt authored Jan 22, 2021
2 parents c670d0e + 9e9f269 commit ea03fc5
Show file tree
Hide file tree
Showing 7 changed files with 588 additions and 671 deletions.
132 changes: 71 additions & 61 deletions modules/aerodyn/src/AeroDyn.f90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -225,9 +225,12 @@ subroutine AD_Init( InitInp, u, p, x, xd, z, OtherState, y, m, Interval, InitOut
integer(IntKi) :: errStat2 ! temporary error status of the operation
character(ErrMsgLen) :: errMsg2 ! temporary error message

type(AD_InputFile) :: InputFileData ! Data stored in the module's input file
type(FileInfoType) :: FileInfo_In !< The derived type for holding the full input file for parsing -- we may pass this in the future
type(AD_InputFile) :: InputFileData ! Data stored in the module's input file after parsing
character(1024) :: PriPath !< Primary path
character(1024) :: EchoFileName
integer(IntKi) :: UnEcho ! Unit number for the echo file

character(*), parameter :: RoutineName = 'AD_Init'


Expand All @@ -245,61 +248,67 @@ subroutine AD_Init( InitInp, u, p, x, xd, z, OtherState, y, m, Interval, InitOut

call DispNVD( AD_Ver )


p%NumBlades = InitInp%NumBlades ! need this before reading the AD input file so that we know how many blade files to read
!bjj: note that we haven't validated p%NumBlades before using it below!

! set a few parameters needed while reading the input file
call ValidateNumBlades( InitInp%NumBlades, ErrStat2, ErrMsg2 )
if (Failed()) return;
p%NumBlades = InitInp%NumBlades
p%RootName = TRIM(InitInp%RootName)//'.AD'

! Read the primary AeroDyn input file
call ReadInputFiles( InitInp%InputFile, InputFileData, interval, p%RootName, p%NumBlades, UnEcho, ErrStat2, ErrMsg2 )
call SetErrStat( ErrStat2, ErrMsg2, ErrStat, ErrMsg, RoutineName )
if (ErrStat >= AbortErrLev) then
call Cleanup()
return
end if



CALL GetPath( InitInp%InputFile, PriPath ) ! Input files will be relative to the path where the primary input file is located.

! -----------------------------------------------------------------
! Read the primary AeroDyn input file, or copy from passed input
if (InitInp%UsePrimaryInputFile) then
! Read the entire input file, minus any comment lines, into the FileInfo_In
! data structure in memory for further processing.
call ProcessComFile( InitInp%InputFile, FileInfo_In, ErrStat2, ErrMsg2 )
else
call NWTC_Library_CopyFileInfoType( InitInp%PassedPrimaryInputData, FileInfo_In, MESH_NEWCOPY, ErrStat2, ErrMsg2 )
endif
if (Failed()) return;


! For diagnostic purposes, the following can be used to display the contents
! of the FileInfo_In data structure.
! call Print_FileInfo_Struct( CU, FileInfo_In ) ! CU is the screen -- different number on different systems.

! Parse the FileInfo_In structure of data from the inputfile into the InitInp%InputFile structure
CALL ParsePrimaryFileInfo( PriPath, InitInp%InputFile, p%RootName, p%NumBlades, interval, FileInfo_In, InputFileData, UnEcho, ErrStat2, ErrMsg2 )
if (Failed()) return;


! -----------------------------------------------------------------
! Read the AeroDyn blade files, or copy from passed input
!FIXME: add handling for passing of blade files and other types of files.
call ReadInputFiles( InitInp%InputFile, InputFileData, interval, p%RootName, p%NumBlades, UnEcho, ErrStat2, ErrMsg2 )
if (Failed()) return;


! Validate the inputs
call ValidateInputData( InitInp, InputFileData, p%NumBlades, ErrStat2, ErrMsg2 )
call SetErrStat( ErrStat2, ErrMsg2, ErrStat, ErrMsg, RoutineName )
if (ErrStat >= AbortErrLev) then
call Cleanup()
return
end if
if (Failed()) return;

!............................................................................................
! Define parameters
!............................................................................................

! Initialize AFI module (read Airfoil tables)
call Init_AFIparams( InputFileData, p%AFI, UnEcho, p%NumBlades, ErrStat2, ErrMsg2 )
call SetErrStat( ErrStat2, ErrMsg2, ErrStat, ErrMsg, RoutineName )
if (ErrStat >= AbortErrLev) then
call Cleanup()
return
end if
if (Failed()) return;


! set the rest of the parameters
call SetParameters( InitInp, InputFileData, p, ErrStat2, ErrMsg2 )
call SetErrStat( ErrStat2, ErrMsg2, ErrStat, ErrMsg, RoutineName )
if (ErrStat >= AbortErrLev) then
call Cleanup()
return
end if
if (Failed()) return;

!............................................................................................
! Define and initialize inputs here
!............................................................................................

call Init_u( u, p, InputFileData, InitInp, errStat2, errMsg2 )
call SetErrStat( ErrStat2, ErrMsg2, ErrStat, ErrMsg, RoutineName )
if (ErrStat >= AbortErrLev) then
call Cleanup()
return
end if
if (Failed()) return;

!

!............................................................................................
! Initialize the BEMT module (also sets other variables for sub module)
Expand All @@ -311,11 +320,7 @@ subroutine AD_Init( InitInp, u, p, x, xd, z, OtherState, y, m, Interval, InitOut
if (p%WakeMod /= WakeMod_FVW) then
call Init_BEMTmodule( InputFileData, u, m%BEMT_u(1), p, x%BEMT, xd%BEMT, z%BEMT, &
OtherState%BEMT, m%BEMT_y, m%BEMT, ErrStat2, ErrMsg2 )
call SetErrStat( ErrStat2, ErrMsg2, ErrStat, ErrMsg, RoutineName )
if (ErrStat >= AbortErrLev) then
call Cleanup()
return
end if
if (Failed()) return;

call BEMT_CopyInput( m%BEMT_u(1), m%BEMT_u(2), MESH_NEWCOPY, ErrStat2, ErrMsg2 )
call SetErrStat( ErrStat2, ErrMsg2, ErrStat, ErrMsg, RoutineName )
Expand All @@ -326,7 +331,7 @@ subroutine AD_Init( InitInp, u, p, x, xd, z, OtherState, y, m, Interval, InitOut
!............................................................................................
if (p%CompAA) then
call Init_AAmodule( InitInp, InputFileData, u, m%AA_u, p, x%AA, xd%AA, z%AA, OtherState%AA, m%AA_y, m%AA, ErrStat2, ErrMsg2 )
call SetErrStat( ErrStat2, ErrMsg2, ErrStat, ErrMsg, RoutineName )
if (Failed()) return;
end if
endif

Expand All @@ -341,15 +346,11 @@ subroutine AD_Init( InitInp, u, p, x, xd, z, OtherState, y, m, Interval, InitOut
if (.not. allocated(m%FVW_u)) Allocate(m%FVW_u(3)) !size(u)))
call Init_FVWmodule( InputFileData, u, m%FVW_u(1), p, x%FVW, xd%FVW, z%FVW, &
OtherState%FVW, m%FVW_y, m%FVW, ErrStat2, ErrMsg2 )
call SetErrStat( ErrStat2, ErrMsg2, ErrStat, ErrMsg, RoutineName )
if (ErrStat >= AbortErrLev) then
call Cleanup()
return
end if
if (Failed()) return;
! populate the rest of the FVW_u so that extrap-interp will work
do i=2,3 !size(u)
call FVW_CopyInput( m%FVW_u(1), m%FVW_u(i), MESH_NEWCOPY, ErrStat2, ErrMsg2 )
call SetErrStat( ErrStat2, ErrMsg2, ErrStat, ErrMsg, RoutineName )
if (Failed()) return;
enddo
endif

Expand All @@ -358,11 +359,7 @@ subroutine AD_Init( InitInp, u, p, x, xd, z, OtherState, y, m, Interval, InitOut
! Define outputs here
!............................................................................................
call Init_y(y, u, p, errStat2, errMsg2) ! do this after input meshes have been initialized
call SetErrStat( ErrStat2, ErrMsg2, ErrStat, ErrMsg, RoutineName )
if (ErrStat >= AbortErrLev) then
call Cleanup()
return
end if
if (Failed()) return;


!............................................................................................
Expand All @@ -372,20 +369,20 @@ subroutine AD_Init( InitInp, u, p, x, xd, z, OtherState, y, m, Interval, InitOut
! many states are in the BEMT module, which were initialized in BEMT_Init()

call Init_MiscVars(m, p, u, y, errStat2, errMsg2)
call SetErrStat( ErrStat2, ErrMsg2, ErrStat, ErrMsg, RoutineName )
if (Failed()) return;

!............................................................................................
! Initialize other states
!............................................................................................
! The wake from FVW is stored in other states. This may not be the best place to put it!
call Init_OtherStates(m, p, OtherState, errStat2, errMsg2)
call SetErrStat( ErrStat2, ErrMsg2, ErrStat, ErrMsg, RoutineName )
if (Failed()) return;

!............................................................................................
! Define initialization output here
!............................................................................................
call AD_SetInitOut(p, InputFileData, InitOut, errStat2, errMsg2)
call SetErrStat( ErrStat2, ErrMsg2, ErrStat, ErrMsg, RoutineName )
if (Failed()) return;

! after setting InitOut variables, we really don't need the airfoil coordinates taking up
! space in AeroDyn
Expand All @@ -401,15 +398,15 @@ subroutine AD_Init( InitInp, u, p, x, xd, z, OtherState, y, m, Interval, InitOut
!............................................................................................
if (InitInp%Linearize) then
call Init_Jacobian(InputFileData, p, u, y, m, InitOut, ErrStat2, ErrMsg2)
call SetErrStat( ErrStat2, ErrMsg2, ErrStat, ErrMsg, RoutineName )
if (Failed()) return;
end if

!............................................................................................
! Print the summary file if requested:
!............................................................................................
if (InputFileData%SumPrint) then
call AD_PrintSum( InputFileData, p, u, y, ErrStat2, ErrMsg2 )
call SetErrStat( ErrStat2, ErrMsg2, ErrStat, ErrMsg, RoutineName )
if (Failed()) return;
end if

!............................................................................................
Expand All @@ -423,11 +420,14 @@ subroutine AD_Init( InitInp, u, p, x, xd, z, OtherState, y, m, Interval, InitOut
call Cleanup()

contains
logical function Failed()
CALL SetErrStat( ErrStat2, ErrMsg2, ErrStat, ErrMsg, RoutineName )
Failed = ErrStat >= AbortErrLev
if (Failed) call Cleanup()
end function Failed
subroutine Cleanup()

CALL AD_DestroyInputFile( InputFileData, ErrStat2, ErrMsg2 )
IF ( UnEcho > 0 ) CLOSE( UnEcho )

end subroutine Cleanup

end subroutine AD_Init
Expand Down Expand Up @@ -1921,6 +1921,16 @@ subroutine SetOutputsFromFVW(u, p, OtherState, x, xd, m, y, ErrStat, ErrMsg)
end subroutine SetOutputsFromFVW
!----------------------------------------------------------------------------------------------------------------------------------
!> This routine validates the inputs from the AeroDyn input files.
SUBROUTINE ValidateNumBlades( NumBl, ErrStat, ErrMsg )
integer(IntKi), intent(in) :: NumBl !< Number of blades
integer(IntKi), intent(out) :: ErrStat !< Error status
character(*), intent(out) :: ErrMsg !< Error message
ErrStat = ErrID_None
ErrMsg = ''
if (NumBl > MaxBl .or. NumBl < 1) call SetErrStat( ErrID_Fatal, 'Number of blades must be between 1 and '//trim(num2lstr(MaxBl))//'.', ErrStat, ErrMsg, 'ValidateNumBlades' )
END SUBROUTINE ValidateNumBlades
!----------------------------------------------------------------------------------------------------------------------------------
!> This routine validates the inputs from the AeroDyn input files.
SUBROUTINE ValidateInputData( InitInp, InputFileData, NumBl, ErrStat, ErrMsg )
!..................................................................................................................................

Expand All @@ -1942,7 +1952,6 @@ SUBROUTINE ValidateInputData( InitInp, InputFileData, NumBl, ErrStat, ErrMsg )
ErrMsg = ""


if (NumBl > MaxBl .or. NumBl < 1) call SetErrStat( ErrID_Fatal, 'Number of blades must be between 1 and '//trim(num2lstr(MaxBl))//'.', ErrSTat, ErrMsg, RoutineName )
if (InputFileData%DTAero <= 0.0) call SetErrStat ( ErrID_Fatal, 'DTAero must be greater than zero.', ErrStat, ErrMsg, RoutineName )
if (InputFileData%WakeMod /= WakeMod_None .and. InputFileData%WakeMod /= WakeMod_BEMT .and. InputFileData%WakeMod /= WakeMod_DBEMT .and. InputFileData%WakeMod /= WakeMod_FVW) then
call SetErrStat ( ErrID_Fatal, 'WakeMod must be '//trim(num2lstr(WakeMod_None))//' (none), '//trim(num2lstr(WakeMod_BEMT))//' (BEMT), '// &
Expand Down Expand Up @@ -2154,6 +2163,7 @@ SUBROUTINE Init_AFIparams( InputFileData, p_AFI, UnEc, NumBl, ErrStat, ErrMsg )
AFI_InitInputs%InCol_Cl = InputFileData%InCol_Cl
AFI_InitInputs%InCol_Cd = InputFileData%InCol_Cd
AFI_InitInputs%InCol_Cm = InputFileData%InCol_Cm
IF (.not. InputFileData%UseBlCm) AFI_InitInputs%InCol_Cm = 0 ! Don't try to use Cm if flag set to false
AFI_InitInputs%InCol_Cpmin = InputFileData%InCol_Cpmin
AFI_InitInputs%AFTabMod = InputFileData%AFTabMod !AFITable_1

Expand Down
Loading

0 comments on commit ea03fc5

Please sign in to comment.