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 12166 for NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/LDF/ldftra.F90 – NEMO

Ignore:
Timestamp:
2019-12-11T09:53:24+01:00 (4 years ago)
Author:
cetlod
Message:

dev_merge_option2 : merge in ENHANCE-02_ISF_nemo branch

File:
1 edited

Legend:

Unmodified
Added
Removed

  • NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/LDF/ldftra.F90

    r12109 r12166  
    662662                  ! eddies using the isopycnal slopes calculated in ldfslp.F :  
    663663                  ! T^-1 = sqrt(m_jpk(N^2*(r1^2+r2^2)*e3w)) 
    664                   ze3w = e3w_n(ji,jj,jk) * tmask(ji,jj,jk) 
     664                  ze3w = e3w_n(ji,jj,jk) * wmask(ji,jj,jk) 
    665665                  zah(ji,jj) = zah(ji,jj) + zn2 * wslp2(ji,jj,jk) * ze3w 
    666666                  zhw(ji,jj) = zhw(ji,jj) + ze3w 
    … …  
    680680                  ! eddies using the isopycnal slopes calculated in ldfslp.F :  
    681681                  ! T^-1 = sqrt(m_jpk(N^2*(r1^2+r2^2)*e3w)) 
    682                   ze3w = e3w_n(ji,jj,jk) * tmask(ji,jj,jk) 
     682                  ze3w = e3w_n(ji,jj,jk) * wmask(ji,jj,jk) 
    683683                  zah(ji,jj) = zah(ji,jj) + zn2 * ( wslpi(ji,jj,jk) * wslpi(ji,jj,jk)   & 
    684684                     &                            + wslpj(ji,jj,jk) * wslpj(ji,jj,jk) ) * ze3w 
Note: See TracChangeset for help on using the changeset viewer.