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 9120 for branches/UKMO/dev_r8814_surge_modelling_Nemo4/NEMOGCM/NEMO/OPA_SRC/DYN/dynvor.F90 – NEMO

Ignore:
Timestamp:
2017-12-18T18:29:02+01:00 (6 years ago)
Author:
clne
Message:

Initial work on 2D surge configuration. Works for tide-only, no SBC yet

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/UKMO/dev_r8814_surge_modelling_Nemo4/NEMOGCM/NEMO/OPA_SRC/DYN/dynvor.F90

    r7913 r9120  
    304304               zx1 = zwx(ji-1,jj) + zwx(ji-1,jj+1) 
    305305               zx2 = zwx(ji  ,jj) + zwx(ji  ,jj+1) 
    306                pua(ji,jj,jk) = pua(ji,jj,jk) + r1_4 * r1_e1u(ji,jj) * ( zwz(ji  ,jj-1) * zy1 + zwz(ji,jj) * zy2 ) 
    307                pva(ji,jj,jk) = pva(ji,jj,jk) - r1_4 * r1_e2v(ji,jj) * ( zwz(ji-1,jj  ) * zx1 + zwz(ji,jj) * zx2 )  
     306               pua(ji,jj,jk) = pua(ji,jj,jk) + r1_4 * r1_e1u(ji,jj) * ( zwz(ji  ,jj-1) * zy1 + zwz(ji,jj) * zy2 ) * umask(ji,jj,jk) 
     307               pva(ji,jj,jk) = pva(ji,jj,jk) - r1_4 * r1_e2v(ji,jj) * ( zwz(ji-1,jj  ) * zx1 + zwz(ji,jj) * zx2 ) * vmask(ji,jj,jk) 
    308308            END DO   
    309309         END DO   
     
    424424               zvau =-r1_8 * r1_e2v(ji,jj) * (  zwx(ji-1,jj  ) + zwx(ji-1,jj+1)  & 
    425425                  &                           + zwx(ji  ,jj  ) + zwx(ji  ,jj+1)  ) 
    426                pua(ji,jj,jk) = pua(ji,jj,jk) + zuav * ( zwz(ji  ,jj-1) + zwz(ji,jj) ) 
    427                pva(ji,jj,jk) = pva(ji,jj,jk) + zvau * ( zwz(ji-1,jj  ) + zwz(ji,jj) ) 
     426               pua(ji,jj,jk) = pua(ji,jj,jk) + zuav * ( zwz(ji  ,jj-1) + zwz(ji,jj) ) * umask(ji,jj,jk) 
     427               pva(ji,jj,jk) = pva(ji,jj,jk) + zvau * ( zwz(ji-1,jj  ) + zwz(ji,jj) ) * vmask(ji,jj,jk) 
    428428            END DO   
    429429         END DO   
     
    591591               zva = - r1_12 * r1_e2v(ji,jj) * (  ztsw(ji,jj+1) * zwx(ji-1,jj+1) + ztse(ji,jj+1) * zwx(ji  ,jj+1)   & 
    592592                  &                             + ztnw(ji,jj  ) * zwx(ji-1,jj  ) + ztne(ji,jj  ) * zwx(ji  ,jj  ) ) 
    593                pua(ji,jj,jk) = pua(ji,jj,jk) + zua 
    594                pva(ji,jj,jk) = pva(ji,jj,jk) + zva 
     593               pua(ji,jj,jk) = pua(ji,jj,jk) + zua * umask(ji,jj,jk) 
     594               pva(ji,jj,jk) = pva(ji,jj,jk) + zva * vmask(ji,jj,jk) 
    595595            END DO   
    596596         END DO   
Note: See TracChangeset for help on using the changeset viewer.