Changeset 2104 for branches/DEV_r2006_merge_TRA_TRC/NEMO/OPA_SRC/TRA/traldf_lap.F90

Timestamp:

2010-09-17T14:35:46+02:00 (14 years ago)

Author:

cetlod

Message:

update DEV_r2006_merge_TRA_TRC according to review

File:

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

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

@@ -13 +13 @@
    !!            3.0  !  10-06  (C. Ethe, G. Madec) Merge TRA-TRC
    !!----------------------------------------------------------------------
+
    !!----------------------------------------------------------------------
    !!   tra_ldf_lap  : update the tracer trend with the horizontal diffusion
    !!                 using a iso-level harmonic (laplacien) operator.
    !!----------------------------------------------------------------------
-   !! * Modules used
    USE oce             ! ocean dynamics and active tracers
    USE dom_oce         ! ocean space and time domain
@@ -25 +25 @@
    USE trc_oce         ! share passive tracers/Ocean variables
 
-
    IMPLICIT NONE
    PRIVATE
 
-   !! * Routine accessibility
-   PUBLIC tra_ldf_lap  ! routine called by step.F90
+   PUBLIC   tra_ldf_lap   ! routine called by step.F90
 
    REAL(wp), DIMENSION(jpi,jpj) ::   e1ur, e2vr   ! scale factor coefficients
@@ -40 +38 @@
    !!----------------------------------------------------------------------
    !! NEMO/OPA 3.3 , LOCEAN-IPSL (2010) 
-   !! $Id$ 
+   !! $Id$
    !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 
    !!----------------------------------------------------------------------
@@ -46 +44 @@
 CONTAINS
 
-   SUBROUTINE tra_ldf_lap( kt, cdtype, pgu, pgv,  &
+   SUBROUTINE tra_ldf_lap( kt, cdtype, pgu, pgv,   &
       &                                ptb, pta, kjpt ) 
       !!----------------------------------------------------------------------
@@ -68 +66 @@
       !!                harmonic mixing trend.
       !!----------------------------------------------------------------------
-      !!
       USE oce         , ztu => ua   ! use ua as workspace
       USE oce         , ztv => va   ! use va as workspace
       !!
-      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  )     ::   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                              , 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), DIMENSION(jpi,jpj    ,kjpt), INTENT(in   ) ::   pgu, pgv   ! tracer gradient at pstep levels
+      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        ! tracer trend 
       !!
-      INTEGER ::   ji, jj, jk, jn          ! dummy loop indices
-      INTEGER ::   iku, ikv                ! temporary integers
-      REAL(wp) ::   &
-         zabe1, zabe2, ztra, zbtr           ! temporary scalars
+      INTEGER  ::   ji, jj, jk, jn       ! dummy loop indices
+      INTEGER  ::   iku, ikv             ! local integers
+      REAL(wp) ::   zabe1, zabe2, zbtr   ! local scalars
       !!----------------------------------------------------------------------
       
-      IF( ( cdtype == 'TRA' .AND. kt == nit000 ) .OR. ( cdtype == 'TRC' .AND. kt == nittrc000 ) )  THEN
+      IF( kt == nit000 )  THEN
          IF(lwp) WRITE(numout,*)
          IF(lwp) WRITE(numout,*) 'tra_ldf_lap : iso-level laplacian diffusion on ', cdtype
@@ -93 +89 @@
       ENDIF
 
-      !
-      DO jn = 1, kjpt                                            ! tracer loop
-         !                                                       ! ===========      
-         !                                                 
-         DO jk = 1, jpkm1                                
+      !                                                          ! =========== !
+      DO jn = 1, kjpt                                            ! tracer loop !
+         !                                                       ! =========== !    
+         DO jk = 1, jpkm1                                            ! slab loop
             !                                           
             ! 1. First derivative (gradient)
@@ -133 +128 @@
                DO ji = fs_2, fs_jpim1   ! vector opt.
                   zbtr = 1.0 / ( e1t(ji,jj) * e2t(ji,jj) * fse3t(ji,jj,jk) )
-                  ! horizontal diffusive trends
-                  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
-                  pta(ji,jj,jk,jn) = pta(ji,jj,jk,jn) + ztra
+                  ! horizontal diffusive trends added to the general tracer trends
+                  pta(ji,jj,jk,jn) = pta(ji,jj,jk,jn) + zbtr * (  ztu(ji,jj,jk) - ztu(ji-1,jj,jk)   &
+                     &                                          + ztv(ji,jj,jk) - ztv(ji,jj-1,jk)  )
                END DO
             END DO
-            !                                               ! =============
+            !
          END DO                                             !  End of slab  
-         !                                                  ! =============
+         !
          ! "Poleward" diffusive heat or salt transports
          IF( cdtype == 'TRA' .AND. ln_diaptr .AND. ( MOD( kt, nf_ptr ) == 0 ) ) THEN
@@ -148 +141 @@
             IF( jn  == jp_sal)   pst_ldf(:) = ptr_vj( ztv(:,:,:) )
          ENDIF
-         !
-      END DO
-      !
+         !                                                  ! ==================
+      END DO                                                ! end of tracer loop
+      !                                                     ! ==================
    END SUBROUTINE tra_ldf_lap