Changeset 2034 for branches/DEV_r2006_merge_TRA_TRC/NEMO/OPA_SRC/TRA/traldf_bilap.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/traldf_bilap.F90 (modified) (6 diffs)

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

@@ -41 +41 @@
 #  include "vectopt_loop_substitute.h90"
    !!----------------------------------------------------------------------
-   !!   OPA 9.0 , LOCEAN-IPSL (2005) 
+   !! NEMO/OPA 3.3 , LOCEAN-IPSL (2010) 
    !! $Id$ 
    !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 
@@ -48 +48 @@
 CONTAINS
  
-   SUBROUTINE tra_ldf_bilap( kt   , cdtype, pgtu, pgtv,  &
-      &                      ptrab, ptraa , kjpt         )  
+   SUBROUTINE tra_ldf_bilap( kt, cdtype, pgu, pgv,  &
+      &                                  ptb, pta, kjpt )  
       !!----------------------------------------------------------------------
       !!                  ***  ROUTINE tra_ldf_bilap  ***
@@ -70 +70 @@
       !!
       !!      Add this trend to the general trend
-      !!         (ptraa) = (ptraa) + ( difft )
+      !!         (pta) = (pta) + ( difft )
       !!
-      !! ** Action : - Update ptraa arrays with the before iso-level
+      !! ** Action : - Update pta arrays with the before iso-level
       !!               biharmonic mixing trend.
       !!----------------------------------------------------------------------
-      !!* Module used
+      !!
       USE oce         , ztu => ua   ! use ua as workspace
       USE oce         , ztv => va   ! use va as workspace
-      !!* Arguments
+      !!
       INTEGER         , INTENT(in   )                                ::   kt             ! ocean time-step index
       CHARACTER(len=3), INTENT(in   )                                ::   cdtype         ! =TRA or TRC (tracer indicator)
       INTEGER         , INTENT(in   )                                ::   kjpt            ! number of tracers
-      REAL(wp)        , INTENT(in   ), DIMENSION(jpi,jpj,kjpt  )     ::   pgtu, pgtv     ! tracer gradient at pstep levels
-      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,kjpt  )     ::   pgu, pgv     ! tracer gradient at pstep levels
+      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         ! dummy loop indices
       INTEGER  ::  iku, ikv               ! temporary integers
@@ -121 +121 @@
             DO jj = 1, jpjm1
                DO ji = 1, fs_jpim1   ! vector opt.
-                  ztu(ji,jj,jk) = zeeu(ji,jj) * ( ptrab(ji+1,jj  ,jk,jn) - ptrab(ji,jj,jk,jn) )
-                  ztv(ji,jj,jk) = zeev(ji,jj) * ( ptrab(ji  ,jj+1,jk,jn) - ptrab(ji,jj,jk,jn) )
+                  ztu(ji,jj,jk) = zeeu(ji,jj) * ( ptb(ji+1,jj  ,jk,jn) - ptb(ji,jj,jk,jn) )
+                  ztv(ji,jj,jk) = zeev(ji,jj) * ( ptb(ji  ,jj+1,jk,jn) - ptb(ji,jj,jk,jn) )
                END DO
             END DO
@@ -131 +131 @@
                      iku = MIN ( mbathy(ji,jj), mbathy(ji+1,jj  ) ) - 1
                      ikv = MIN ( mbathy(ji,jj), mbathy(ji  ,jj+1) ) - 1
-                     IF( iku == jk )  ztu(ji,jj,jk) = zeeu(ji,jj) * pgtu(ji,jj,jn)
-                     IF( ikv == jk )  ztv(ji,jj,jk) = zeev(ji,jj) * pgtv(ji,jj,jn)
+                     IF( iku == jk )  ztu(ji,jj,jk) = zeeu(ji,jj) * pgu(ji,jj,jn)
+                     IF( ikv == jk )  ztv(ji,jj,jk) = zeev(ji,jj) * pgv(ji,jj,jn)
                   END DO
                END DO
@@ -167 +167 @@
                   ztra = zbtr * (  ztu(ji,jj,jk) - ztu(ji-1,jj,jk) + ztv(ji,jj,jk) - ztv(ji,jj-1,jk)  )
                   ! add it to the general tracer trends
-                  ptraa(ji,jj,jk,jn) = ptraa(ji,jj,jk,jn) + ztra
+                  pta(ji,jj,jk,jn) = pta(ji,jj,jk,jn) + ztra
                END DO
             END DO