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/OPA_SRC/DOM/dommsk.F90

    r3294 r4147  
    3939 
    4040   !                            !!* Namelist namlbc : lateral boundary condition * 
    41    REAL(wp)        :: rn_shlat   = 2.   ! type of lateral boundary condition on velocity 
    42    LOGICAL, PUBLIC :: ln_vorlat  = .false.   !  consistency of vorticity boundary condition  
     41   REAL(wp)        :: rn_shlat   ! type of lateral boundary condition on velocity 
     42   LOGICAL, PUBLIC :: ln_vorlat  !  consistency of vorticity boundary condition  
    4343   !                                            with analytical eqs. 
    4444 
     
    133133      INTEGER  ::   iif, iil, ii0, ii1, ii   ! local integers 
    134134      INTEGER  ::   ijf, ijl, ij0, ij1       !   -       - 
     135      INTEGER  ::   ios 
    135136      INTEGER , POINTER, DIMENSION(:,:) ::  imsk 
    136137      REAL(wp), POINTER, DIMENSION(:,:) ::  zwf 
     
    144145      CALL wrk_alloc( jpi, jpj, zwf  ) 
    145146      ! 
    146       REWIND( numnam )              ! Namelist namlbc : lateral momentum boundary condition 
    147       READ  ( numnam, namlbc ) 
     147      REWIND( numnam_ref )              ! Namelist namlbc in reference namelist : Lateral momentum boundary condition 
     148      READ  ( numnam_ref, namlbc, IOSTAT = ios, ERR = 901 ) 
     149901   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namlbc in reference namelist', lwp ) 
     150 
     151      REWIND( numnam_cfg )              ! Namelist namlbc in configuration namelist : Lateral momentum boundary condition 
     152      READ  ( numnam_cfg, namlbc, IOSTAT = ios, ERR = 902 ) 
     153902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namlbc in configuration namelist', lwp ) 
     154      WRITE ( numond, namlbc ) 
    148155       
    149156      IF(lwp) THEN                  ! control print 
Note: See TracChangeset for help on using the changeset viewer.