diff -rupN WW3_314_11/bin/comp.Intel WW3_314_12/bin/comp.Intel --- WW3_314_11/bin/comp.Intel 2012-10-02 21:41:48.000000000 -0400 +++ WW3_314_12/bin/comp.Intel 2012-10-02 21:40:06.000000000 -0400 @@ -78,8 +78,8 @@ # 2.b.1 Build options and determine compiler name # Note that all but GrADS output is forced to big endian data - opt="-c -list -O3 -xSSE4.2 -ip -module $path_m" -# opt="-c -list -O0 -g -traceback -check all -fpe0 -ftrapuv -module $path_m" +# opt="-c -list -O3 -xSSE4.2 -ip -module $path_m" + opt="-c -list -O0 -g -traceback -check all -fpe0 -ftrapuv -module $path_m" if [ "$name" != 'gx_outp' ] && [ "$name" != 'gx_outf' ] then diff -rupN WW3_314_11/bin/comp.Portland WW3_314_12/bin/comp.Portland --- WW3_314_11/bin/comp.Portland 2012-10-02 21:41:48.000000000 -0400 +++ WW3_314_12/bin/comp.Portland 2012-10-02 21:40:06.000000000 -0400 @@ -78,9 +78,9 @@ # 2.b.1 Build options and determine compiler name # Note that all but GrADS output is forced to big endian data - opt="-c -Mlist -fast -module $path_m" +# opt="-c -Mlist -fast -module $path_m" -# opt="-c -C -g -Mlist -module $path_m" + opt="-c -O0 -g -traceback -Mbounds -Mchkfpstk -Mchkptr -Mchkstk -Mlist -module $path_m" if [ "$name" != 'gx_outp' ] && [ "$name" != 'gx_outf' ] then diff -rupN WW3_314_11/ftn/w3iosfmd.ftn WW3_314_12/ftn/w3iosfmd.ftn --- WW3_314_11/ftn/w3iosfmd.ftn 2012-10-02 21:41:46.000000000 -0400 +++ WW3_314_12/ftn/w3iosfmd.ftn 2012-10-02 21:40:05.000000000 -0400 @@ -5,7 +5,7 @@ !/ | WAVEWATCH III NOAA/NCEP | !/ | H. L. Tolman | !/ | FORTRAN 90 | -!/ | Last update : 29-May-2009 | +!/ | Last update : 06-Mar-2012 | !/ +-----------------------------------+ !/ !/ 27-Jun-2006 : Origination. ( version 3.09 ) @@ -13,8 +13,9 @@ !/ 24-Mar-2007 : Add pars for entire spectrum. ( version 3.11 ) !/ 17-May-2007 : Adding NTPROC/NAPROC separation. ( version 3.11 ) !/ 29-May-2009 : Preparing distribution version. ( version 3.14 ) +!/ 06-Mar-2012 : Reparing test output under MPI. ( version 3.14 ) !/ -!/ Copyright 2009 National Weather Service (NWS), +!/ Copyright 2009-2012 National Weather Service (NWS), !/ National Oceanic and Atmospheric Administration. All rights !/ reserved. WAVEWATCH III is a trademark of the NWS. !/ No unauthorized use without permission. @@ -460,7 +461,7 @@ !/MPI MPI_COMM_WAVE, IERR_MPI ) !/MPI DTSIZ = ICPRT(NSEAL+1,2) - 1 ! -!/T WRITE (NDST,9021) IAPROC, NAPPRT, DTSIZ +!/MPIT WRITE (NDST,9021) IAPROC, NAPPRT, DTSIZ ! !/MPI IT = IT0PRT + NAPROC + IAPROC - 1 !/MPI IF ( DTSIZ .GT. 0 ) CALL MPI_SEND & @@ -499,7 +500,7 @@ !/MPI JSLM = 1 + (NSEA-JAPROC)/NAPROC !/MPI DTSIZ = ICP(JSLM+1,2) - 1 ! -!/T WRITE (NDST,9031) JAPROC, DTSIZ +!/MPIT WRITE (NDST,9031) JAPROC, DTSIZ ! !/MPI ALLOCATE ( PROC(JAPROC)%DTPRT(6,MAX(1,DTSIZ)) ) !/MPI DTP => PROC(JAPROC)%DTPRT @@ -616,12 +617,12 @@ !/T 9010 FORMAT (' TEST W3IOSF : OPENING NEW FILE [',A,']') !/T 9020 FORMAT (' TEST W3IOSF : SENDING ICPRT FROM',I3,' TO',I3, & !/T ' WITH SIZE :',I6) -!/T 9021 FORMAT (' TEST W3IOSF : SENDING DTPRT FROM',I3,' TO',I3, & -!/T ' WITH SIZE :',I6) +!/MPIT 9021 FORMAT (' TEST W3IOSF : SENDING DTPRT FROM',I3,' TO',I3, & +!/MPIT ' WITH SIZE :',I6) !/T 9030 FORMAT (' TEST W3IOSF : RECEIVING ICPRT FROM',I3, & !/T ' WITH SIZE :',I6) -!/T 9031 FORMAT (' TEST W3IOSF : RECEIVING DTPRT FROM',I3, & -!/T ' WITH SIZE :',I6) +!/MPIT 9031 FORMAT (' TEST W3IOSF : RECEIVING DTPRT FROM',I3, & +!/MPIT ' WITH SIZE :',I6) !/ !/ End of W3IOSF ----------------------------------------------------- / !/ diff -rupN WW3_314_11/ftn/w3wavemd.ftn WW3_314_12/ftn/w3wavemd.ftn --- WW3_314_11/ftn/w3wavemd.ftn 2012-10-02 21:41:46.000000000 -0400 +++ WW3_314_12/ftn/w3wavemd.ftn 2012-10-02 21:40:05.000000000 -0400 @@ -5,7 +5,7 @@ !/ | WAVEWATCH III NOAA/NCEP | !/ | H. L. Tolman | !/ | FORTRAN 90 | -!/ | Last update : 29-May-2009 | +!/ | Last update : 06-Mar-2012 | !/ +-----------------------------------+ !/ !/ 04-Feb-2000 : Origination. ( version 2.00 ) @@ -50,8 +50,9 @@ !/ 22-Feb-2008 : Initialize VGX-Y properly. ( version 3.13 ) !/ 10-Apr-2008 : Bug fix writing log file (MPI). ( version 3.13 ) !/ 29-May-2009 : Preparing distribution version. ( version 3.14 ) +!/ 06-Mar-2012 : Initializing ITEST as needed. ( version 3.14 ) !/ -!/ Copyright 2009 National Weather Service (NWS), +!/ Copyright 2009-2012 National Weather Service (NWS), !/ National Oceanic and Atmospheric Administration. All rights !/ reserved. WAVEWATCH III is a trademark of the NWS. !/ No unauthorized use without permission. @@ -599,6 +600,8 @@ CALL W3IOBC ( 'READ', NDS(9), TBPI0, TBPIN, & ITEST, IMOD ) IF ( ITEST .NE. 1 ) CALL W3UBPT + ELSE + ITEST = 0 END IF IF ( ITEST .LT. 0 ) IDACT(1:1) = 'L' IF ( ITEST .GT. 0 ) IDACT(1:1) = ' ' diff -rupN WW3_314_11/ftn/wminitmd.ftn WW3_314_12/ftn/wminitmd.ftn --- WW3_314_11/ftn/wminitmd.ftn 2012-10-02 21:41:46.000000000 -0400 +++ WW3_314_12/ftn/wminitmd.ftn 2012-10-02 21:40:05.000000000 -0400 @@ -5,15 +5,17 @@ !/ | WAVEWATCH III NOAA/NCEP | !/ | H. L. Tolman | !/ | FORTRAN 90 | -!/ | Last update : 16-Aug-2010 | +!/ | Last update : 07-Mar-2012 | !/ +-----------------------------------+ !/ !/ 13-Jun-2005 : Origination. ( version 3.07 ) !/ See subroutine for update log. !/ 29-May-2009 : Preparing distribution version. ( version 3.14 ) -!/ 16-Aug-2010 : Adding NTRMAX to unify NTRACE. ( version 3.14.5 ) +!/ 16-Aug-2010 : Adding NTRMAX to unify NTRACE. ( version 3.14 ) +!/ 07-Mar-2012 : Adding TNAMES to avoid read warn. ( version 3.14 ) +!/ Adjust allocation INPMAP and IDINP. !/ -!/ Copyright 2009-2010 National Weather Service (NWS), +!/ Copyright 2009-2012 National Weather Service (NWS), !/ National Oceanic and Atmospheric Administration. All rights !/ reserved. WAVEWATCH III is a trademark of the NWS. !/ No unauthorized use without permission. @@ -348,7 +350,7 @@ CHARACTER(LEN=6) :: ACTION(9), YESXX, XXXNO CHARACTER(LEN=8) :: LFILE, STTIME !/SHRD CHARACTER(LEN=9) :: TFILE - CHARACTER(LEN=10) :: STDATE, PN, MN + CHARACTER(LEN=10) :: STDATE, PN, MN, TNAMES(7) CHARACTER(LEN=10), & ALLOCATABLE :: INAMES(:,:), MNAMES(:), PNAMES(:) !/DIST CHARACTER(LEN=12) :: TFILE @@ -647,8 +649,9 @@ ! DO I=NRGRD+1, 2*NRGRD CALL NEXTLN ( COMSTR , MDSI , MDSE2 ) - READ (MDSI,*,END=2001,ERR=2002) MNAMES(I), INAMES(I,:), & + READ (MDSI,*,END=2001,ERR=2002) MNAMES(I), TNAMES(:), & TMPRNK(I), TMPGRP(I), RP1(I), RPN(I), BCDTMP(I) + INAMES(I,:) = TNAMES(:) RP1(I) = MAX ( 0. , MIN ( 1. , RP1(I) ) ) RPN(I) = MAX ( RP1(I) , MIN ( 1. , RPN(I) ) ) END DO @@ -683,7 +686,7 @@ ! ! 3.a.5 Set input flags ! - ALLOCATE ( INPMAP(NRGRD,7), IDINP(-NRINP:NRGRD,7) ) + ALLOCATE ( INPMAP(NRGRD,8), IDINP(-NRINP:NRGRD,8) ) INPMAP = 0 IDINP = '---' ! diff -rupN WW3_314_11/ftn/ww3_shel.ftn WW3_314_12/ftn/ww3_shel.ftn --- WW3_314_11/ftn/ww3_shel.ftn 2012-10-02 21:41:46.000000000 -0400 +++ WW3_314_12/ftn/ww3_shel.ftn 2012-10-02 21:40:05.000000000 -0400 @@ -5,7 +5,7 @@ !/ | WAVEWATCH III NOAA/NCEP | !/ | H. L. Tolman | !/ | FORTRAN 90 | -!/ | Last update : 29-May-2009 | +!/ | Last update : 06-Mar-2012 | !/ +-----------------------------------+ !/ !/ 19-Jan-1999 : Final FORTRAN 77 ( version 1.18 ) @@ -26,8 +26,9 @@ !/ 28-Oct-2006 : Adding partitioning options. ( version 3.10 ) !/ 21-Jun-2007 : Dedicated output processes. ( version 3.11 ) !/ 29-May-2009 : Preparing distribution version. ( version 3.14 ) +!/ 06-Mar-2012 : Repairing test output. ( version 3.14 ) !/ -!/ Copyright 2009 National Weather Service (NWS), +!/ Copyright 2009-2012 National Weather Service (NWS), !/ National Oceanic and Atmospheric Administration. All rights !/ reserved. WAVEWATCH III is a trademark of the NWS. !/ No unauthorized use without permission. @@ -267,6 +268,8 @@ !/LLG FACTOR = 1. !/XYG FACTOR = 1.E-3 ! +!/T PRTFRM = .TRUE. +! !/F90 CALL SYSTEM_CLOCK ( CLKT0, CLKINC, CLKMAX ) ! !--- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -rupN WW3_314_11/ftn/ww3_strt.ftn WW3_314_12/ftn/ww3_strt.ftn --- WW3_314_11/ftn/ww3_strt.ftn 2012-10-02 21:41:46.000000000 -0400 +++ WW3_314_12/ftn/ww3_strt.ftn 2012-10-02 21:40:05.000000000 -0400 @@ -5,7 +5,7 @@ !/ | WAVEWATCH III NOAA/NCEP | !/ | H. L. Tolman | !/ | FORTRAN 90 | -!/ | Last update : 29-May-2009 | +!/ | Last update : 06-Mar-2012 | !/ +-----------------------------------+ !/ !/ 15-Jan-1999 : Final FORTRAN 77 ( version 1.18 ) @@ -18,8 +18,9 @@ !/ 28-Jun-2006 : Adding file name preamble. ( version 3.09 ) !/ 08-May-2007 : Starting from calm as an option. ( version 3.11 ) !/ 29-May-2009 : Preparing distribution version. ( version 3.14 ) +!/ 06-Mar-2012 : Hardening output. ( version 3.14 ) !/ -!/ Copyright 2009 National Weather Service (NWS), +!/ Copyright 2009-2012 National Weather Service (NWS), !/ National Oceanic and Atmospheric Administration. All rights !/ reserved. WAVEWATCH III is a trademark of the NWS. !/ No unauthorized use without permission. @@ -316,8 +317,9 @@ !/LLG FACTOR = 1. !/XYG FACTOR = 1.E-3 IF ( IAPROC .EQ. NAPOUT ) WRITE (NDSO,940) & - FP, SIP, THM, NCOS, FACTOR*XM, FACTOR*SIX, & - FACTOR*YM, FACTOR*SIY, HMAX + FP, SIP, THM, NCOS, FACTOR*XM, MIN(9999.99,FACTOR*SIX),& + FACTOR*YM, MIN(9999.99,FACTOR*SIY),& + HMAX ! FP = FP * TPI SIP = SIP * TPI diff -rupN WW3_314_11/test/mww3_test_01 WW3_314_12/test/mww3_test_01 --- WW3_314_11/test/mww3_test_01 2012-10-02 21:41:42.000000000 -0400 +++ WW3_314_12/test/mww3_test_01 2012-10-02 21:40:01.000000000 -0400 @@ -6,7 +6,7 @@ # Model should be compiled with the switches : # # # # !/XYG Cartesian grid. # -# !/FLX1 !/LN0 !/ST0 !/NL0 !/BT0 !/DB1 !/TR0 !/BS0 !/XX0 # +# !/FLX0 !/LN0 !/ST0 !/NL0 !/BT0 !/DB1 !/TR0 !/BS0 !/XX0 # # Only depth breaking relevant here. # # !/PRn Selecting one of the propagation schemes. # # !/O0 !/O1 !/O2 !/O3 !/O4 !/O5 !/O6 !/O7 !/O10 !/O11 # @@ -55,7 +55,7 @@ #PBS -l procs=4 # #PBS -l mem=1G #PBS -q batch -#PBS -l walltime=05:00 +#PBS -l walltime=15:00 #PBS -A omd #PBS -N mww3_test_01 #PBS -j oe @@ -359,8 +359,10 @@ $ 1 $ 19680606 000000 450 19680607 000000 - T T T T T T T T T T T T T T T T T T T T T T T T T - T T T T T T + T T T T T T T T T T T T F F F F F F F F F F F F F + F F F F F F +$ T T T T T T T T T T T T T T T T T T T T T T T T T +$ T T T T T T 19680606 000000 450 19680607 000000 EOF cat buoy.data >> ww3_shel.inp