Changeset 3432 for branches/2011/DEV_r2739_STFC_dCSE/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfgls.F90

Timestamp:

2012-07-11T13:22:58+02:00 (12 years ago)

Author:

trackstand2

Message:

Merge branch 'ksection_partition'

File:

• branches/2011/DEV_r2739_STFC_dCSE/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfgls.F90 (modified) (7 diffs)

branches/2011/DEV_r2739_STFC_dCSE/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfgls.F90

@@ -61 +61 @@
    !                                         !!! ** Namelist  namzdf_gls  **
    LOGICAL  ::   ln_crban      = .FALSE.      ! =T use Craig and Banner scheme
-   LOGICAL  ::   ln_length_lim = .FALSE.      ! use limit on the dissipation rate under stable stratification (Galperin et al. 1988)
-   LOGICAL  ::   ln_sigpsi     = .FALSE.      ! Activate Burchard (2003) modification for k-eps closure & wave breaking mixing
+   LOGICAL  ::   ln_length_lim = .FALSE.      ! use limit on the dissipation rate under 
+                                              ! stable stratification (Galperin et al. 1988)
+   LOGICAL  ::   ln_sigpsi     = .FALSE.      ! Activate Burchard (2003) modification for 
+                                              ! k-eps closure & wave breaking mixing
    INTEGER  ::   nn_tkebc_surf = 0            ! TKE surface boundary condition (=0/1)
    INTEGER  ::   nn_tkebc_bot  = 0            ! TKE bottom boundary condition (=0/1)
@@ -72 +74 @@
    REAL(wp) ::   rn_epsmin     = 1.e-12_wp    ! minimum value of dissipation (m2/s3)
    REAL(wp) ::   rn_emin       = 1.e-6_wp     ! minimum value of TKE (m2/s2)
-   REAL(wp) ::   rn_charn      = 2.e+5_wp     ! Charnock constant for surface breaking waves mixing : 1400. (standard) or 2.e5 (Stacey value)
+   REAL(wp) ::   rn_charn      = 2.e+5_wp     ! Charnock constant for surface breaking waves 
+                                              ! mixing : 1400. (standard) or 2.e5 (Stacey value)
    REAL(wp) ::   rn_crban      = 100._wp      ! Craig and Banner constant for surface breaking waves mixing
 
@@ -167 +170 @@
       USE wrk_nemo, ONLY: eps       => wrk_3d_4   ! dissipation rate
       USE wrk_nemo, ONLY: zwall_psi => wrk_3d_5   ! Wall function use in the wb case (ln_sigpsi.AND.ln_crban=T)
+      USE timing,   ONLY: timing_start, timing_stop
 
       !! DCSE_NEMO: need additional directives for renamed module variables
@@ -180 +184 @@
       REAL(wp) ::   gh, gm, shr, dif, zsqen, zav        !   -      -
       !!--------------------------------------------------------------------
+
+      CALL timing_start('zdf_gls')
 
       IF(  wrk_in_use(2, 1,2,3)  .OR.  wrk_in_use(3, 1,2,3,4,5)  ) THEN
@@ -319 +325 @@
                IF( ln_sigpsi ) THEN
                   zsigpsi = MIN( 1._wp, zesh2 / eps(ji,jj,jk) )     ! 0. <= zsigpsi <= 1.
-                  zwall_psi(ji,jj,jk) = rsc_psi / (  zsigpsi * rsc_psi + (1._wp-zsigpsi) * rsc_psi0 / MAX( zwall(ji,jj,jk), 1._wp )  )
+                  zwall_psi(ji,jj,jk) = rsc_psi / (  zsigpsi * rsc_psi + &
+                          (1._wp-zsigpsi) * rsc_psi0 / MAX( zwall(ji,jj,jk), 1._wp )  )
                ELSE
                   zwall_psi(ji,jj,jk) = 1._wp
@@ -1048 +1055 @@
             DO ji = fs_2, fs_jpim1   ! vector opt.
 #endif
-      DO jk = 1, jpk
-         DO jj = 2, jpjm1
-            DO ji = fs_2, fs_jpim1   ! vector opt.
                zsqen         = SQRT( 2._wp * en(ji,jj,jk) ) * mxln(ji,jj,jk)
                zav           = zsqen * avmu(ji,jj,jk)
@@ -1089 +1093 @@
       IF( wrk_not_released(2, 1,2,3)     .OR. &
           wrk_not_released(3, 1,2,3,4,5)  )   CALL ctl_stop('zdf_gls: failed to release workspace arrays')
+      !
+      CALL timing_stop('zdf_gls','section')
       !
    END SUBROUTINE zdf_gls