diff --git a/manual/defs.tex b/manual/defs.tex index be802221a8..1f67da7e72 100644 --- a/manual/defs.tex +++ b/manual/defs.tex @@ -1,4 +1,4 @@ -\newcommand{\WWver}{7.13} +\newcommand{\WWver}{7.14} \newcommand{\guidever}{1.2} \newcommand{\guideref}{tol:MMABguide} \newcommand{\genever}{1.5} diff --git a/manual/intro/about.tex b/manual/intro/about.tex index c980178f39..bf567e3077 100644 --- a/manual/intro/about.tex +++ b/manual/intro/about.tex @@ -79,6 +79,9 @@ \subsection{~About this manual} and NCC switches, removed experimental and supplemental switches (XX0, XXX, FLXX, PRX, STX, NLX, BTX, DBX, TRX, BSX) and modularized and cleaned up the build (model version 7.13). +\item Changed from WW3 preprocessor and ftn source code directory to using CPP preprocessors and + src for the source code directory (model version 7.14). + \end{list} \vspace{\baselineskip} \noindent diff --git a/model/bin/cmplr.env b/model/bin/cmplr.env index 22e8db8fb0..0227962987 100644 --- a/model/bin/cmplr.env +++ b/model/bin/cmplr.env @@ -192,6 +192,9 @@ if [ "$cmplr" == "intel" ] || [ "$cmplr" == "intel_debug" ] || [ "$c elif [ ! -z "$(echo $cmplr | grep wcoss_dell_p3)" ] ; then optc="$optc -xHOST" optl="$optl -xHOST" + elif [ ! -z "$(echo $cmplr | grep jet.intel)" ] ; then + optc="$optc -axSSE4.2,AVX,CORE-AVX2,CORE-AVX512 -align array64byte -ip" + optl="$optl -axSSE4.2,AVX,CORE-AVX2,CORE-AVX512 -align array64byte -ip" elif [[ $cmplr == ukmo_cray* ]]; then : # processor type set by ftn wrapper script. elif [ ! -z "$(echo $cmplr | grep s4)" ] ; then diff --git a/model/src/gx_outp.F90 b/model/src/gx_outp.F90 index e9def5d379..b033b844af 100644 --- a/model/src/gx_outp.F90 +++ b/model/src/gx_outp.F90 @@ -40,7 +40,7 @@ PROGRAM GXOUTP !/ 26-Dec-2012 : Modified obsolete declarations. ( version 4.11 ) !/ 27-Aug-2015 : Sice add as additional output ( version 5.10 ) !/ (in source terms) -!/ 19-Jul-2021 : Momentum and air density support ( version 7.xx ) +!/ 19-Jul-2021 : Momentum and air density support ( version 7.14 ) !/ !/ Copyright 2009-2012 National Weather Service (NWS), !/ National Oceanic and Atmospheric Administration. All rights diff --git a/model/src/w3fldsmd.F90 b/model/src/w3fldsmd.F90 index 71e17e01f8..18b608942a 100644 --- a/model/src/w3fldsmd.F90 +++ b/model/src/w3fldsmd.F90 @@ -1013,7 +1013,7 @@ SUBROUTINE W3FLDG (INXOUT, IDFLD, NDS, NDST, NDSE, MX, MY, & !/ (M. Accensi & F. Ardhuin, IFREMER) !/ 25-Sep-2020 : Receive coupled fields at T+0 ( version 7.10 ) !/ 22-Mar-2021 : adds momentum and density input ( version 7.13 ) -!/ 13-Aug-2021 : Allow scalar fields to be time ( version 7.xx ) +!/ 13-Aug-2021 : Allow scalar fields to be time ( version 7.14 ) !/ interpolated !/ ! 1. Purpose : diff --git a/model/src/w3flx5md.F90 b/model/src/w3flx5md.F90 index a4c21d2da8..daac6cf939 100644 --- a/model/src/w3flx5md.F90 +++ b/model/src/w3flx5md.F90 @@ -12,7 +12,7 @@ MODULE W3FLX5MD !/ | Last update : 01-Jul-2021 | !/ +-----------------------------------+ !/ -!/ 22-Mar-2021 : Origination. ( version 7.xx ) +!/ 22-Mar-2021 : Origination. ( version 7.14 ) !/ 22-Mar-2021 : Enable direct use of atmospheric model wind stress !/ by source terms ST6 !/ 01-Jul-2021 : Enable direct use of atmospheric model wind stress @@ -73,7 +73,7 @@ SUBROUTINE W3FLX5 ( ZWND, U10, U10D, TAUA, TAUADIR, RHOAIR, UST, USTD, Z0, CD ) !/ | Last update : 01-Jul-2021 | !/ +-----------------------------------+ !/ -!/ 22-Mar-2021 : Origination. ( version 7.xx ) +!/ 22-Mar-2021 : Origination. ( version 7.14 ) !/ 22-Mar-2021 : Enable direct use of atmospheric model wind stress !/ by source terms ST6 !/ 01-Jul-2021 : Enable direct use of atmospheric model wind stress @@ -179,7 +179,7 @@ SUBROUTINE W3FLX5 ( ZWND, U10, U10D, TAUA, TAUADIR, RHOAIR, UST, USTD, Z0, CD ) ! 2. Computation ---------------------------------------------------- * ! ! - UST = SQRT(TAUA/RHOAIR) + UST = MAX ( 1E-4, SQRT(TAUA/RHOAIR) ) UNZ = MAX ( 0.01 , U10 ) CD = (UST/UNZ)**2 USTD = TAUADIR diff --git a/model/src/w3gridmd.F90 b/model/src/w3gridmd.F90 index 5ac13f1a2e..63117b0138 100644 --- a/model/src/w3gridmd.F90 +++ b/model/src/w3gridmd.F90 @@ -112,7 +112,7 @@ MODULE W3GRIDMD !/ 27-May-2021 : Updates for IC5 (Q. Liu) ( version 7.12 ) !/ 27-May-2021 : Moved to a subroutine ( version 7.13 ) !/ 07-Jun-2021 : S_{nl} GKE NL5 (Q. Liu) ( version 7.13 ) -!/ 19-Jul-2021 : Momentum and air density support ( version 7.xx ) +!/ 19-Jul-2021 : Momentum and air density support ( version 7.14 ) !/ !/ Copyright 2009-2013 National Weather Service (NWS), !/ National Oceanic and Atmospheric Administration. All rights diff --git a/model/src/w3initmd.F90 b/model/src/w3initmd.F90 index c2b3d8a5f6..310626158d 100644 --- a/model/src/w3initmd.F90 +++ b/model/src/w3initmd.F90 @@ -112,7 +112,7 @@ MODULE W3INITMD PUBLIC !/ REAL, PARAMETER :: CRITOS = 15. - CHARACTER(LEN=10), PARAMETER :: WWVER = '7.13 ' + CHARACTER(LEN=10), PARAMETER :: WWVER = '7.14 ' CHARACTER(LEN=512), PARAMETER :: SWITCHES = & __WW3_SWITCHES__ !/ @@ -1857,14 +1857,14 @@ SUBROUTINE W3INIT ( IMOD, IsMulti, FEXT, MDS, MTRACE, ODAT & 990 FORMAT ( ' Air density time : ',A) ! 984 FORMAT (// & - 37X,' | input | output |'/ & - 37X,' |-----------------------|---------------|'/ & + 37X,' | input | output |'/ & + 37X,' |-----------------------|------------------|'/ & 2X,' step | pass | date time |', & - ' b w l c t r i i1 i5 d | g p t r b f c |'/ & + ' b w l c t r i i1 i5 d | g p t r b f c r2 |'/ & 2X,'--------|------|---------------------|', & - '-------------------|---------------|'/ & + '-----------------------|------------------|'/ & 2X,'--------+------+---------------------+', & - '-------------------+---------------+') + '---------------------------+--------------+') 987 FORMAT (/' Coupling output fields : '/ & '--------------------------------------------------') ! diff --git a/model/src/w3iogrmd.F90 b/model/src/w3iogrmd.F90 index 516bcc8af2..f93b0c2279 100644 --- a/model/src/w3iogrmd.F90 +++ b/model/src/w3iogrmd.F90 @@ -149,7 +149,7 @@ SUBROUTINE W3IOGR ( INXOUT, NDSM, IMOD, FEXT ) !/ 18-Jun-2020 : Adds 360-day calendar option ( version 7.08 ) !/ 19-Oct-2020 : Add AIRCMIN, AIRGB parameters ( version 7.08 ) !/ 07-07-2021 : S_{nl} GKE NL5 (Q. Liu) ( version 7.12 ) -!/ 19-Jul-2021 : Momentum and air density support ( version 7.xx ) +!/ 19-Jul-2021 : Momentum and air density support ( version 7.14 ) !/ !/ Copyright 2009-2013 National Weather Service (NWS), !/ National Oceanic and Atmospheric Administration. All rights diff --git a/model/src/w3iopomd.F90 b/model/src/w3iopomd.F90 index 072ab5ce17..b915682f4e 100644 --- a/model/src/w3iopomd.F90 +++ b/model/src/w3iopomd.F90 @@ -617,7 +617,7 @@ SUBROUTINE W3IOPE ( A ) !/ (Jian-Guo Li) ( version 4.06 ) !/ 01-Mar-2018 : Add option to unrotate spectra ( version 6.02 ) !/ from RTD grid models -!/ 19-Jul-2021 : Momentum and air density support ( version 7.xx ) +!/ 19-Jul-2021 : Momentum and air density support ( version 7.14 ) !/ ! 1. Purpose : ! @@ -1033,7 +1033,7 @@ SUBROUTINE W3IOPO ( INXOUT, NDSOP, IOTST, IMOD ) !/ 27-Jun-2006 : Adding file name preamble. ( version 3.09 ) !/ 25-Jul-2006 : Adding grid ID per point. ( version 3.10 ) !/ 27-Aug-2015 : Adding interpolation for the ice. ( version 5.10 ) -!/ 19-Jul-2021 : Momentum and air density support ( version 7.xx ) +!/ 19-Jul-2021 : Momentum and air density support ( version 7.14 ) !/ ! 1. Purpose : ! diff --git a/model/src/w3odatmd.F90 b/model/src/w3odatmd.F90 index a845e8fe20..8a6f540a51 100644 --- a/model/src/w3odatmd.F90 +++ b/model/src/w3odatmd.F90 @@ -48,7 +48,7 @@ MODULE W3ODATMD !/ internal fields. (C. Bunney, UKMO) !/ 22-Mar-2021 : Add extra coupling variables ( version 7.13 ) !/ 07-Jun-2021 : S_{nl} GKE NL5 (Q. Liu) ( version 7.13 ) -!/ 19-Jul-2021 : Momentum and air density support ( version 7.xx ) +!/ 19-Jul-2021 : Momentum and air density support ( version 7.14 ) !/ !/ Copyright 2009-2012 National Weather Service (NWS), !/ National Oceanic and Atmospheric Administration. All rights diff --git a/model/src/w3ounfmetamd.F90 b/model/src/w3ounfmetamd.F90 index 4ad4fa887c..d805c762d5 100644 --- a/model/src/w3ounfmetamd.F90 +++ b/model/src/w3ounfmetamd.F90 @@ -954,9 +954,9 @@ SUBROUTINE READ_META_PAIRS(NDMI, META, ILINE) ! !/ ------------------------------------------------------------------- / IMPLICIT NONE - INTEGER, INTENT(IN) :: NDMI - TYPE(META_T), INTENT(IN), POINTER :: META - INTEGER, INTENT(INOUT) :: ILINE + INTEGER, INTENT(IN) :: NDMI + TYPE(META_T), INTENT(INOUT), POINTER :: META + INTEGER, INTENT(INOUT) :: ILINE !/ ------------------------------------------------------------------- / !/ Local parameters ! diff --git a/model/src/w3src4md.F90 b/model/src/w3src4md.F90 index bd35e07f89..1d86fb0388 100644 --- a/model/src/w3src4md.F90 +++ b/model/src/w3src4md.F90 @@ -102,7 +102,7 @@ SUBROUTINE W3SPR4 (A, CG, WN, EMEAN, FMEAN, FMEAN1, WNMEAN, & !/ 13-Jun-2011 : Adds f_m0,-1 as FMEAN in the outout ( version 4.04 ) !/ 08-Jun-2018 : use STRACE and FLUSH ( version 6.04 ) !/ 22-Feb-2020 : Merge Romero (2019) and cleanup ( version 7.06 ) -!/ 22-Jun-2021 : Add FLX5 to use stresses with the ST( version 7.xx ) +!/ 22-Jun-2021 : Add FLX5 to use stresses with the ST( version 7.14 ) !/ ! 1. Purpose : ! @@ -1647,13 +1647,19 @@ SUBROUTINE CALC_USTAR(WINDSPEED,TAUW,USTAR,Z0,CHARN) ! ! Determines roughness length ! - SQRTCDM1 = MIN(WINDSPEED/USTAR,100.0) - Z0 = ZZWND*EXP(-KAPPA*SQRTCDM1) IF (USTAR.GT.0.001) THEN + SQRTCDM1 = MIN(WINDSPEED/USTAR,100.0) + Z0 = ZZWND*EXP(-KAPPA*SQRTCDM1) CHARN = GRAV*Z0/USTAR**2 ELSE + IF (USTAR.GT.0) THEN + SQRTCDM1 = MIN(WINDSPEED/USTAR,100.0) + Z0 = ZZWND*EXP(-KAPPA*SQRTCDM1) + ELSE + Z0 = AALPHA*0.001*0.001/GRAV + END IF CHARN = AALPHA - END IF + END IF ! RETURN END SUBROUTINE CALC_USTAR @@ -1673,7 +1679,7 @@ SUBROUTINE W3SDS4 (A, K, CG, USTAR, USDIR, DEPTH, DAIR, SRHS, & !/ 13-Nov-2013 : Reduced frequency range with IG1 switch !/ 06-Jun-2018 : Add optional DEBUGSRC ( version 6.04 ) !/ 22-Feb-2020 : Option to use Romero (GRL 2019) ( version 7.06 ) -!/ 13-Aug-2021 : Consider DAIR a variable ( version x.xx ) +!/ 13-Aug-2021 : Consider DAIR a variable ( version 7.14 ) !/ ! 1. Purpose : ! diff --git a/model/src/w3srcemd.F90 b/model/src/w3srcemd.F90 index 48a729811c..c62b47eeb0 100644 --- a/model/src/w3srcemd.F90 +++ b/model/src/w3srcemd.F90 @@ -51,11 +51,11 @@ MODULE W3SRCEMD !/ ------------------------------------------------------------------- / SUBROUTINE W3SRCE ( srce_call, IT, JSEA, IX, IY, IMOD, & SPECOLD, SPEC, VSIO, VDIO, SHAVEIO, & - ALPHA, WN1, CG1, & - D_INP, U10ABS, U10DIR, AS, USTAR, USTDIR, & + ALPHA, WN1, CG1, D_INP, U10ABS, U10DIR, & #ifdef W3_FLX5 TAUA, TAUADIR, & #endif + AS, USTAR, USTDIR, & CX, CY, ICE, ICEH, ICEF, ICEDMAX, & REFLEC, REFLED, DELX, DELY, DELA, TRNX, & TRNY, BERG, FPI, DTDYN, FCUT, DTG, TAUWX, & @@ -125,7 +125,7 @@ SUBROUTINE W3SRCE ( srce_call, IT, JSEA, IX, IY, IMOD, & !/ 26-Aug-2018 : UOST (Mentaschi et al. 2015, 2018) ( version 6.06 ) !/ 22-Mar-2021 : Add extra fields used in coupling ( version 7.13 ) !/ 07-Jun-2021 : S_{nl5} GKE NL5 (Q. Liu) ( version 7.13 ) -!/ 19-Jul-2021 : Momentum and air density support ( version 7.xx ) +!/ 19-Jul-2021 : Momentum and air density support ( version 7.14 ) !/ !/ Copyright 2009-2013 National Weather Service (NWS), !/ National Oceanic and Atmospheric Administration. All rights diff --git a/model/src/w3updtmd.F90 b/model/src/w3updtmd.F90 index 0ed3b32bb9..6931a5a0e2 100644 --- a/model/src/w3updtmd.F90 +++ b/model/src/w3updtmd.F90 @@ -2496,7 +2496,7 @@ SUBROUTINE W3URHO ( FLFRST ) !/ +-----------------------------------+ !/ !/ 22-Mar-2021 : First implementation ( version 7.13 ) -!/ 13-Aug-2021 : Enable time interpolation ( version 7.xx ) +!/ 13-Aug-2021 : Enable time interpolation ( version 7.14 ) !/ ! 1. Purpose : ! diff --git a/model/src/w3wavemd.F90 b/model/src/w3wavemd.F90 index b48c3577d7..ac3a451713 100644 --- a/model/src/w3wavemd.F90 +++ b/model/src/w3wavemd.F90 @@ -84,7 +84,7 @@ MODULE W3WAVEMD !/ defunct OMPX switches. !/ 22-Mar-2021 : Update TAUA, RHOA ( version 7.13 ) !/ 06-May-2021 : Use ARCTC and SMCTYPE options. JGLi ( version 7.13 ) -!/ 19-Jul-2021 : Momentum and air density support ( version 7.xx ) +!/ 19-Jul-2021 : Momentum and air density support ( version 7.14 ) !/ !/ Copyright 2009-2014 National Weather Service (NWS), !/ National Oceanic and Atmospheric Administration. All rights @@ -537,7 +537,7 @@ SUBROUTINE W3WAVE ( IMOD, ODAT, TEND, STAMP, NO_OUT & LOGICAL :: UGDTUPDATE ! true if time step should be updated for UG schemes CHARACTER(LEN=8) :: STTIME CHARACTER(LEN=21) :: IDACT - CHARACTER(LEN=13) :: OUTID + CHARACTER(LEN=16) :: OUTID CHARACTER(LEN=23) :: IDTIME INTEGER eIOBP INTEGER ITH_F @@ -3500,7 +3500,7 @@ SUBROUTINE W3WAVE ( IMOD, ODAT, TEND, STAMP, NO_OUT & 900 FORMAT (4X,I6,'|',I6,'| ', A19 ,' | ',A,' | ',A,' |') 901 FORMAT (4X,I6,'|',I6,'| ',11X,A8,' | ',A,' | ',A,' |') 902 FORMAT (2X,'--------+------+---------------------+' & - ,'-------------------+---------------+') + ,'-----------------------+------------------+') ! #ifdef W3_IC3 920 FORMAT (' Updating k and Cg from ice param. 1,2,3,4.'/) @@ -4029,7 +4029,7 @@ SUBROUTINE W3SCAT ( ISPEC, MAPSTA, FIELD ) #ifdef W3_SHRD DO ISEA=1, NSEA IXY = MAPSF(ISEA,3) - IF ( MAPSTA(IXY) .GE. 1 ) A(ISPEC,ISEA) = FIELD(IXY) + IF ( MAPSTA(IXY) .NE. 0 ) A(ISPEC,ISEA) = FIELD(IXY) END DO #endif ! @@ -4056,7 +4056,7 @@ SUBROUTINE W3SCAT ( ISPEC, MAPSTA, FIELD ) #ifdef W3_MPI DO ISEA=1, NSEA IXY = MAPSF(ISEA,3) - IF ( MAPSTA(IXY) .GE. 1 ) SSTORE(ISEA,IBFLOC) = FIELD(IXY) + IF ( MAPSTA(IXY) .NE. 0 ) SSTORE(ISEA,IBFLOC) = FIELD(IXY) END DO #endif ! @@ -4080,7 +4080,7 @@ SUBROUTINE W3SCAT ( ISPEC, MAPSTA, FIELD ) DO JSEA=1, NSEAL CALL INIT_GET_ISEA(ISEA, JSEA) IXY = MAPSF(ISEA,3) - IF (MAPSTA(IXY) .GE. 1) A(ISPEC,JSEA) = SSTORE(ISEA,IBFLOC) + IF (MAPSTA(IXY) .NE. 0) A(ISPEC,JSEA) = SSTORE(ISEA,IBFLOC) END DO #endif ! diff --git a/model/src/ww3_grib.F90 b/model/src/ww3_grib.F90 index 690402e6c1..1a94f7d0c9 100644 --- a/model/src/ww3_grib.F90 +++ b/model/src/ww3_grib.F90 @@ -36,7 +36,7 @@ PROGRAM W3GRIB !/ 26-Jul-2018 : Adding polar stereographic grid ( version 6.05 ) !/ (J.H. Alves) !/ 22-Mar-2021 : New coupling fields output ( version 7.13 ) -!/ 09-Jun-2021 : remove grib1 support (NCEP1) ( version X.XX ) +!/ 09-Jun-2021 : remove grib1 support (NCEP1) ( version 7.14 ) !/ !/ Copyright 2009 National Weather Service (NWS), !/ National Oceanic and Atmospheric Administration. All rights diff --git a/model/src/ww3_ounp.F90 b/model/src/ww3_ounp.F90 index e871abfa40..1fef286c14 100644 --- a/model/src/ww3_ounp.F90 +++ b/model/src/ww3_ounp.F90 @@ -53,7 +53,7 @@ PROGRAM W3OUNP !/ 15-May-2018 : Add namelist feature ( version 6.05 ) !/ 18-Aug-2018 : S_{ice} IC5 (Q. Liu) ( version 6.06 ) !/ 18-Jun-2020 : Support for 360-day calendar. ( version 7.08 ) -!/ 19-Jul-2021 : Momentum and air density support ( version 7.xx ) +!/ 19-Jul-2021 : Momentum and air density support ( version 7.14 ) !/ 06-Sep-2021 : scale factor on spectra output ( version 7.12 ) !/ !/ Copyright 2009 National Weather Service (NWS), diff --git a/model/src/ww3_outp.F90 b/model/src/ww3_outp.F90 index 206dddd875..320b6c214d 100644 --- a/model/src/ww3_outp.F90 +++ b/model/src/ww3_outp.F90 @@ -59,7 +59,7 @@ PROGRAM W3OUTP !/ (in source terms) !/ 27-Jun-2017 : Expanding WMO table to 2 digits JHA ( version 6.02 ) !/ 18-Aug-2018 : S_{ice} IC5 (Q. Liu) ( version 6.06 ) -!/ 19-Jul-2021 : Momentum and air density support ( version 7.xx ) +!/ 19-Jul-2021 : Momentum and air density support ( version 7.14 ) !/ !/ Copyright 2009-2014 National Weather Service (NWS), !/ National Oceanic and Atmospheric Administration. All rights @@ -1024,7 +1024,7 @@ SUBROUTINE W3EXPO !/ from 3.15 (HLT). ( version 4.08 ) !/ 26-Dec-2012 : Modified obsolete declarations. ( version 4.11 ) !/ 06-Feb-2014 : Fix header format in part. files. ( version 4.18 ) -!/ 19-Jul-2021 : Momentum and air density support ( version 7.xx ) +!/ 19-Jul-2021 : Momentum and air density support ( version 7.14 ) !/ ! 1. Purpose : ! diff --git a/model/src/ww3_uprstr.F90 b/model/src/ww3_uprstr.F90 index b0204253c8..6b644afe17 100644 --- a/model/src/ww3_uprstr.F90 +++ b/model/src/ww3_uprstr.F90 @@ -1248,7 +1248,7 @@ SUBROUTINE CHECK_PRCNTG (PRCNTG,PRCNTG_CAP) !/ +-----------------------------------+ !/ !/ 16-Oct-2018 : Original Code ( version 6.06 ) -!/ 24-Oct-2018 : Update by Andy Saulter ( version x.xx ) +!/ 24-Oct-2018 : Update by Andy Saulter ( version 7.14 ) !/ !/ Copyright 2010 National Weather Service (NWS), !/ National Oceanic and Atmospheric Administration. All rights