Changeset 9168 for branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DIA/diahsb.F90

Timestamp:

2017-12-23T13:27:17+01:00 (6 years ago)

Author:

gm

Message:

dev_merge_2017: OPA_SRC & CONFIG: remove useless warning when reading namelist_cfg

File:

• branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DIA/diahsb.F90 (modified) (2 diffs)

branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DIA/diahsb.F90

@@ -13 +13 @@
    !!   dia_hsb_init  : Initialization of the conservation diagnostic
    !!----------------------------------------------------------------------
-   USE oce             ! ocean dynamics and tracers
-   USE dom_oce         ! ocean space and time domain
-   USE phycst          ! physical constants
-   USE sbc_oce         ! surface thermohaline fluxes
-   USE sbcrnf          ! river runoff
-   USE sbcisf          ! ice shelves
-   USE domvvl          ! vertical scale factors
-   USE traqsr          ! penetrative solar radiation
-   USE trabbc          ! bottom boundary condition 
-   USE trabbc          ! bottom boundary condition
-   USE restart         ! ocean restart
-   USE bdy_oce   , ONLY: ln_bdy
+   USE oce            ! ocean dynamics and tracers
+   USE dom_oce        ! ocean space and time domain
+   USE phycst         ! physical constants
+   USE sbc_oce        ! surface thermohaline fluxes
+   USE sbcrnf         ! river runoff
+   USE sbcisf         ! ice shelves
+   USE domvvl         ! vertical scale factors
+   USE traqsr         ! penetrative solar radiation
+   USE trabbc         ! bottom boundary condition 
+   USE trabbc         ! bottom boundary condition
+   USE restart        ! ocean restart
+   USE bdy_oce , ONLY : ln_bdy
    !
-   USE iom             ! I/O manager
-   USE in_out_manager  ! I/O manager
-   USE lib_fortran     ! glob_sum
-   USE lib_mpp         ! distributed memory computing library
-   USE timing          ! preformance summary
+   USE iom            ! I/O manager
+   USE in_out_manager ! I/O manager
+   USE lib_fortran    ! glob_sum
+   USE lib_mpp        ! distributed memory computing library
+   USE timing         ! preformance summary
 
    IMPLICIT NONE
@@ -346 +346 @@
       REWIND( numnam_ref )              ! Namelist namhsb in reference namelist
       READ  ( numnam_ref, namhsb, IOSTAT = ios, ERR = 901)
-901   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namhsb in reference namelist', lwp )
-
+901   IF( ios /= 0 )   CALL ctl_nam ( ios , 'namhsb in reference namelist', lwp )
       REWIND( numnam_cfg )              ! Namelist namhsb in configuration namelist
       READ  ( numnam_cfg, namhsb, IOSTAT = ios, ERR = 902 )
-902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namhsb in configuration namelist', lwp )
+902   IF( ios >  0 )   CALL ctl_nam ( ios , 'namhsb in configuration namelist', lwp )
       IF(lwm) WRITE ( numond, namhsb )
 
       IF(lwp) THEN
          WRITE(numout,*)
-         WRITE(numout,*) 'dia_hsb_init'
-         WRITE(numout,*) '~~~~~~~~ '
-         WRITE(numout,*) '  check the heat and salt budgets (T) or not (F)       ln_diahsb = ', ln_diahsb
+         WRITE(numout,*) 'dia_hsb_init : heat and salt budgets diagnostics'
+         WRITE(numout,*) '~~~~~~~~~~~~ '
+         WRITE(numout,*) '   Namelist  namhsb :'
+         WRITE(numout,*) '      check the heat and salt budgets (T) or not (F)       ln_diahsb = ', ln_diahsb
       ENDIF
       !