Changeset 10030 for NEMO/branches/2018/dev_r9838_ENHANCE04_RK3/src/OCE/ZDF/zdfosm.F90

Timestamp:

2018-08-03T10:18:16+02:00 (6 years ago)

Author:

gm

Message:

#1911 (ENHANCE-04): RK3 branch - step II.3 remove e3uw_$ e3vw_$, except e3.w_0 and use only after e3 in dyn/trazdf

File:

• NEMO/branches/2018/dev_r9838_ENHANCE04_RK3/src/OCE/ZDF/zdfosm.F90 (modified) (4 diffs)

NEMO/branches/2018/dev_r9838_ENHANCE04_RK3/src/OCE/ZDF/zdfosm.F90

@@ -247 +247 @@
       REAL(wp), DIMENSION(jpi,jpj,jpk) :: zviscos ! viscosity
       REAL(wp), DIMENSION(jpi,jpj,jpk) :: zdiffut ! t-diffusivity
+      
+      REAL(wp)                     ::   ze3uw_BN, ze3vw_BN   ! use for e3uw, e3vw computation
+      REAL(wp), DIMENSION(jpi,jpj) ::   zsshu_hB, zsshv_hB   ! at Before and Now time-step
+      REAL(wp), DIMENSION(jpi,jpj) ::   zsshu_hN, zsshv_hN   
 
       ! For debugging
@@ -1235 +1239 @@
 
 ! KPP-style Ri# mixing
-       IF( ln_kpprimix) THEN
-          DO jk = 2, jpkm1           !* Shear production at uw- and vw-points (energy conserving form)
-             DO jj = 1, jpjm1
-                DO ji = 1, jpim1   ! vector opt.
-                   z3du(ji,jj,jk) = 0.5 * (  un(ji,jj,jk-1) -  un(ji  ,jj,jk) )   &
-                        &                 * (  ub(ji,jj,jk-1) -  ub(ji  ,jj,jk) ) * wumask(ji,jj,jk) &
-                        &                 / (  e3uw_n(ji,jj,jk) * e3uw_b(ji,jj,jk) )
-                   z3dv(ji,jj,jk) = 0.5 * (  vn(ji,jj,jk-1) -  vn(ji,jj  ,jk) )   &
-                        &                 * (  vb(ji,jj,jk-1) -  vb(ji,jj  ,jk) ) * wvmask(ji,jj,jk) &
-                        &                 / (  e3vw_n(ji,jj,jk) * e3vw_b(ji,jj,jk) )
+      IF( ln_kpprimix) THEN
+         ! 
+         IF( ln_linssh ) THEN      !==      linear ssh case  ==!
+            DO jk = 2, jpkm1           !* Shear production at uw- and vw-points (energy conserving form)
+               DO jj = 1, jpjm1
+                  DO ji = 1, jpim1   ! vector opt.
+                     ze3uw_BN = e3uw_0(ji,jj,jk) * e3uw_0(ji,jj,jk)
+                     ze3vw_BN = e3vw_0(ji,jj,jk) * e3vw_0(ji,jj,jk)
+                     z3du(ji,jj,jk) = 0.5 * (  un(ji,jj,jk-1) -  un(ji,jj,jk) )            &
+                        &                 * (  ub(ji,jj,jk-1) -  ub(ji,jj,jk) ) / ze3uw_BN * wumask(ji,jj,jk)
+                     z3dv(ji,jj,jk) = 0.5 * (  vn(ji,jj,jk-1) -  vn(ji,jj,jk) )            &
+                        &                 * (  vb(ji,jj,jk-1) -  vb(ji,jj,jk) ) / ze3vw_BN * wvmask(ji,jj,jk)
+                   END DO
                 END DO
-             END DO
-          END DO
-      !
+            END DO
+         ELSE                       !==  Non linear ssh case  ==!
+            DO jj = 1, jpjm1
+               DO ji = 1, jpim1
+                  zsshu_hB(ji,jj) = 0.5_wp * ( ssh(ji,jj,Nbb) + ssh(ji+1,jj  ,Nbb) ) * r1_hu_0(ji,jj) * ssumask(ji,jj)
+                  zsshv_hB(ji,jj) = 0.5_wp * ( ssh(ji,jj,Nbb) + ssh(ji  ,jj+1,Nbb) ) * r1_hv_0(ji,jj) * ssvmask(ji,jj)
+                  zsshu_hN(ji,jj) = 0.5_wp * ( ssh(ji,jj,Nnn) + ssh(ji+1,jj  ,Nnn) ) * r1_hu_0(ji,jj) * ssumask(ji,jj)
+                  zsshv_hN(ji,jj) = 0.5_wp * ( ssh(ji,jj,Nnn) + ssh(ji  ,jj+1,Nnn) ) * r1_hv_0(ji,jj) * ssvmask(ji,jj)
+               END DO
+            END DO
+            !
+            DO jk = 2, jpkm1           !* Shear production at uw- and vw-points (energy conserving form)
+               DO jj = 1, jpjm1
+                  DO ji = 1, jpim1   ! vector opt.
+                     ze3uw_BN = e3uw_0(ji,jj,jk) * e3uw_0(ji,jj,jk) * ( 1._wp + zsshu_hB(ji,jj) * wumask(ji,jj,jk) )   &
+                        &                                           * ( 1._wp + zsshu_hN(ji,jj) * wumask(ji,jj,jk) )
+                     ze3vw_BN = e3vw_0(ji,jj,jk) * e3vw_0(ji,jj,jk) * ( 1._wp + zsshu_hB(ji,jj) * wvmask(ji,jj,jk) )   &
+                        &                                           * ( 1._wp + zsshu_hN(ji,jj) * wvmask(ji,jj,jk) )
+                     z3du(ji,jj,jk) = 0.5 * (  un(ji,jj,jk-1) -  un(ji,jj,jk) )            &
+                        &                 * (  ub(ji,jj,jk-1) -  ub(ji,jj,jk) ) / ze3uw_BN * wumask(ji,jj,jk)
+                     z3dv(ji,jj,jk) = 0.5 * (  vn(ji,jj,jk-1) -  vn(ji,jj,jk) )            &
+                        &                 * (  vb(ji,jj,jk-1) -  vb(ji,jj,jk) ) / ze3vw_BN * wvmask(ji,jj,jk)
+                   END DO
+                END DO
+            END DO
+         ENDIF
+         !
          DO jk = 2, jpkm1
             DO jj = 2, jpjm1
@@ -1262 +1293 @@
                 END DO
              END DO
-          END DO
-
-          DO jj = 2, jpjm1
-             DO ji = 2, jpim1
-                DO jk = ibld(ji,jj) + 1, jpkm1
-                   zdiffut(ji,jj,jk) = zrimix(ji,jj,jk)*rn_difri
-                   zviscos(ji,jj,jk) = zrimix(ji,jj,jk)*rn_difri
-                END DO
-             END DO
-          END DO
-
+         END DO
+         !
+         DO jj = 2, jpjm1
+            DO ji = 2, jpim1
+               DO jk = ibld(ji,jj) + 1, jpkm1
+                  zdiffut(ji,jj,jk) = zrimix(ji,jj,jk)*rn_difri
+                  zviscos(ji,jj,jk) = zrimix(ji,jj,jk)*rn_difri
+               END DO
+            END DO
+         END DO
+         !
        END IF ! ln_kpprimix = .true.
 
@@ -1708 +1739 @@
          DO jj = 2, jpjm1
             DO ji = 2, jpim1
-               ua(ji,jj,jk) =  ua(ji,jj,jk)                      &
-                  &                 - (  ghamu(ji,jj,jk  )  &
-                  &                    - ghamu(ji,jj,jk+1) ) / e3u_n(ji,jj,jk)
-               va(ji,jj,jk) =  va(ji,jj,jk)                      &
-                  &                 - (  ghamv(ji,jj,jk  )  &
-                  &                    - ghamv(ji,jj,jk+1) ) / e3v_n(ji,jj,jk)
+               ua(ji,jj,jk) = ua(ji,jj,jk) - (  ghamu(ji,jj,jk) - ghamu(ji,jj,jk+1) ) / e3u_n(ji,jj,jk)
+               va(ji,jj,jk) = va(ji,jj,jk) - (  ghamv(ji,jj,jk) - ghamv(ji,jj,jk+1) ) / e3v_n(ji,jj,jk)
             END DO
          END DO