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/cla.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/cla.F90

    r1146 r2000  
    163163         DO ji = mi0(148), mi1(160) 
    164164            zwei    = tmask(ji,jj,1) * e1t(ji,jj) * e2t(ji,jj) 
    165             zempred = zempred + emp(ji,jj) * zwei 
     165            zempred = zempred + ( emp(ji,jj) - rnf(ji,jj) ) * zwei  
    166166         END DO 
    167167      END DO 
     
    365365         DO ji = mi0(141),mi1(181) 
    366366            zwei    = tmask(ji,jj,1) * e1t(ji,jj) * e2t(ji,jj) 
    367             zempmed = zempmed + emp(ji,jj) * zwei 
     367            zempmed = zempmed + ( emp(ji,jj) - rnf(ji,jj) ) * zwei  
    368368         END DO 
    369369      END DO 
     
    374374      DO jj = mj0(96),mj1(96) 
    375375         DO ji = mi0(148),mi1(148) 
    376             zempmed = zempmed  -  emp(ji  ,jj) * tmask(ji  ,jj,1) * e1t(ji  ,jj) * e2t(ji  ,jj)   & 
    377                                -  emp(ji+1,jj) * tmask(ji+1,jj,1) * e1t(ji+1,jj) * e2t(ji+1,jj)    
     376            zempmed = zempmed  -  ( emp(ji  ,jj)-rnf(ji  ,jj) ) * tmask(ji  ,jj,1) * e1t(ji  ,jj) * e2t(ji  ,jj)   &  
     377                               -  ( emp(ji+1,jj)-rnf(ji+1,jj) ) * tmask(ji+1,jj,1) * e1t(ji+1,jj) * e2t(ji+1,jj)     
    378378         END DO 
    379379      END DO 
     
    389389      zu3_ms(:) = zu3_ms_i(:) 
    390390 
    391       ! velocity profile at 139,101  South point + emp on surface  
     391      ! velocity profile at 139,101  South point + (emp-rnf) on surface  
    392392      DO jk = 1, 14                       
    393393         DO jj = mj0(102), mj1(102)  
     
    399399 
    400400      ! profile at East Gibraltar     
    401       ! velocity profile at 141,102  + emp on surface  
     401      ! velocity profile at 141,102  + (emp-rnf) on surface  
    402402      DO  jk = 1, 14                      
    403403         DO jj = mj0(102), mj1(102)  
Note: See TracChangeset for help on using the changeset viewer.