Ignore:
Timestamp:
2013-11-04T12:51:55+01:00 (7 years ago)
Author:
cetlod
Message:

merge in dev_LOCEAN_2013, the 1st development branch dev_r3853_CNRS9_Confsetting, from its starting point ( r3853 ) on the trunk: see ticket #1169

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2013/dev_LOCEAN_2013/NEMOGCM/NEMO/LIM_SRC_3/limthd_sal.F90

    r3625 r4147  
    203203      !! ** input   :   Namelist namicesal 
    204204      !!------------------------------------------------------------------- 
     205      INTEGER  ::   ios                 ! Local integer output status for namelist read 
    205206      NAMELIST/namicesal/ num_sal, bulk_sal, sal_G, time_G, sal_F, time_F,   & 
    206207         &                s_i_max, s_i_min, s_i_0, s_i_1 
    207208      !!------------------------------------------------------------------- 
    208209      ! 
    209       REWIND( numnam_ice )                   ! Read Namelist namicesal 
    210       READ  ( numnam_ice  , namicesal ) 
     210      REWIND( numnam_ice_ref )              ! Namelist namicesal in reference namelist : Ice salinity 
     211      READ  ( numnam_ice_ref, namicesal, IOSTAT = ios, ERR = 901) 
     212901   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namicesal in reference namelist', lwp ) 
     213 
     214      REWIND( numnam_ice_cfg )              ! Namelist namicesal in configuration namelist : Ice salinity 
     215      READ  ( numnam_ice_cfg, namicesal, IOSTAT = ios, ERR = 902 ) 
     216902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namicesal in configuration namelist', lwp ) 
     217      WRITE ( numoni, namicesal ) 
    211218      ! 
    212219      IF(lwp) THEN                           ! control print 
Note: See TracChangeset for help on using the changeset viewer.