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

Timestamp:

2017-12-19T09:26:25+01:00 (7 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/p4zmort.F90 (modified) (6 diffs)

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

@@ -72 +72 @@
       !!---------------------------------------------------------------------
       !
-      IF( nn_timing == 1 )  CALL timing_start('p4z_nano')
+      IF( ln_timing )   CALL timing_start('p4z_nano')
       !
       prodcal(:,:,:) = 0.  !: calcite production variable set to zero
@@ -126 +126 @@
        ENDIF
       !
-      IF( nn_timing == 1 )  CALL timing_stop('p4z_nano')
+      IF( ln_timing )   CALL timing_stop('p4z_nano')
       !
    END SUBROUTINE p4z_nano
+
 
    SUBROUTINE p4z_diat
@@ -145 +146 @@
       !!---------------------------------------------------------------------
       !
-      IF( nn_timing == 1 )  CALL timing_start('p4z_diat')
+      IF( ln_timing )   CALL timing_start('p4z_diat')
       !
 
@@ -201 +202 @@
       ENDIF
       !
-      IF( nn_timing == 1 )  CALL timing_stop('p4z_diat')
+      IF( ln_timing )   CALL timing_stop('p4z_diat')
       !
    END SUBROUTINE p4z_diat
 
+
    SUBROUTINE p4z_mort_init
-
       !!----------------------------------------------------------------------
       !!                  ***  ROUTINE p4z_mort_init  ***
@@ -218 +219 @@
       !!
       !!----------------------------------------------------------------------
-
+      INTEGER ::   ios   ! Local integer
+      !
       NAMELIST/namp4zmort/ wchl, wchld, wchldm, mprat, mprat2
-      INTEGER :: ios                 ! Local integer output status for namelist read
-
+      !!----------------------------------------------------------------------
+      !
       REWIND( numnatp_ref )              ! Namelist nampismort in reference namelist : Pisces phytoplankton
       READ  ( numnatp_ref, namp4zmort, IOSTAT = ios, ERR = 901)
 901   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namp4zmort in reference namelist', lwp )
-
+      !
       REWIND( numnatp_cfg )              ! Namelist nampismort in configuration namelist : Pisces phytoplankton
       READ  ( numnatp_cfg, namp4zmort, IOSTAT = ios, ERR = 902 )
-902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namp4zmort in configuration namelist', lwp )
+902   IF( ios >  0 ) CALL ctl_nam ( ios , 'namp4zmort in configuration namelist', lwp )
       IF(lwm) WRITE ( numonp, namp4zmort )
-
+      !
       IF(lwp) THEN                         ! control print
          WRITE(numout,*) ' '
@@ -241 +243 @@
          WRITE(numout,*) '    Diatoms mortality rate                    mprat2    =', mprat2
       ENDIF
-
+      !
    END SUBROUTINE p4z_mort_init