Changeset 4147 for branches/2013/dev_LOCEAN_2013/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfini.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/OPA_SRC/ZDF/zdfini.F90 (modified) (2 diffs)

branches/2013/dev_LOCEAN_2013/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfini.F90

@@ -51 +51 @@
       !!----------------------------------------------------------------------
       INTEGER ::   ioptio       ! temporary scalar
+      INTEGER ::   ios
       !!
       NAMELIST/namzdf/ rn_avm0, rn_avt0, nn_avb, nn_havtb, ln_zdfexp, nn_zdfexp,   &
@@ -56 +57 @@
       !!----------------------------------------------------------------------
 
-      REWIND( numnam )           !* Read namzdf namelist : vertical mixing parameters
-      READ  ( numnam, namzdf )
+      REWIND( numnam_ref )              ! Namelist namzdf in reference namelist : Vertical mixing parameters
+      READ  ( numnam_ref, namzdf, IOSTAT = ios, ERR = 901)
+901   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namzdf in reference namelist', lwp )
+
+      REWIND( numnam_cfg )              ! Namelist namzdf in reference namelist : Vertical mixing parameters
+      READ  ( numnam_cfg, namzdf, IOSTAT = ios, ERR = 902 )
+902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namzdf in configuration namelist', lwp )
+      WRITE ( numond, namzdf )
 
       IF(lwp) THEN               !* Parameter print