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

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

@@ -22 +22 @@
    USE eosbn2         ! ocean equation of state
    USE phycst         ! physical constants
+   !
    USE prtctl         ! Print control
    USE in_out_manager ! I/O manager
@@ -27 +28 @@
    USE lib_mpp        ! MPP library
    USE wrk_nemo       ! work arrays
-   USE timing         ! Timing
    USE lib_fortran    ! Fortran utilities (allows no signed zero when 'key_nosignedzero' defined)  
 
@@ -138 +138 @@
       !!----------------------------------------------------------------------
       !
-      IF( ln_timing )   CALL timing_start('zdf_iwm')
-      !
       !                       !* Set to zero the 1st and last vertical levels of appropriate variables
       zemx_iwm (:,:,1) = 0._wp   ;   zemx_iwm (:,:,jpk) = 0._wp
@@ -370 +368 @@
       IF(ln_ctl)   CALL prt_ctl(tab3d_1=zav_wave , clinfo1=' iwm - av_wave: ', tab3d_2=avt, clinfo2=' avt: ', ovlap=1, kdim=jpk)
       !
-      IF( ln_timing )   CALL timing_stop('zdf_iwm')
-      !
    END SUBROUTINE zdf_iwm
 
@@ -409 +405 @@
       !!----------------------------------------------------------------------
       !
-      IF( ln_timing )   CALL timing_start('zdf_iwm_init')
-      !
       REWIND( numnam_ref )              ! Namelist namzdf_iwm in reference namelist : Wave-driven mixing
       READ  ( numnam_ref, namzdf_iwm_new, IOSTAT = ios, ERR = 901)
-901   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namzdf_iwm in reference namelist', lwp )
+901   IF( ios /= 0 )   CALL ctl_nam ( ios , 'namzdf_iwm in reference namelist', lwp )
       !
       REWIND( numnam_cfg )              ! Namelist namzdf_iwm in configuration namelist : Wave-driven mixing
       READ  ( numnam_cfg, namzdf_iwm_new, IOSTAT = ios, ERR = 902 )
-902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namzdf_iwm in configuration namelist', lwp )
+902   IF( ios >  0 )   CALL ctl_nam ( ios , 'namzdf_iwm in configuration namelist', lwp )
       IF(lwm) WRITE ( numond, namzdf_iwm_new )
       !
@@ -479 +473 @@
       ENDIF
       !
-      IF( ln_timing )   CALL timing_stop('zdf_iwm_init')
-      !
    END SUBROUTINE zdf_iwm_init