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 4147 for branches/2013/dev_LOCEAN_2013/NEMOGCM/NEMO/LIM_SRC_2/limdmp_2.F90 – NEMO

Ignore:
Timestamp:
2013-11-04T12:51:55+01:00 (10 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_2/limdmp_2.F90

    r3635 r4147  
    9797      INTEGER  :: ji, jj, jk       ! dummy loop indices 
    9898      INTEGER  :: irelax, ierror   ! error flag for allocation 
     99      INTEGER  ::   ios            ! Local integer output status for namelist read 
    99100      ! 
    100101      REAL(wp) :: zdmpmax, zdmpmin, zfactor, zreltim ! temporary scalar 
     
    109110      ! 1)  initialize fld read structure for input data  
    110111      !     -------------------------------------------- 
    111       ln_limdmp = .false.                 !* set file information (default values) 
    112       cn_dir    = './' 
    113       ! (NB: frequency positive => hours, negative => months) 
    114       !                !    file     ! frequency ! variable ! time intep !  clim   ! 'yearly' or ! weights  ! rotation ! 
    115       !                !    name     !  (hours)  !  name    !   (T/F)    !  (T/F)  !  'monthly'  ! filename ! pairs    ! 
    116       sn_hicif = FLD_N( 'ice_damping ', -1       , 'hicif'  ,  .true.    , .true.  ,  'yearly'   ,  ''      ,  ''      ) 
    117       sn_frld  = FLD_N( 'ice_damping ', -1       , 'frld'   ,  .true.    , .true.  ,  'yearly'   ,  ''      ,  ''      ) 
     112                   
     113      REWIND( numnam_ice_ref )              ! Namelist namice_dmp in reference namelist : Ice restoring 
     114      READ  ( numnam_ice_ref, namice_dmp, IOSTAT = ios, ERR = 901) 
     115901   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namice_dmp in reference namelist', lwp ) 
    118116 
    119       REWIND( numnam_ice )                !* read in namelist_ice namicedmp 
    120       READ  ( numnam_ice, namice_dmp ) 
     117      REWIND( numnam_ice_cfg )              ! Namelist  namice_dmp in configuration namelist : Ice restoring 
     118      READ  ( numnam_ice_cfg, namice_dmp, IOSTAT = ios, ERR = 902 ) 
     119902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namice_dmp in configuration namelist', lwp ) 
     120      WRITE ( numoni, namice_dmp ) 
    121121      ! 
    122122      IF ( lwp ) THEN                     !* control print 
Note: See TracChangeset for help on using the changeset viewer.