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 2000 for branches/DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/OBC/obcvol.F90 – NEMO

Ignore:
Timestamp:
2010-07-09T13:27:11+02:00 (14 years ago)
Author:
acc
Message:

ticket #684 step 7: Add in changes between the head of the DEV_r1821_Rivers branch and the trunk@1821. Note untested changes were made to the Rivers branch before this merge see wiki ticket page for details

File:
1 edited

Legend:

Unmodified
Added
Removed

  • branches/DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/OBC/obcvol.F90

    r1739 r2000  
    9797      ! --------------------------------------------------------------------------- 
    9898 
    99       zCflxemp = SUM ( emp(:,:)*obctmsk(:,:)* e1t(:,:) * e2t(:,:)  / rau0 ) 
     99      zCflxemp = SUM ( ( emp(:,:)-rnf(:,:) )*obctmsk(:,:)* e1t(:,:) * e2t(:,:)  / rau0 )  
    100100 
    101101      IF( lk_mpp )   CALL mpp_sum( zCflxemp )   ! sum over the global domain 
Note: See TracChangeset for help on using the changeset viewer.