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
9 changes: 5 additions & 4 deletions model/src/w3wdasmd.F90
Original file line number Diff line number Diff line change
Expand Up @@ -194,12 +194,14 @@ SUBROUTINE W3WDAS ( DASFLAG, RECL, NDAT, DATA0, DATA1, DATA2 )
USE W3GDATMD
USE W3WDATMD
USE W3ADATMD
USE W3ODATMD, ONLY: NDSO, NDSE, NDST, SCREEN, NAPROC, IAPROC, &
NAPLOG, NAPOUT, NAPERR
#ifdef W3_S
USE W3SERVMD, ONLY: STRACE
#endif
!
#ifdef W3_T
USE W3ODATMD, ONLY: NDSO, NDSE, NDST, SCREEN, NAPROC, IAPROC, NAPOUT, NAPERR
#endif
!
#ifdef W3_MPI
use mpi_f08
#endif
Expand All @@ -218,9 +220,8 @@ SUBROUTINE W3WDAS ( DASFLAG, RECL, NDAT, DATA0, DATA1, DATA2 )
!/ ------------------------------------------------------------------- /
!/ Local parameters :
!/
INTEGER :: J
#ifdef W3_T
INTEGER :: MREC, MDAT, IREC, IDAT
INTEGER :: MREC, MDAT, IREC, IDAT, J
#endif
#ifdef W3_S
INTEGER, SAVE :: IENT = 0
Expand Down
11 changes: 3 additions & 8 deletions model/src/ww3_gint.F90
Original file line number Diff line number Diff line change
Expand Up @@ -115,21 +115,18 @@ PROGRAM W3GRID_INTERP
USE W3IOGOMD, ONLY : W3IOGO
USE W3ADATMD, ONLY : W3DIMA, W3NAUX, W3SETA
USE W3GDATMD
USE W3ODATMD, ONLY : FNMPRE, NOGRP, NGRPP, OUTPTS, UNDEF, FLOGRD, &
NAPROC, NOSWLL, IDOUT
USE W3ODATMD, ONLY : FNMPRE, NOGRP, NGRPP, OUTPTS, UNDEF, FLOGRD, IDOUT
USE W3ODATMD, ONLY : W3NOUT, W3SETO
USE W3IDATMD
USE W3WDATMD, ONLY : W3NDAT, W3DIMW, W3SETW
USE W3WDATMD, ONLY : WDATAS, TIME, WLV, ICE, ICEH, ICEF, &
UST, USTDIR, ASF, RHOAIR
USE W3WDATMD, ONLY : WDATAS
USE W3SERVMD, ONLY : ITRACE, NEXTLN, EXTCDE, EXTOPN, EXTIOF
#ifdef W3_S
USE W3SERVMD, ONLY : STRACE
#endif
USE W3ARRYMD, ONLY : PRTBLK
USE W3GSRUMD
USE W3TRIAMD
USE W3WDATMD, ONLY: VA
USE W3IORSMD, ONLY: W3IORS
!/
IMPLICIT NONE
Expand Down Expand Up @@ -161,7 +158,7 @@ PROGRAM W3GRID_INTERP
INTEGER, ALLOCATABLE :: FIDOUT(:), MAP(:,:), TMP_INDX(:)
REAL :: SXT, SYT, XT, YT, XTT
DOUBLE PRECISION :: DAREA, SAREA
REAL :: XCRNR(5),YCRNR(5),DT(4),DX,DY,XSUB,YSUB
REAL :: XCRNR(5),YCRNR(5),DT(4)
INTEGER :: TOUT(2), NOUT, IOUT
REAL :: DTREQ, DTEST
INTEGER :: IS(4), JS(4)
Expand All @@ -175,7 +172,6 @@ PROGRAM W3GRID_INTERP
CHARACTER :: COMSTR*1, IDTIME*23, FNAMEWHT*32
REAL :: XXX !< Dummy Value for w3iors call
LOGICAL :: OUTorREST !< True interpolate out_grd or False restart
INTEGER :: INTYPE !check if this can be removed
INTEGER, ALLOCATABLE :: MAPSTA_NG(:,:),MAPST2_NG(:,:)
INTEGER, ALLOCATABLE :: NOINT(:),NOINT2(:),MAPSTATMP(:,:)
INTEGER :: iNOINT,iNOINT2,JSEA,iloops
Expand Down Expand Up @@ -1133,7 +1129,6 @@ SUBROUTINE W3EXGI ( NGRD, NSEA, NOSWLL_MIN, INTMETHOD, OUTorRESTflag, &
!variables for restart
LOGICAL :: OUTorRESTflag
REAL :: VAAUX(NSPEC), SUMRES(NSPEC)
INTEGER :: INTYPE
REAL :: XXX
INTEGER :: MAPSTA_NG(NY,NX),MAPST2_NG(NY,NX)
!/
Expand Down
8 changes: 4 additions & 4 deletions model/src/ww3_grib.F90
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ PROGRAM W3GRIB
USE W3WDATMD, ONLY: TIME, WLV, ICE, UST, USTDIR, RHOAIR
USE W3ADATMD
USE W3ODATMD, ONLY: NDSE, NDST, NDSO, NOGRP, NGRPP, IDOUT, UNDEF,&
FLOGRD, FNMPRE, NOSWLL, NOGE, FLOGD
FLOGRD, NOSWLL, NOGE, FLOGD
!
IMPLICIT NONE
!/
Expand Down Expand Up @@ -218,7 +218,7 @@ END SUBROUTINE GRIBEND
!/ Local variables
!/
INTEGER :: NDSI, NDSM, NDSOG, NDSDAT, NDSTRC, &
NTRACE, IERR, IOTEST, I,J,K, IFI,IFJ,&
NTRACE, IERR, IOTEST, I, J, IFI, IFJ,&
ISEA, IX, IY, TOUT(2), NOUT, TDUM(2),&
FTIME(2), CID, PID, GID, GDS, IOUT, &
GDTN
Expand All @@ -244,7 +244,7 @@ END SUBROUTINE GRIBEND
INTEGER, SAVE :: IENT = 0
#endif
REAL :: DTREQ, DTEST, RFTIME
LOGICAL :: FLREQ(NOGRP,NGRPP), FLGRIB(NOGRP,NGRPP)
LOGICAL :: FLREQ(NOGRP,NGRPP)
CHARACTER :: COMSTR*1, IDTIME*23, IDDDAY*11
CHARACTER(LEN=80) :: LINEIN
CHARACTER(LEN=8) :: WORDS(5)
Expand Down Expand Up @@ -1034,7 +1034,7 @@ SUBROUTINE W3EXGB ( NX, NY, NSEA )
!/ ------------------------------------------------------------------- /
!/ Local parameters
!/
INTEGER :: J, IXY, NDATA
INTEGER :: IXY, NDATA
INTEGER :: IO
#ifdef W3_S
INTEGER, SAVE :: IENT = 0
Expand Down
12 changes: 7 additions & 5 deletions model/src/ww3_outf.F90
Original file line number Diff line number Diff line change
Expand Up @@ -155,8 +155,7 @@ PROGRAM W3OUTF
USE W3IOGOMD, ONLY: W3IOGO, W3READFLGRD
!/
USE W3GDATMD
USE W3WDATMD, ONLY: TIME, WLV, ICE, ICEH, ICEF, BERG, UST, &
USTDIR, RHOAIR
USE W3WDATMD, ONLY: TIME, WLV, ICE, BERG, UST, USTDIR, RHOAIR
USE W3ADATMD, ONLY: DW, UA, UD, AS, CX, CY, HS, WLM, T0M1, THM, &
THS, FP0, THP0, DTDYN, FCUT, &
ABA, ABD, UBA, UBD, SXX, SYY, SXY, USERO, &
Expand All @@ -173,7 +172,10 @@ PROGRAM W3OUTF
HCMAXE, HMAXD, HCMAXD, MSSD, MSCD, WBT, &
WNMEAN, TAUA, TAUADIR
USE W3ODATMD, ONLY: NDSO, NDSE, NDST, NOGRP, NGRPP, IDOUT, &
UNDEF, FLOGRD, FNMPRE, FNMGRD, FNMPNT, FNMRST, NOSWLL, NOGE
UNDEF, FLOGRD, FNMPRE, NOSWLL
#ifdef W3_IS2
USE W3WDATMD, ONLY: ICEH, ICEF
#endif
!
IMPLICIT NONE
!/
Expand All @@ -192,7 +194,7 @@ PROGRAM W3OUTF
CHARACTER :: COMSTR*1, IDTIME*23, IDDDAY*11, &
TABNME*9
LOGICAL :: FLREQ(NOGRP,NGRPP), FLOG(NOGRP), &
SCALE, VECTOR, LTEMP(NGRPP)
SCALE, VECTOR
!/
!/ ------------------------------------------------------------------- /
!/
Expand Down Expand Up @@ -632,7 +634,7 @@ SUBROUTINE W3EXGO ( NX, NY, NSEA )
!/ Local parameters
!/
INTEGER :: NXMAX, NXTOT, NBLOK, IH, IM, IS, &
MFILL, J, ISEA, IX, IY, IXB, IB, &
MFILL, ISEA, IX, IY, IXB, IB, &
IXA, NINGRD, JJ, IFI, IFJ
INTEGER :: MAP(NX+1,NY), MP2(NX+1,NY), &
MX1(NX,NY), MXX(NX,NY), MYY(NX,NY), &
Expand Down
37 changes: 22 additions & 15 deletions model/src/ww3_outp.F90
Original file line number Diff line number Diff line change
Expand Up @@ -224,13 +224,15 @@ PROGRAM W3OUTP
USE W3GDATMD
USE W3WDATMD, ONLY: TIME
USE W3ODATMD, ONLY: NDSE, NDST, NDSO, NOPTS, PTLOC, PTNME, &
DPO, WAO, WDO, ASO, CAO, CDO, SPCO, FNMPRE,&
ICEO, ICEHO, ICEFO, DIMP
DPO, WAO, WDO, ASO, CAO, CDO, SPCO, FNMPRE, DIMP
#ifdef W3_IS2
USE W3ODATMD, ONLY: ICEO, ICEHO, ICEFO
#endif
#ifdef W3_FLX5
USE W3ODATMD, ONLY: TAUAO, TAUDO, DAIRO
#endif
USE W3BULLMD, ONLY: NPTAB, NFLD, NPMAX, BHSMIN, BHSDROP, IYY, &
HST, TPT, DMT, ASCBLINE, CSVBLINE
USE W3BULLMD, ONLY: NPTAB, NFLD, NPMAX, BHSMIN, BHSDROP, &
ASCBLINE, CSVBLINE
#ifdef W3_NCO
USE W3BULLMD, ONLY: CASCBLINE
#endif
Expand Down Expand Up @@ -1417,7 +1419,7 @@ SUBROUTINE W3EXPO
!/
INTEGER :: J, I1, I2, ISP, IKM, ITH, &
IK, IH, IM, IS, IYR, IMTH, IDY, ITT, &
I, NPART, IP, IX, IY, ISEA
I, NPART, IX, IY
INTEGER, SAVE :: IPASS = 0
#ifdef W3_S
INTEGER, SAVE :: IENT = 0
Expand All @@ -1430,15 +1432,20 @@ SUBROUTINE W3EXPO
SPP, CD, USTAR, FACTOR, UNORM, ESTAR,&
FPSTAR, FACF, FACE, FACS, HMAT, WNA, &
XYZ, AGE1, AFR, AGE2, FACT, XSTAR, &
YSTAR, FHIGH, ZWND, Z0, USTD, EMEAN, &
YSTAR, ZWND, Z0, USTD, EMEAN, &
FMEAN, WNMEAN, UDIRCA, X, Y, CHARN, &
M2KM, ICEF, ICEDMAX, ICETHICK, &
ICECON
M2KM
#if defined(W3_ST0) || defined(W3_ST1) || defined(W3_ST2) || defined(W3_ST6) || defined(W3_LN1)
REAL :: FHIGH
#endif

#ifdef W3_FLX5
REAL ::TAUA, TAUADIR, RHOAIR
REAL :: TAUA, TAUADIR, RHOAIR
#endif
#ifdef W3_IS2
REAL :: WN_R(NK),CG_ICE(NK), ALPHA_LIU(NK)
REAL :: WN_R(NK), CG_ICE(NK), ALPHA_LIU(NK), R(NK)
REAL :: DIA2(NTH,NK)
REAL :: ICEF, ICEDMAX, ICETHICK, ICECON
#endif
#ifdef W3_ST1
REAL :: AMAX, FH1, FH2
Expand All @@ -1448,10 +1455,10 @@ SUBROUTINE W3EXPO
#endif
#ifdef W3_ST3
REAL :: AMAX, FMEANS, FMEANWS, TAUWX, TAUWY, &
TAUWNX, TAUWNY
TAUWNX, TAUWNY, ICE
#endif
#ifdef W3_ST4
REAL :: AMAX, FMEANS, FMEANWS, TAUWX, TAUWY, &
REAL :: AMAX, FMEANWS, TAUWX, TAUWY, &
TAUWNX, TAUWNY, FMEAN1, WHITECAP(1:4), DLWMEAN
#endif
#ifdef W3_ST6
Expand All @@ -1461,21 +1468,21 @@ SUBROUTINE W3EXPO
REAL :: TAUSCX, TAUSCY
#endif
#ifdef W3_BT4
INTEGER :: ISEA
REAL :: D50, PSIC, BEDFORM(3), TAUBBL(2)
#endif
REAL :: ICE
#ifdef W3_STAB2
REAL :: STAB0, STAB, COR1, COR2, ASFAC, &
THARG1, THARG2
#endif
REAL, SAVE :: HSMIN = 0.05
REAL :: WN(NK), CG(NK), R(NK)
REAL :: WN(NK), CG(NK)
REAL :: E(NK,NTH), E1(NK), APM(NK), &
THBND(NK), SPBND(NK), A(NTH,NK), &
WN2(NTH,NK)
REAL :: DIA(NTH,NK), SWN(NK,NTH), SNL(NK,NTH),&
SDS(NK,NTH), SBT(NK,NTH), SIS(NK,NTH),&
STT(NK,NTH), DIA2(NTH,NK)
STT(NK,NTH)
REAL :: XLN(NTH,NK), XIN(NTH,NK), XNL(NTH,NK),&
XTR(NTH,NK), XDS(NTH,NK), XDB(NTH,NK),&
XBT(NTH,NK), XBS(NTH,NK), XXX(NTH,NK),&
Expand Down