Skip to content

FAST.Farm WriteOutput: fix for Windows Intel OMP build #1263

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

Merged
ebranlard merged 6 commits into from
Oct 5, 2022
Merged

FAST.Farm WriteOutput: fix for Windows Intel OMP build #1263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2e9ea7c
VS FAST.Farm OMP build: use static libraries
bjonkman Sep 26, 2022
284152d
FAST.Farm OutListParameters: fix issue with Windows/Intel/OMP
bjonkman Sep 27, 2022
bfa9eb1
VS build of FAST.Farm OMP: remove dependency on MKL libraries
bjonkman Sep 27, 2022
624dfab
Merge remote-tracking branch 'bjonkman/test/OMP_FF' into b/Farm_OMP
bjonkman Sep 27, 2022
99113d0
FAST.Farm: Update types files + remove OutStrLenM1 parameter
bjonkman Sep 27, 2022
6906dfc
Simplify code in Farm_SetOutParam
bjonkman Sep 27, 2022
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
Binary file modified docs/OtherSupporting/OutListParameters.xlsx
View file
Open in desktop
Binary file not shown.
198 changes: 162 additions & 36 deletions glue-codes/fast-farm/src/FASTWrapper_Types.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,15 +189,27 @@ SUBROUTINE FWrap_CopyInitInput( SrcInitInputData, DstInitInputData, CtrlCode, Er
ENDIF
END SUBROUTINE FWrap_CopyInitInput

SUBROUTINE FWrap_DestroyInitInput( InitInputData, ErrStat, ErrMsg )
SUBROUTINE FWrap_DestroyInitInput( InitInputData, ErrStat, ErrMsg, DEALLOCATEpointers )
TYPE(FWrap_InitInputType), INTENT(INOUT) :: InitInputData
INTEGER(IntKi), INTENT( OUT) :: ErrStat
CHARACTER(*), INTENT( OUT) :: ErrMsg
CHARACTER(*), PARAMETER :: RoutineName = 'FWrap_DestroyInitInput'
LOGICAL,OPTIONAL,INTENT(IN ) :: DEALLOCATEpointers

INTEGER(IntKi) :: i, i1, i2, i3, i4, i5
!
LOGICAL :: DEALLOCATEpointers_local
INTEGER(IntKi) :: ErrStat2
CHARACTER(ErrMsgLen) :: ErrMsg2
CHARACTER(*), PARAMETER :: RoutineName = 'FWrap_DestroyInitInput'

ErrStat = ErrID_None
ErrMsg = ""

IF (PRESENT(DEALLOCATEpointers)) THEN
DEALLOCATEpointers_local = DEALLOCATEpointers
ELSE
DEALLOCATEpointers_local = .true.
END IF

IF (ALLOCATED(InitInputData%fromSCGlob)) THEN
DEALLOCATE(InitInputData%fromSCGlob)
ENDIF
Expand Down Expand Up @@ -525,16 +537,29 @@ SUBROUTINE FWrap_CopyInitOutput( SrcInitOutputData, DstInitOutputData, CtrlCode,
IF (ErrStat>=AbortErrLev) RETURN
END SUBROUTINE FWrap_CopyInitOutput

SUBROUTINE FWrap_DestroyInitOutput( InitOutputData, ErrStat, ErrMsg )
SUBROUTINE FWrap_DestroyInitOutput( InitOutputData, ErrStat, ErrMsg, DEALLOCATEpointers )
TYPE(FWrap_InitOutputType), INTENT(INOUT) :: InitOutputData
INTEGER(IntKi), INTENT( OUT) :: ErrStat
CHARACTER(*), INTENT( OUT) :: ErrMsg
CHARACTER(*), PARAMETER :: RoutineName = 'FWrap_DestroyInitOutput'
LOGICAL,OPTIONAL,INTENT(IN ) :: DEALLOCATEpointers

INTEGER(IntKi) :: i, i1, i2, i3, i4, i5
!
LOGICAL :: DEALLOCATEpointers_local
INTEGER(IntKi) :: ErrStat2
CHARACTER(ErrMsgLen) :: ErrMsg2
CHARACTER(*), PARAMETER :: RoutineName = 'FWrap_DestroyInitOutput'

ErrStat = ErrID_None
ErrMsg = ""
CALL NWTC_Library_Destroyprogdesc( InitOutputData%Ver, ErrStat, ErrMsg )

IF (PRESENT(DEALLOCATEpointers)) THEN
DEALLOCATEpointers_local = DEALLOCATEpointers
ELSE
DEALLOCATEpointers_local = .true.
END IF

CALL NWTC_Library_Destroyprogdesc( InitOutputData%Ver, ErrStat2, ErrMsg2, DEALLOCATEpointers_local )
CALL SetErrStat(ErrStat2, ErrMsg2, ErrStat, ErrMsg, RoutineName)
END SUBROUTINE FWrap_DestroyInitOutput

SUBROUTINE FWrap_PackInitOutput( ReKiBuf, DbKiBuf, IntKiBuf, Indata, ErrStat, ErrMsg, SizeOnly )
Expand Down Expand Up @@ -744,15 +769,27 @@ SUBROUTINE FWrap_CopyContState( SrcContStateData, DstContStateData, CtrlCode, Er
DstContStateData%dummy = SrcContStateData%dummy
END SUBROUTINE FWrap_CopyContState

SUBROUTINE FWrap_DestroyContState( ContStateData, ErrStat, ErrMsg )
SUBROUTINE FWrap_DestroyContState( ContStateData, ErrStat, ErrMsg, DEALLOCATEpointers )
TYPE(FWrap_ContinuousStateType), INTENT(INOUT) :: ContStateData
INTEGER(IntKi), INTENT( OUT) :: ErrStat
CHARACTER(*), INTENT( OUT) :: ErrMsg
CHARACTER(*), PARAMETER :: RoutineName = 'FWrap_DestroyContState'
LOGICAL,OPTIONAL,INTENT(IN ) :: DEALLOCATEpointers

INTEGER(IntKi) :: i, i1, i2, i3, i4, i5
!
LOGICAL :: DEALLOCATEpointers_local
INTEGER(IntKi) :: ErrStat2
CHARACTER(ErrMsgLen) :: ErrMsg2
CHARACTER(*), PARAMETER :: RoutineName = 'FWrap_DestroyContState'

ErrStat = ErrID_None
ErrMsg = ""

IF (PRESENT(DEALLOCATEpointers)) THEN
DEALLOCATEpointers_local = DEALLOCATEpointers
ELSE
DEALLOCATEpointers_local = .true.
END IF

END SUBROUTINE FWrap_DestroyContState

SUBROUTINE FWrap_PackContState( ReKiBuf, DbKiBuf, IntKiBuf, Indata, ErrStat, ErrMsg, SizeOnly )
Expand Down Expand Up @@ -869,15 +906,27 @@ SUBROUTINE FWrap_CopyDiscState( SrcDiscStateData, DstDiscStateData, CtrlCode, Er
DstDiscStateData%dummy = SrcDiscStateData%dummy
END SUBROUTINE FWrap_CopyDiscState

SUBROUTINE FWrap_DestroyDiscState( DiscStateData, ErrStat, ErrMsg )
SUBROUTINE FWrap_DestroyDiscState( DiscStateData, ErrStat, ErrMsg, DEALLOCATEpointers )
TYPE(FWrap_DiscreteStateType), INTENT(INOUT) :: DiscStateData
INTEGER(IntKi), INTENT( OUT) :: ErrStat
CHARACTER(*), INTENT( OUT) :: ErrMsg
CHARACTER(*), PARAMETER :: RoutineName = 'FWrap_DestroyDiscState'
LOGICAL,OPTIONAL,INTENT(IN ) :: DEALLOCATEpointers

INTEGER(IntKi) :: i, i1, i2, i3, i4, i5
!
LOGICAL :: DEALLOCATEpointers_local
INTEGER(IntKi) :: ErrStat2
CHARACTER(ErrMsgLen) :: ErrMsg2
CHARACTER(*), PARAMETER :: RoutineName = 'FWrap_DestroyDiscState'

ErrStat = ErrID_None
ErrMsg = ""

IF (PRESENT(DEALLOCATEpointers)) THEN
DEALLOCATEpointers_local = DEALLOCATEpointers
ELSE
DEALLOCATEpointers_local = .true.
END IF

END SUBROUTINE FWrap_DestroyDiscState

SUBROUTINE FWrap_PackDiscState( ReKiBuf, DbKiBuf, IntKiBuf, Indata, ErrStat, ErrMsg, SizeOnly )
Expand Down Expand Up @@ -994,15 +1043,27 @@ SUBROUTINE FWrap_CopyConstrState( SrcConstrStateData, DstConstrStateData, CtrlCo
DstConstrStateData%dummy = SrcConstrStateData%dummy
END SUBROUTINE FWrap_CopyConstrState

SUBROUTINE FWrap_DestroyConstrState( ConstrStateData, ErrStat, ErrMsg )
SUBROUTINE FWrap_DestroyConstrState( ConstrStateData, ErrStat, ErrMsg, DEALLOCATEpointers )
TYPE(FWrap_ConstraintStateType), INTENT(INOUT) :: ConstrStateData
INTEGER(IntKi), INTENT( OUT) :: ErrStat
CHARACTER(*), INTENT( OUT) :: ErrMsg
CHARACTER(*), PARAMETER :: RoutineName = 'FWrap_DestroyConstrState'
LOGICAL,OPTIONAL,INTENT(IN ) :: DEALLOCATEpointers

INTEGER(IntKi) :: i, i1, i2, i3, i4, i5
!
LOGICAL :: DEALLOCATEpointers_local
INTEGER(IntKi) :: ErrStat2
CHARACTER(ErrMsgLen) :: ErrMsg2
CHARACTER(*), PARAMETER :: RoutineName = 'FWrap_DestroyConstrState'

ErrStat = ErrID_None
ErrMsg = ""

IF (PRESENT(DEALLOCATEpointers)) THEN
DEALLOCATEpointers_local = DEALLOCATEpointers
ELSE
DEALLOCATEpointers_local = .true.
END IF

END SUBROUTINE FWrap_DestroyConstrState

SUBROUTINE FWrap_PackConstrState( ReKiBuf, DbKiBuf, IntKiBuf, Indata, ErrStat, ErrMsg, SizeOnly )
Expand Down Expand Up @@ -1119,15 +1180,27 @@ SUBROUTINE FWrap_CopyOtherState( SrcOtherStateData, DstOtherStateData, CtrlCode,
DstOtherStateData%dummy = SrcOtherStateData%dummy
END SUBROUTINE FWrap_CopyOtherState

SUBROUTINE FWrap_DestroyOtherState( OtherStateData, ErrStat, ErrMsg )
SUBROUTINE FWrap_DestroyOtherState( OtherStateData, ErrStat, ErrMsg, DEALLOCATEpointers )
TYPE(FWrap_OtherStateType), INTENT(INOUT) :: OtherStateData
INTEGER(IntKi), INTENT( OUT) :: ErrStat
CHARACTER(*), INTENT( OUT) :: ErrMsg
CHARACTER(*), PARAMETER :: RoutineName = 'FWrap_DestroyOtherState'
LOGICAL,OPTIONAL,INTENT(IN ) :: DEALLOCATEpointers

INTEGER(IntKi) :: i, i1, i2, i3, i4, i5
!
LOGICAL :: DEALLOCATEpointers_local
INTEGER(IntKi) :: ErrStat2
CHARACTER(ErrMsgLen) :: ErrMsg2
CHARACTER(*), PARAMETER :: RoutineName = 'FWrap_DestroyOtherState'

ErrStat = ErrID_None
ErrMsg = ""

IF (PRESENT(DEALLOCATEpointers)) THEN
DEALLOCATEpointers_local = DEALLOCATEpointers
ELSE
DEALLOCATEpointers_local = .true.
END IF

END SUBROUTINE FWrap_DestroyOtherState

SUBROUTINE FWrap_PackOtherState( ReKiBuf, DbKiBuf, IntKiBuf, Indata, ErrStat, ErrMsg, SizeOnly )
Expand Down Expand Up @@ -1311,37 +1384,54 @@ SUBROUTINE FWrap_CopyMisc( SrcMiscData, DstMiscData, CtrlCode, ErrStat, ErrMsg )
ENDIF
END SUBROUTINE FWrap_CopyMisc

SUBROUTINE FWrap_DestroyMisc( MiscData, ErrStat, ErrMsg )
SUBROUTINE FWrap_DestroyMisc( MiscData, ErrStat, ErrMsg, DEALLOCATEpointers )
TYPE(FWrap_MiscVarType), INTENT(INOUT) :: MiscData
INTEGER(IntKi), INTENT( OUT) :: ErrStat
CHARACTER(*), INTENT( OUT) :: ErrMsg
CHARACTER(*), PARAMETER :: RoutineName = 'FWrap_DestroyMisc'
LOGICAL,OPTIONAL,INTENT(IN ) :: DEALLOCATEpointers

INTEGER(IntKi) :: i, i1, i2, i3, i4, i5
!
LOGICAL :: DEALLOCATEpointers_local
INTEGER(IntKi) :: ErrStat2
CHARACTER(ErrMsgLen) :: ErrMsg2
CHARACTER(*), PARAMETER :: RoutineName = 'FWrap_DestroyMisc'

ErrStat = ErrID_None
ErrMsg = ""
CALL FAST_Destroyturbinetype( MiscData%Turbine, ErrStat, ErrMsg )

IF (PRESENT(DEALLOCATEpointers)) THEN
DEALLOCATEpointers_local = DEALLOCATEpointers
ELSE
DEALLOCATEpointers_local = .true.
END IF

CALL FAST_Destroyturbinetype( MiscData%Turbine, ErrStat2, ErrMsg2, DEALLOCATEpointers_local )
CALL SetErrStat(ErrStat2, ErrMsg2, ErrStat, ErrMsg, RoutineName)
IF (ALLOCATED(MiscData%TempDisp)) THEN
DO i1 = LBOUND(MiscData%TempDisp,1), UBOUND(MiscData%TempDisp,1)
CALL MeshDestroy( MiscData%TempDisp(i1), ErrStat, ErrMsg )
CALL MeshDestroy( MiscData%TempDisp(i1), ErrStat2, ErrMsg2 )
CALL SetErrStat(ErrStat2, ErrMsg2, ErrStat, ErrMsg, RoutineName)
ENDDO
DEALLOCATE(MiscData%TempDisp)
ENDIF
IF (ALLOCATED(MiscData%TempLoads)) THEN
DO i1 = LBOUND(MiscData%TempLoads,1), UBOUND(MiscData%TempLoads,1)
CALL MeshDestroy( MiscData%TempLoads(i1), ErrStat, ErrMsg )
CALL MeshDestroy( MiscData%TempLoads(i1), ErrStat2, ErrMsg2 )
CALL SetErrStat(ErrStat2, ErrMsg2, ErrStat, ErrMsg, RoutineName)
ENDDO
DEALLOCATE(MiscData%TempLoads)
ENDIF
IF (ALLOCATED(MiscData%ADRotorDisk)) THEN
DO i1 = LBOUND(MiscData%ADRotorDisk,1), UBOUND(MiscData%ADRotorDisk,1)
CALL MeshDestroy( MiscData%ADRotorDisk(i1), ErrStat, ErrMsg )
CALL MeshDestroy( MiscData%ADRotorDisk(i1), ErrStat2, ErrMsg2 )
CALL SetErrStat(ErrStat2, ErrMsg2, ErrStat, ErrMsg, RoutineName)
ENDDO
DEALLOCATE(MiscData%ADRotorDisk)
ENDIF
IF (ALLOCATED(MiscData%AD_L2L)) THEN
DO i1 = LBOUND(MiscData%AD_L2L,1), UBOUND(MiscData%AD_L2L,1)
CALL NWTC_Library_Destroymeshmaptype( MiscData%AD_L2L(i1), ErrStat, ErrMsg )
CALL NWTC_Library_Destroymeshmaptype( MiscData%AD_L2L(i1), ErrStat2, ErrMsg2, DEALLOCATEpointers_local )
CALL SetErrStat(ErrStat2, ErrMsg2, ErrStat, ErrMsg, RoutineName)
ENDDO
DEALLOCATE(MiscData%AD_L2L)
ENDIF
Expand Down Expand Up @@ -2038,15 +2128,27 @@ SUBROUTINE FWrap_CopyParam( SrcParamData, DstParamData, CtrlCode, ErrStat, ErrMs
DstParamData%p_ref_Turbine = SrcParamData%p_ref_Turbine
END SUBROUTINE FWrap_CopyParam

SUBROUTINE FWrap_DestroyParam( ParamData, ErrStat, ErrMsg )
SUBROUTINE FWrap_DestroyParam( ParamData, ErrStat, ErrMsg, DEALLOCATEpointers )
TYPE(FWrap_ParameterType), INTENT(INOUT) :: ParamData
INTEGER(IntKi), INTENT( OUT) :: ErrStat
CHARACTER(*), INTENT( OUT) :: ErrMsg
CHARACTER(*), PARAMETER :: RoutineName = 'FWrap_DestroyParam'
LOGICAL,OPTIONAL,INTENT(IN ) :: DEALLOCATEpointers

INTEGER(IntKi) :: i, i1, i2, i3, i4, i5
!
LOGICAL :: DEALLOCATEpointers_local
INTEGER(IntKi) :: ErrStat2
CHARACTER(ErrMsgLen) :: ErrMsg2
CHARACTER(*), PARAMETER :: RoutineName = 'FWrap_DestroyParam'

ErrStat = ErrID_None
ErrMsg = ""

IF (PRESENT(DEALLOCATEpointers)) THEN
DEALLOCATEpointers_local = DEALLOCATEpointers
ELSE
DEALLOCATEpointers_local = .true.
END IF

IF (ALLOCATED(ParamData%r)) THEN
DEALLOCATE(ParamData%r)
ENDIF
Expand Down Expand Up @@ -2269,15 +2371,27 @@ SUBROUTINE FWrap_CopyInput( SrcInputData, DstInputData, CtrlCode, ErrStat, ErrMs
ENDIF
END SUBROUTINE FWrap_CopyInput

SUBROUTINE FWrap_DestroyInput( InputData, ErrStat, ErrMsg )
SUBROUTINE FWrap_DestroyInput( InputData, ErrStat, ErrMsg, DEALLOCATEpointers )
TYPE(FWrap_InputType), INTENT(INOUT) :: InputData
INTEGER(IntKi), INTENT( OUT) :: ErrStat
CHARACTER(*), INTENT( OUT) :: ErrMsg
CHARACTER(*), PARAMETER :: RoutineName = 'FWrap_DestroyInput'
LOGICAL,OPTIONAL,INTENT(IN ) :: DEALLOCATEpointers

INTEGER(IntKi) :: i, i1, i2, i3, i4, i5
!
LOGICAL :: DEALLOCATEpointers_local
INTEGER(IntKi) :: ErrStat2
CHARACTER(ErrMsgLen) :: ErrMsg2
CHARACTER(*), PARAMETER :: RoutineName = 'FWrap_DestroyInput'

ErrStat = ErrID_None
ErrMsg = ""

IF (PRESENT(DEALLOCATEpointers)) THEN
DEALLOCATEpointers_local = DEALLOCATEpointers
ELSE
DEALLOCATEpointers_local = .true.
END IF

IF (ALLOCATED(InputData%fromSCglob)) THEN
DEALLOCATE(InputData%fromSCglob)
ENDIF
Expand Down Expand Up @@ -2586,15 +2700,27 @@ SUBROUTINE FWrap_CopyOutput( SrcOutputData, DstOutputData, CtrlCode, ErrStat, Er
ENDIF
END SUBROUTINE FWrap_CopyOutput

SUBROUTINE FWrap_DestroyOutput( OutputData, ErrStat, ErrMsg )
SUBROUTINE FWrap_DestroyOutput( OutputData, ErrStat, ErrMsg, DEALLOCATEpointers )
TYPE(FWrap_OutputType), INTENT(INOUT) :: OutputData
INTEGER(IntKi), INTENT( OUT) :: ErrStat
CHARACTER(*), INTENT( OUT) :: ErrMsg
CHARACTER(*), PARAMETER :: RoutineName = 'FWrap_DestroyOutput'
LOGICAL,OPTIONAL,INTENT(IN ) :: DEALLOCATEpointers

INTEGER(IntKi) :: i, i1, i2, i3, i4, i5
!
LOGICAL :: DEALLOCATEpointers_local
INTEGER(IntKi) :: ErrStat2
CHARACTER(ErrMsgLen) :: ErrMsg2
CHARACTER(*), PARAMETER :: RoutineName = 'FWrap_DestroyOutput'

ErrStat = ErrID_None
ErrMsg = ""

IF (PRESENT(DEALLOCATEpointers)) THEN
DEALLOCATEpointers_local = DEALLOCATEpointers
ELSE
DEALLOCATEpointers_local = .true.
END IF

IF (ALLOCATED(OutputData%toSC)) THEN
DEALLOCATE(OutputData%toSC)
ENDIF
Expand Down
Loading