Changeset 6108 for branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/TRA/trazdf_exp.F90

Timestamp:

2015-12-17T19:21:15+01:00 (9 years ago)

Author:

lovato

Message:

dev_merge_2015 : Merge dev_CMCC_merge_2015

File:

• branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/TRA/trazdf_exp.F90 (modified) (4 diffs)

branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/TRA/trazdf_exp.F90

@@ -77 +77 @@
       INTEGER                              , INTENT(in   ) ::   kjpt     ! number of tracers
       INTEGER                              , INTENT(in   ) ::   ksts     ! number of sub-time step
-      REAL(wp), DIMENSION(        jpk     ), INTENT(in   ) ::   p2dt     ! vertical profile of tracer time-step
+      REAL(wp)                             , INTENT(in   ) ::   p2dt     ! vertical profile of tracer time-step
       REAL(wp), DIMENSION(jpi,jpj,jpk,kjpt), INTENT(in   ) ::   ptb      ! before and now tracer fields
       REAL(wp), DIMENSION(jpi,jpj,jpk,kjpt), INTENT(inout) ::   pta      ! in: tracer trend ; out: after tracer field 
@@ -83 +83 @@
       INTEGER  ::  ji, jj, jk, jn, jl   ! dummy loop indices
       REAL(wp) ::  z1_ksts, ze3tr       ! local scalars
-      REAL(wp) ::  ztra, ze3tb, z2dt    !   -      -
+      REAL(wp) ::  ztra, ze3tb    !   -      -
       REAL(wp), POINTER, DIMENSION(:,:,:) ::  ztb, zwf
       !!---------------------------------------------------------------------
@@ -123 +123 @@
             !
             DO jk = 1, jpkm1           ! 2nd vertical derivative   ==> tracer at kt+l*2*rdt/nn_zdfexp
-               z2dt = z1_ksts * p2dt(jk) 
                DO jj = 2, jpjm1 
                   DO ji = fs_2, fs_jpim1   ! vector opt.
-                     ztb(ji,jj,jk) = ztb(ji,jj,jk) + z2dt * ( zwf(ji,jj,jk) - zwf(ji,jj,jk+1) ) / e3t_n(ji,jj,jk)
+                     ztb(ji,jj,jk) = ztb(ji,jj,jk) + p2dt * ( zwf(ji,jj,jk) - zwf(ji,jj,jk+1) ) / e3t_n(ji,jj,jk)
                   END DO
                END DO
@@ -137 +136 @@
                DO ji = fs_2, fs_jpim1   ! vector opt.
                   ze3tb = e3t_b(ji,jj,jk) / e3t_n(ji,jj,jk)
-                  ztra  = ( ztb(ji,jj,jk) - ptb(ji,jj,jk,jn) ) + p2dt(jk) * pta(ji,jj,jk,jn)  ! total trend * 2dt 
+                  ztra  = ( ztb(ji,jj,jk) - ptb(ji,jj,jk,jn) ) + p2dt * pta(ji,jj,jk,jn)  ! total trend * 2dt 
                   pta(ji,jj,jk,jn) = ( ze3tb * ptb(ji,jj,jk,jn) + ztra ) * tmask(ji,jj,jk)    ! after tracer
                END DO