New URL for NEMO forge!   http://forge.nemo-ocean.eu

Since March 2022 along with NEMO 4.2 release, the code development moved to a self-hosted GitLab.
This present forge is now archived and remained online for history.
Changeset 9168 for branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DIA – NEMO

Ignore:
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

Location:
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DIA
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DIA/dia25h.F90

    r9019 r9168  
    5454      REWIND ( numnam_ref )              ! Read Namelist nam_dia25h in reference namelist : 25hour mean diagnostics 
    5555      READ   ( numnam_ref, nam_dia25h, IOSTAT=ios, ERR= 901 ) 
    56 901   IF( ios /= 0 ) CALL ctl_nam ( ios , 'nam_dia25h in reference namelist', lwp ) 
    57  
     56901   IF( ios /= 0 )   CALL ctl_nam ( ios , 'nam_dia25h in reference namelist', lwp ) 
    5857      REWIND( numnam_cfg )              ! Namelist nam_dia25h in configuration namelist  25hour diagnostics 
    5958      READ  ( numnam_cfg, nam_dia25h, IOSTAT = ios, ERR = 902 ) 
    60 902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'nam_dia25h in configuration namelist', lwp ) 
     59902   IF( ios >  0 )  CALL ctl_nam ( ios , 'nam_dia25h in configuration namelist', lwp ) 
    6160      IF(lwm) WRITE ( numond, nam_dia25h ) 
    6261 

  • branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DIA/diaharm.F90

    r9124 r9168  
    8888      REWIND( numnam_ref )              ! Namelist nam_diaharm in reference namelist : Tidal harmonic analysis 
    8989      READ  ( numnam_ref, nam_diaharm, IOSTAT = ios, ERR = 901) 
    90 901   IF( ios /= 0 ) CALL ctl_nam ( ios , 'nam_diaharm in reference namelist', lwp ) 
    91  
     90901   IF( ios /= 0 )   CALL ctl_nam ( ios , 'nam_diaharm in reference namelist', lwp ) 
    9291      REWIND( numnam_cfg )              ! Namelist nam_diaharm in configuration namelist : Tidal harmonic analysis 
    9392      READ  ( numnam_cfg, nam_diaharm, IOSTAT = ios, ERR = 902 ) 
    94 902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'nam_diaharm in configuration namelist', lwp ) 
     93902   IF( ios >  0 )  CALL ctl_nam ( ios , 'nam_diaharm in configuration namelist', lwp ) 
    9594      IF(lwm) WRITE ( numond, nam_diaharm ) 
    9695      ! 

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

    r9124 r9168  
    1313   !!   dia_hsb_init  : Initialization of the conservation diagnostic 
    1414   !!---------------------------------------------------------------------- 
    15    USE oce             ! ocean dynamics and tracers 
    16    USE dom_oce         ! ocean space and time domain 
    17    USE phycst          ! physical constants 
    18    USE sbc_oce         ! surface thermohaline fluxes 
    19    USE sbcrnf          ! river runoff 
    20    USE sbcisf          ! ice shelves 
    21    USE domvvl          ! vertical scale factors 
    22    USE traqsr          ! penetrative solar radiation 
    23    USE trabbc          ! bottom boundary condition  
    24    USE trabbc          ! bottom boundary condition 
    25    USE restart         ! ocean restart 
    26    USE bdy_oce   , ONLY: ln_bdy 
     15   USE oce            ! ocean dynamics and tracers 
     16   USE dom_oce        ! ocean space and time domain 
     17   USE phycst         ! physical constants 
     18   USE sbc_oce        ! surface thermohaline fluxes 
     19   USE sbcrnf         ! river runoff 
     20   USE sbcisf         ! ice shelves 
     21   USE domvvl         ! vertical scale factors 
     22   USE traqsr         ! penetrative solar radiation 
     23   USE trabbc         ! bottom boundary condition  
     24   USE trabbc         ! bottom boundary condition 
     25   USE restart        ! ocean restart 
     26   USE bdy_oce , ONLY : ln_bdy 
    2727   ! 
    28    USE iom             ! I/O manager 
    29    USE in_out_manager  ! I/O manager 
    30    USE lib_fortran     ! glob_sum 
    31    USE lib_mpp         ! distributed memory computing library 
    32    USE timing          ! preformance summary 
     28   USE iom            ! I/O manager 
     29   USE in_out_manager ! I/O manager 
     30   USE lib_fortran    ! glob_sum 
     31   USE lib_mpp        ! distributed memory computing library 
     32   USE timing         ! preformance summary 
    3333 
    3434   IMPLICIT NONE 
    … …  
    346346      REWIND( numnam_ref )              ! Namelist namhsb in reference namelist 
    347347      READ  ( numnam_ref, namhsb, IOSTAT = ios, ERR = 901) 
    348 901   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namhsb in reference namelist', lwp ) 
    349  
     348901   IF( ios /= 0 )   CALL ctl_nam ( ios , 'namhsb in reference namelist', lwp ) 
    350349      REWIND( numnam_cfg )              ! Namelist namhsb in configuration namelist 
    351350      READ  ( numnam_cfg, namhsb, IOSTAT = ios, ERR = 902 ) 
    352 902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namhsb in configuration namelist', lwp ) 
     351902   IF( ios >  0 )  CALL ctl_nam ( ios , 'namhsb in configuration namelist', lwp ) 
    353352      IF(lwm) WRITE ( numond, namhsb ) 
    354353 
    355354      IF(lwp) THEN 
    356355         WRITE(numout,*) 
    357          WRITE(numout,*) 'dia_hsb_init' 
    358          WRITE(numout,*) '~~~~~~~~ ' 
    359          WRITE(numout,*) '  check the heat and salt budgets (T) or not (F)       ln_diahsb = ', ln_diahsb 
     356         WRITE(numout,*) 'dia_hsb_init : heat and salt budgets diagnostics' 
     357         WRITE(numout,*) '~~~~~~~~~~~~ ' 
     358         WRITE(numout,*) '   Namelist  namhsb :' 
     359         WRITE(numout,*) '      check the heat and salt budgets (T) or not (F)       ln_diahsb = ', ln_diahsb 
    360360      ENDIF 
    361361      ! 
Note: See TracChangeset for help on using the changeset viewer.