From 82837c726a8b78e5ce630c6450d713b8892b0929 Mon Sep 17 00:00:00 2001 From: Fabrice Ardhuin Date: Fri, 6 Mar 2020 15:31:13 -0800 Subject: [PATCH] Since I was at it, I added also the effect of water viscosity on the dissipation --- model/ftn/w3gdatmd.ftn | 2 +- model/ftn/w3src4md.ftn | 9 +++++---- model/ftn/ww3_grid.ftn | 13 ++++++++----- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/model/ftn/w3gdatmd.ftn b/model/ftn/w3gdatmd.ftn index 12851a406..ef7a11f3c 100644 --- a/model/ftn/w3gdatmd.ftn +++ b/model/ftn/w3gdatmd.ftn @@ -792,7 +792,7 @@ !/ST4 REAL, POINTER :: DCKI(:,:), SATWEIGHTS(:,:),CUMULW(:,:),QBI(:,:) !/ST4 REAL :: AALPHA, BBETA, ZZ0MAX, ZZ0RAT, ZZALP,& !/ST4 SSINTHP, TTAUWSHELTER, SSWELLF(1:7), & -!/ST4 SSDSC(1:20), SSDSBR, & +!/ST4 SSDSC(1:21), SSDSBR, & !/ST4 SSDSP, WWNMEANP, SSTXFTF, SSTXFTWN, & !/ST4 FFXPM, FFXFM, FFXFA, & !/ST4 SSDSBRF1, SSDSBRF2, SSDSBINT,SSDSBCK,& diff --git a/model/ftn/w3src4md.ftn b/model/ftn/w3src4md.ftn index 9bad61c19..9482cf8f9 100755 --- a/model/ftn/w3src4md.ftn +++ b/model/ftn/w3src4md.ftn @@ -1663,7 +1663,7 @@ REAL :: COEF1, COEF2, COEF4(NK), & COEF5(NK) - REAL :: FACTURB, FACTURB2, DTURB, DIAG2, BREAKFRACTION + REAL :: FACTURB, FACTURB2, DTURB, DVISC, DIAG2, BREAKFRACTION REAL :: RENEWALFREQ, EPSR REAL :: S1(NK), E1(NK) INTEGER :: NTIMES(NK) @@ -2142,9 +2142,11 @@ ! ! loop over spectrum ! - IF ( (SSDSC(3).NE.0.) .OR. (SSDSC(5).NE.0.) ) THEN + IF ( (SSDSC(3).NE.0.) .OR. (SSDSC(5).NE.0.) .OR. (SSDSC(21).NE.0.) ) THEN DO IK=IK1, NK FACTURB2=-2.*SIG(IK)*K(IK)*FACTURB + DVISC=-4.*SSDSC(21)*K(IK)*K(IK) +! DO ITH=1,NTH IS=ITH+(IK-1)*NTH ! @@ -2167,8 +2169,7 @@ ! ! Add effects ! - DIAG2 = (SSDSC(3)*RENEWALFREQ+DTURB) -WRITE(998,*) 'TEST:',IK,ITH,FACTURB2,DTURB,COSWIND,DIAG2,DDIAG(IS) + DIAG2 = (SSDSC(3)*RENEWALFREQ+DTURB+DVISC) DDIAG(IS) = DDIAG(IS) + DIAG2 SRHS(IS) = SRHS(IS) + A(IS)* DIAG2 END DO diff --git a/model/ftn/ww3_grid.ftn b/model/ftn/ww3_grid.ftn index 01fb46b0a..23410e28f 100644 --- a/model/ftn/ww3_grid.ftn +++ b/model/ftn/ww3_grid.ftn @@ -742,7 +742,7 @@ !/ST4 SDSPBK, SDSBINT, SDSHCK, & !/ST4 SDSBRF1, & !/ST4 SDSBM0, SDSBM1, SDSBM2, SDSBM3, & -!/ST4 SDSBM4, SDSFACMTF, SDSCUMP, & +!/ST4 SDSBM4, SDSFACMTF, SDSCUMP, SDSNUW, & !/ST4 SDSL, SDSMWD, SDSMWPOW, SPMSS, SDSNMTF ! !/ST6 REAL :: SINA0, SINWS, SINFC, & @@ -844,7 +844,7 @@ !/ST4 SDSSTRAIN2, SDSC4, SDSFACMTF, SDSNMTF,SDSCUMP, & !/ST4 SDSC5, SDSC6, SDSBR, SDSBT, SDSP, SDSISO, & !/ST4 SDSBCK, SDSABK, SDSPBK, SDSBINT, SDSHCK, & -!/ST4 SDSDTH, SDSCOS, SDSBRF1, SDSBRFDF, & +!/ST4 SDSDTH, SDSCOS, SDSBRF1, SDSBRFDF, SDSNUW, & !/ST4 SDSBM0, SDSBM1, SDSBM2, SDSBM3, SDSBM4, & !/ST4 WHITECAPWIDTH, WHITECAPDUR, SDSMWD, SDSMWPOW, SDKOF @@ -1689,6 +1689,7 @@ !/ST4 SDSCUM = -0.40344 !/ST4 SDSC4 = 1. !/ST4 SDSC5 = 0. +!/ST4 SDSNUW = 0. !/ST4 SDSC6 = 0.3 !/ST4 SDSBR = 0.90E-3 ! 0.005 for Romero !/ST4 SDSBRFDF = 0 @@ -1803,6 +1804,7 @@ !/ST4 SSDSC(18) = SDSFACMTF !/ST4 SSDSC(19) = SDSNMTF !/ST4 SSDSC(20) = SDSCUMP +!/ST4 SSDSC(21) = SDSNUW ! !/ST4 SSDSBR = SDSBR !/ST4 SSDSBRF1 = SDSBRF1 @@ -2667,7 +2669,7 @@ !/ST4 SDSBT, SDSP, SDSISO, SDSCOS, SDSDTH, SDSBRF1, & !/ST4 SDSBRFDF, SDSBM0, SDSBM1, SDSBM2, SDSBM3, SDSBM4, & !/ST4 SPMSS, SDKOF, SDSMWD, SDSFACMTF, SDSNMTF,SDSMWPOW,& -!/ST4 SDSCUMP, WHITECAPWIDTH, WHITECAPDUR +!/ST4 SDSCUMP, SDSNUW, WHITECAPWIDTH, WHITECAPDUR !/ST6 WRITE (NDSO,2924) SDSET, SDSA1, SDSA2, SDSP1, SDSP2 !/ST6 WRITE (NDSO,2937) SWLB1, CSTB1 !/BT1 WRITE (NDSO,2926) GAMMA @@ -5455,8 +5457,9 @@ !/ST4 ', SDSBM2 =',F5.2,', SDSBM3 =',F5.2,', SDSBM4 =', & !/ST4 F5.2,', '/, & !/ST4 ' SPMSS = ',F5.2, ', SDKOF =',F5.2, & -!/ST4 ', SDSMWD =',F5.2,', SDSFACMTF =',F5.1,', SDSMWPOW =',F3.1, & -!/ST4 ', SDSNMTF =', F5.2,', SDSCUMP =', F3.1,', '/, & +!/ST4 ', SDSMWD =',F5.2,', SDSFACMTF =',F5.1,', '/ & +!/ST4 ' SDSMWPOW =',F3.1,', SDSNMTF =', F5.2, & +!/ST4 ', SDSCUMP =', F3.1,', SDSNUW =', E8.3,', '/, & !/ST4 ' WHITECAPWIDTH =',F5.2, ' WHITECAPDUR =',F5.2,' /') ! !/ST6 924 FORMAT (/' Dissipation (Rogers et al. 2012) ',A/ &