Ignore:
Timestamp:
2017-12-13T19:01:03+01:00 (3 years ago)
Author:
timgraham
Message:

Resolved conflicts in namelists

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/WAD/MY_SRC/usrdef_zgr.F90

    r7616 r9024  
    1616   USE oce            ! ocean variables 
    1717   USE dom_oce ,  ONLY: ln_zco, ln_zps, ln_sco   ! ocean space and time domain 
    18    USE dom_oce ,  ONLY: mi0, mi1, nimpp, njmpp,  & 
    19                       & mj0, mj1, glamt, gphit   ! ocean space and time domain 
     18   USE dom_oce ,  ONLY: ht_0, mi0, mi1, nimpp, njmpp,  & 
     19                      & mj0, mj1, glamt, gphit         ! ocean space and time domain 
    2020   USE usrdef_nam     ! User defined : namelist variables 
    21    USE wet_dry ,  ONLY: rn_wdmin1, rn_wdmin2, rn_wdld, ht_wd 
     21   USE wet_dry ,  ONLY: rn_wdmin1, rn_wdmin2, rn_wdld  ! Wetting and drying 
    2222   ! 
    2323   USE in_out_manager ! I/O manager 
     
    232232         END SELECT 
    233233      END IF 
    234                ! 
    235       ! 
     234               
     235 
    236236      ! at u-point: averaging zht 
    237237      DO ji = 1, jpim1 
     
    283283      IF ( ln_sco ) THEN      !==  s-coordinate  ==!   (terrain-following coordinate) 
    284284         ! 
    285          ht_wd = zht 
     285         ht_0 = zht 
    286286         k_bot(:,:) = jpkm1 * k_top(:,:)  !* bottom ocean = jpk-1 (here use k_top as a land mask) 
    287287         DO jj = 1, jpj 
Note: See TracChangeset for help on using the changeset viewer.