Ignore:
Timestamp:
2014-12-15T17:42:49+01:00 (7 years ago)
Author:
timgraham
Message:

Merged branches/2014/dev_MERGE_2014 back onto the trunk as follows:

In the working copy of branch ran:
svn merge svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@HEAD
1 conflict in LIM_SRC_3/limdiahsb.F90
Resolved by keeping the version from dev_MERGE_2014 branch
and commited at r4989

In working copy run:
svn switch svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk
to switch working copy

Run:
svn merge —reintegrate svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2014/dev_MERGE_2014
to merge the branch into the trunk - no conflicts at this stage.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/NEMOGCM/NEMO/OFF_SRC/domrea.F90

    r4569 r4990  
    164164 
    165165         CALL iom_get( inum4, jpdom_data, 'mbathy', zmbk )              ! number of ocean t-points 
    166          mbathy(:,:) = INT( zmbk(:,:) ) 
     166         mbathy (:,:) = INT( zmbk(:,:) ) 
     167         misfdep(:,:) = 1                                               ! ice shelf case not yet done 
    167168          
    168169         CALL zgr_bot_level                                             ! mbk. arrays (deepest ocean t-, u- & v-points 
     
    371372      ! 
    372373      mbkt(:,:) = MAX( mbathy(:,:) , 1 )    ! bottom k-index of T-level (=1 over land) 
     374      mikt(:,:) = 1 ; miku(:,:) = 1; mikv(:,:) = 1; ! top k-index of T-level (=1 over open ocean; >1 beneath ice shelf) 
    373375      !                                     ! bottom k-index of W-level = mbkt+1 
    374376      DO jj = 1, jpjm1                      ! bottom k-index of u- (v-) level 
Note: See TracChangeset for help on using the changeset viewer.