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

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

@@ -65 +65 @@
       !!---------------------------------------------------------------------
       !
-      IF( nn_timing == 1 )  CALL timing_start('p4z_lys')
+      IF( ln_timing )  CALL timing_start('p4z_lys')
       !
       CALL wrk_alloc( jpi, jpj, jpk, zco3, zcaldiss, zhinit, zhi, zco3sat )
@@ -141 +141 @@
       CALL wrk_dealloc( jpi, jpj, jpk, zco3, zcaldiss, zhinit, zhi, zco3sat )
       !
-      IF( nn_timing == 1 )  CALL timing_stop('p4z_lys')
+      IF( ln_timing )   CALL timing_stop('p4z_lys')
       !
    END SUBROUTINE p4z_lys
 
+
    SUBROUTINE p4z_lys_init
-
       !!----------------------------------------------------------------------
       !!                  ***  ROUTINE p4z_lys_init  ***
@@ -158 +158 @@
       !!
       !!----------------------------------------------------------------------
-      INTEGER  ::  ios                 ! Local integer output status for namelist read
-
+      INTEGER ::   ios   ! Local integer
+      !
       NAMELIST/nampiscal/ kdca, nca
       !!----------------------------------------------------------------------
-
+      !
       REWIND( numnatp_ref )              ! Namelist nampiscal in reference namelist : Pisces CaCO3 dissolution
       READ  ( numnatp_ref, nampiscal, IOSTAT = ios, ERR = 901)
 901   IF( ios /= 0 ) CALL ctl_nam ( ios , 'nampiscal in reference namelist', lwp )
-
+      !
       REWIND( numnatp_cfg )              ! Namelist nampiscal in configuration namelist : Pisces CaCO3 dissolution
       READ  ( numnatp_cfg, nampiscal, IOSTAT = ios, ERR = 902 )
-902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'nampiscal in configuration namelist', lwp )
+902   IF( ios >  0 ) CALL ctl_nam ( ios , 'nampiscal in configuration namelist', lwp )
       IF(lwm) WRITE ( numonp, nampiscal )
-
+      !
       IF(lwp) THEN                         ! control print
          WRITE(numout,*) ' '
@@ -179 +179 @@
          WRITE(numout,*) '    order of reaction for calcite dissolution nca       =', nca
       ENDIF
-
+      !
       ! Number of seconds per month 
       rmtss =  nyear_len(1) * rday / raamo