Changeset 9124 for branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zprod.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/p4zprod.F90 (modified) (6 diffs)

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

@@ -65 +65 @@
       !! ** Method  : - ???
       !!---------------------------------------------------------------------
-      !
       INTEGER, INTENT(in) :: kt, knt
       !
@@ -85 +84 @@
       !!---------------------------------------------------------------------
       !
-      IF( nn_timing == 1 )  CALL timing_start('p4z_prod')
+      IF( ln_timing )   CALL timing_start('p4z_prod')
       !
       !  Allocate temporary workspace
@@ -486 +485 @@
      CALL wrk_dealloc( jpi, jpj, jpk, zprorcan, zprorcad, zprofed, zprofen, zpronewn, zpronewd )
      !
-     IF( nn_timing == 1 )  CALL timing_stop('p4z_prod')
+     IF( ln_timing )  CALL timing_stop('p4z_prod')
      !
    END SUBROUTINE p4z_prod
@@ -502 +501 @@
       !! ** input   :   Namelist nampisprod
       !!----------------------------------------------------------------------
+      INTEGER :: ios                 ! Local integer output status for namelist read
       !
       NAMELIST/namp4zprod/ pislopen, pisloped, xadap, ln_newprod, bresp, excretn, excretd,  &
          &                 chlcnm, chlcdm, chlcmin, fecnm, fecdm, grosip
-      INTEGER :: ios                 ! Local integer output status for namelist read
       !!----------------------------------------------------------------------
 
@@ -514 +513 @@
       REWIND( numnatp_cfg )              ! Namelist nampisprod in configuration namelist : Pisces phytoplankton production
       READ  ( numnatp_cfg, namp4zprod, IOSTAT = ios, ERR = 902 )
-902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namp4zprod in configuration namelist', lwp )
+902   IF( ios >  0 ) CALL ctl_nam ( ios , 'namp4zprod in configuration namelist', lwp )
       IF(lwm) WRITE ( numonp, namp4zprod )
 
@@ -555 +554 @@
       !
    END FUNCTION p4z_prod_alloc
+
    !!======================================================================
 END MODULE p4zprod