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

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

@@ -17 +17 @@
    USE prtctl_trc      !  print control for debugging
    USE iom             !  I/O manager
-
 
    IMPLICIT NONE
@@ -69 +68 @@
       !!---------------------------------------------------------------------
       !
-      IF( nn_timing == 1 )  CALL timing_start('p4z_poc')
+      IF( ln_timing )  CALL timing_start('p4z_poc')
       !
       ! Allocate temporary workspace
@@ -470 +469 @@
       DEALLOCATE( alphag )
       !
-      IF( nn_timing == 1 )  CALL timing_stop('p4z_poc')
+      IF( ln_timing )   CALL timing_stop('p4z_poc')
       !
    END SUBROUTINE p4z_poc
@@ -487 +486 @@
       !!
       !!----------------------------------------------------------------------
-      INTEGER :: jn
+      INTEGER ::   ios, ifault   ! Local integer
+      INTEGER ::   jn
       REAL(wp) :: remindelta, reminup, remindown
-      INTEGER  :: ifault
-
-      NAMELIST/nampispoc/ xremip, jcpoc, rshape,  &
-         &     xremipc, xremipn, xremipp
-
-
-      INTEGER :: ios                 ! Local integer output status for namelist read
+      !!
+      NAMELIST/nampispoc/ xremip , jcpoc  , rshape,  &
+         &                xremipc, xremipn, xremipp
+      !!----------------------------------------------------------------------
 
       REWIND( numnatp_ref )              ! Namelist nampisrem in reference namelist : Pisces remineralization
@@ -503 +500 @@
       REWIND( numnatp_cfg )              ! Namelist nampisrem in configuration namelist : Pisces remineralization
       READ  ( numnatp_cfg, nampispoc, IOSTAT = ios, ERR = 902 )
-902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'nampispoc in configuration namelist', lwp )
+902   IF( ios >  0 ) CALL ctl_nam ( ios , 'nampispoc in configuration namelist', lwp )
       IF(lwm) WRITE ( numonp, nampispoc )