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

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

@@ -74 +74 @@
       !!---------------------------------------------------------------------
       !
-      IF( nn_timing == 1 )  CALL timing_start('p5z_nano')
+      IF( ln_timing )   CALL timing_start('p5z_nano')
       !
       prodcal(:,:,:) = 0.  !: calcite production variable set to zero
@@ -124 +124 @@
        ENDIF
       !
-      IF( nn_timing == 1 )  CALL timing_stop('p5z_nano')
+      IF( ln_timing )   CALL timing_stop('p5z_nano')
       !
    END SUBROUTINE p5z_nano
+
 
    SUBROUTINE p5z_pico
@@ -143 +144 @@
       !!---------------------------------------------------------------------
       !
-      IF( nn_timing == 1 )  CALL timing_start('p5z_pico')
+      IF( ln_timing )   CALL timing_start('p5z_pico')
       !
       DO jk = 1, jpkm1
@@ -184 +185 @@
        ENDIF
       !
-      IF( nn_timing == 1 )  CALL timing_stop('p5z_pico')
+      IF( ln_timing )   CALL timing_stop('p5z_pico')
       !
    END SUBROUTINE p5z_pico
@@ -204 +205 @@
       !!---------------------------------------------------------------------
       !
-      IF( nn_timing == 1 )  CALL timing_start('p5z_diat')
+      IF( ln_timing )   CALL timing_start('p5z_diat')
       !
 
@@ -262 +263 @@
       ENDIF
       !
-      IF( nn_timing == 1 )  CALL timing_stop('p5z_diat')
+      IF( ln_timing )   CALL timing_stop('p5z_diat')
       !
    END SUBROUTINE p5z_diat
 
+
    SUBROUTINE p5z_mort_init
-
       !!----------------------------------------------------------------------
       !!                  ***  ROUTINE p5z_mort_init  ***
@@ -279 +280 @@
       !!
       !!----------------------------------------------------------------------
-
+      INTEGER :: ios                 ! Local integer output status for namelist read
+      !!
       NAMELIST/namp5zmort/ wchln, wchlp, wchld, wchldm, mpratn, mpratp, mpratd
-      INTEGER :: ios                 ! Local integer output status for namelist read
+      !!----------------------------------------------------------------------
 
       REWIND( numnatp_ref )              ! Namelist nampismort in reference namelist : Pisces phytoplankton
@@ -289 +291 @@
       REWIND( numnatp_cfg )              ! Namelist nampismort in configuration namelist : Pisces phytoplankton
       READ  ( numnatp_cfg, namp5zmort, IOSTAT = ios, ERR = 902 )
-902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namp5zmort in configuration namelist', lwp )
+902   IF( ios >  0 ) CALL ctl_nam ( ios , 'namp5zmort in configuration namelist', lwp )
       IF(lwm) WRITE ( numonp, namp5zmort )