Ignore:
Timestamp:
2017-09-15T20:07:33+02:00 (3 years ago)
Author:
clem
Message:

changes in style - part6 - more clarity (still not finished)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/iceistate.F90

    r8518 r8531  
    4949   TYPE(FLD), ALLOCATABLE, DIMENSION(:) ::   si  ! structure of input fields (file informations, fields read) 
    5050   ! 
    51    ! ** namelist (namice_ini) ** 
     51   ! ** namelist (namini) ** 
    5252   LOGICAL  ::   ln_iceini        ! initialization or not 
    5353   LOGICAL  ::   ln_iceini_file   ! Ice initialization state from 2D netcdf file 
     
    512512      !! ** Purpose : Definition of initial state of the ice  
    513513      !! 
    514       !! ** Method : Read the namice_ini namelist and check the parameter  
     514      !! ** Method : Read the namini namelist and check the parameter  
    515515      !!       values called at the first timestep (nit000) 
    516516      !! 
    517517      !! ** input :  
    518       !!        Namelist namice_ini 
     518      !!        Namelist namini 
    519519      !! 
    520520      !! history : 
     
    531531      TYPE(FLD_N), DIMENSION(jpfldi) ::   slf_i                 ! array of namelist informations on the fields to read 
    532532      ! 
    533       NAMELIST/namice_ini/ ln_iceini, ln_iceini_file, rn_thres_sst, rn_hts_ini_n, rn_hts_ini_s,  & 
    534          &                rn_hti_ini_n, rn_hti_ini_s, rn_ati_ini_n, rn_ati_ini_s, rn_smi_ini_n, & 
    535          &                rn_smi_ini_s, rn_tmi_ini_n, rn_tmi_ini_s,                             & 
    536          &                sn_hti, sn_hts, sn_ati, sn_tsu, sn_tmi, sn_smi, cn_dir 
     533      NAMELIST/namini/ ln_iceini, ln_iceini_file, rn_thres_sst, rn_hts_ini_n, rn_hts_ini_s,  & 
     534         &             rn_hti_ini_n, rn_hti_ini_s, rn_ati_ini_n, rn_ati_ini_s, rn_smi_ini_n, & 
     535         &             rn_smi_ini_s, rn_tmi_ini_n, rn_tmi_ini_s,                             & 
     536         &             sn_hti, sn_hts, sn_ati, sn_tsu, sn_tmi, sn_smi, cn_dir 
    537537      !!----------------------------------------------------------------------------- 
    538538      ! 
    539       REWIND( numnam_ice_ref )              ! Namelist namice_ini in reference namelist : Ice initial state 
    540       READ  ( numnam_ice_ref, namice_ini, IOSTAT = ios, ERR = 901) 
    541 901   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namice_ini in reference namelist', lwp ) 
    542  
    543       REWIND( numnam_ice_cfg )              ! Namelist namice_ini in configuration namelist : Ice initial state 
    544       READ  ( numnam_ice_cfg, namice_ini, IOSTAT = ios, ERR = 902 ) 
    545 902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namice_ini in configuration namelist', lwp ) 
    546       IF(lwm) WRITE ( numoni, namice_ini ) 
     539      REWIND( numnam_ice_ref )              ! Namelist namini in reference namelist : Ice initial state 
     540      READ  ( numnam_ice_ref, namini, IOSTAT = ios, ERR = 901) 
     541901   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namini in reference namelist', lwp ) 
     542 
     543      REWIND( numnam_ice_cfg )              ! Namelist namini in configuration namelist : Ice initial state 
     544      READ  ( numnam_ice_cfg, namini, IOSTAT = ios, ERR = 902 ) 
     545902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namini in configuration namelist', lwp ) 
     546      IF(lwm) WRITE ( numoni, namini ) 
    547547 
    548548      slf_i(jp_hti) = sn_hti  ;  slf_i(jp_hts) = sn_hts 
     
    555555         WRITE(numout,*) 'ice_istate_init: ice parameters inititialisation ' 
    556556         WRITE(numout,*) '~~~~~~~~~~~~~~~' 
    557          WRITE(numout,*) '   Namelist namice_ini' 
     557         WRITE(numout,*) '   Namelist namini:' 
    558558         WRITE(numout,*) '      initialization with ice (T) or not (F)                 ln_iceini     = ', ln_iceini 
    559559         WRITE(numout,*) '      ice initialization from a netcdf file                ln_iceini_file  = ', ln_iceini_file 
Note: See TracChangeset for help on using the changeset viewer.