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
28 changes: 9 additions & 19 deletions model/src/w3adatmd.F90
Original file line number Diff line number Diff line change
Expand Up @@ -757,7 +757,6 @@ SUBROUTINE W3NAUX ( NDSE, NDST )
!/ ------------------------------------------------------------------- /
USE W3GDATMD, ONLY: NGRIDS
USE W3SERVMD, ONLY: EXTCDE
USE W3ODATMD, ONLY: IAPROC
#ifdef W3_S
USE W3SERVMD, ONLY: STRACE
#endif
Expand Down Expand Up @@ -926,11 +925,9 @@ SUBROUTINE W3DIMA ( IMOD, NDSE, NDST, D_ONLY )
!
!/ ------------------------------------------------------------------- /
USE CONSTANTS, ONLY : LPDLIB
USE W3GDATMD, ONLY: NGRIDS, IGRID, W3SETG, NK, NX, NY, NSEA, &
NSEAL, NSPEC, NTH, E3DF, P2MSF, US3DF, &
USSPF, GTYPE, UNGTYPE
USE W3ODATMD, ONLY: IAPROC, NAPROC, NTPROC, NAPFLD, &
NOSWLL, NOEXTR, UNDEF, FLOGRD, FLOGR2
USE W3GDATMD, ONLY: NGRIDS, IGRID, W3SETG, NK, NX, NY, NSEA, &
NSEAL, NSPEC, NTH, E3DF, P2MSF, US3DF, USSPF, GTYPE, UNGTYPE
USE W3ODATMD, ONLY: IAPROC, NAPROC, NOSWLL, NOEXTR, UNDEF
USE W3IDATMD, ONLY: FLCUR, FLWIND, FLTAUA, FLRHOA
USE W3SERVMD, ONLY: EXTCDE
#ifdef W3_S
Expand All @@ -947,7 +944,7 @@ SUBROUTINE W3DIMA ( IMOD, NDSE, NDST, D_ONLY )
!/ ------------------------------------------------------------------- /
!/ Local parameters
!/
INTEGER :: JGRID, NXXX, NSEAL_tmp
INTEGER :: JGRID, NXXX
integer :: memunit
#ifdef W3_S
INTEGER, SAVE :: IENT = 0
Expand Down Expand Up @@ -1543,12 +1540,8 @@ SUBROUTINE W3XDMA ( IMOD, NDSE, NDST, OUTFLAGS )
! 10. Source code :
!
!/ ------------------------------------------------------------------- /
USE W3GDATMD, ONLY: NGRIDS, IGRID, W3SETG, NK, NX, NY, NSEA, &
NSEAL, NSPEC, NTH, E3DF, P2MSF, US3DF, &
USSPF, GTYPE, UNGTYPE
USE W3ODATMD, ONLY: IAPROC, NAPROC, NTPROC, NAPFLD, &
NOSWLL, NOEXTR, UNDEF, FLOGRD, FLOGR2, &
NOGRP, NGRPP
USE W3GDATMD, ONLY: NGRIDS, IGRID, W3SETG, NK, E3DF, P2MSF, UNGTYPE
USE W3ODATMD, ONLY: IAPROC, NAPROC, NOSWLL, NOEXTR, UNDEF, NOGRP, NGRPP
USE W3SERVMD, ONLY: EXTCDE
#ifdef W3_S
USE W3SERVMD, ONLY: STRACE
Expand Down Expand Up @@ -2495,9 +2488,7 @@ SUBROUTINE W3DMNL ( IMOD, NDSE, NDST, NSP, NSPX )
! 10. Source code :
!
!/ ------------------------------------------------------------------- /
USE W3GDATMD, ONLY: NGRIDS, IGRID, NK, NX, NY, NSEA, NSEAL, &
NSPEC, NTH, GTYPE, UNGTYPE
USE W3ODATMD, ONLY: NAPROC
USE W3GDATMD, ONLY: NGRIDS, UNGTYPE
USE W3SERVMD, ONLY: EXTCDE
#ifdef W3_S
USE W3SERVMD, ONLY: STRACE
Expand Down Expand Up @@ -2711,7 +2702,7 @@ SUBROUTINE W3SETA ( IMOD, NDSE, NDST )
!/ ------------------------------------------------------------------- /
!
USE W3IDATMD, ONLY: INPUTS
USE W3GDATMD, ONLY: E3DF, P2MSF, US3DF, USSPF, GTYPE, UNGTYPE
USE W3GDATMD, ONLY: GTYPE, UNGTYPE
!
USE W3SERVMD, ONLY: EXTCDE
#ifdef W3_S
Expand Down Expand Up @@ -3139,8 +3130,7 @@ SUBROUTINE W3XETA ( IMOD, NDSE, NDST )
!
!/ ------------------------------------------------------------------- /
!
USE W3IDATMD, ONLY: INPUTS
USE W3GDATMD, ONLY: E3DF, P2MSF, US3DF, USSPF, GTYPE, UNGTYPE
USE W3GDATMD, ONLY: UNGTYPE
!
USE W3SERVMD, ONLY: EXTCDE
#ifdef W3_S
Expand Down
16 changes: 10 additions & 6 deletions model/src/w3gdatmd.F90
Original file line number Diff line number Diff line change
Expand Up @@ -2970,7 +2970,10 @@ SUBROUTINE W3GNTX ( IMOD, NDSE, NDST )
LOGICAL, PARAMETER :: SPHERE = .FALSE.
INTEGER :: PRANGE(2), QRANGE(2)
INTEGER :: LBI(2), UBI(2), LBO(2), UBO(2), ISTAT
#if defined(TEST_W3GDATMD) || defined(TEST_W3GDATMD_W3GNTX)
REAL , ALLOCATABLE :: COSA(:,:)
#endif

#ifdef W3_S
INTEGER, SAVE :: IENT = 0
CALL STRACE (IENT, 'W3GNTX')
Expand Down Expand Up @@ -3189,7 +3192,6 @@ SUBROUTINE W3DIMUG ( IMOD, MTRI, MX, COUNTOTA, NNZ, NDSE, NDST )
!/ Parameter list
!/
INTEGER, INTENT(IN) :: IMOD, MTRI, MX, COUNTOTA, NNZ, NDSE, NDST
INTEGER :: IAPROC = 1
!/
!/ ------------------------------------------------------------------- /
!/ Local parameters
Expand Down Expand Up @@ -3361,15 +3363,17 @@ SUBROUTINE W3SETREF
!/
!/ ------------------------------------------------------------------- /
!/
INTEGER :: ISEA, IX, IY, IXY, IXN, IXP, IYN, IYP
INTEGER :: J, K, NEIGH1(0:7)
INTEGER :: ILEV, NLEV
INTEGER :: IX, IY
INTEGER :: NEIGH1(0:7)
#ifdef W3_S
INTEGER, SAVE :: IENT = 0
#endif
#ifdef W3_REF1
REAL :: COSAVG, SINAVG, THAVG, CLAT
INTEGER :: J, K
#endif

REAL :: TRIX(NY*NX), TRIY(NY*NX), DX, DY, &
COSAVG, SINAVG, THAVG, ANGLES(0:7), CLAT
REAL :: ANGLES(0:7)
!/
!/ ------------------------------------------------------------------- /
!/
Expand Down
57 changes: 27 additions & 30 deletions model/src/w3iogomd.F90
Original file line number Diff line number Diff line change
Expand Up @@ -401,7 +401,6 @@ SUBROUTINE W3READFLGRD ( NDSI , NDSO, NDSS, NDSEN, COMSTR, &
!
!/ ------------------------------------------------------------------- /
USE CONSTANTS
USE W3GDATMD, ONLY: US3DF, USSPF
USE W3ODATMD, ONLY: NOGRP, NGRPP, NOGE, IDOUT
USE W3SERVMD, ONLY: NEXTLN, STRSPLIT, STR_TO_UPPER
#ifdef W3_S
Expand Down Expand Up @@ -657,7 +656,6 @@ SUBROUTINE W3FLGRDFLAG ( NDSO, NDSS, NDSEN, FLDOUT, &
USE CONSTANTS
USE W3ODATMD, ONLY: NOGRP, NGRPP, IDOUT
USE W3SERVMD, ONLY: STRSPLIT, STR_TO_UPPER
USE W3GDATMD, ONLY: US3DF, USSPF
#ifdef W3_S
USE W3SERVMD, ONLY: STRACE
#endif
Expand All @@ -676,7 +674,7 @@ SUBROUTINE W3FLGRDFLAG ( NDSO, NDSS, NDSEN, FLDOUT, &
!/ ------------------------------------------------------------------- /
!/ Local parameters
!/
INTEGER :: I, IFI, IFJ, IOUT
INTEGER :: IFI, IFJ, IOUT
#ifdef W3_S
INTEGER, SAVE :: IENT = 0
#endif
Expand Down Expand Up @@ -1300,24 +1298,23 @@ SUBROUTINE W3OUTG ( A, FLPART, FLOUTG, FLOUTG2 )
!/ ------------------------------------------------------------------- /
USE CONSTANTS
USE W3GDATMD
USE W3WDATMD, ONLY: UST, FPIS
USE W3ADATMD, ONLY: CG, WN, DW
USE W3ADATMD, ONLY: HS, WLM, T02, T0M1, T01, FP0, &
THM, THS, THP0
USE W3ADATMD, ONLY: ABA, ABD, UBA, UBD, FCUT, SXX, &
SYY, SXY, PHS, PTP, PLP, PDIR, PSI, PWS, &
PWST, PNR, USERO, TUSX, TUSY, PRMS, TPMS, &
PWST, PNR, TUSX, TUSY, PRMS, TPMS, &
USSX, USSY, MSSX, MSSY, MSSD, MSCX, MSCY, &
MSCD, CHARN, &
BHD, CGE, P2SMS, US3D, EF, TH1M, STH1M, &
MSCD, BHD, CGE, P2SMS, EF, TH1M, STH1M, &
TH2M, STH2M, HSIG, STMAXE, STMAXD, &
HCMAXE, HMAXE, HCMAXD, HMAXD, USSP, QP, PQP,&
HCMAXE, HMAXE, HCMAXD, HMAXD, QP, PQP, &
PTHP0, PPE, PGW, PSW, PTM1, PT1, PT2, PEP, &
WBT, QKK
USE W3ODATMD, ONLY: NDST, UNDEF, IAPROC, NAPROC, NAPFLD, &
ICPRT, DTPRT, WSCUT, NOSWLL, FLOGRD, FLOGR2,&
NOGRP, NGRPP
USE W3ADATMD, ONLY: NSEALM
USE W3ODATMD, ONLY: UNDEF, ICPRT, DTPRT, WSCUT, &
NOSWLL, FLOGRD, FLOGR2, NOGRP, NGRPP
#ifdef W3_T
USE W3ODATMD, ONLY: NDST
#endif
#ifdef W3_S
USE W3SERVMD, ONLY: STRACE
#endif
Expand All @@ -1335,13 +1332,11 @@ SUBROUTINE W3OUTG ( A, FLPART, FLOUTG, FLOUTG2 )
!/ Local parameters
!/
INTEGER :: IK, ITH, JSEA, ISEA, IX, IY, &
IKP0(NSEAL), NKH(NSEAL), &
I, J, LKMS, HKMS, ITL
IKP0(NSEAL), NKH(NSEAL), I, J, ITL
#ifdef W3_S
INTEGER, SAVE :: IENT = 0
#endif
REAL :: FXPMC, FACTOR, FACTOR2, EBAND, FKD, &
AABS, UABS, &
XL, XH, XL2, XH2, EL, EH, DENOM, KD, &
M1, M2, MA, MB, MC, STEX, STEY, STED
REAL :: ET(NSEAL), EWN(NSEAL), ETR(NSEAL), &
Expand All @@ -1367,8 +1362,8 @@ SUBROUTINE W3OUTG ( A, FLPART, FLOUTG, FLOUTG2 )
T02P(NSEAL), NV(NSEAL), NS(NSEAL), &
NB(NSEAL), MODE(NSEAL), &
MU(NSEAL), NI(NSEAL), STMAXEL(NSEAL),&
PHI(21,NSEAL),PHIST(NSEAL), &
EBC(NK,NSEAL), ABP(NSEAL), &
PHI(21,NSEAL),PHIST(NSEAL), &
EBC(NK,NSEAL), &
STMAXDL(NSEAL), TLPHI(NSEAL), &
WL02X(NSEAL), WL02Y(NSEAL), &
ALPXT(NSEAL), ALPYT(NSEAL), &
Expand Down Expand Up @@ -2518,7 +2513,7 @@ SUBROUTINE W3IOGO ( INXOUT, NDSOG, IOTST, IMOD &
USE W3ADATMD, ONLY: W3SETA, W3DIMA, W3XETA
USE W3ODATMD, ONLY: W3SETO
!/
USE W3WDATMD, ONLY: TIME, DINIT, WLV, ICE, ICEF, ICEH, BERG, &
USE W3WDATMD, ONLY: TIME, DINIT, WLV, ICE, BERG, &
UST, USTDIR, ASF, RHOAIR
USE W3ADATMD, ONLY: AINIT, DW, UA, UD, AS, CX, CY, WN, &
TAUA, TAUADIR
Expand All @@ -2537,18 +2532,23 @@ SUBROUTINE W3IOGO ( INXOUT, NDSOG, IOTST, IMOD &
STMAXE, STMAXD, HMAXE, HCMAXE, HMAXD, HCMAXD,&
USSP, TAUOCX, TAUOCY, QKK, SKEW, EMBIA1, EMBIA2
!/
USE W3ODATMD, ONLY: NOGRP, NGRPP, IDOUT, UNDEF, NDST, NDSE, &
USE W3ODATMD, ONLY: NOGRP, NGRPP, UNDEF, NDST, NDSE, &
FLOGRD, IPASS => IPASS1, WRITE => WRITE1, &
FNMPRE, FNMGRD, NOSWLL, NOEXTR
!/
USE W3SERVMD, ONLY: EXTCDE, EXTOPN, EXTIOF
USE W3ODATMD, only: IAPROC
USE W3ODATMD, ONLY: OFILES
#ifdef W3_T
USE W3ODATMD, ONLY: IDOUT
#endif
#ifdef W3_SETUP
USE W3WDATMD, ONLY: ZETA_SETUP
#endif
#ifdef W3_S
USE W3SERVMD, ONLY: STRACE
#endif
#ifdef W3_IS2
USE W3WDATMD, ONLY: ICEF, ICEH
#endif
!
IMPLICIT NONE
Expand All @@ -2569,14 +2569,12 @@ SUBROUTINE W3IOGO ( INXOUT, NDSOG, IOTST, IMOD &
!/ Local parameters
!/
INTEGER :: IGRD, IERR, I, J, IX, IY, MOGRP, &
MGRPP, ISEA, MOSWLL, IK, IFI, IFJ &
,IFILOUT
MGRPP, ISEA, MOSWLL, IK, IFI, IFJ
INTEGER, ALLOCATABLE :: MAPTMP(:,:)
#ifdef W3_S
INTEGER, SAVE :: IENT = 0
#endif
REAL :: AUX1(NSEA), AUX2(NSEA), &
AUX3(NSEA), AUX4(NSEA)
REAL :: AUX1(NSEA), AUX2(NSEA)
#ifdef W3_SMC
REAL :: UDARC
#endif
Expand Down Expand Up @@ -4191,12 +4189,11 @@ SUBROUTINE CALC_U3STOKES ( A , USS_SWITCH )
!
!/ ------------------------------------------------------------------- /
USE CONSTANTS, ONLY: TPIINV, GRAV, TPI
USE W3GDATMD, ONLY: DDEN, DSII, XFR, SIG, NK, NTH, NSEAl, &
USE W3GDATMD, ONLY: DDEN, DSII, SIG, NK, NTH, NSEAl, &
ECOS, ESIN, US3DF, USSPF, USSP_WN
USE W3ADATMD, ONLY: CG, WN, DW
USE W3ADATMD, ONLY: USSX, USSY, US3D, USSP
USE W3ODATMD, ONLY: IAPROC, NAPROC
USE W3PARALL, ONLY: INIT_GET_ISEA
USE W3ADATMD, ONLY: US3D, USSP
USE W3PARALL, ONLY: INIT_GET_ISEA
#ifdef W3_S
USE W3SERVMD, ONLY: STRACE
#endif
Expand Down Expand Up @@ -4645,7 +4642,7 @@ SUBROUTINE SECONDHH(NKHF,FAC0,FAC1,FAC2,FAC3)
! V E ZAKHAROV(1967)
!-------------------------------------------------------------------
USE CONSTANTS, ONLY: GRAV, TPI
USE W3GDATMD, ONLY: NK, NTH, XFR, SIG, TH, DTH, ECOS, ESIN
USE W3GDATMD, ONLY: NTH, XFR, SIG, TH, DTH, ECOS, ESIN
IMPLICIT NONE

INTEGER, INTENT(IN) :: NKHF
Expand Down Expand Up @@ -4930,7 +4927,7 @@ SUBROUTINE SKEWNESS(A)

REAL(KIND=4) :: CONX, DELTA
REAL(KIND=4) :: FH, DELF, XK1
REAL(KIND=4) :: XPI, XPJ, XPK, XN, XFAC, CO1
REAL(KIND=4) :: XPI, XPJ, XPK, XN, CO1
REAL(KIND=4), DIMENSION(:,:), ALLOCATABLE :: F2
REAL(KIND=4), DIMENSION(0:3,0:2,0:2) :: XMU, XLAMBDA
REAL(KIND=4), DIMENSION(:) , ALLOCATABLE:: SIGHF, DFIMHF, FAK
Expand Down
Loading