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

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

@@ -76 +76 @@
       !!---------------------------------------------------------------------
       !
-      IF( nn_timing == 1 )  CALL timing_start('p4z_meso')
+      IF( ln_timing )   CALL timing_start('p4z_meso')
       !
       CALL wrk_alloc( jpi, jpj, jpk, zgrazing )
@@ -240 +240 @@
       CALL wrk_dealloc( jpi, jpj, jpk, zgrazing )
       !
-      IF( nn_timing == 1 )  CALL timing_stop('p4z_meso')
+      IF( ln_timing )   CALL timing_stop('p4z_meso')
       !
    END SUBROUTINE p4z_meso
 
+
    SUBROUTINE p4z_meso_init
-
       !!----------------------------------------------------------------------
       !!                  ***  ROUTINE p4z_meso_init  ***
@@ -257 +257 @@
       !!
       !!----------------------------------------------------------------------
-
+      INTEGER ::   ios   ! Local integer
+      !
       NAMELIST/namp4zmes/ part2, grazrat2, resrat2, mzrat2, xprefc, xprefp, xprefz,   &
          &                xprefpoc, xthresh2dia, xthresh2phy, xthresh2zoo, xthresh2poc, &
          &                xthresh2, xkgraz2, epsher2, sigma2, unass2, grazflux
-      INTEGER :: ios                 ! Local integer output status for namelist read
-
+      !!----------------------------------------------------------------------
+      !
       REWIND( numnatp_ref )              ! Namelist nampismes in reference namelist : Pisces mesozooplankton
       READ  ( numnatp_ref, namp4zmes, IOSTAT = ios, ERR = 901)
 901   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namp4zmes in reference namelist', lwp )
-
+      !
       REWIND( numnatp_cfg )              ! Namelist nampismes in configuration namelist : Pisces mesozooplankton
       READ  ( numnatp_cfg, namp4zmes, IOSTAT = ios, ERR = 902 )
-902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namp4zmes in configuration namelist', lwp )
+902   IF( ios >  0 ) CALL ctl_nam ( ios , 'namp4zmes in configuration namelist', lwp )
       IF(lwm) WRITE ( numonp, namp4zmes )
-
-
+      !
       IF(lwp) THEN                         ! control print
          WRITE(numout,*) ' ' 
@@ -296 +296 @@
          WRITE(numout,*) '    half sturation constant for grazing 2          xkgraz2      =', xkgraz2
       ENDIF
-
-
+      !
    END SUBROUTINE p4z_meso_init