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

Timestamp:

2013-11-04T12:51:55+01:00 (10 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/p4zsink.F90 (modified) (3 diffs)

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

@@ -44 +44 @@
 
 #if  defined key_kriest
-   REAL(wp) ::  xkr_sfact    = 250.     !: Sinking factor
-   REAL(wp) ::  xkr_stick    = 0.2      !: Stickiness
-   REAL(wp) ::  xkr_nnano    = 2.337    !: Nbr of cell in nano size class
-   REAL(wp) ::  xkr_ndiat    = 3.718    !: Nbr of cell in diatoms size class
-   REAL(wp) ::  xkr_nmicro   = 3.718    !: Nbr of cell in microzoo size class
-   REAL(wp) ::  xkr_nmeso    = 7.147    !: Nbr of cell in mesozoo  size class
-   REAL(wp) ::  xkr_naggr    = 9.877    !: Nbr of cell in aggregates  size class
+   REAL(wp) ::  xkr_sfact    !: Sinking factor
+   REAL(wp) ::  xkr_stick    !: Stickiness
+   REAL(wp) ::  xkr_nnano    !: Nbr of cell in nano size class
+   REAL(wp) ::  xkr_ndiat    !: Nbr of cell in diatoms size class
+   REAL(wp) ::  xkr_nmicro   !: Nbr of cell in microzoo size class
+   REAL(wp) ::  xkr_nmeso    !: Nbr of cell in mesozoo  size class
+   REAL(wp) ::  xkr_naggr    !: Nbr of cell in aggregates  size class
 
    REAL(wp) ::  xkr_frac 
@@ -538 +538 @@
       !!----------------------------------------------------------------------
       INTEGER  ::   jk, jn, kiter
+      INTEGER  ::   ios                 ! Local integer output status for namelist read
       REAL(wp) ::   znum, zdiv
       REAL(wp) ::   zws, zwr, zwl,wmax, znummax
@@ -548 +549 @@
       IF( nn_timing == 1 )  CALL timing_start('p4z_sink_init')
       !
-      REWIND( numnatp )                     ! read nampiskrs
-      READ  ( numnatp, nampiskrs )
+
+      REWIND( numnatp_ref )              ! Namelist nampiskrs in reference namelist : Pisces sinking Kriest
+      READ  ( numnatp_ref, nampiskrs, IOSTAT = ios, ERR = 901)
+901   IF( ios /= 0 ) CALL ctl_nam ( ios , 'nampiskrs in reference namelist', lwp )
+
+      REWIND( numnatp_cfg )              ! Namelist nampiskrs in configuration namelist : Pisces sinking Kriest
+      READ  ( numnatp_cfg, nampiskrs, IOSTAT = ios, ERR = 902 )
+902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'nampiskrs in configuration namelist', lwp )
+      WRITE ( numonp, nampiskrs )
 
       IF(lwp) THEN