Changeset 4147 for branches/2013/dev_LOCEAN_2013/NEMOGCM/NEMO/OPA_SRC/TRD/trdmod.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/TRD/trdmod.F90 (modified) (1 diff)

branches/2013/dev_LOCEAN_2013/NEMOGCM/NEMO/OPA_SRC/TRD/trdmod.F90

@@ -251 +251 @@
       !!----------------------------------------------------------------------
       USE in_out_manager          ! I/O manager
+      USE lib_mpp                 ! MPP library
       !!    
       NAMELIST/namtrd/ nn_trd, nn_ctls, cn_trdrst_in, cn_trdrst_out, ln_trdmld_restart, rn_ucf, ln_trdmld_instant
+      INTEGER  ::   ios           ! Local integer output status for namelist read
       !!----------------------------------------------------------------------
 
       IF( l_trdtra .OR. l_trddyn )   THEN
-         REWIND( numnam )
-         READ  ( numnam, namtrd )      ! namelist namtrd : trends diagnostic
+ 
+         REWIND( numnam_ref )              ! Namelist namtrd in reference namelist : Diagnostics: trends
+         READ  ( numnam_ref, namtrd, IOSTAT = ios, ERR = 901)
+901      IF( ios /= 0 ) CALL ctl_nam ( ios , 'namtrd in reference namelist', lwp )
+
+         REWIND( numnam_cfg )              ! Namelist namtrd in configuration namelist : Diagnostics: trends
+         READ  ( numnam_cfg, namtrd, IOSTAT = ios, ERR = 902 )
+902      IF( ios /= 0 ) CALL ctl_nam ( ios , 'namtrd in configuration namelist', lwp )
+         WRITE ( numond, namtrd )
 
          IF(lwp) THEN