Changeset 1527

Timestamp:

2009-07-22T17:18:48+02:00 (15 years ago)

Author:

ctlod

Message:

tke2: minor bug correction on the TKE vertical diffusion term, see ticket: #484

Location:

trunk/NEMO/OPA_SRC/ZDF

Files:

• zdfddm.F90 (modified) (3 diffs)
• zdfevd.F90 (modified) (2 diffs)
• zdftmx.F90 (modified) (2 diffs)

trunk/NEMO/OPA_SRC/ZDF/zdfddm.F90

@@ -173 +173 @@
                avs (ji,jj,jk) = avt(ji,jj,jk) + zavfs + zavds
                avt (ji,jj,jk) = avt(ji,jj,jk) + zavft + zavdt
+               avm (ji,jj,jk) = avm(ji,jj,jk) + MAX( zavft + zavdt, zavfs + zavds )
             END DO
          END DO
@@ -179 +180 @@
          ! Increase avmu, avmv if necessary
          ! --------------------------------
+!!gm to be changed following the definition of avm.
          DO jj = 1, jpjm1
             DO ji = 1, fs_jpim1   ! vector opt.
@@ -199 +201 @@
       CALL lbc_lnk( avt , 'W', 1. )
       CALL lbc_lnk( avs , 'W', 1. )
+      CALL lbc_lnk( avm , 'W', 1. )
       CALL lbc_lnk( avmu, 'U', 1. ) 
       CALL lbc_lnk( avmv, 'V', 1. )

trunk/NEMO/OPA_SRC/ZDF/zdfevd.F90

@@ -89 +89 @@
 #endif
                      avt (ji  ,jj  ,jk) = avevd * tmask(ji  ,jj  ,jk)
+                     avm (ji  ,jj  ,jk) = avevd * tmask(ji  ,jj  ,jk)
                      avmu(ji  ,jj  ,jk) = avevd * umask(ji  ,jj  ,jk)
                      avmu(ji-1,jj  ,jk) = avevd * umask(ji-1,jj  ,jk)
@@ -103 +104 @@
          ! -------------------------------===================
          CALL lbc_lnk( avt , 'W', 1. )
+         CALL lbc_lnk( avm , 'W', 1. )
          CALL lbc_lnk( avmu, 'U', 1. )
          CALL lbc_lnk( avmv, 'V', 1. )

trunk/NEMO/OPA_SRC/ZDF/zdftmx.F90

@@ -79 +79 @@
       !!              - update the model vertical eddy viscosity and diffusivity: 
       !!                     avt  = avt  +    av_tides
+      !!                     avm  = avm  +    av_tides
       !!                     avmu = avmu + mi(av_tides)
       !!                     avmv = avmv + mj(av_tides)
       !!
-      !! ** Action  :   avt, avmu, avmv   increased by tidal mixing
+      !! ** Action  :   avt, avm, avmu, avmv   increased by tidal mixing
       !!
       !! References : Simmons et al. 2004, Ocean Modelling, 6, 3-4, 245-263.
@@ -142 +143 @@
       DO jk = 2, jpkm1              !* update momentum & tracer diffusivity with tidal mixing
          avt(:,:,jk) = avt(:,:,jk) + av_tide(:,:,jk)
+         avm(:,:,jk) = avm(:,:,jk) + av_tide(:,:,jk)
          DO jj = 2, jpjm1
             DO ji = fs_2, fs_jpim1  ! vector opt.