Skip to content
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

Remove fp1 and thp1 #807

Merged
merged 3 commits into from
Sep 27, 2022
Merged

Remove fp1 and thp1 #807

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1a9dad9
Remove FP1 and THP1
benoitp-cmc Sep 23, 2022
9c93a7c
Remove unused calls to INIT_GET_ISEA and add some where it was calcul…
benoitp-cmc Sep 23, 2022
314b90e
Merge branch 'develop' into remove_fp1_and_thp1
benoitp-cmc Sep 23, 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
2 changes: 1 addition & 1 deletion model/src/gx_outf.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ PROGRAM GXOUTF
UST, USTDIR, RHOAIR
USE W3ADATMD, ONLY: CFLXYMAX, CFLTHMAX, AS, CX, CY, UA, UD, WN, &
DW, HS, WLM, T01, T0M1, T02, THM, THS, FP0, &
THP0, FP1, THP1, ABA, ABD, UBA, UBD, FCUT, &
THP0, ABA, ABD, UBA, UBD, FCUT, &
SXX, SYY, SXY, PHS, PTP, PLP, PDIR, PSI, PWS,&
PTM1, PT1, PT2, PEP, TAUA, TAUADIR, &
PTHP0, PQP, PSW, PPE, PGW, QP, &
Expand Down
2 changes: 1 addition & 1 deletion model/src/pdlib_field_vec.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -814,7 +814,7 @@ SUBROUTINE DO_OUTPUT_EXCHANGES(IMOD)
USE W3WDATMD, ONLY: VA, UST, USTDIR, ASF, FPIS
USE W3ADATMD, ONLY: MPI_COMM_WAVE, WW3_FIELD_VEC
USE W3ADATMD, ONLY: HS, WLM, T02
USE W3ADATMD, ONLY: T0M1, THM, THS, FP0, THP0, FP1, THP1, &
USE W3ADATMD, ONLY: T0M1, THM, THS, FP0, THP0, &
DTDYN, FCUT, SPPNT, ABA, ABD, UBA, UBD,&
SXX, SYY, SXY, USERO, PHS, PTP, PLP, &
PDIR, PSI, PWS, PWST, PNR, PHIAW, &
Expand Down
38 changes: 4 additions & 34 deletions model/src/w3adatmd.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,11 +174,6 @@ MODULE W3ADATMD
! CFLTHMAX R.A. Public Max. CFL number for refraction.
! CFLKMAX R.A. Public Max. CFL number for wavenumber shift.
!
! Old parameters not yet in new structure ...
!
! FP1 R.A. Public Wind sea peak frequency. (parked in 2)
! THP1 R.A. Public Wind sea peak direction. (parked in 2)
!
! Orphans, commented out here, now automatic arrays in W3WAVE, ....
!
! DRAT R.A. Public Density ration air/water. Was
Expand Down Expand Up @@ -381,13 +376,13 @@ MODULE W3ADATMD
!
REAL, POINTER :: HS(:), WLM(:), T02(:), T0M1(:), &
T01 (:), FP0(:), THM(:), &
THS(:), THP0(:), FP1(:), THP1(:), &
THS(:), THP0(:), &
HSIG(:), STMAXE(:), STMAXD(:), &
HMAXE(:), HCMAXE(:), HMAXD(:), &
HCMAXD(:), QP(:), WBT(:), WNMEAN(:)
REAL, POINTER :: XHS(:), XWLM(:), XT02(:), XT0M1(:), &
XT01 (:), XFP0(:), XTHM(:), &
XTHS(:), XTHP0(:), XFP1(:), XTHP1(:),&
XTHS(:), XTHP0(:), &
XHSIG(:), XSTMAXE(:), XSTMAXD(:), &
XHMAXE(:), XHCMAXE(:), XHMAXD(:), &
XHCMAXD(:), XQP(:), XWBT(:), &
Expand Down Expand Up @@ -562,7 +557,7 @@ MODULE W3ADATMD
!
REAL, POINTER :: HS(:), WLM(:), T02(:), T0M1(:), &
T01 (:), FP0(:), THM(:), THS(:), &
THP0(:), FP1(:), THP1(:), HSIG(:), &
THP0(:), HSIG(:), &
STMAXE(:), STMAXD(:), HMAXE(:), &
HCMAXE(:), HMAXD(:), HCMAXD(:), &
QP(:), WBT(:), WNMEAN(:)
Expand Down Expand Up @@ -1016,8 +1011,7 @@ SUBROUTINE W3DIMA ( IMOD, NDSE, NDST, D_ONLY )
WADATS(IMOD)%T02 (NSEALM), WADATS(IMOD)%T0M1(NSEALM), &
WADATS(IMOD)%T01 (NSEALM), WADATS(IMOD)%FP0 (NSEALM), &
WADATS(IMOD)%THM (NSEALM), WADATS(IMOD)%THS (NSEALM), &
WADATS(IMOD)%THP0 (NSEALM), WADATS(IMOD)%FP1 (NSEALM), &
WADATS(IMOD)%THP1 (NSEALM), WADATS(IMOD)%HSIG(NSEALM), &
WADATS(IMOD)%THP0 (NSEALM), WADATS(IMOD)%HSIG(NSEALM), &
WADATS(IMOD)%STMAXE (NSEALM), &
WADATS(IMOD)%STMAXD(NSEALM), &
WADATS(IMOD)%HMAXE(NSEALM), WADATS(IMOD)%HMAXD(NSEALM),&
Expand All @@ -1037,8 +1031,6 @@ SUBROUTINE W3DIMA ( IMOD, NDSE, NDST, D_ONLY )
WADATS(IMOD)%THM = UNDEF
WADATS(IMOD)%THS = UNDEF
WADATS(IMOD)%THP0 = UNDEF
WADATS(IMOD)%FP1 = UNDEF
WADATS(IMOD)%THP1 = UNDEF
WADATS(IMOD)%HSIG = UNDEF
WADATS(IMOD)%STMAXE = UNDEF
WADATS(IMOD)%STMAXD = UNDEF
Expand Down Expand Up @@ -1746,22 +1738,6 @@ SUBROUTINE W3XDMA ( IMOD, NDSE, NDST, OUTFLAGS )
ALLOCATE ( WADATS(IMOD)%XWNMEAN(1), STAT=ISTAT )
CHECK_ALLOC_STATUS ( ISTAT )
END IF
!
! IF ( OUTFLAGS( 2,xx) ) THEN
! ALLOCATE ( WADATS(IMOD)%XFP1(NXXX), STAT=ISTAT )
! CHECK_ALLOC_STATUS ( ISTAT )
! ELSE
! ALLOCATE ( WADATS(IMOD)%XFP1(1), STAT=ISTAT )
! CHECK_ALLOC_STATUS ( ISTAT )
! END IF
!
! IF ( OUTFLAGS( 2,xx) ) THEN
! ALLOCATE ( WADATS(IMOD)%XTHP1(NXXX), STAT=ISTAT )
! CHECK_ALLOC_STATUS ( ISTAT )
! ELSE
! ALLOCATE ( WADATS(IMOD)%XTHP1(1), STAT=ISTAT )
! CHECK_ALLOC_STATUS ( ISTAT )
! END IF
!
WADATS(IMOD)%XHS = UNDEF
WADATS(IMOD)%XWLM = UNDEF
Expand All @@ -1781,8 +1757,6 @@ SUBROUTINE W3XDMA ( IMOD, NDSE, NDST, OUTFLAGS )
WADATS(IMOD)%XHCMAXD= UNDEF
WADATS(IMOD)%XWBT = UNDEF
WADATS(IMOD)%XWNMEAN= UNDEF
! WADATS(IMOD)%XFP1 = UNDEF
! WADATS(IMOD)%XTHP1 = UNDEF
!
IF ( OUTFLAGS( 3, 1) ) THEN
ALLOCATE ( WADATS(IMOD)%XEF(NXXX,E3DF(2,1):E3DF(3,1)), STAT=ISTAT )
Expand Down Expand Up @@ -2842,8 +2816,6 @@ SUBROUTINE W3SETA ( IMOD, NDSE, NDST )
THM => WADATS(IMOD)%THM
THS => WADATS(IMOD)%THS
THP0 => WADATS(IMOD)%THP0
FP1 => WADATS(IMOD)%FP1
THP1 => WADATS(IMOD)%THP1
HSIG => WADATS(IMOD)%HSIG
STMAXE => WADATS(IMOD)%STMAXE
STMAXD => WADATS(IMOD)%STMAXD
Expand Down Expand Up @@ -3190,8 +3162,6 @@ SUBROUTINE W3XETA ( IMOD, NDSE, NDST )
QP => WADATS(IMOD)%XQP
WBT => WADATS(IMOD)%XWBT
WNMEAN => WADATS(IMOD)%XWNMEAN
! FP1 => WADATS(IMOD)%XFP1
! THP1 => WADATS(IMOD)%XTHP1
!
EF => WADATS(IMOD)%XEF
TH1M => WADATS(IMOD)%XTH1M
Expand Down
2 changes: 1 addition & 1 deletion model/src/w3initmd.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2327,7 +2327,7 @@ SUBROUTINE W3MPIO ( IMOD )


#ifdef W3_MPI
USE W3ADATMD, ONLY: T0M1, THM, THS, FP0, THP0, FP1, THP1, &
USE W3ADATMD, ONLY: T0M1, THM, THS, FP0, THP0, &
DTDYN, FCUT, SPPNT, ABA, ABD, UBA, UBD,&
SXX, SYY, SXY, USERO, PHS, PTP, PLP, &
PDIR, PSI, PWS, PWST, PNR, PHIAW, PHIOC,&
Expand Down
Loading