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 4612 for branches – NEMO

Changeset 4612 for branches


Ignore:
Timestamp:
2014-04-02T14:17:19+02:00 (10 years ago)
Author:
cbricaud
Message:

fixe bug in diadct, ticket 1292

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2012/dev_v3_4_STABLE_2012/NEMOGCM/NEMO/OPA_SRC/DIA/diadct.F90

    r3988 r4612  
    11371137  REAL(wp):: zet1, zet2                                        ! weight for interpolation  
    11381138  REAL(wp):: zdep1,zdep2                                       ! differences of depth 
     1139  REAL(wp):: zmsk                                              ! mask value 
    11391140  !!---------------------------------------------------------------------- 
    11401141 
     
    11451146     zet1=e1t(ii1,ij1) 
    11461147     zet2=e1t(ii2,ij2) 
     1148     zmsk=umask(ii1,ij1,kk) 
    11471149 
    11481150  ELSE ! cd_point=='V'  
     
    11521154     zet1=e2t(ii1,ij1) 
    11531155     zet2=e2t(ii2,ij2) 
     1156     zmsk=vmask(ii1,ij1,kk) 
    11541157 
    11551158  ENDIF 
     
    11661169   
    11671170     ! result 
    1168      interp = umask(ii1,ij1,kk) * ( zwgt2 *  ptab(ii1,ij1,kk) + zwgt1 *  ptab(ii1,ij1,kk) ) / ( zwgt2 + zwgt1 )    
     1171     interp = zmsk * ( zwgt2 *  ptab(ii1,ij1,kk) + zwgt1 *  ptab(ii1,ij1,kk) ) / ( zwgt2 + zwgt1 )    
    11691172 
    11701173 
     
    11911194           zbis = ptab(ii2,ij2,kk) + zwgt1 * ( ptab(ii2,ij2,kk-1) - ptab(ii2,ij2,kk) )  
    11921195           ! result 
    1193             interp = umask(ii1,ij1,kk) * ( zet2 * ptab(ii1,ij1,kk) + zet1 * zbis )/( zet1 + zet2 ) 
     1196            interp = zmsk * ( zet2 * ptab(ii1,ij1,kk) + zet1 * zbis )/( zet1 + zet2 ) 
    11941197        ELSE 
    11951198           !zbis 
    11961199           zbis = ptab(ii1,ij1,kk) + zwgt2 * ( ptab(ii1,ij1,kk-1) - ptab(ii1,ij2,kk) ) 
    11971200           ! result 
    1198            interp = umask(ii1,ij1,kk) * ( zet2 * zbis + zet1 * ptab(ii2,ij2,kk) )/( zet1 + zet2 ) 
     1201           interp = zmsk * ( zet2 * zbis + zet1 * ptab(ii2,ij2,kk) )/( zet1 + zet2 ) 
    11991202        ENDIF     
    12001203 
    12011204     ELSE 
    1202         interp = umask(ii1,ij1,kk) * (  zet2 * ptab(ii1,ij1,kk) + zet1 * ptab(ii2,ij2,kk) )/( zet1 + zet2 ) 
     1205        interp = zmsk * (  zet2 * ptab(ii1,ij1,kk) + zet1 * ptab(ii2,ij2,kk) )/( zet1 + zet2 ) 
    12031206     ENDIF 
    12041207 
Note: See TracChangeset for help on using the changeset viewer.