Changeset 4147 for branches/2013/dev_LOCEAN_2013/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zprod.F90

Timestamp:

2013-11-04T12:51:55+01:00 (11 years ago)

Author:

cetlod

Message:

merge in dev_LOCEAN_2013, the 1st development branch dev_r3853_CNRS9_Confsetting, from its starting point ( r3853 ) on the trunk: see ticket #1169

File:

• branches/2013/dev_LOCEAN_2013/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zprod.F90 (modified) (2 diffs)

branches/2013/dev_LOCEAN_2013/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zprod.F90

@@ -32 +32 @@
 
    !! * Shared module variables
-   LOGICAL , PUBLIC ::  ln_newprod = .FALSE.
-   REAL(wp), PUBLIC ::  pislope    = 3.0_wp            !:
-   REAL(wp), PUBLIC ::  pislope2   = 3.0_wp            !:
-   REAL(wp), PUBLIC ::  excret     = 10.e-5_wp         !:
-   REAL(wp), PUBLIC ::  excret2    = 0.05_wp           !:
-   REAL(wp), PUBLIC ::  bresp      = 0.00333_wp        !:
-   REAL(wp), PUBLIC ::  chlcnm     = 0.033_wp          !:
-   REAL(wp), PUBLIC ::  chlcdm     = 0.05_wp           !:
-   REAL(wp), PUBLIC ::  chlcmin    = 0.00333_wp        !:
-   REAL(wp), PUBLIC ::  fecnm      = 10.E-6_wp         !:
-   REAL(wp), PUBLIC ::  fecdm      = 15.E-6_wp         !:
-   REAL(wp), PUBLIC ::  grosip     = 0.151_wp          !:
+   LOGICAL , PUBLIC ::  ln_newprod      !:
+   REAL(wp), PUBLIC ::  pislope         !:
+   REAL(wp), PUBLIC ::  pislope2        !:
+   REAL(wp), PUBLIC ::  excret          !:
+   REAL(wp), PUBLIC ::  excret2         !:
+   REAL(wp), PUBLIC ::  bresp           !:
+   REAL(wp), PUBLIC ::  chlcnm          !:
+   REAL(wp), PUBLIC ::  chlcdm          !:
+   REAL(wp), PUBLIC ::  chlcmin         !:
+   REAL(wp), PUBLIC ::  fecnm           !:
+   REAL(wp), PUBLIC ::  fecdm           !:
+   REAL(wp), PUBLIC ::  grosip          !:
 
    REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:) ::   prmax    !: optimal production = f(temperature)
@@ -472 +472 @@
       NAMELIST/nampisprod/ pislope, pislope2, ln_newprod, bresp, excret, excret2,  &
          &                 chlcnm, chlcdm, chlcmin, fecnm, fecdm, grosip
+      INTEGER :: ios                 ! Local integer output status for namelist read
       !!----------------------------------------------------------------------
 
-      REWIND( numnatp )                     ! read numnatp
-      READ  ( numnatp, nampisprod )
+      REWIND( numnatp_ref )              ! Namelist nampisprod in reference namelist : Pisces phytoplankton production
+      READ  ( numnatp_ref, nampisprod, IOSTAT = ios, ERR = 901)
+901   IF( ios /= 0 ) CALL ctl_nam ( ios , 'nampisprod in reference namelist', lwp )
+
+      REWIND( numnatp_cfg )              ! Namelist nampisprod in configuration namelist : Pisces phytoplankton production
+      READ  ( numnatp_cfg, nampisprod, IOSTAT = ios, ERR = 902 )
+902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'nampisprod in configuration namelist', lwp )
+      WRITE ( numonp, nampisprod )
 
       IF(lwp) THEN                         ! control print