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
43 changes: 19 additions & 24 deletions model/src/w3pro3md.F90
Original file line number Diff line number Diff line change
Expand Up @@ -215,12 +215,15 @@ SUBROUTINE W3MAP3
!
! 10. Source code :
!/ ------------------------------------------------------------------- /
USE W3GDATMD, ONLY: NK, NTH, NSPEC, NX, NY, NSEA, MAPSTA, MAPSF,&
GTYPE
USE W3GDATMD, ONLY: NK, NTH, NX, NY, NSEA, MAPSTA, MAPSF, GTYPE
USE W3ADATMD, ONLY: NMX0, NMX1, NMX2, NMY0, NMY1, NMY2, NACT, &
NCENT, MAPX2, MAPY2, MAPAXY, MAPCXY, &
MAPTH2, MAPWN2
#ifdef W3_T
USE W3GDATMD, ONLY: NSPEC
USE W3ODATMD, ONLY: NDST
#endif
!/
#ifdef W3_S
USE W3SERVMD, ONLY: STRACE
#endif
Expand Down Expand Up @@ -571,7 +574,7 @@ SUBROUTINE W3MAPT
!
! 10. Source code :
!/ ------------------------------------------------------------------- /
USE W3GDATMD, ONLY: NX, NY, NSEA, MAPSF
USE W3GDATMD, ONLY: NSEA, MAPSF
USE W3ADATMD, ONLY: ATRNX, ATRNY, MAPTRN
#ifdef W3_S
USE W3SERVMD, ONLY: STRACE
Expand Down Expand Up @@ -788,14 +791,14 @@ SUBROUTINE W3XYP3 ( ISP, DTG, MAPSTA, MAPFS, VQ, VGX, VGY )
USE W3TIMEMD, ONLY: DSEC21
!
USE W3GDATMD, ONLY: NX, NY, NSEA, MAPSF, DTCFL, CLATS, &
ICLOSE, FLCX, FLCY, NK, NTH, DTH, XFR, &
ICLOSE, FLCX, FLCY, NTH, DTH, XFR, &
ICLOSE_NONE, ICLOSE_SMPL, ICLOSE_TRPL, &
ECOS, ESIN, SIG, WDCG, WDTH, PFMOVE, &
ECOS, ESIN, SIG, WDCG, WDTH, &
FLAGLL, DPDX, DPDY, DQDX, DQDY, GSQRT
USE W3WDATMD, ONLY: TIME
USE W3ADATMD, ONLY: NMX0, NMX1, NMX2, NMY0, NMY1, NMY2, NACT, &
NCENT, MAPX2, MAPY2, MAPAXY, MAPCXY, &
MAPTRN, CG, CX, CY, ATRNX, ATRNY, ITIME
NCENT, MAPX2, MAPY2, MAPAXY, MAPCXY, &
MAPTRN, CG, CX, CY, ATRNX, ATRNY
USE W3IDATMD, ONLY: FLCUR
USE W3ODATMD, ONLY: NDSE, NDST, FLBPI, NBI, TBPI0, TBPIN, &
ISBPI, BBPI0, BBPIN, IAPROC, NAPERR
Expand All @@ -808,6 +811,9 @@ SUBROUTINE W3XYP3 ( ISP, DTG, MAPSTA, MAPFS, VQ, VGX, VGY )
#endif
#ifdef W3_UNO
USE W3UNO2MD
#endif
#ifdef W3_MGG
USE W3GDATMD, ONLY: PFMOVE
#endif
!/
IMPLICIT NONE
Expand Down Expand Up @@ -1625,7 +1631,7 @@ SUBROUTINE W3KTP3 ( ISEA, FACTH, FACK, CTHG0, CG, WN, DW, &
USE W3GDATMD, ONLY: NK, NK2, NTH, NSPEC, SIG, DSIP, ECOS, ESIN, &
EC2, ESC, ES2, FACHFA, MAPWN, FLCTH, FLCK, &
CTMAX, DMIN
USE W3ADATMD, ONLY: MAPTH2, MAPWN2, ITIME, ITSTEP
USE W3ADATMD, ONLY: MAPTH2, MAPWN2, ITSTEP
USE W3IDATMD, ONLY: FLCUR
USE W3ODATMD, ONLY: NDSE, NDST
#ifdef W3_S
Expand Down Expand Up @@ -2050,17 +2056,10 @@ SUBROUTINE W3CFLXY ( ISEA, DTG, MAPSTA, MAPFS, CFLXYMAX, VGX, VGY )
!
USE W3TIMEMD, ONLY: DSEC21
!
USE W3GDATMD, ONLY: NX, NY, NSEA, MAPSF, DTCFL, CLATS, &
FLCX, FLCY, NK, NTH, DTH, XFR, &
ECOS, ESIN, SIG, WDCG, WDTH, PFMOVE, &
FLAGLL, DPDX, DPDY, DQDX, DQDY, GSQRT
USE W3WDATMD, ONLY: TIME
USE W3ADATMD, ONLY: NMX0, NMX1, NMX2, NMY0, NMY1, NMY2, NACT, &
NCENT, MAPX2, MAPY2, MAPAXY, MAPCXY, &
MAPTRN, CG, CX, CY, ATRNX, ATRNY, ITIME
USE W3GDATMD, ONLY: NX, NY, MAPSF, CLATS, &
NK, NTH, ECOS, ESIN, DPDX, DPDY, DQDX, DQDY
USE W3ADATMD, ONLY: CG, CX, CY
USE W3IDATMD, ONLY: FLCUR
USE W3ODATMD, ONLY: NDSE, NDST, FLBPI, NBI, TBPI0, TBPIN, &
ISBPI, BBPI0, BBPIN
#ifdef W3_S
USE W3SERVMD, ONLY: STRACE
#endif
Expand All @@ -2077,15 +2076,11 @@ SUBROUTINE W3CFLXY ( ISEA, DTG, MAPSTA, MAPFS, CFLXYMAX, VGX, VGY )
!/ ------------------------------------------------------------------- /
!/ Local parameters
!/
INTEGER :: ITH, IK, IXY, IP
INTEGER :: IX, IY, IXC, IYC, IBI
INTEGER :: ITH, IK, IXY
INTEGER :: IX, IY
#ifdef W3_S
INTEGER, SAVE :: IENT = 0
#endif
REAL :: CG0, CGA, CGN, CGX, CGY, CXC, CYC, &
CXMIN, CXMAX, CYMIN, CYMAX
REAL :: CGC, FGSE = 1.
REAL :: FTH, FTHX, FTHY, FCG, FCGX, FCGY
REAL :: CP, CQ
!/
!/ Automatic work arrays
Expand Down
72 changes: 30 additions & 42 deletions model/src/w3profsmd.F90
Original file line number Diff line number Diff line change
Expand Up @@ -136,16 +136,13 @@ SUBROUTINE W3XYPUG ( ISP, FACX, FACY, DTG, VQ, VGX, VGY, LCALC )
!
USE W3TIMEMD, ONLY: DSEC21
!
USE W3GDATMD, ONLY: NX, NY, NSEA, MAPSF, MAPFS, DTCFL, CLATS, &
FLCX, FLCY, NK, NTH, DTH, XFR, &
ECOS, ESIN, SIG, PFMOVE,IEN, &
NTRI, TRIGP, CCON , &
IE_CELL, POS_CELL, IOBP, IOBPD, IOBDP, &
FSN, FSPSI, FSFCT, FSNIMP, GTYPE, UNGTYPE
USE W3GDATMD, ONLY: NX, NY, NSEA, MAPSF, MAPFS, CLATS, &
NTH, ECOS, ESIN, IOBP, &
IOBDP, FSN, FSPSI, FSFCT, FSNIMP, UNGTYPE

USE W3WDATMD, ONLY: TIME
USE W3ODATMD, ONLY: TBPI0, TBPIN, FLBPI
USE W3ADATMD, ONLY: CG, CX, CY, ATRNX, ATRNY, ITIME, CFLXYMAX, DW
USE W3ADATMD, ONLY: CG, CX, CY
USE W3IDATMD, ONLY: FLCUR
! USE W3ODATMD, ONLY: NDSE, NDST, FLBPI, NBI, TBPI0, TBPIN, &
! ISBPI, BBPI0, BBPIN
Expand Down Expand Up @@ -347,17 +344,14 @@ SUBROUTINE W3CFLUG ( ISEA, NKCFL, FACX, FACY, DT, MAPFS, CFLXYMAX, &
!
USE W3TIMEMD, ONLY: DSEC21
!
USE W3GDATMD, ONLY: NX, NY, NSEA, MAPSF, DTCFL, CLATS, &
FLCX, FLCY, NK, NTH, DTH, XFR, &
ECOS, ESIN, SIG, PFMOVE,IEN, INDEX_CELL, &
NTRI, TRIGP, CCON , &
IE_CELL, POS_CELL, COUNTRI, SI, IOBP
USE W3GDATMD, ONLY: NX, NY, NSEA, MAPSF, CLATS, &
NTH, ECOS, ESIN, IEN, INDEX_CELL, &
TRIGP, IE_CELL, POS_CELL, SI, IOBP

USE W3ADATMD, ONLY: CG, CX, CY, ATRNX, ATRNY, ITIME, DW
USE W3ADATMD, ONLY: CG, CX, CY
USE W3IDATMD, ONLY: FLCUR
#ifdef W3_T
USE W3ODATMD, ONLY: NDSE, NDST, FLBPI, NBI, TBPI0, TBPIN, &
ISBPI, BBPI0, BBPIN
USE W3ODATMD, ONLY: FLBPI, NBI, ISBPI, BBPI0, BBPIN
#endif
#ifdef W3_S
USE W3SERVMD, ONLY: STRACE
Expand Down Expand Up @@ -531,15 +525,14 @@ SUBROUTINE W3XYPFSN2 ( ISP, C, LCALC, RD10, RD20, DT, AC)
!
!/ ------------------------------------------------------------------- /
!/
USE W3GDATMD, ONLY : NK, NTH, NTRI, NX, CCON, IE_CELL,POS_CELL, SI, &
IEN, TRIGP, CLATS, MAPSF, IOBPD, IOBP, IOBDP, &
USE W3GDATMD, ONLY : NTH, NTRI, NX, SI, &
IEN, TRIGP, CLATS, MAPSF, IOBPD, IOBP, IOBDP, &
IOBPA, FSBCCFL
#ifdef W3_REF1
USE W3GDATMD, ONLY : REFPARS
#endif
USE W3WDATMD, ONLY: TIME
USE W3ADATMD, ONLY: CG, ITER, DW
USE W3ODATMD, ONLY: NDSE, NDST, FLBPI, NBI, TBPI0, TBPIN, ISBPI, BBPI0, BBPIN
USE W3ADATMD, ONLY: CG, ITER
USE W3ODATMD, ONLY: FLBPI, NBI, ISBPI, BBPI0, BBPIN
USE W3TIMEMD, ONLY: DSEC21
#ifdef W3_S
USE W3SERVMD, ONLY: STRACE
Expand Down Expand Up @@ -582,13 +575,13 @@ SUBROUTINE W3XYPFSN2 ( ISP, C, LCALC, RD10, RD20, DT, AC)
!
! local double
!
REAL*8 :: UTILDE, BOUNDARY_FORCING
REAL*8 :: UTILDE
REAL*8 :: CFLXY
REAL*8 :: FL11, FL12, FL21, FL22, FL31, FL32
REAL*8 :: FL111, FL112, FL211, FL212, FL311, FL312
REAL*8 :: DTSI(NX), U(NX)
REAL*8 :: DTMAXGL, DTMAXEXP, REST
REAL*8 :: LAMBDA(2), KTMP(3), CLOC(2,3)
REAL*8 :: LAMBDA(2), KTMP(3)
REAL*8 :: KELEM(3,NTRI), FLALL(3,NTRI)
REAL*8 :: KKSUM(NX), ST(NX)
REAL*8 :: NM(NTRI)
Expand Down Expand Up @@ -778,14 +771,13 @@ SUBROUTINE W3XYPFSPSI2 ( ISP, C, LCALC, RD10, RD20, DT, AC)
!
!/ ------------------------------------------------------------------- /
!/
USE W3GDATMD, ONLY : NK, NTH, NTRI, NX, CCON, IE_CELL,POS_CELL, SI, &
IEN, TRIGP, CLATS, MAPSF, IOBPA, IOBPD, IOBP, NNZ, IOBDP
USE W3GDATMD, ONLY : NTH, NTRI, NX, SI, &
IEN, TRIGP, CLATS, MAPSF, IOBPA, IOBPD, IOBDP
#ifdef W3_REF1
USE W3GDATMD, ONLY : REFPARS
#endif
USE W3WDATMD, ONLY: TIME
USE W3ADATMD, ONLY: CG, ITER
USE W3ODATMD, ONLY: NDSE, NDST, FLBPI, NBI, TBPI0, TBPIN, ISBPI, BBPI0, BBPIN
USE W3ODATMD, ONLY: FLBPI, NBI, ISBPI, BBPI0, BBPIN
USE W3TIMEMD, ONLY: DSEC21
#ifdef W3_S
USE W3SERVMD, ONLY: STRACE
Expand Down Expand Up @@ -828,13 +820,13 @@ SUBROUTINE W3XYPFSPSI2 ( ISP, C, LCALC, RD10, RD20, DT, AC)
!:
! local double
!
REAL*8 :: UTILDE, BOUNDARY_FORCING
REAL*8 :: UTILDE
REAL*8 :: FT, CFLXY
REAL*8 :: FL11, FL12, FL21, FL22, FL31, FL32
REAL*8 :: FL111, FL112, FL211, FL212, FL311, FL312
REAL*8 :: DTSI(NX), U(NX)
REAL*8 :: DTMAXGL, DTMAXEXP, REST
REAL*8 :: LAMBDA(2), KTMP(3), TMP(3)
REAL*8 :: LAMBDA(2), KTMP(3)
REAL*8 :: THETA_L(3), BET1(3), BETAHAT(3)
REAL*8 :: KELEM(3,NTRI), FLALL(3,NTRI)
REAL*8 :: KKSUM(NX), ST(NX)
Expand Down Expand Up @@ -1032,15 +1024,14 @@ SUBROUTINE W3XYPFSNIMP ( ISP, C, LCALC, RD10, RD20, DT, AC)
!
!/ ------------------------------------------------------------------- /
!/
USE W3GDATMD, ONLY : NK, NTH, NTRI, NX, CCON, IE_CELL,POS_CELL, SI, &
IEN, TRIGP, CLATS, MAPSF, IOBPD, IOBPA, IOBP, IAA, JAA, POSI, &
USE W3GDATMD, ONLY : NTH, NTRI, NX, CCON, IE_CELL,POS_CELL, &
IEN, TRIGP, CLATS, MAPSF, IOBPD, IOBPA, IAA, JAA, POSI, &
TRIA, NNZ
#ifdef W3_REF1
USE W3GDATMD, ONLY : REFPARS
#endif
USE W3WDATMD, ONLY: TIME
USE W3ADATMD, ONLY: CG, ITER
USE W3ODATMD, ONLY: NDSE, NDST, FLBPI, NBI, TBPI0, TBPIN, ISBPI, BBPI0, BBPIN
USE W3ADATMD, ONLY: CG
USE W3ODATMD, ONLY: FLBPI, NBI, ISBPI, BBPI0, BBPIN
USE W3TIMEMD, ONLY: DSEC21
#ifdef W3_S
USE W3SERVMD, ONLY: STRACE
Expand Down Expand Up @@ -1084,7 +1075,6 @@ SUBROUTINE W3XYPFSNIMP ( ISP, C, LCALC, RD10, RD20, DT, AC)
!:
! local double
!
REAL*8 :: BOUNDARY_FORCING
REAL*8 :: FL11, FL12, FL21, FL22, FL31, FL32
REAL*8 :: U(NX)
REAL*8 :: DTMAXGL
Expand Down Expand Up @@ -1332,14 +1322,13 @@ SUBROUTINE W3XYPFSFCT2 ( ISP, C, LCALC, RD10, RD20, DT, AC)
!
!/ ------------------------------------------------------------------- /
!/
USE W3GDATMD, ONLY : NK, NTH, NTRI, NX, CCON, IE_CELL,POS_CELL, SI, &
IEN, TRIGP, CLATS, MAPSF, IOBPD, IOBPA, TRIA, IOBDP
USE W3GDATMD, ONLY : NTH, NTRI, NX, SI, &
IEN, TRIGP, CLATS, MAPSF, IOBPD, IOBPA, IOBDP
#ifdef W3_REF1
USE W3GDATMD, ONLY : REFPARS
#endif
USE W3WDATMD, ONLY: TIME
USE W3ADATMD, ONLY: CG, ITER
USE W3ODATMD, ONLY: NDSE, NDST, FLBPI, NBI, TBPI0, TBPIN, ISBPI, BBPI0, BBPIN
USE W3ODATMD, ONLY: FLBPI, NBI, ISBPI, BBPI0, BBPIN
USE W3TIMEMD, ONLY: DSEC21
#ifdef W3_S
USE W3SERVMD, ONLY: STRACE
Expand Down Expand Up @@ -1383,7 +1372,7 @@ SUBROUTINE W3XYPFSFCT2 ( ISP, C, LCALC, RD10, RD20, DT, AC)
!:
! local double
!
REAL*8 :: UTILDE, BOUNDARY_FORCING
REAL*8 :: UTILDE
REAL*8 :: FT, CFLXY
REAL*8 :: FL11, FL12, FL21, FL22, FL31, FL32
REAL*8 :: FL111, FL112, FL211, FL212, FL311, FL312
Expand Down Expand Up @@ -1637,8 +1626,7 @@ SUBROUTINE SETDEPTH
USE W3SERVMD, ONLY: STRACE
#endif
!
USE CONSTANTS, ONLY : LPDLIB
USE W3GDATMD, ONLY: MAPSF, NSEAL, DMIN, IOBDP, MAPSTA, IOBP, MAPFS, NX
USE W3GDATMD, ONLY: DMIN, IOBDP, MAPFS, NX
USE W3ADATMD, ONLY: DW

IMPLICIT NONE
Expand All @@ -1655,7 +1643,7 @@ SUBROUTINE SETDEPTH
!/
!/ ------------------------------------------------------------------- /
!
INTEGER :: JSEA, ISEA, IX, IP
INTEGER :: IP
REAL*8, PARAMETER :: DTHR = 10E-6
#ifdef W3_S
CALL STRACE (IENT, 'SETDEPTH')
Expand Down
9 changes: 6 additions & 3 deletions model/src/w3sdb1md.F90
Original file line number Diff line number Diff line change
Expand Up @@ -183,19 +183,22 @@ SUBROUTINE W3SDB1 (IX, A, DEPTH, EMEAN, FMEAN, WNMEAN, CG, LBREAK, S, D )
!/ ------------------------------------------------------------------- /
!/
USE CONSTANTS
USE W3GDATMD, ONLY: NK, NTH, NSPEC, SDBC1, SDBC2, FDONLY, FSSOURCE, DDEN
USE W3ODATMD, ONLY: NDST
USE W3GDATMD, ONLY: NK, NTH, NSPEC, SDBC1, SDBC2, FDONLY, DDEN
USE W3GDATMD, ONLY: SIG
USE W3ODATMD, only : IAPROC
USE W3PARALL, only : THR
#ifdef W3_S
USE W3SERVMD, ONLY: STRACE
#endif
#ifdef W3_T
USE W3ODATMD, ONLY: NDST
#endif
#ifdef W3_T0
USE W3ARRYMD, ONLY: PRT2DS
USE W3ODATMD, ONLY: NDST
#endif
#ifdef W3_T1
USE W3ARRYMD, ONLY: OUTMAT
USE W3ODATMD, ONLY: NDST
#endif
!/
IMPLICIT NONE
Expand Down
Loading