Ignore:
Timestamp:
2014-12-15T17:42:49+01:00 (6 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/OPA_SRC/BDY/bdyvol.F90

    r4292 r4990  
    1717   USE timing          ! Timing 
    1818   USE oce             ! ocean dynamics and tracers  
     19   USE sbcisf          ! ice shelf 
    1920   USE dom_oce         ! ocean space and time domain  
    2021   USE phycst          ! physical constants 
     
    9091      ! Calculate the cumulate surface Flux z_cflxemp (m3/s) over all the domain 
    9192      ! ----------------------------------------------------------------------- 
    92       z_cflxemp = SUM ( ( emp(:,:)-rnf(:,:) ) * bdytmask(:,:) * e1t(:,:) * e2t(:,:) ) / rau0 
     93      z_cflxemp = SUM ( ( emp(:,:)-rnf(:,:)+rdivisf*fwfisf(:,:) ) * bdytmask(:,:) * e1t(:,:) * e2t(:,:) ) / rau0 
    9394      IF( lk_mpp )   CALL mpp_sum( z_cflxemp )     ! sum over the global domain 
    9495 
Note: See TracChangeset for help on using the changeset viewer.