Skip to content
Merged
2 changes: 1 addition & 1 deletion model/src/w3iogomd.F90
Original file line number Diff line number Diff line change
Expand Up @@ -2569,7 +2569,7 @@ SUBROUTINE W3IOGO ( INXOUT, NDSOG, IOTST, IMOD &
!/ Local parameters
!/
INTEGER :: IGRD, IERR, I, J, IX, IY, MOGRP, &
MGRPP, ISEA, MOSWLL, IK, IFI, IFJ
MGRPP, ISEA, MOSWLL, IFI, IFJ
INTEGER, ALLOCATABLE :: MAPTMP(:,:)
#ifdef W3_S
INTEGER, SAVE :: IENT = 0
Expand Down
26 changes: 16 additions & 10 deletions model/src/w3iogrmd.F90
Original file line number Diff line number Diff line change
Expand Up @@ -331,11 +331,8 @@ SUBROUTINE W3IOGR ( INXOUT, NDSM, IMOD, FEXT &
!/ ------------------------------------------------------------------- /
!/ Local parameters
!/
INTEGER :: IGRD, IERR, I, J, MTH, MK, ISEA, IX, IY
INTEGER :: IGRD, IERR, I, MTH, MK, IX, IY
INTEGER :: IEXT, IPRE
#ifdef W3_ST4
INTEGER :: IK, ITH, IK2, ITH2
#endif
INTEGER, ALLOCATABLE :: MAPTMP(:,:)
#ifdef W3_MPI
INTEGER :: IERR_MPI, IP
Expand All @@ -344,12 +341,22 @@ SUBROUTINE W3IOGR ( INXOUT, NDSM, IMOD, FEXT &
INTEGER, SAVE :: IENT = 0
#endif
#ifdef W3_T
INTEGER :: K
INTEGER :: K, ISEA
#endif
#if defined(W3_T) || defined(W3_SMC)
INTEGER :: J
#endif
LOGICAL :: WRITE, FLTEST = .FALSE.
#if defined(W3_NL2) || defined(W3_MPI)
LOGICAL :: FLSNL2 = .FALSE.
#endif
LOGICAL, SAVE :: FLDISP = .FALSE.
#if defined(W3_ST2) || defined(W3_ST3)
LOGICAL, SAVE :: FLINP = .FALSE.
#endif
#ifdef W3_IS2
LOGICAL, SAVE :: FLIS = .FALSE.
#endif
LOGICAL :: WRITE, FLTEST = .FALSE., TESTLL, &
FLSNL2 = .FALSE.
LOGICAL, SAVE :: FLINP = .FALSE. , FLDISP = .FALSE., &
FLIS = .FALSE.
CHARACTER(LEN=10) :: VERTST
CHARACTER(LEN=13) :: TEMPXT
CHARACTER(LEN=30) :: TNAME0, TNAME1, TNAME2, TNAME3, &
Expand All @@ -360,7 +367,6 @@ SUBROUTINE W3IOGR ( INXOUT, NDSM, IMOD, FEXT &
FNAMEP, FNAMEG, FNAMEF, FNAMEI
CHARACTER(LEN=35) :: IDTST
CHARACTER(LEN=60) :: MESSAGE(5)
LOGICAL :: GLOBAL

REAL, ALLOCATABLE :: XGRD4(:,:), YGRD4(:,:)

Expand Down
6 changes: 5 additions & 1 deletion model/src/w3iorsmd.F90
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ SUBROUTINE W3IORS ( INXOUT, NDSR, DUMFPI, IMOD, FLRSTRT )
UBA, UBD, PHIBBL, TAUBBL, TAUOCX, TAUOCY, &
WNMEAN
!/
USE W3GDATMD, ONLY: NX, NY, NSEA, NSEAL, NSPEC, MAPSTA, MAPST2, &
USE W3GDATMD, ONLY: NX, NY, NSEA, NSPEC, MAPSTA, MAPST2, &
GNAME, FILEXT, GTYPE, UNGTYPE
USE W3TRIAMD, ONLY: SET_UG_IOBP
USE W3WDATMD, only : DINIT, VA, TIME, TLEV, TICE, TRHO, ICE, UST
Expand All @@ -323,6 +323,10 @@ SUBROUTINE W3IORS ( INXOUT, NDSR, DUMFPI, IMOD, FLRSTRT )
VAAUX
USE W3ADATMD, ONLY: MPI_COMM_WCMP
USE mpi_f08
#endif
!/
#if defined(W3_T) || defined(W3_MPI)
USE W3GDATMD, ONLY: NSEAL
#endif
!/
USE W3SERVMD, ONLY: EXTCDE, EXTIOF
Expand Down
4 changes: 3 additions & 1 deletion model/src/w3iosfmd.F90
Original file line number Diff line number Diff line change
Expand Up @@ -441,14 +441,16 @@ SUBROUTINE W3IOSF ( NDSPT, IMOD )
IPASS => IPASS6, FLFORM, FNMPRE, OUTPTS, &
IX0, IXN, IXS, IY0, IYN, IYS, DIMP
USE W3ADATMD, ONLY: DW, U10, U10D, CX, CY
USE W3ADATMD, ONLY: NSEALM
USE W3PARALL, ONLY: INIT_GET_JSEA_ISPROC
#ifdef W3_MPI
USE W3ADATMD, ONLY: MPI_COMM_WAVE
USE W3ODATMD, ONLY: ICPRT, DTPRT, IT0PRT
#endif
#ifdef W3_T
USE W3ODATMD, ONLY: NDST
#endif
#if defined(W3_T) || defined(W3_MPI)
USE W3ADATMD, ONLY: NSEALM
#endif
!
#ifdef W3_MPI
Expand Down
10 changes: 5 additions & 5 deletions model/src/w3profsmd.F90
Original file line number Diff line number Diff line change
Expand Up @@ -344,8 +344,8 @@ SUBROUTINE W3CFLUG ( ISEA, NKCFL, FACX, FACY, DT, MAPFS, CFLXYMAX, &
!
USE W3TIMEMD, ONLY: DSEC21
!
USE W3GDATMD, ONLY: NX, NY, NSEA, MAPSF, CLATS, &
NTH, ECOS, ESIN, IEN, INDEX_CELL, &
USE W3GDATMD, ONLY: NX, NY, MAPSF, CLATS, &
NTH, ECOS, ESIN, IEN, INDEX_CELL, &
TRIGP, IE_CELL, POS_CELL, SI, IOBP

USE W3ADATMD, ONLY: CG, CX, CY
Expand Down Expand Up @@ -1323,9 +1323,9 @@ SUBROUTINE W3XYPFSFCT2 ( ISP, C, LCALC, RD10, RD20, DT, AC)
!/ ------------------------------------------------------------------- /
!/
USE W3GDATMD, ONLY : NTH, NTRI, NX, SI, &
IEN, TRIGP, CLATS, MAPSF, IOBPD, IOBPA, IOBDP
IEN, TRIGP, CLATS, MAPSF, IOBPD, IOBDP
#ifdef W3_REF1
USE W3GDATMD, ONLY : REFPARS
USE W3GDATMD, ONLY : REFPARS, IOBPA
#endif
USE W3ADATMD, ONLY: CG, ITER
USE W3ODATMD, ONLY: FLBPI, NBI, ISBPI, BBPI0, BBPIN
Expand Down Expand Up @@ -1626,7 +1626,7 @@ SUBROUTINE SETDEPTH
USE W3SERVMD, ONLY: STRACE
#endif
!
USE W3GDATMD, ONLY: DMIN, IOBDP, MAPFS, NX
USE W3GDATMD, ONLY: DMIN, IOBDP, NX
USE W3ADATMD, ONLY: DW

IMPLICIT NONE
Expand Down
3 changes: 2 additions & 1 deletion model/src/w3snl1md.F90
Original file line number Diff line number Diff line change
Expand Up @@ -836,8 +836,9 @@ SUBROUTINE W3SNLGQM(A,CG,WN,DEPTH,TSTOTn,TSDERn)
REAL :: q_dfac, SATVAL(NK), SUME, ACCVAL, ACCMAX, AMPFAC
DOUBLE PRECISION :: RAISF, FREQ(NK)
DOUBLE PRECISION :: TSTOT(NTH,NK) , TSDER(NTH,NK), F(NTH,NK)
#ifdef W3_TGQM
DOUBLE PRECISION :: TEMP

#endif
!.....LOCAL VARIABLES
INTEGER JF , JT , JF1 , JT1 , IQ_OM2 &
, JFM0 , JFM1 , JFM2 , JFM3 , IXF1 , IXF2 &
Expand Down
5 changes: 4 additions & 1 deletion model/src/w3src4md.F90
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ SUBROUTINE W3SPR4 (A, CG, WN, EMEAN, FMEAN, FMEAN1, WNMEAN, &
USE CONSTANTS, ONLY: TPIINV, GRAV, nu_air
USE W3GDATMD, ONLY: NK, NTH, NSPEC, SIG, DDEN, WWNMEANP, &
WWNMEANPTAIL, FTE, FTF, SSTXFTWN,&
SSTXFTFTAIL, ESIN, ECOS, ZZWND, SSDSC
SSTXFTFTAIL, ESIN, ECOS, SSDSC
#ifdef W3_S
USE W3SERVMD, ONLY: STRACE
#endif
Expand All @@ -240,6 +240,7 @@ SUBROUTINE W3SPR4 (A, CG, WN, EMEAN, FMEAN, FMEAN1, WNMEAN, &
!
#ifdef W3_FLX5
USE W3FLX5MD
USE W3GDATMD, ONLY: ZZWND
#endif
IMPLICIT NONE
!/
Expand Down Expand Up @@ -550,8 +551,10 @@ SUBROUTINE W3SIN4 (A, CG, K, U, USTAR, DRAT, AS, USDIR, Z0, CD, &
REAL :: COSU, SINU, TAUX, TAUY, USDIRP, USTP
REAL :: TAUPX, TAUPY, UST2, TAUW, TAUWB
REAL , PARAMETER :: EPS1 = 0.00001, EPS2 = 0.000001
#if defined(W3_T) || defined(W3_STAB3)
REAL :: Usigma !standard deviation of U due to gustiness
REAL :: USTARsigma !standard deviation of USTAR due to gustiness
#endif
REAL :: CM,UCN,ZCN, &
Z0VISC, Z0NOZ, EB, &
EBX, EBY, AORB, AORB1, FW, UORB, &
Expand Down
8 changes: 5 additions & 3 deletions model/src/w3srcemd.F90
Original file line number Diff line number Diff line change
Expand Up @@ -497,11 +497,13 @@ SUBROUTINE W3SRCE ( srce_call, IT, ISEA, JSEA, IX, IY, IMOD, &
USE CONSTANTS, ONLY: DWAT, srce_imp_post, srce_imp_pre, &
srce_direct, GRAV, TPI, TPIINV
USE W3GDATMD, ONLY: NK, NTH, NSPEC, SIG, TH, DMIN, DTMAX, &
DTMIN, FACTI1, FACTI2, FACSD, FACHFA, FACP, &
XFLT, XREL, FXFM, FXPM, DDEN, &
FHMAX, ECOS, ESIN, IICEDISP, &
DTMIN, FACTI1, FACTI2, FACSD, FACHFA, FACP, &
XFLT, XREL, DDEN, FHMAX, ECOS, ESIN, IICEDISP, &
ICESCALES, IICESMOOTH
USE W3GDATMD, ONLY: IC_NUMERICS
#if defined(W3_ST1) || defined(W3_ST6)
USE W3GDATMD, ONLY: FXFM, FXPM
#endif
#if defined(W3_NL5) || defined(W3_NNT)
USE W3WDATMD, ONLY: TIME
#endif
Expand Down
3 changes: 2 additions & 1 deletion model/src/w3triamd.F90
Original file line number Diff line number Diff line change
Expand Up @@ -2070,11 +2070,12 @@ SUBROUTINE UG_GRADIENTS (PARAM, DIFFX, DIFFY)
! 10. Source code :
USE CONSTANTS
USE W3GDATMD, ONLY : TRIGP, NTRI, NX, NSEA, MAPFS, CLATIS, &
FLAGLL, IEN, TRIA, NSEAL, NTRI
FLAGLL, IEN, TRIA, NTRI
#ifdef W3_PDLIB
USE yowElementpool
use yowNodepool, only: PDLIB_IEN, PDLIB_TRIA, NPA
USE yowExchangeModule, only : PDLIB_exchange1Dreal
USE W3GDATMD, ONLY : NSEAL
#endif

IMPLICIT NONE
Expand Down
15 changes: 12 additions & 3 deletions model/src/w3uqckmd.F90
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ SUBROUTINE W3QCK1 (MX, MY, NX, NY, CFLL, Q, CLOSE, INC, &
!/ ------------------------------------------------------------------- /
!/ Local parameters
!/
INTEGER :: IXY, IP, IXYC, IXYU, IXYD, IY, IX, &
INTEGER :: IXY, IP, IXYC, IXYU, IXYD, IY, &
IAD00, IAD02, IADN0, IADN1, IADN2
#ifdef W3_S
INTEGER, SAVE :: IENT = 0
Expand All @@ -238,6 +238,9 @@ SUBROUTINE W3QCK1 (MX, MY, NX, NY, CFLL, Q, CLOSE, INC, &
#endif
#ifdef W3_T2
REAL :: QOLD
#endif
#if defined(W3_T0) || defined(W3_T1)
INTEGER :: IX
#endif
!/
!/ ------------------------------------------------------------------- /
Expand Down Expand Up @@ -615,7 +618,7 @@ SUBROUTINE W3QCK2 (MX, MY, NX, NY, VELO, DT, DX1, DX2, Q, CLOSE,&
!/ ------------------------------------------------------------------- /
!/ Local parameters
!/
INTEGER :: IXY, IP, IXYC, IXYU, IXYD, IY, IX, &
INTEGER :: IXY, IP, IXYC, IXYU, IXYD, IY, &
IAD00, IAD02, IADN0, IADN1, IADN2
#ifdef W3_S
INTEGER, SAVE :: IENT
Expand All @@ -633,6 +636,9 @@ SUBROUTINE W3QCK2 (MX, MY, NX, NY, VELO, DT, DX1, DX2, Q, CLOSE,&
#endif
#ifdef W3_T2
REAL :: QOLD
#endif
#if defined(W3_T0) || defined(W3_T1)
INTEGER :: IX
#endif
!/
!/ ------------------------------------------------------------------- /
Expand Down Expand Up @@ -1017,7 +1023,7 @@ SUBROUTINE W3QCK3 (MX, MY, NX, NY, CFLL, TRANS, Q, CLOSE, &
!/ ------------------------------------------------------------------- /
!/ Local parameters
!/
INTEGER :: IXY, IP, IXYC, IXYU, IXYD, IY, IX, &
INTEGER :: IXY, IP, IXYC, IXYU, IXYD, IY, &
IAD00, IAD02, IADN0, IADN1, IADN2, &
JN, JP
#ifdef W3_S
Expand All @@ -1036,6 +1042,9 @@ SUBROUTINE W3QCK3 (MX, MY, NX, NY, CFLL, TRANS, Q, CLOSE, &
#endif
#ifdef W3_T2
REAL :: QOLD
#endif
#if defined(W3_T0) || defined(W3_T1)
INTEGER :: IX
#endif
!/
!/ ------------------------------------------------------------------- /
Expand Down