Skip to content

Commit

Permalink
[BugFix] WAMIT2 multidirectional angle issue #9
Browse files Browse the repository at this point in the history
  • Loading branch information
@andrew-platt
andrew-platt committed Jan 13, 2020
1 parent 9ead8d6 commit b736f5b
Showing 1 changed file with 12 additions and 12 deletions.
24 changes: 12 additions & 12 deletions modules/hydrodyn/src/WAMIT2.f90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -966,7 +966,7 @@ SUBROUTINE MnDrift_InitCalc( InitInp, p, MnDriftData, MnDriftForce, ErrMsg, ErrS
'found in the WAMIT data file '//TRIM(MnDriftData%Filename)//' for the first wave direction.', &
ErrStat, ErrMsg, RoutineName)
ENDIF
IF ( InitInp%WaveDirMax < MAXVAL(MnDriftData%Data3D%WvDir1) ) THEN
IF ( InitInp%WaveDirMax > MAXVAL(MnDriftData%Data3D%WvDir1) ) THEN
CALL SetErrStat( ErrID_Fatal,' Maximum wave direction required of '//TRIM(Num2LStr(InitInp%WaveDirMax))//' is not'//&
'found in the WAMIT data file '//TRIM(MnDriftData%Filename)//' for the first wave direction.', &
ErrStat, ErrMsg, RoutineName)
Expand All @@ -980,7 +980,7 @@ SUBROUTINE MnDrift_InitCalc( InitInp, p, MnDriftData, MnDriftForce, ErrMsg, ErrS
'found in the WAMIT data file '//TRIM(MnDriftData%Filename)//' for the second wave direction.', &
ErrStat, ErrMsg, RoutineName)
ENDIF
IF ( InitInp%WaveDirMax < MAXVAL(MnDriftData%Data3D%WvDir2) ) THEN
IF ( InitInp%WaveDirMax > MAXVAL(MnDriftData%Data3D%WvDir2) ) THEN
CALL SetErrStat( ErrID_Fatal,' Maximum wave direction required of '//TRIM(Num2LStr(InitInp%WaveDirMax))//' is not'//&
'found in the WAMIT data file '//TRIM(MnDriftData%Filename)//' for the second wave direction.', &
ErrStat, ErrMsg, RoutineName)
Expand Down Expand Up @@ -1023,7 +1023,7 @@ SUBROUTINE MnDrift_InitCalc( InitInp, p, MnDriftData, MnDriftForce, ErrMsg, ErrS
'found in the WAMIT data file '//TRIM(MnDriftData%Filename)//' for the first wave direction.', &
ErrStat, ErrMsg, RoutineName)
ENDIF
IF ( InitInp%WaveDirMax < MAXVAL(MnDriftData%Data4D%WvDir1) ) THEN
IF ( InitInp%WaveDirMax > MAXVAL(MnDriftData%Data4D%WvDir1) ) THEN
CALL SetErrStat( ErrID_Fatal,' Maximum wave direction required of '//TRIM(Num2LStr(InitInp%WaveDirMax))//' is not'//&
'found in the WAMIT data file '//TRIM(MnDriftData%Filename)//' for the first wave direction.', &
ErrStat, ErrMsg, RoutineName)
Expand All @@ -1037,7 +1037,7 @@ SUBROUTINE MnDrift_InitCalc( InitInp, p, MnDriftData, MnDriftForce, ErrMsg, ErrS
'found in the WAMIT data file '//TRIM(MnDriftData%Filename)//' for the second wave direction.', &
ErrStat, ErrMsg, RoutineName)
ENDIF
IF ( InitInp%WaveDirMax < MAXVAL(MnDriftData%Data4D%WvDir2) ) THEN
IF ( InitInp%WaveDirMax > MAXVAL(MnDriftData%Data4D%WvDir2) ) THEN
CALL SetErrStat( ErrID_Fatal,' Maximum wave direction required of '//TRIM(Num2LStr(InitInp%WaveDirMax))//' is not'//&
'found in the WAMIT data file '//TRIM(MnDriftData%Filename)//' for the second wave direction.', &
ErrStat, ErrMsg, RoutineName)
Expand Down Expand Up @@ -1478,7 +1478,7 @@ SUBROUTINE NewmanApp_InitCalc( InitInp, p, NewmanAppData, NewmanAppForce, ErrMsg
'found in the WAMIT data file '//TRIM(NewmanAppData%Filename)//' for the first wave direction.', &
ErrStat, ErrMsg, RoutineName)
ENDIF
IF ( InitInp%WaveDirMax < MAXVAL(NewmanAppData%Data3D%WvDir1) ) THEN
IF ( InitInp%WaveDirMax > MAXVAL(NewmanAppData%Data3D%WvDir1) ) THEN
CALL SetErrStat( ErrID_Fatal,' Maximum wave direction required of '//TRIM(Num2LStr(InitInp%WaveDirMax))//' is not'//&
'found in the WAMIT data file '//TRIM(NewmanAppData%Filename)//' for the first wave direction.', &
ErrStat, ErrMsg, RoutineName)
Expand All @@ -1492,7 +1492,7 @@ SUBROUTINE NewmanApp_InitCalc( InitInp, p, NewmanAppData, NewmanAppForce, ErrMsg
'found in the WAMIT data file '//TRIM(NewmanAppData%Filename)//' for the second wave direction.', &
ErrStat, ErrMsg, RoutineName)
ENDIF
IF ( InitInp%WaveDirMax < MAXVAL(NewmanAppData%Data3D%WvDir2) ) THEN
IF ( InitInp%WaveDirMax > MAXVAL(NewmanAppData%Data3D%WvDir2) ) THEN
CALL SetErrStat( ErrID_Fatal,' Maximum wave direction required of '//TRIM(Num2LStr(InitInp%WaveDirMax))//' is not'//&
'found in the WAMIT data file '//TRIM(NewmanAppData%Filename)//' for the second wave direction.', &
ErrStat, ErrMsg, RoutineName)
Expand Down Expand Up @@ -1535,7 +1535,7 @@ SUBROUTINE NewmanApp_InitCalc( InitInp, p, NewmanAppData, NewmanAppForce, ErrMsg
'found in the WAMIT data file '//TRIM(NewmanAppData%Filename)//' for the first wave direction.', &
ErrStat, ErrMsg, RoutineName)
ENDIF
IF ( InitInp%WaveDirMax < MAXVAL(NewmanAppData%Data4D%WvDir1) ) THEN
IF ( InitInp%WaveDirMax > MAXVAL(NewmanAppData%Data4D%WvDir1) ) THEN
CALL SetErrStat( ErrID_Fatal,' Maximum wave direction required of '//TRIM(Num2LStr(InitInp%WaveDirMax))//' is not'//&
'found in the WAMIT data file '//TRIM(NewmanAppData%Filename)//' for the first wave direction.', &
ErrStat, ErrMsg, RoutineName)
Expand All @@ -1549,7 +1549,7 @@ SUBROUTINE NewmanApp_InitCalc( InitInp, p, NewmanAppData, NewmanAppForce, ErrMsg
'found in the WAMIT data file '//TRIM(NewmanAppData%Filename)//' for the second wave direction.', &
ErrStat, ErrMsg, RoutineName)
ENDIF
IF ( InitInp%WaveDirMax < MAXVAL(NewmanAppData%Data4D%WvDir2) ) THEN
IF ( InitInp%WaveDirMax > MAXVAL(NewmanAppData%Data4D%WvDir2) ) THEN
CALL SetErrStat( ErrID_Fatal,' Maximum wave direction required of '//TRIM(Num2LStr(InitInp%WaveDirMax))//' is not'//&
'found in the WAMIT data file '//TRIM(NewmanAppData%Filename)//' for the second wave direction.', &
ErrStat, ErrMsg, RoutineName)
Expand Down Expand Up @@ -2129,7 +2129,7 @@ SUBROUTINE DiffQTF_InitCalc( InitInp, p, DiffQTFData, DiffQTFForce, ErrMsg, ErrS
'found in the WAMIT data file '//TRIM(DiffQTFData%Filename)//' for the first wave direction.', &
ErrStat, ErrMsg, RoutineName)
ENDIF
IF ( InitInp%WaveDirMax < MAXVAL(DiffQTFData%Data4D%WvDir1) ) THEN
IF ( InitInp%WaveDirMax > MAXVAL(DiffQTFData%Data4D%WvDir1) ) THEN
CALL SetErrStat( ErrID_Fatal,' Maximum wave direction required of '//TRIM(Num2LStr(InitInp%WaveDirMax))//' is not'//&
'found in the WAMIT data file '//TRIM(DiffQTFData%Filename)//' for the first wave direction.', &
ErrStat, ErrMsg, RoutineName)
Expand All @@ -2143,7 +2143,7 @@ SUBROUTINE DiffQTF_InitCalc( InitInp, p, DiffQTFData, DiffQTFForce, ErrMsg, ErrS
'found in the WAMIT data file '//TRIM(DiffQTFData%Filename)//' for the second wave direction.', &
ErrStat, ErrMsg, RoutineName)
ENDIF
IF ( InitInp%WaveDirMax < MAXVAL(DiffQTFData%Data4D%WvDir2) ) THEN
IF ( InitInp%WaveDirMax > MAXVAL(DiffQTFData%Data4D%WvDir2) ) THEN
CALL SetErrStat( ErrID_Fatal,' Maximum wave direction required of '//TRIM(Num2LStr(InitInp%WaveDirMax))//' is not'//&
'found in the WAMIT data file '//TRIM(DiffQTFData%Filename)//' for the second wave direction.', &
ErrStat, ErrMsg, RoutineName)
Expand Down Expand Up @@ -2651,7 +2651,7 @@ SUBROUTINE SumQTF_InitCalc( InitInp, p, SumQTFData, SumQTFForce, ErrMsg, ErrStat
'found in the WAMIT data file '//TRIM(SumQTFData%Filename)//' for the first wave direction.', &
ErrStat, ErrMsg, RoutineName)
ENDIF
IF ( InitInp%WaveDirMax < MAXVAL(SumQTFData%Data4D%WvDir1) ) THEN
IF ( InitInp%WaveDirMax > MAXVAL(SumQTFData%Data4D%WvDir1) ) THEN
CALL SetErrStat( ErrID_Fatal,' Maximum wave direction required of '//TRIM(Num2LStr(InitInp%WaveDirMax))//' is not'//&
'found in the WAMIT data file '//TRIM(SumQTFData%Filename)//' for the first wave direction.', &
ErrStat, ErrMsg, RoutineName)
Expand All @@ -2665,7 +2665,7 @@ SUBROUTINE SumQTF_InitCalc( InitInp, p, SumQTFData, SumQTFForce, ErrMsg, ErrStat
'found in the WAMIT data file '//TRIM(SumQTFData%Filename)//' for the second wave direction.', &
ErrStat, ErrMsg, RoutineName)
ENDIF
IF ( InitInp%WaveDirMax < MAXVAL(SumQTFData%Data4D%WvDir2) ) THEN
IF ( InitInp%WaveDirMax > MAXVAL(SumQTFData%Data4D%WvDir2) ) THEN
CALL SetErrStat( ErrID_Fatal,' Maximum wave direction required of '//TRIM(Num2LStr(InitInp%WaveDirMax))//' is not'//&
'found in the WAMIT data file '//TRIM(SumQTFData%Filename)//' for the second wave direction.', &
ErrStat, ErrMsg, RoutineName)
Expand Down

0 comments on commit b736f5b

Please sign in to comment.