Changeset 9169 for branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/CFC/trcnam_cfc.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/CFC/trcnam_cfc.F90 (modified) (3 diffs)

branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/CFC/trcnam_cfc.F90

@@ -24 +24 @@
    !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt)
    !!----------------------------------------------------------------------
-
 CONTAINS
 
@@ -38 +37 @@
       !! ** input   :   Namelist namcfc
       !!----------------------------------------------------------------------
-      INTEGER :: ios                 ! Local integer output status for namelist read
-      INTEGER :: jl, jn
+      INTEGER ::   ios   ! Local integer
+      INTEGER ::   jl, jn
       !!
       NAMELIST/namcfc/ ndate_beg, nyear_res, clname
       !!----------------------------------------------------------------------
+      !
+      IF(lwp) THEN
+         WRITE(numout,*) ' '
+         WRITE(numout,*) ' CFCs'
+         WRITE(numout,*) ' '
+         WRITE(numout,*) ' trc_nam_cfc : Read namcfc namelist for CFC chemical model'
+         WRITE(numout,*) ' ~~~~~~~~~~~'
+      ENDIF
+      !
+      REWIND( numtrc_ref )              ! Namelist namcfcdate in reference namelist : CFC parameters
+      READ  ( numtrc_ref, namcfc, IOSTAT = ios, ERR = 901)
+901   IF( ios /= 0 )   CALL ctl_nam ( ios , 'namcfc in reference namelist', lwp )
+      REWIND( numtrc_cfg )              ! Namelist namcfcdate in configuration namelist : CFC parameters
+      READ  ( numtrc_cfg, namcfc, IOSTAT = ios, ERR = 902 )
+902   IF( ios >  0 )   CALL ctl_nam ( ios , 'namcfc in configuration namelist', lwp )
+      IF(lwm) WRITE( numonr, namcfc )
+      IF(lwm) CALL FLUSH ( numonr )     ! flush output namelist CFC
+
+      IF(lwp) THEN                  ! control print
+         WRITE(numout,*) '   Namelist : namcfc'
+         WRITE(numout,*) '      initial calendar date (aammjj) for CFC     ndate_beg = ', ndate_beg, '[yymmdd]'
+         WRITE(numout,*) '      restoring time constant (year)             nyear_res = ', nyear_res
+      ENDIF
+      nyear_beg = ndate_beg / 10000
+      IF(lwp) WRITE(numout,*) '      associated initial year (aa)               nyear_beg = ', nyear_beg, '[yy]'
       !
       jn = jp_cfc0 - 1
@@ -79 +103 @@
       ENDIF
       !
-      REWIND( numtrc_ref )              ! Namelist namcfcdate in reference namelist : CFC parameters
-      READ  ( numtrc_ref, namcfc, IOSTAT = ios, ERR = 901)
-901   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namcfc in reference namelist', lwp )
-
-      REWIND( numtrc_cfg )              ! Namelist namcfcdate in configuration namelist : CFC parameters
-      READ  ( numtrc_cfg, namcfc, IOSTAT = ios, ERR = 902 )
-902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namcfc in configuration namelist', lwp )
-      IF(lwm) WRITE ( numonr, namcfc )
-
-      IF(lwp) THEN                  ! control print
-         WRITE(numout,*) ' '
-         WRITE(numout,*) ' CFCs'
-         WRITE(numout,*) ' '
-         WRITE(numout,*) ' trc_nam: Read namdates, namelist for CFC chemical model'
-         WRITE(numout,*) ' ~~~~~~~'
-         WRITE(numout,*) '    initial calendar date (aammjj) for CFC  ndate_beg = ', ndate_beg
-         WRITE(numout,*) '    restoring time constant (year)          nyear_res = ', nyear_res
-      ENDIF
-      nyear_beg = ndate_beg / 10000
-      IF(lwp) WRITE(numout,*) '    initial year (aa)                       nyear_beg = ', nyear_beg
-      !
-      IF(lwm) CALL FLUSH ( numonr )     ! flush output namelist CFC
-
    END SUBROUTINE trc_nam_cfc