Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
34 changes: 14 additions & 20 deletions model/src/w3initmd.F90
Original file line number Diff line number Diff line change
Expand Up @@ -421,16 +421,13 @@ SUBROUTINE W3INIT ( IMOD, IsMulti, FEXT, MDS, MTRACE, ODAT, FLGRD, FLGR2, FLGD,
USE W3DISPMD, ONLY: WAVNU1, WAVNU3
USE W3PARALL, ONLY: SET_UP_NSEAL_NSEALM
#ifdef W3_PDLIB
USE W3PARALL, ONLY: SYNCHRONIZE_IPGL_ETC_ARRAY, ISEA_TO_JSEA
use yowNodepool, only: npa
use yowRankModule, only : rank
USE W3PARALL, ONLY: SYNCHRONIZE_IPGL_ETC_ARRAY
#endif
USE W3GDATMD, ONLY: GTYPE, UNGTYPE
#ifdef W3_PDLIB
USE PDLIB_W3PROFSMD, ONLY : PDLIB_MAPSTA_INIT, SET_IOBDP_PDLIB, PDLIB_IOBP_INIT, SET_IOBPA_PDLIB
USE PDLIB_W3PROFSMD, ONLY : BLOCK_SOLVER_INIT, BLOCK_SOLVER_EXPLICIT_INIT, PDLIB_INIT, DEALLOCATE_PDLIB_GLOBAL
USE W3GDATMD, ONLY : FSREFRACTION, FSFREQSHIFT
use yowDatapool, only: istatus
#endif
#ifdef W3_SETUP
USE W3WAVSET, ONLY : PREPARATION_FD_SCHEME
Expand Down Expand Up @@ -519,9 +516,6 @@ SUBROUTINE W3INIT ( IMOD, IsMulti, FEXT, MDS, MTRACE, ODAT, FLGRD, FLGR2, FLGD,
#endif
CHARACTER(LEN=23) :: DTME21
CHARACTER(LEN=30) :: LFILE, TFILE
#ifdef W3_PDLIB
INTEGER :: IScal(1), IPROC
#endif
integer :: memunit
!/
!/ ------------------------------------------------------------------- /
Expand Down Expand Up @@ -2122,7 +2116,7 @@ SUBROUTINE W3MPIO ( IMOD )
#endif
!/
#ifdef W3_MPI
USE W3GDATMD, ONLY: NX, NSPEC, MAPFS, E3DF, P2MSF, US3DF, USSPF
USE W3GDATMD, ONLY: NSPEC, E3DF, P2MSF
USE W3WDATMD, ONLY: VA, UST, USTDIR, ASF, FPIS, ICEF
USE W3ADATMD, ONLY: MPI_COMM_WAVE, WW3_FIELD_VEC, NSEALM
USE W3ADATMD, ONLY: HS, WLM, T02
Expand All @@ -2131,7 +2125,7 @@ SUBROUTINE W3MPIO ( IMOD )

#ifdef W3_MPI
USE W3ADATMD, ONLY: T0M1, THM, THS, FP0, THP0, &
DTDYN, FCUT, SPPNT, ABA, ABD, UBA, UBD, &
DTDYN, FCUT, ABA, ABD, UBA, UBD, &
SXX, SYY, SXY, USERO, PHS, PTP, PLP, &
PDIR, PSI, PWS, PWST, PNR, PHIAW, PHIOC, &
TUSX, TUSY, TAUWIX, TAUWIY, TAUOX, &
Expand All @@ -2150,17 +2144,15 @@ SUBROUTINE W3MPIO ( IMOD )

#ifdef W3_MPI
USE W3GDATMD, ONLY: NK
USE W3ODATMD, ONLY: NDST, IAPROC, NAPROC, NTPROC, FLOUT, &
NAPFLD, NAPPNT, NAPRST, NAPBPT, NAPTRK, &
USE W3ODATMD, ONLY: NDST, IAPROC, NAPROC, FLOUT, &
NAPFLD, NAPRST, NAPBPT, NAPTRK, &
NOGRP, NGRPP, NOGE, FLOGRR
USE W3ODATMD, ONLY: OUTPTS, NRQGO, NRQGO2, IRQGO, IRQGO2, &
FLOGRD, NRQPO, NRQPO2, IRQPO1, IRQPO2, &
NOPTS, IPTINT, NRQRS, IRQRS, NBLKRS, &
FLOGRD, NRQRS, IRQRS, NBLKRS, &
RSBLKS, IRQRSS, VAAUX, NRQBP, NRQBP2, &
IRQBP1, IRQBP2, NFBPO, NBO2, ISBPO, &
ABPOS, NRQTR, IRQTR, IT0PNT, IT0TRK, &
IT0PRT, NOSWLL, NOEXTR, NDSE, IOSTYP, &
FLOGR2
IT0PRT, NOSWLL, NOEXTR, NDSE, IOSTYP, FLOGR2
USE W3PARALL, ONLY : INIT_GET_JSEA_ISPROC
USE CONSTANTS, ONLY: LPDLIB
#endif
Expand All @@ -2181,9 +2173,8 @@ SUBROUTINE W3MPIO ( IMOD )
#ifdef W3_MPI
INTEGER :: IK, IFJ
INTEGER :: IH, IT0, IROOT, IT, IERR, I0, &
IFROM, IX(4), IY(4), IS(4), &
IP(4), I, J, JSEA, ITARG, IB, &
JSEA0, JSEAN, NSEAB, IBOFF, &
IFROM, I, J, JSEA, ITARG, IB, &
JSEA0, JSEAN, NSEAB, IBOFF, &
ISEA, ISPROC, K, NRQMAX
#endif
#ifdef W3_S
Expand Down Expand Up @@ -5450,13 +5441,16 @@ SUBROUTINE W3MPIP ( IMOD )
#ifdef W3_MPI
USE W3SERVMD, ONLY: EXTCDE
!/
USE W3GDATMD, ONLY: NX, NY, NSPEC, MAPFS
USE W3GDATMD, ONLY: NSPEC, MAPFS
USE W3WDATMD, ONLY: VA
USE W3ADATMD, ONLY: MPI_COMM_WAVE, SPPNT
USE W3ODATMD, ONLY: NDST, NDSE, IAPROC, NAPROC, NAPPNT, FLOUT
USE W3ODATMD, ONLY: NDSE, IAPROC, NAPPNT
USE W3ODATMD, ONLY: OUTPTS, NRQPO, NRQPO2, IRQPO1, IRQPO2, &
NOPTS, IPTINT, IT0PNT, IT0TRK, O2IRQI
USE W3PARALL, ONLY: INIT_GET_JSEA_ISPROC
#endif
#ifdef W3_MPIT
USE W3ODATMD, ONLY: NDST
#endif
!/
#ifdef W3_MPI
Expand Down
2 changes: 2 additions & 0 deletions model/src/w3iobcmd.F90
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,9 @@ SUBROUTINE W3IOBC ( INXOUT, NDSB, TIME1, TIME2, IOTST, IMOD )
USE W3GDATMD, ONLY: PoLat, PoLon, AnglD, NX, NY, X0, Y0, SX, SY
USE W3SERVMD, ONLY: W3LLTOEQ, W3EQTOLL, W3ACTURN
#endif
#ifdef W3_SHRD
USE W3WDATMD, ONLY: VA
#endif
USE W3ADATMD, ONLY: CG
USE W3ODATMD, ONLY: NDSE, NDST, IAPROC, NAPERR, NAPBPT, &
NBI, NBI2, NFBPO, NBO, NBO2, NDSL, &
Expand Down
13 changes: 4 additions & 9 deletions model/src/w3parall.F90
Original file line number Diff line number Diff line change
Expand Up @@ -959,7 +959,7 @@ SUBROUTINE SYNCHRONIZE_IPGL_ETC_ARRAY(IMOD, IsMulti)
USE yowNodepool, only: np_global
USE W3ODATMD, ONLY: NTPROC, NAPROC, IAPROC
USE W3GDATMD, ONLY: MAPSF, NSEA
USE W3ADATMD, ONLY: MPI_COMM_WAVE, MPI_COMM_WCMP
USE W3ADATMD, ONLY: MPI_COMM_WAVE
USE yowRankModule, only : IPGL_TO_PROC, IPGL_tot
USE WMMDATMD, ONLY: MDATAS
#endif
Expand Down Expand Up @@ -1078,14 +1078,9 @@ SUBROUTINE SET_UP_NSEAL_NSEALM(NSEALout, NSEALMout)
!/
!/ ------------------------------------------------------------------- /
#ifdef W3_PDLIB
use yowDatapool, only: istatus
use yowNodepool, only: npa
use yowRankModule, only : rank
USE W3GDATMD, ONLY: GTYPE, UNGTYPE
#endif
#ifdef W3_MPI
USE W3ADATMD, ONLY: MPI_COMM_WAVE, MPI_COMM_WCMP
#endif
#ifdef W3_DIST
USE CONSTANTS, ONLY : LPDLIB
#endif
Expand Down Expand Up @@ -1207,7 +1202,7 @@ SUBROUTINE INIT_GET_JSEA_ISPROC(ISEA, JSEA, ISPROC)
USE W3ODATMD, ONLY: NAPROC
USE W3GDATMD, ONLY: UNGTYPE
#ifdef W3_PDLIB
USE yowRankModule, only : IPGL_TO_PROC, IPGL_tot
USE yowRankModule, only : IPGL_TO_PROC
use yowNodepool, only: ipgl, iplg
USE W3ODATMD, ONLY: IAPROC
USE W3GDATMD, ONLY: MAPSF
Expand Down Expand Up @@ -1321,7 +1316,7 @@ SUBROUTINE GET_JSEA_IBELONG(ISEA, JSEA, IBELONG)
USE W3GDATMD, ONLY: UNGTYPE
USE CONSTANTS, ONLY : LPDLIB
#ifdef W3_PDLIB
USE yowRankModule, only : IPGL_TO_PROC, IPGL_tot, IPGL_npa
USE yowRankModule, only : IPGL_npa
use yowNodepool, only: ipgl, iplg
USE W3GDATMD, ONLY: MAPSF, GTYPE
#endif
Expand Down Expand Up @@ -1578,7 +1573,7 @@ SUBROUTINE SYNCHRONIZE_GLOBAL_ARRAY(TheVar)
!
USE W3GDATMD, ONLY: NX
#ifdef W3_PDLIB
USE W3ODATMD, only : IAPROC, NAPROC, NTPROC
USE W3ODATMD, only : IAPROC, NAPROC
USE W3ADATMD, ONLY: MPI_COMM_WCMP
use yowDatapool, only: rtype, istatus
USE yowNodepool, only: npa
Expand Down
3 changes: 1 addition & 2 deletions model/src/w3strkmd.F90
Original file line number Diff line number Diff line change
Expand Up @@ -432,10 +432,9 @@ SUBROUTINE waveTracking_NWS_V2 (intype ,tmax , &
LOGICAL :: endloop

#ifdef W3_MPI
INTEGER :: rank, irank, nproc, EXTENT, DOMSIZE, tag1, tag2, ic
INTEGER :: rank, irank, nproc, DOMSIZE, tag1, tag2, ic
! INTEGER :: MPI_INT_DOMARR, MPI_REAL_DOMARR
type(MPI_STATUS) :: MPI_STAT
INTEGER :: REQ(16)
! INTEGER :: ISTAT(MPI_STATUS_SIZE,16)
REAL :: COMMARR1(44)
INTEGER :: COMMARR2(11)
Expand Down
7 changes: 1 addition & 6 deletions model/src/w3triamd.F90
Original file line number Diff line number Diff line change
Expand Up @@ -549,11 +549,6 @@ SUBROUTINE GET_BOUNDARY_STATUS(STATUS)
USE W3SERVMD, ONLY: STRACE
#endif
!

#ifdef W3_PDLIB
use yowElementpool, only: ne_global
use yowNodepool, only: np_global
#endif
USE W3GDATMD, ONLY : TRIGP, NTRI, NX
IMPLICIT NONE
!/
Expand Down Expand Up @@ -2073,7 +2068,7 @@ SUBROUTINE UG_GRADIENTS (PARAM, DIFFX, DIFFY)
FLAGLL, IEN, TRIA, NTRI
#ifdef W3_PDLIB
USE yowElementpool
use yowNodepool, only: PDLIB_IEN, PDLIB_TRIA, NPA
use yowNodepool, only: PDLIB_IEN, PDLIB_TRIA
USE yowExchangeModule, only : PDLIB_exchange1Dreal
USE W3GDATMD, ONLY : NSEAL
#endif
Expand Down
23 changes: 11 additions & 12 deletions model/src/w3wavemd.F90
Original file line number Diff line number Diff line change
Expand Up @@ -448,11 +448,13 @@ SUBROUTINE W3WAVE ( IMOD, ODAT, TEND, STAMP, NO_OUT &
USE W3SRCEMD, ONLY : W3SRCE
!/
#ifdef W3_MPI
USE W3ODATMD, ONLY : NRQGO, NRQGO2, IRQGO, IRQGO2, NRQPO, NRQPO2, &
IRQPO1, IRQPO2
USE W3ODATMD, ONLY : NRQGO, NRQGO2, IRQGO, IRQGO2, NRQPO, IRQPO1
USE W3ODATMD, ONLY : NRQRS, IRQRS, IRQPO1, NRQBP, IRQBP1, IRQBP2, &
NRQBP2
USE W3ADATMD, ONLY : NRQSG1, IRQSG1, NRQSG1, MPI_COMM_WAVE
USE W3ADATMD, ONLY : NRQSG1, IRQSG1, NRQSG1
#endif
#if defined(W3_MPI) && defined(W3_SMC)
USE W3ADATMD, ONLY : MPI_COMM_WAVE
#endif
#ifdef W3_NL5
USE W3ODATMD, ONLY : TOSNL5
Expand Down Expand Up @@ -507,11 +509,10 @@ SUBROUTINE W3WAVE ( IMOD, ODAT, TEND, STAMP, NO_OUT &
USE PDLIB_W3PROFSMD, only : APPLY_BOUNDARY_CONDITION_VA
USE PDLIB_W3PROFSMD, only : PDLIB_W3XYPUG, PDLIB_W3XYPUG_BLOCK_IMPLICIT, PDLIB_W3XYPUG_BLOCK_EXPLICIT
USE PDLIB_W3PROFSMD, only : ALL_VA_INTEGRAL_PRINT, ALL_VAOLD_INTEGRAL_PRINT, ALL_FIELD_INTEGRAL_PRINT
USE W3PARALL, only : PDLIB_NSEAL, PDLIB_NSEALM
USE yowNodepool, only: npa, iplg, np
USE yowNodepool, only: np
USE W3WDATMD, ONLY : VAOLD, VSTOT, VDTOT, SHAVETOT
USE W3GDATMD, ONLY : FSSOURCE, FSTOTALEXP
USE W3GDATMD, ONLY : IOBP_LOC, IOBPD_LOC, IOBPA_LOC, IOBDP_LOC
USE W3GDATMD, ONLY : IOBP_LOC, IOBPA_LOC, IOBDP_LOC
#endif
!/
USE W3SERVMD, ONLY : EXTCDE, WWTIME
Expand Down Expand Up @@ -550,7 +551,7 @@ SUBROUTINE W3WAVE ( IMOD, ODAT, TEND, STAMP, NO_OUT &

#ifdef W3_PDLIB
USE PDLIB_FIELD_VEC, only : DO_OUTPUT_EXCHANGES
USE PDLIB_W3PROFSMD, ONLY: ASPAR_JAC, ASPAR_DIAG_ALL, B_JAC
USE PDLIB_W3PROFSMD, ONLY: ASPAR_JAC, B_JAC
USE W3PARALL, only : LSLOC
#endif
#ifdef W3_TIMINGS
Expand Down Expand Up @@ -658,7 +659,6 @@ SUBROUTINE W3WAVE ( IMOD, ODAT, TEND, STAMP, NO_OUT &
CHARACTER(LEN=16) :: OUTID
CHARACTER(LEN=23) :: IDTIME
#ifdef W3_PDLIB
REAL :: VS_SPEC(NSPEC), VD_SPEC(NSPEC)
REAL :: DTGpre
INTEGER :: IP
#endif
Expand Down Expand Up @@ -3108,8 +3108,10 @@ SUBROUTINE W3GATH ( ISPEC, FIELD )
#ifdef W3_MPI
USE W3ADATMD, ONLY: MPIBUF, BSTAT, IBFLOC, ISPLOC, BISPL, &
NSPLOC, NRQSG2, IRQSG2, GSTORE
USE W3ODATMD, ONLY: NDST, IAPROC, NAPROC, NOTYPE
USE W3GDATMD, ONLY: NSEAL, NSPEC
#endif
#ifdef W3_MPIT
USE W3ODATMD, ONLY: NDST
#endif
!/
!
Expand Down Expand Up @@ -3424,9 +3426,6 @@ SUBROUTINE W3SCAT ( ISPEC, MAPSTA, FIELD )
#endif
#ifdef W3_MPIT
USE W3ODATMD, ONLY: NDST
#endif
#ifdef W3_MPI
USE W3ODATMD, ONLY: IAPROC, NAPROC
#endif
USE W3PARALL, only: INIT_GET_ISEA
!/
Expand Down
7 changes: 1 addition & 6 deletions model/src/w3wdatmd.F90
Original file line number Diff line number Diff line change
Expand Up @@ -421,9 +421,7 @@ SUBROUTINE W3DIMW ( IMOD, NDSE, NDST, F_ONLY )
USE W3GDATMD, ONLY: QI5NNZ
#endif
#ifdef W3_PDLIB
use yowNodepool, only: npa, np
use yowRankModule, only : rank
USE W3GDATMD, ONLY: GTYPE, UNGTYPE
USE W3GDATMD, ONLY: UNGTYPE
#endif
#ifdef W3_S
USE W3SERVMD, ONLY: STRACE
Expand All @@ -443,9 +441,6 @@ SUBROUTINE W3DIMW ( IMOD, NDSE, NDST, F_ONLY )
!/
INTEGER :: JGRID, NSEALM, NSEATM
INTEGER :: NSEAL_DUMMY, ISEA
#ifdef W3_PDLIB
INTEGER IRANK
#endif
#ifdef W3_S
INTEGER, SAVE :: IENT = 0
#endif
Expand Down