Changeset 2034 for branches/DEV_r2006_merge_TRA_TRC/NEMO/OPA_SRC/TRA/trazdf_exp.F90

Timestamp:

2010-07-29T17:05:35+02:00 (14 years ago)

Author:

cetlod

Message:

cosmetic changes

File:

• branches/DEV_r2006_merge_TRA_TRC/NEMO/OPA_SRC/TRA/trazdf_exp.F90 (modified) (8 diffs)

branches/DEV_r2006_merge_TRA_TRC/NEMO/OPA_SRC/TRA/trazdf_exp.F90

@@ -40 +40 @@
 #  include "vectopt_loop_substitute.h90"
    !!----------------------------------------------------------------------
-   !! NEMO/OPA  3.2 , LOCEAN-IPSL (2009) 
+   !! NEMO/OPA  3.3 , LOCEAN-IPSL (2010) 
    !! $Id$ 
    !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
@@ -47 +47 @@
 CONTAINS
 
-   SUBROUTINE tra_zdf_exp( kt    , cdtype, p2dt, kn_zdfexp,  &
-      &                    ptrab , ptraa , kjpt              )
+   SUBROUTINE tra_zdf_exp( kt, cdtype, p2dt, kn_zdfexp,  &
+      &                                ptb , pta      , kjpt )
       !!----------------------------------------------------------------------
       !!                  ***  ROUTINE tra_zdf_exp  ***
@@ -57 +57 @@
       !! ** Method  : - The after tracer fields due to the vertical diffusion
       !!      of tracers alone is given by:
-      !!                zwx = ptrab + p2dt difft
-      !!      where difft = dz( avt dz(ptrab) ) = 1/e3t dk+1( avt/e3w dk(ptrab) )
+      !!                zwx = ptb + p2dt difft
+      !!      where difft = dz( avt dz(ptb) ) = 1/e3t dk+1( avt/e3w dk(ptb) )
       !!           (if lk_zdfddm=T use avs on salinity and passive tracers instead of avt)
       !!      difft is evaluated with an Euler split-explit scheme using a
@@ -65 +65 @@
       !!              - the after tracer fields due to the whole trend is 
       !!      obtained in leap-frog environment by :
-      !!          ptraa = zwx + p2dt ptraa
+      !!          pta = zwx + p2dt pta
       !!              - in case of variable level thickness (lk_vvl=T) the 
       !!     the leap-frog is applied on thickness weighted tracer. That is:
-      !!          ptraa = [ ptrab*e3tb + e3tn*( zwx - ptrab + p2dt ptraa ) ] / e3tn
+      !!          pta = [ ptb*e3tb + e3tn*( zwx - ptb + p2dt pta ) ] / e3tn
       !!
       !! ** Action : - after tracer fields pta
       !!---------------------------------------------------------------------
-      !! * Arguments
+      !! 
       INTEGER         , INTENT(in   )                                ::   kt          ! ocean time-step index
       CHARACTER(len=3), INTENT(in   )                                ::   cdtype      ! =TRA or TRC (tracer indicator)
@@ -78 +78 @@
       INTEGER         , INTENT(in   )                                ::   kn_zdfexp   ! number of sub-time step
       REAL(wp)        , INTENT(in   ), DIMENSION(jpk)                ::   p2dt        ! vertical profile of tracer time-step
-      REAL(wp)        , INTENT(in   ), DIMENSION(jpi,jpj,jpk,kjpt)   ::   ptrab       ! before and now tracer fields
-      REAL(wp)        , INTENT(inout), DIMENSION(jpi,jpj,jpk,kjpt)   ::   ptraa       ! tracer trend 
-      !! * Local declarations
+      REAL(wp)        , INTENT(in   ), DIMENSION(jpi,jpj,jpk,kjpt)   ::   ptb       ! before and now tracer fields
+      REAL(wp)        , INTENT(inout), DIMENSION(jpi,jpj,jpk,kjpt)   ::   pta       ! tracer trend 
+      !! 
       INTEGER  ::  ji, jj, jk, jn, jl        ! dummy loop indices
       REAL(wp) ::  zlavmr, zave3r, ze3tr     ! temporary scalars
@@ -103 +103 @@
          zwy(:,:,jpk) = 0.e0     ! bottom  boundary conditions: no flux
          !
-         zwx(:,:,:)   = ptrab(:,:,:,jn)  ! zwx array set to before tracer values
+         zwx(:,:,:)   = ptb(:,:,:,jn)  ! zwx array set to before tracer values
 
          ! Split-explicit loop  (after tracer due to the vertical diffusion alone)
@@ -141 +141 @@
                   DO ji = fs_2, fs_jpim1   ! vector opt.
                      ze3tb = fse3t_b(ji,jj,jk) / fse3t(ji,jj,jk)                          ! before e3t
-                     ztra  = zwx(ji,jj,jk) - ptrab(ji,jj,jk,jn) + p2dt(jk) * ptraa(ji,jj,jk,jn)       ! total trends * 2*rdt 
-                     ptraa(ji,jj,jk,jn) = ( ze3tb * ptrab(ji,jj,jk,jn) + ztra ) * tmask(ji,jj,jk)
+                     ztra  = zwx(ji,jj,jk) - ptb(ji,jj,jk,jn) + p2dt(jk) * pta(ji,jj,jk,jn)       ! total trends * 2*rdt 
+                     pta(ji,jj,jk,jn) = ( ze3tb * ptb(ji,jj,jk,jn) + ztra ) * tmask(ji,jj,jk)
                   END DO
                END DO
@@ -150 +150 @@
                DO jj = 2, jpjm1 
                   DO ji = fs_2, fs_jpim1   ! vector opt.
-                     ptraa(ji,jj,jk,jn) = ( zwx(ji,jj,jk) + p2dt(jk) * ptraa(ji,jj,jk,jn) ) * tmask(ji,jj,jk)
+                     pta(ji,jj,jk,jn) = ( zwx(ji,jj,jk) + p2dt(jk) * pta(ji,jj,jk,jn) ) * tmask(ji,jj,jk)
                   END DO
                END DO