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

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

@@ -154 +154 @@
       !!---------------------------------------------------------------------
       !
-      IF( nn_timing == 1 )  CALL timing_start('p5z_lim')
+      IF( ln_timing )   CALL timing_start('p5z_lim')
       !
       zratchl = 6.0
@@ -448 +448 @@
       ENDIF
       !
-      IF( nn_timing == 1 )  CALL timing_stop('p5z_lim')
+      IF( ln_timing )  CALL timing_stop('p5z_lim')
       !
    END SUBROUTINE p5z_lim
 
+
    SUBROUTINE p5z_lim_init
-
       !!----------------------------------------------------------------------
       !!                  ***  ROUTINE p5z_lim_init  ***
@@ -465 +465 @@
       !!
       !!----------------------------------------------------------------------
-
+      INTEGER :: ios                 ! Local integer output status for namelist read
+      !!
       NAMELIST/namp5zlim/ concnno3, concpno3, concdno3, concnnh4, concpnh4, concdnh4,  &
          &                concnfer, concpfer, concdfer, concbfe, concnpo4, concppo4,   &
@@ -471 +472 @@
          &                xsizephy, xsizern, xsizerp, xsizerd, xksi1, xksi2, xkdoc,    &
          &                caco3r, oxymin
-
+         !
       NAMELIST/namp5zquota/ qnnmin, qnnmax, qpnmin, qpnmax, qnpmin, qnpmax, qppmin,      &
          &                  qppmax, qndmin, qndmax, qpdmin, qpdmax, qfnmax, qfpmax, qfdmax,  &
          &                  qfnopt, qfpopt, qfdopt
- 
-
-      INTEGER :: ios                 ! Local integer output status for namelist read
-
+      !!----------------------------------------------------------------------
+      !
       REWIND( numnatp_ref )              ! Namelist nampislim in reference namelist : Pisces nutrient limitation parameters
       READ  ( numnatp_ref, namp5zlim, IOSTAT = ios, ERR = 901)
 901   IF( ios /= 0 ) CALL ctl_nam ( ios , 'nampislim in reference namelist', lwp )
-
+      !
       REWIND( numnatp_cfg )              ! Namelist nampislim in configuration namelist : Pisces nutrient limitation parameters 
       READ  ( numnatp_cfg, namp5zlim, IOSTAT = ios, ERR = 902 )
-902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'nampislim in configuration namelist', lwp )
+902   IF( ios >  0 ) CALL ctl_nam ( ios , 'nampislim in configuration namelist', lwp )
       IF(lwm) WRITE ( numonp, namp5zlim )
-
+      !
       IF(lwp) THEN                         ! control print
          WRITE(numout,*) ' '
@@ -523 +522 @@
       READ  ( numnatp_ref, namp5zquota, IOSTAT = ios, ERR = 903)
 903   IF( ios /= 0 ) CALL ctl_nam ( ios , 'nampisquota in reference namelist', lwp )
-
+      !
       REWIND( numnatp_cfg )              ! Namelist nampislim in configuration namelist : Pisces nutrient limitation parameters 
       READ  ( numnatp_cfg, namp5zquota, IOSTAT = ios, ERR = 904 )
-904   IF( ios /= 0 ) CALL ctl_nam ( ios , 'nampisquota in configuration namelist', lwp )
+904   IF( ios >  0 ) CALL ctl_nam ( ios , 'nampisquota in configuration namelist', lwp )
       IF(lwm) WRITE ( numonp, namp5zquota )
-
+      !
       IF(lwp) THEN                         ! control print
          WRITE(numout,*) ' '
@@ -552 +551 @@
          WRITE(numout,*) '    Maximal Fe quota for diatoms             qfdmax    = ', qfdmax
       ENDIF
-
+      !
       zpsino3 = 2.3 * rno3
       zpsinh4 = 1.8 * rno3
@@ -560 +559 @@
       !
    END SUBROUTINE p5z_lim_init
+
 
    INTEGER FUNCTION p5z_lim_alloc()
@@ -569 +569 @@
       !!----------------------------------------------------------------------
       ierr(:) = 0
-
+      !
       !*  Biological arrays for phytoplankton growth
       ALLOCATE( xpicono3(jpi,jpj,jpk), xpiconh4(jpi,jpj,jpk),       &
@@ -585 +585 @@
          &      fvpuptk (jpi,jpj,jpk), xlimpic (jpi,jpj,jpk),       &
          &      xlimsi  (jpi,jpj,jpk), STAT=ierr(1) )
-
+         !
       !*  Minimum/maximum quotas of phytoplankton
       ALLOCATE( xqnnmin (jpi,jpj,jpk), xqnnmax(jpi,jpj,jpk),       &
@@ -593 +593 @@
          &      xqndmin (jpi,jpj,jpk), xqndmax(jpi,jpj,jpk),       &
          &      xqpdmin (jpi,jpj,jpk), xqpdmax(jpi,jpj,jpk),     STAT=ierr(2) )
-      !
+         !
       p5z_lim_alloc = MAXVAL( ierr )
       !