Skip to content

Commit 62ac9d6

Browse files
committed
Add C and Fortran string error handling functions
1 parent e316c84 commit 62ac9d6

File tree

5 files changed

+443
-458
lines changed

5 files changed

+443
-458
lines changed

glue-codes/labview/src/WaveTank.f90

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ MODULE WaveTankTesting
77
USE SeaState_C_Binding, ONLY: SeaSt_C_Init, SeaSt_C_CalcOutput, SeaSt_C_End, MaxOutPts
88
USE AeroDyn_Inflow_C_BINDING, ONLY: ADI_C_PreInit, ADI_C_SetupRotor, ADI_C_Init, ADI_C_End, MaxADIOutputs
99
USE MoorDyn_C, ONLY: MD_C_Init, MD_C_End
10-
USE NWTC_C_Binding, ONLY: IntfStrLen, SetErr, ErrMsgLen_C
10+
USE NWTC_C_Binding, ONLY: IntfStrLen, SetErrStat_C, ErrMsgLen_C
1111

1212
IMPLICIT NONE
1313
SAVE
@@ -27,26 +27,7 @@ MODULE WaveTankTesting
2727

2828
CONTAINS
2929

30-
SUBROUTINE SetErrStat_C(ErrStatLocal, ErrMessLocal, ErrStatGlobal, ErrMessGlobal, RoutineName)
3130

32-
INTEGER(C_INT), INTENT(IN ) :: ErrStatLocal ! Error status of the operation
33-
CHARACTER(KIND=C_CHAR, LEN=ErrMsgLen_C), INTENT(IN ) :: ErrMessLocal ! Error message if ErrStat /= ErrID_None
34-
INTEGER(C_INT), INTENT(INOUT) :: ErrStatGlobal ! Error status of the operation
35-
CHARACTER(KIND=C_CHAR), INTENT(INOUT) :: ErrMessGlobal(ErrMsgLen_C) ! Error message if ErrStat /= ErrID_None
36-
CHARACTER(*), INTENT(IN ) :: RoutineName ! Name of the routine error occurred in
37-
38-
IF ( ErrStatLocal == ErrID_None ) RETURN
39-
40-
IF (ErrStatGlobal /= ErrID_None) THEN
41-
! print *, "in if", ErrStatGlobal, ErrID_None
42-
! ErrMessGlobal = TRIM(ErrMessGlobal)//new_line('a')
43-
! print *, "ErrMessGlobal", ErrMessGlobal
44-
ENDIF
45-
ErrMessGlobal = TRANSFER( ErrMessGlobal//TRIM(RoutineName)//':'//TRIM(ErrMessLocal)//C_NULL_CHAR, ErrMessGlobal )
46-
! ErrMessGlobal = TRIM(ErrMessGlobal)//TRIM(RoutineName)//':'//TRIM(ErrMessLocal)
47-
ErrStatGlobal = MAX(ErrStatGlobal, ErrStatLocal)
48-
49-
END SUBROUTINE
5031

5132
SUBROUTINE WaveTank_Init( &
5233
MD_InputFile_C, &

0 commit comments

Comments
 (0)