Changeset 9104 for branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfric.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/zdfric.F90 (modified) (5 diffs)

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

@@ -28 +28 @@
    USE in_out_manager ! I/O manager
    USE iom            ! I/O manager library
-   USE timing         ! Timing
    USE lib_fortran    ! Fortran utilities (allows no signed zero when 'key_nosignedzero' defined)  
 
@@ -72 +71 @@
       !! ** Action  :   increase by 1 the nstop flag is setting problem encounter
       !!----------------------------------------------------------------------
-      INTEGER :: ji, jj, jk   ! dummy loop indices
-      INTEGER ::   ios        ! Local integer output status for namelist read
+      INTEGER ::   ji, jj, jk   ! dummy loop indices
+      INTEGER ::   ios          ! Local integer output status for namelist read
       !!
       NAMELIST/namzdf_ric/ rn_avmri, rn_alp   , nn_ric  , rn_ekmfc,  &
@@ -85 +84 @@
       REWIND( numnam_cfg )              ! Namelist namzdf_ric in configuration namelist : Vertical diffusion Kz depends on Richardson number
       READ  ( numnam_cfg, namzdf_ric, IOSTAT = ios, ERR = 902 )
-902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namzdf_ric in configuration namelist', lwp )
+902   IF( ios >  0 ) CALL ctl_nam ( ios , 'namzdf_ric in configuration namelist', lwp )
       IF(lwm) WRITE ( numond, namzdf_ric )
       !
@@ -157 +156 @@
       REAL(wp), DIMENSION(jpi,jpj) ::   zh_ekm  ! 2D workspace
       !!----------------------------------------------------------------------
-      !
-      IF( ln_timing )   CALL timing_start('zdf_ric')
       !
       !                       !==  avm and avt = F(Richardson number)  ==!
@@ -196 +193 @@
          END DO
       ENDIF
-      !
-      IF( ln_timing )   CALL timing_stop('zdf_ric')
       !
    END SUBROUTINE zdf_ric