Changeset 9104 for branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ZDF/zdftke.F90

Timestamp:

2017-12-15T18:56:13+01:00 (6 years ago)

Author:

gm

Message:

dev_merge_2017: ZDF: timing + lnk_multi + namelist cfg ctl

File:

• branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ZDF/zdftke.F90 (modified) (7 diffs)

branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ZDF/zdftke.F90

@@ -51 +51 @@
    USE lbclnk         ! ocean lateral boundary conditions (or mpp link)
    USE prtctl         ! Print control
-   USE timing         ! Timing
    USE lib_fortran    ! Fortran utilities (allows no signed zero when 'key_nosignedzero' defined)  
 
@@ -205 +204 @@
       REAL(wp), DIMENSION(jpi,jpj,jpk) ::   zpelc, zdiag, zd_up, zd_lw
       !!--------------------------------------------------------------------
-      !
-      IF( ln_timing )   CALL timing_start('tke_tke')
       !
       zbbrau = rn_ebb / rau0       ! Local constant initialisation
@@ -430 +427 @@
          END DO
       ENDIF
-      !
-      IF( ln_timing )   CALL timing_stop('tke_tke')
       !
    END SUBROUTINE tke_tke
@@ -483 +478 @@
       !!--------------------------------------------------------------------
       !
-      IF( ln_timing )   CALL timing_start('tke_avn')
-      !
       !                     !<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
       !                     !  Mixing length
@@ -625 +618 @@
       ENDIF
       !
-      IF( ln_timing )   CALL timing_stop('tke_avn')
-      !
    END SUBROUTINE tke_avn
 
@@ -661 +652 @@
       REWIND( numnam_cfg )              ! Namelist namzdf_tke in configuration namelist : Turbulent Kinetic Energy
       READ  ( numnam_cfg, namzdf_tke, IOSTAT = ios, ERR = 902 )
-902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namzdf_tke in configuration namelist', lwp )
+902   IF( ios >  0 ) CALL ctl_nam ( ios , 'namzdf_tke in configuration namelist', lwp )
       IF(lwm) WRITE ( numond, namzdf_tke )
       !
@@ -767 +758 @@
             !
             IF( MIN( id1, id2, id3, id4 ) > 0 ) THEN      ! fields exist
-               CALL iom_get( numror, jpdom_autoglo, 'en', en )
+               CALL iom_get( numror, jpdom_autoglo, 'en'   , en    )
                CALL iom_get( numror, jpdom_autoglo, 'avt_k', avt_k )
                CALL iom_get( numror, jpdom_autoglo, 'avm_k', avm_k )