Changeset 8568 for branches/2017/dev_r7881_ENHANCE09_RK3/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfgls.F90

Timestamp:

2017-09-27T16:29:24+02:00 (7 years ago)

Author:

gm

Message:

#1911 (ENHANCE-09): PART I.2 - _NONE option + remove zts + see associated wiki page

File:

• branches/2017/dev_r7881_ENHANCE09_RK3/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfgls.F90 (modified) (5 diffs)

branches/2017/dev_r7881_ENHANCE09_RK3/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfgls.F90

@@ -159 +159 @@
       !!--------------------------------------------------------------------
       !
-      IF( nn_timing == 1 )   CALL timing_start('zdf_gls')
+      IF( ln_timing )   CALL timing_start('zdf_gls')
       !
       ! Preliminary computing
@@ -822 +822 @@
       ENDIF
       !
-      IF( nn_timing == 1 )   CALL timing_stop('zdf_gls')
+      IF( ln_timing )   CALL timing_stop('zdf_gls')
       !
    END SUBROUTINE zdf_gls
@@ -852 +852 @@
       !!----------------------------------------------------------
       !
-      IF( nn_timing == 1 )  CALL timing_start('zdf_gls_init')
+      IF( ln_timing )   CALL timing_start('zdf_gls_init')
       !
       REWIND( numnam_ref )              ! Namelist namzdf_gls in reference namelist : Vertical eddy diffivity and viscosity using gls turbulent closure scheme
@@ -1077 +1077 @@
          rl_sf = vkarmn
       ELSE
-         rl_sf = rc0 * SQRT(rc0/rcm_sf) * SQRT( ( (1._wp + 4._wp*rmm + 8._wp*rmm**2_wp)*rsc_tke          &
-                 &                                       + 12._wp * rsc_psi0*rpsi2 - (1._wp + 4._wp*rmm) &
-                 &                                                *SQRT(rsc_tke*(rsc_tke                 &
-                 &                                                   + 24._wp*rsc_psi0*rpsi2)) )         &
-                 &                                         /(12._wp*rnn**2.)                             &
-                 &                                       )
+         rl_sf = rc0 * SQRT(rc0/rcm_sf) * SQRT( ( (1._wp + 4._wp*rmm + 8._wp*rmm**2_wp) * rsc_tke        &
+            &                                            + 12._wp*rsc_psi0*rpsi2 - (1._wp + 4._wp*rmm)   &
+            &                                                     *SQRT(rsc_tke*(rsc_tke                 &
+            &                                                        + 24._wp*rsc_psi0*rpsi2)) )         &
+            &                                              /(12._wp*rnn**2.)                             )
       ENDIF
 
@@ -1130 +1129 @@
       CALL gls_rst( nit000, 'READ' )      ! (en, avt_k, avm_k, hmxl_n)
       !
-      IF( nn_timing == 1 )  CALL timing_stop('zdf_gls_init')
+      IF( ln_timing )   CALL timing_stop('zdf_gls_init')
       !
    END SUBROUTINE zdf_gls_init