Skip to content

Bug fix for Failed0 error checking functions #2770

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
andrew-platt merged 2 commits into from
Apr 21, 2025
Merged

Bug fix for Failed0 error checking functions #2770

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d6aab24
Check for local error in Failed0
rafmudaf Apr 21, 2025
14c9117
Set C error on failure in Failed0
rafmudaf Apr 21, 2025
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
6 changes: 3 additions & 3 deletions glue-codes/fast-farm/src/FASTWrapper.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,12 +229,12 @@ end function Failed
! check for failed where /= 0 is fatal
logical function Failed0(txt)
character(*), intent(in) :: txt
if (errStat /= 0) then
if (ErrStat2 /= 0) then
ErrStat2 = ErrID_Fatal
ErrMsg2 = "Could not allocate memory for "//trim(txt)
call SetErrStat(errStat2, errMsg2, errStat, errMsg, RoutineName)
call SetErrStat(ErrStat2, ErrMsg2, errStat, errMsg, RoutineName)
endif
Failed0 = errStat >= AbortErrLev
Failed0 = ErrStat >= AbortErrLev
if(Failed0) call cleanUp()
end function Failed0
END SUBROUTINE FWrap_Init
Expand Down
18 changes: 9 additions & 9 deletions glue-codes/fast-farm/src/FAST_Farm_Subs.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -604,12 +604,12 @@ end subroutine cleanup
! check for failed where /= 0 is fatal
logical function Failed0(txt)
character(*), intent(in) :: txt
if (errStat /= 0) then
if (ErrStat2 /= 0) then
ErrStat2 = ErrID_Fatal
ErrMsg2 = "Could not allocate memory for "//trim(txt)
call SetErrStat(errStat2, errMsg2, errStat, errMsg, RoutineName)
call SetErrStat(ErrStat2, ErrMsg2, ErrStat, ErrMsg, RoutineName)
endif
Failed0 = errStat >= AbortErrLev
Failed0 = ErrStat >= AbortErrLev
if(Failed0) call cleanUp()
end function Failed0
END SUBROUTINE Farm_InitWD
Expand Down Expand Up @@ -716,12 +716,12 @@ end subroutine cleanup
! check for failed where /= 0 is fatal
logical function Failed0(txt)
character(*), intent(in) :: txt
if (errStat /= 0) then
if (ErrStat2 /= 0) then
ErrStat2 = ErrID_Fatal
ErrMsg2 = "Could not allocate memory for "//trim(txt)
call SetErrStat(errStat2, errMsg2, errStat, errMsg, RoutineName)
call SetErrStat(ErrStat2, ErrMsg2, ErrStat, ErrMsg, RoutineName)
endif
Failed0 = errStat >= AbortErrLev
Failed0 = ErrStat >= AbortErrLev
if(Failed0) call cleanUp()
end function Failed0
END SUBROUTINE Farm_InitFAST
Expand Down Expand Up @@ -873,12 +873,12 @@ end function Failed
! check for failed where /= 0 is fatal
logical function Failed0(txt)
character(*), intent(in) :: txt
if (errStat /= 0) then
if (ErrStat2 /= 0) then
ErrStat2 = ErrID_Fatal
ErrMsg2 = "Could not allocate memory for "//trim(txt)
call SetErrStat(errStat2, errMsg2, errStat, errMsg, RoutineName)
call SetErrStat(ErrStat2, ErrMsg2, ErrStat, ErrMsg, RoutineName)
endif
Failed0 = errStat >= AbortErrLev
Failed0 = ErrStat >= AbortErrLev
if(Failed0) call cleanUp()
end function Failed0
END SUBROUTINE Farm_InitMD
Expand Down
6 changes: 3 additions & 3 deletions modules/aerodyn/src/AeroDyn_Driver_Subs.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -557,12 +557,12 @@ end function Failed
! check for failed where /= 0 is fatal
logical function Failed0(txt)
character(*), intent(in) :: txt
if (errStat /= 0) then
if (ErrStat2 /= 0) then
ErrStat2 = ErrID_Fatal
ErrMsg2 = "Could not allocate "//trim(txt)
call SetErrStat(errStat2, errMsg2, errStat, errMsg, 'Init_ADI_ForDriver')
call SetErrStat(ErrStat2, ErrMsg2, errStat, errMsg, 'Init_ADI_ForDriver')
endif
Failed0 = errStat >= AbortErrLev
Failed0 = ErrStat >= AbortErrLev
if(Failed0) call cleanUp()
end function Failed0

Expand Down
16 changes: 11 additions & 5 deletions modules/aerodyn/src/AeroDyn_Inflow_C_Binding.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,13 +369,16 @@ end function Failed
! check for failed where /= 0 is fatal
logical function Failed0(txt)
character(*), intent(in) :: txt
if (errStat /= 0) then
if (ErrStat2 /= 0) then
ErrStat2 = ErrID_Fatal
ErrMsg2 = "Could not allocate "//trim(txt)
call SetErrStat(ErrStat2, ErrMsg2, ErrStat, ErrMsg, RoutineName)
endif
Failed0 = ErrStat >= AbortErrLev
if(Failed0) call ClearTmpStorage()
if(Failed0) then
call ClearTmpStorage()
call SetErr(ErrStat,ErrMsg,ErrStat_C,ErrMsg_C)
endif
end function Failed0

!> This subroutine prints out all the variables that are passed in. Use this only
Expand Down Expand Up @@ -787,7 +790,7 @@ end function Failed
! check for failed where /= 0 is fatal
logical function Failed0(txt)
character(*), intent(in) :: txt
if (errStat2 /= 0) then
if (ErrStat2 /= 0) then
ErrStat2 = ErrID_Fatal
ErrMsg2 = "Could not allocate "//trim(txt)
call SetErrStat(ErrStat2, ErrMsg2, ErrStat, ErrMsg, RoutineName)
Expand Down Expand Up @@ -1532,13 +1535,16 @@ end function Failed
! check for failed where /= 0 is fatal
logical function Failed0(txt)
character(*), intent(in) :: txt
if (errStat /= 0) then
if (ErrStat2 /= 0) then
ErrStat2 = ErrID_Fatal
ErrMsg2 = "Could not allocate "//trim(txt)
call SetErrStat(ErrStat2, ErrMsg2, ErrStat, ErrMsg, RoutineName)
endif
Failed0 = ErrStat >= AbortErrLev
if(Failed0) call ClearTmpStorage()
if(Failed0) then
call ClearTmpStorage()
call SetErr(ErrStat,ErrMsg,ErrStat_C,ErrMsg_C)
endif
end function Failed0

!> This subroutine prints out all the variables that are passed in. Use this only
Expand Down
6 changes: 3 additions & 3 deletions modules/awae/src/AWAE.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1207,12 +1207,12 @@ end function Failed
! check for failed where /= 0 is fatal
logical function Failed0(txt)
character(*), intent(in) :: txt
if (errStat /= 0) then
if (ErrStat2 /= 0) then
ErrStat2 = ErrID_Fatal
ErrMsg2 = "Could not allocate memory for "//trim(txt)
call SetErrStat(errStat2, errMsg2, errStat, errMsg, RoutineName)
call SetErrStat(ErrStat2, ErrMsg2, ErrStat, ErrMsg, RoutineName)
endif
Failed0 = errStat >= AbortErrLev
Failed0 = ErrStat >= AbortErrLev
end function Failed0
end subroutine AWAE_Init

Expand Down
2 changes: 1 addition & 1 deletion modules/elastodyn/src/ElastoDyn.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2999,7 +2999,7 @@ end function Failed
! check for failed where /= 0 is fatal
logical function Failed0(txt)
character(*), intent(in) :: txt
if (errStat /= 0) then
if (ErrStat2 /= 0) then
ErrStat2 = ErrID_Fatal
ErrMsg2 = "Could not allocate "//trim(txt)
call SetErrStat(ErrStat2, ErrMsg2, ErrStat, ErrMsg2, RoutineName)
Expand Down
2 changes: 1 addition & 1 deletion modules/moordyn/src/MoorDyn_Line.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2016,7 +2016,7 @@ end function Failed
! check for failed where /= 0 is fatal
logical function Failed0(txt)
character(*), intent(in) :: txt
if (errStat /= 0) then
if (ErrStat2 /= 0) then
ErrStat2 = ErrID_Fatal
ErrMsg2 = "Could not allocate "//trim(txt)
call SetErrStat(ErrStat2, ErrMsg2, ErrStat, ErrMsg, RoutineName)
Expand Down
2 changes: 1 addition & 1 deletion modules/moordyn/src/MoorDyn_Rod.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1298,7 +1298,7 @@ end function Failed
! check for failed where /= 0 is fatal
logical function Failed0(txt)
character(*), intent(in) :: txt
if (errStat /= 0) then
if (ErrStat2 /= 0) then
ErrStat2 = ErrID_Fatal
ErrMsg2 = "Could not allocate "//trim(txt)
call SetErrStat(ErrStat2, ErrMsg2, ErrStat, ErrMsg, RoutineName)
Expand Down
2 changes: 1 addition & 1 deletion modules/openfast-library/src/FAST_Lin.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5258,7 +5258,7 @@ SUBROUTINE AllocateOP(p_FAST, y_FAST, ErrStat, ErrMsg )
! check for failed where /= 0 is fatal
logical function Failed0(txt)
character(*), intent(in) :: txt
if (errStat /= 0) then
if (ErrStat2 /= 0) then
ErrStat2 = ErrID_Fatal
ErrMsg2 = "Could not allocate "//trim(txt)
call SetErrStat(ErrStat2, ErrMsg2, ErrStat, ErrMsg, RoutineName)
Expand Down
4 changes: 2 additions & 2 deletions modules/wakedynamics/src/WakeDynamics.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -633,10 +633,10 @@ end function Failed
! check for failed where /= 0 is fatal
logical function Failed0(txt)
character(*), intent(in) :: txt
if (errStat /= 0) then
if (ErrStat2 /= 0) then
ErrStat2 = ErrID_Fatal
ErrMsg2 = "Could not allocate memory for "//trim(txt)
call SetErrStat(errStat2, errMsg2, errStat, errMsg, RoutineName)
call SetErrStat(ErrStat2, ErrMsg2, ErrStat, ErrMsg, RoutineName)
endif
Failed0 = errStat >= AbortErrLev
end function Failed0
Expand Down