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

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

@@ -43 +43 @@
 #  include "vectopt_loop_substitute.h90"
    !!----------------------------------------------------------------------
-   !!   OPA 9.0 , LOCEAN-IPSL (2005) 
+   !! NEMO/OPA 3.3 , LOCEAN-IPSL (2010) 
    !! $Id$ 
    !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
@@ -50 +50 @@
 CONTAINS
 
-   SUBROUTINE tra_ldf_iso( kt   , cdtype, pgtu, pgtv,  &
-      &                    ptrab, ptraa , kjpt, pahtb0 )
+   SUBROUTINE tra_ldf_iso( kt, cdtype, pgu, pgv,  &
+      &                                ptb, pta, kjpt, pahtb0 )
       !!----------------------------------------------------------------------
       !!                  ***  ROUTINE tra_ldf_iso  ***
@@ -98 +98 @@
       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 
+      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 
       REAL(wp)        , INTENT(in   )                                ::   pahtb0         ! background diffusion coef
       !!* Local declarations
@@ -138 +138 @@
             DO jj = 1, jpjm1
                DO ji = 1, fs_jpim1   ! vector opt.
-                  zdit(ji,jj,jk) = ( ptrab(ji+1,jj  ,jk,jn) - ptrab(ji,jj,jk,jn) ) * umask(ji,jj,jk)
-                  zdjt(ji,jj,jk) = ( ptrab(ji  ,jj+1,jk,jn) - ptrab(ji,jj,jk,jn) ) * vmask(ji,jj,jk)
+                  zdit(ji,jj,jk) = ( ptb(ji+1,jj  ,jk,jn) - ptb(ji,jj,jk,jn) ) * umask(ji,jj,jk)
+                  zdjt(ji,jj,jk) = ( ptb(ji  ,jj+1,jk,jn) - ptb(ji,jj,jk,jn) ) * vmask(ji,jj,jk)
                END DO
             END DO
@@ -149 +149 @@
                   iku = MIN( mbathy(ji,jj), mbathy(ji+1,jj  ) ) - 1
                   ikv = MIN( mbathy(ji,jj), mbathy(ji  ,jj+1) ) - 1
-                  zdit(ji,jj,iku) = pgtu(ji,jj,jn)          
-                  zdjt(ji,jj,ikv) = pgtv(ji,jj,jn)      
+                  zdit(ji,jj,iku) = pgu(ji,jj,jn)          
+                  zdjt(ji,jj,ikv) = pgv(ji,jj,jn)      
                END DO
             END DO
@@ -167 +167 @@
             ! surface boundary condition: zdkt(jk=1)=zdkt(jk=2)
             
-            zdk1t(:,:) = ( ptrab(:,:,jk,jn) - ptrab(:,:,jk+1,jn) ) * tmask(:,:,jk+1)
+            zdk1t(:,:) = ( ptb(:,:,jk,jn) - ptb(:,:,jk+1,jn) ) * tmask(:,:,jk+1)
             
             IF( jk == 1 ) THEN
                zdkt(:,:) = zdk1t(:,:)
             ELSE
-               zdkt(:,:) = ( ptrab(:,:,jk-1,jn) - ptrab(:,:,jk,jn) ) * tmask(:,:,jk)
+               zdkt(:,:) = ( ptb(:,:,jk-1,jn) - ptb(:,:,jk,jn) ) * tmask(:,:,jk)
             ENDIF
 
@@ -209 +209 @@
                   zbtr = 1.0 / ( e1t(ji,jj) * e2t(ji,jj) * fse3t(ji,jj,jk) )
                   ztra = zbtr * ( zftu(ji,jj,jk) - zftu(ji-1,jj,jk) + zftv(ji,jj,jk) - zftv(ji,jj-1,jk)  )
-                  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
@@ -229 +229 @@
                   DO ji = fs_2, fs_jpim1   ! vector opt.
                      z2d(ji,jj) = z2d(ji,jj) + zztmp * zftu(ji,jj,jk)   &
-            &                    * ( ptran(ji,jj,jk,jn) + ptran(ji+1,jj,jk,jn) ) * e1u(ji,jj) * fse3u(ji,jj,jk) 
+            &                    * ( ptn(ji,jj,jk,jn) + ptn(ji+1,jj,jk,jn) ) * e1u(ji,jj) * fse3u(ji,jj,jk) 
                   END DO
                END DO
@@ -240 +240 @@
                   DO ji = fs_2, fs_jpim1   ! vector opt.
                      z2d(ji,jj) = z2d(ji,jj) + zztmp * zftv(ji,jj,jk)   &
-           &                   * ( ptran(ji,jj,jk,jn) + ptran(ji,jj+1,jk,jn) ) * e2v(ji,jj) * fse3v(ji,jj,jk) 
+           &                   * ( ptn(ji,jj,jk,jn) + ptn(ji,jj+1,jk,jn) ) * e2v(ji,jj) * fse3v(ji,jj,jk) 
                   END DO
                END DO
@@ -295 +295 @@
                   zbtr = 1.0 / ( e1t(ji,jj) * e2t(ji,jj) * fse3t(ji,jj,jk) )
                   ztra = (  ztfw(ji,jj,jk) - ztfw(ji,jj,jk+1)  ) * zbtr
-                  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