Changeset 2205 for branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/TRA/trazdf_imp.F90

Timestamp:

2010-10-11T18:24:37+02:00 (14 years ago)

Author:

acc

Message:

#733 DEV_r2191_3partymerge2010. Merged in changes from DEV_r1924_nocs_latphys

File:

• branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/TRA/trazdf_imp.F90 (modified) (2 diffs)

branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/TRA/trazdf_imp.F90

@@ -136 +136 @@
 #if defined key_ldfslp
       ! update and save of avt (and avs if double diffusive mixing)
-      IF( l_traldf_rot ) THEN
+      IF ( ln_traldf_grif ) THEN
+         DO jk = 2, jpkm1
+            DO jj = 2, jpjm1
+               DO ji = fs_2, fs_jpim1   ! vector opt.
+                  zavi = fsahtw(ji,jj,jk) * wslp2(ji,jj,jk)                ! vertical mixing coef. due to lateral mixing
+                  zwt(ji,jj,jk) = avt(ji,jj,jk) + zavi              ! zwt=avt+zavi (total vertical mixing coef. on temperature)
+# if defined key_zdfddm
+                  zavsi(ji,jj,jk) = fsavs(ji,jj,jk) + zavi          ! dd mixing: zavsi = total vertical mixing coef. on salinity
+# endif
+               END DO
+            END DO
+         END DO
+      ELSE IF (l_traldf_rot ) THEN
          DO jk = 2, jpkm1
             DO jj = 2, jpjm1
@@ -281 +293 @@
       END DO
 
-      ! Surface boudary conditions
+      ! Surface boundary conditions
       DO jj = 2, jpjm1
          DO ji = fs_2, fs_jpim1   ! vector opt.