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

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

@@ -79 +79 @@
       !!---------------------------------------------------------------------
       !
-      IF( nn_timing == 1 )  CALL timing_start('p4z_fechem')
+      IF( ln_timing )   CALL timing_start('p4z_fechem')
       !
       ! Allocate temporary workspace
@@ -366 +366 @@
       ENDIF
       !
-      IF( nn_timing == 1 )  CALL timing_stop('p4z_fechem')
+      IF( ln_timing )   CALL timing_stop('p4z_fechem')
       !
    END SUBROUTINE p4z_fechem
@@ -383 +383 @@
       !!
       !!----------------------------------------------------------------------
+      INTEGER ::   ios   ! Local integer 
+      !!
       NAMELIST/nampisfer/ ln_fechem, ln_ligvar, ln_fecolloid, xlam1, xlamdust, ligand, kfep 
-      INTEGER :: ios                 ! Local integer output status for namelist read
+      !!----------------------------------------------------------------------
 
       REWIND( numnatp_ref )              ! Namelist nampisfer in reference namelist : Pisces iron chemistry
@@ -392 +394 @@
       REWIND( numnatp_cfg )              ! Namelist nampisfer in configuration namelist : Pisces iron chemistry
       READ  ( numnatp_cfg, nampisfer, IOSTAT = ios, ERR = 902 )
-902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'nampisfer in configuration namelist', lwp )
+902   IF( ios >  0 ) CALL ctl_nam ( ios , 'nampisfer in configuration namelist', lwp )
       IF(lwm) WRITE ( numonp, nampisfer )
 
@@ -434 +436 @@
       !
    END SUBROUTINE p4z_fechem_init
+   
    !!======================================================================
 END MODULE p4zfechem