Changeset 1546 for trunk/NEMO/OPA_SRC/ZDF/zdfevd.F90

Timestamp:

2009-07-27T15:39:29+02:00 (15 years ago)

Author:

ctlod

Message:

small optimisation, see ticket: #495

File:

• trunk/NEMO/OPA_SRC/ZDF/zdfevd.F90 (modified) (6 diffs)

trunk/NEMO/OPA_SRC/ZDF/zdfevd.F90

@@ -45 +45 @@
       !!      sivity coefficients when a static instability is encountered.
       !!
-      !! ** Method  :   avt, and the 4 neighbouring avmu, avmv coefficients
+      !! ** Method  :   avt, avm, and the 4 neighbouring avmu, avmv coefficients
       !!      are set to avevd (namelist parameter) if the water column is 
       !!      statically unstable (i.e. if rn2 < -1.e-12 )
       !!
-      !! ** Action  :   Update avt, avmu, avmv in statically instable cases
-      !!                and avt_evd which is avt due to convection
+      !! ** Action  :   avt, avm, avmu, avmv updted in static instability cases
+      !!
       !! References :   Lazar, A., these de l'universite Paris VI, France, 1997
       !!----------------------------------------------------------------------
+      USE oce,   zav_evd  =>   ua   ! use ua as workspace
+      !!
       INTEGER, INTENT( in ) ::   kt         ! ocean time-step indexocean time step
       !!
@@ -65 +67 @@
       ENDIF
 
-      ! Initialisation of avt_evd (vertical diffusion due to convection) to avt and avmu_evd to avmu
-      avt_evd  (:,:,:) = avt(:,:,:) 
-      avmu_evd (:,:,:) = avmu(:,:,:) 
+      zav_evd(:,:,:) = avt(:,:,:)           ! set avt prior to evd application
 
       SELECT CASE ( nn_evdm )
  
       CASE ( 1 )           ! enhance vertical eddy viscosity and diffusivity (if rn2<-1.e-12)
-         !                                                ! ===============
-         DO jk = 1, jpkm1                                 ! Horizontal slab
-            !                                             ! ===============
+         DO jk = 1, jpkm1 
 #if defined key_vectopt_loop
             DO jj = 1, 1                     ! big loop forced
@@ -83 +81 @@
 #endif
 #if defined key_zdfkpp
-!! no implicit mixing in the boundary layer with KPP
+                  ! no evd mixing in the boundary layer with KPP
                   IF( ( MIN( rn2(ji,jj,jk),  rn2b(ji,jj,jk) ) <= -1.e-12 ) .AND. ( fsdepw(ji,jj,jk) > hkpp(ji,jj) ) ) THEN
 #else
@@ -97 +95 @@
                END DO
             END DO
-            !                                             ! ===============
-         END DO                                           !   End of slab
-         !                                                ! ===============
-
-         ! Lateral boundary conditions on ( avt, avmu, avmv )   (unchanged sign)
-         ! -------------------------------===================
-         CALL lbc_lnk( avt , 'W', 1. )
-         CALL lbc_lnk( avm , 'W', 1. )
-         CALL lbc_lnk( avmu, 'U', 1. )
-         CALL lbc_lnk( avmv, 'V', 1. )
-
+         END DO 
+         CALL lbc_lnk( avt , 'W', 1. )   ;   CALL lbc_lnk( avm , 'W', 1. )   ! Lateral boundary conditions   (unchanged sign)
+         CALL lbc_lnk( avmu, 'U', 1. )   ;   CALL lbc_lnk( avmv, 'V', 1. )
+         !
       CASE DEFAULT         ! enhance vertical eddy diffusivity only (if rn2<-1.e-12) 
-         !                                                ! ===============
-         DO jk = 1, jpkm1                                 ! Horizontal slab
-            !                                             ! ===============
-!!!         WHERE( rn2(:,:,jk) <= -1.e-12 ) avt(:,:,jk) = tmask(:,:,jk) * rn_avevd   ! agissant sur T SEUL! 
+         DO jk = 1, jpkm1
+!!!         WHERE( rn2(:,:,jk) <= -1.e-12 ) avt(:,:,jk) = tmask(:,:,jk) * avevd   ! agissant sur T SEUL! 
 #if defined key_vectopt_loop
             DO jj = 1, 1                     ! big loop forced
@@ -121 +110 @@
 #endif
 #if defined key_zdfkpp
-!! no implicit mixing in the boundary layer with KPP
+                  ! no evd mixing in the boundary layer with KPP
                   IF( ( MIN( rn2(ji,jj,jk), rn2b(ji,jj,jk) ) <= -1.e-12 ) .AND. ( fsdepw(ji,jj,jk) > hkpp(ji,jj) ) ) &          
 #else
@@ -129 +118 @@
                END DO
             END DO
-            !                                             ! ===============
-         END DO                                           !   End of slab
-         !                                                ! ===============
+         END DO
+         !
       END SELECT 
 
-      ! update of avt_evd and avmu_evd
-      avt_evd (:,:,:) = avt (:,:,:) - avt_evd (:,:,:) 
-      avmu_evd(:,:,:) = avmu(:,:,:) - avmu_evd(:,:,:) 
-      CALL iom_put( "avt_evd", avt_evd  )    ! T enhan. vert. eddy diff. coef.
-      CALL iom_put( "avm_evd", avmu_evd )    ! T enhan. vert. eddy visc. coef.
-
+      zav_evd(:,:,:) = avt(:,:,:) - zav_evd(:,:,:)      ! change in avt due to evd
+      CALL iom_put( "avt_evd", zav_evd )                ! output this change
+      !
    END SUBROUTINE zdf_evd