Changeset 9169 for branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/trcdta.F90

Timestamp:

2017-12-26T17:32:56+01:00 (6 years ago)

Author:

gm

Message:

dev_merge_2017: all SRC: finalize the removal of useless warning when reading namelist_cfg + remove all nn_closea + nn_msh replaced by a logical

File:

• branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/trcdta.F90 (modified) (4 diffs)

branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/trcdta.F90

@@ -55 +55 @@
       !!              - allocates passive tracer data structure 
       !!----------------------------------------------------------------------
-      !
-      INTEGER,INTENT(IN) :: ntrc                             ! number of tracers
-      INTEGER            :: jl, jn                           ! dummy loop indices
-      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
+      INTEGER,INTENT(in) ::   ntrc   ! number of tracers
+      !
+      INTEGER ::   jl, jn                            ! dummy loop indices
+      INTEGER ::   ios, ierr0, ierr1, ierr2, ierr3   ! local integers
+      REAL(wp) ::   zfact
+      CHARACTER(len=100) ::   clndta, clntrc
+      !
+      CHARACTER(len=100) ::   cn_dir
       TYPE(FLD_N), ALLOCATABLE, DIMENSION(:) :: slf_i ! array of namelist informations on the fields to read
       TYPE(FLD_N), DIMENSION(jpmaxtrc) :: sn_trcdta
@@ -72 +71 @@
       !
       IF( lwp ) THEN
-         WRITE(numout,*) ' '
-         WRITE(numout,*) '  trc_dta_ini : Tracers Initial Conditions (IC)'
-         WRITE(numout,*) '  ~~~~~~~~~~~ '
+         WRITE(numout,*)
+         WRITE(numout,*) 'trc_dta_ini : Tracers Initial Conditions (IC)'
+         WRITE(numout,*) '~~~~~~~~~~~ '
       ENDIF
       !
@@ -91 +90 @@
              n_trc_index(jn) = nb_trcdta 
          ENDIF
-      ENDDO
+      END DO
       !
       ntra = MAX( 1, nb_trcdta )   ! To avoid compilation error with bounds checking
       IF(lwp) THEN
-         WRITE(numout,*) ' '
-         WRITE(numout,*) ' number of passive tracers to be initialize by data :', ntra
-         WRITE(numout,*) ' '
+         WRITE(numout,*)
+         WRITE(numout,*) '   number of passive tracers to be initialize by data :', ntra
       ENDIF
       !
       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_ini in reference namelist', lwp )
-
+901   IF( ios /= 0 )   CALL ctl_nam ( ios , 'namtrc_dta_ini 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_ini in configuration namelist', lwp )
+902   IF( ios >  0 )   CALL ctl_nam ( ios , 'namtrc_dta_ini in configuration namelist', lwp )
       IF(lwm) WRITE ( numont, namtrc_dta )
 
@@ -121 +118 @@
                   &              ' differs from that of tracer : '//TRIM(clntrc)//' ')
                ENDIF
-               WRITE(numout,*) ' '
-               WRITE(numout,'(a, i4,3a,e11.3)') ' Read IC file for tracer number :', &
+               WRITE(numout,*)
+               WRITE(numout,'(a, i4,3a,e11.3)') '   Read IC file for tracer number :', &
                &            jn, ', name : ', TRIM(clndta), ', Multiplicative Scaling factor : ', zfact
             ENDIF