Changeset 4147 for branches/2013/dev_LOCEAN_2013/NEMOGCM/NEMO/TOP_SRC/trcdta.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/trcdta.F90 (modified) (3 diffs)

branches/2013/dev_LOCEAN_2013/NEMOGCM/NEMO/TOP_SRC/trcdta.F90

@@ -53 +53 @@
       !!----------------------------------------------------------------------
       !
-      INTEGER            :: jl, jn                   ! dummy loop indicies
+      INTEGER            :: jl, jn                           ! dummy loop indicies
       INTEGER            :: ierr0, ierr1, ierr2, ierr3       ! temporary integers
+      INTEGER            :: ios                              ! Local integer output status for namelist read
       CHARACTER(len=100) :: clndta, clntrc
       REAL(wp)           :: zfact
       !
-      CHARACTER(len=100) :: cn_dir
+      CHARACTER(len=100)            :: cn_dir
       TYPE(FLD_N), DIMENSION(jptra) :: slf_i     ! array of namelist informations on the fields to read
       TYPE(FLD_N), DIMENSION(jptra) :: sn_trcdta
-      REAL(wp)   , DIMENSION(jptra) :: rn_trfac    ! multiplicative factor for tracer values
+      REAL(wp)   , DIMENSION(jptra) :: rn_trfac  ! multiplicative factor for tracer values
       !!
       NAMELIST/namtrc_dta/ sn_trcdta, cn_dir, rn_trfac 
@@ -90 +91 @@
          WRITE(numout,*) ' '
       ENDIF
-      !                         ! allocate the arrays (if necessary)
-      !
-      cn_dir  = './'            ! directory in which the model is executed
+      !
       DO jn = 1, jptra
          WRITE( clndta,'("TR_",I1)' ) jn
@@ -103 +102 @@
       END DO
       !
-      REWIND( numnat )               ! read nattrc
-      READ  ( numnat, namtrc_dta )
+      REWIND( numnat_ref )              ! Namelist namtrc_dta in reference namelist : Passive tracer input data
+      READ  ( numnat_ref, namtrc_dta, IOSTAT = ios, ERR = 901)
+901   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namtrc_dta in reference namelist', lwp )
+
+      REWIND( numnat_cfg )              ! Namelist namtrc_dta in configuration namelist : Passive tracer input data
+      READ  ( numnat_cfg, namtrc_dta, IOSTAT = ios, ERR = 902 )
+902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namtrc_dta in configuration namelist', lwp )
+      WRITE ( numont, namtrc_dta )
 
       IF( lwp ) THEN