Changeset 9124 for branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p5zprod.F90

Timestamp:

2017-12-19T09:26:25+01:00 (6 years ago)

Author:

gm

Message:

dev_merge_2017: ln_timing instead of nn_timing + restricted timing to nemo_init and routine called by step in OPA_SRC

File:

• branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p5zprod.F90 (modified) (4 diffs)

branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p5zprod.F90

@@ -98 +98 @@
       !!---------------------------------------------------------------------
       !
-      IF( nn_timing == 1 )  CALL timing_start('p5z_prod')
+      IF( ln_timing )   CALL timing_start('p5z_prod')
       !
       !  Allocate temporary workspace
@@ -571 +571 @@
       CALL wrk_dealloc( jpi, jpj, jpk, zcroissp, zcroissn, zcroissd )
       !
-      IF( nn_timing == 1 )  CALL timing_stop('p5z_prod')
+      IF( ln_timing )   CALL timing_stop('p5z_prod')
       !
    END SUBROUTINE p5z_prod
@@ -587 +587 @@
       !! ** input   :   Namelist nampisprod
       !!----------------------------------------------------------------------
-      !
+      INTEGER :: ios                 ! Local integer output status for namelist read
+      !!
       NAMELIST/namp5zprod/ pislopen, pislopep, pisloped, excretn, excretp, excretd,     &
          &                 thetannm, thetanpm, thetandm, chlcmin, grosip, bresp, xadap
-
-      INTEGER :: ios                 ! Local integer output status for namelist read
       !!----------------------------------------------------------------------
 
@@ -600 +599 @@
       REWIND( numnatp_cfg )              ! Namelist nampisprod in configuration namelist : Pisces phytoplankton production
       READ  ( numnatp_cfg, namp5zprod, IOSTAT = ios, ERR = 902 )
-902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namp5zprod in configuration namelist', lwp )
+902   IF( ios >  0 ) CALL ctl_nam ( ios , 'namp5zprod in configuration namelist', lwp )
       IF(lwm) WRITE ( numonp, namp5zprod )