Changeset 4616 for branches/2014/dev_CNRS0_NOC1_LDF/NEMOGCM/NEMO/OPA_SRC/DYN/dynldf_bilapg.F90

Timestamp:

2014-04-06T17:28:25+02:00 (10 years ago)

Author:

gm

Message:

#1260 : see the associated wiki page for explanation

File:

• branches/2014/dev_CNRS0_NOC1_LDF/NEMOGCM/NEMO/OPA_SRC/DYN/dynldf_bilapg.F90 (modified) (4 diffs)

branches/2014/dev_CNRS0_NOC1_LDF/NEMOGCM/NEMO/OPA_SRC/DYN/dynldf_bilapg.F90

@@ -161 +161 @@
       !!      ===========  pu as follows (idem on pv)
       !!      vertical fluxes :
-      !!         zftw = e1t*e2t/e3w * (ahm*wslpi^2+ahm*wslpj^2)  dk-1[ pu ]
-      !!              -     e2t     *  ahm*wslpi                di[ mi(mk(pu)) ]
-      !!              -     e1t     *  ahm*wslpj                dj[ mj(mk(pu)) ]
+      !!         zftw = e1e2t/e3w * (ahm*wslpi^2+ahm*wslpj^2)  dk-1[ pu ]
+      !!              -   e2t     *  ahm*wslpi                di[ mi(mk(pu)) ]
+      !!              -   e1t     *  ahm*wslpj                dj[ mj(mk(pu)) ]
       !!      take the vertical divergence of the fluxes add it to the hori-
       !!      zontal component, divide the result by the volume element :
-      !!         plu  =  zsign / (e1t*e2t*e3t) { plu + dk[ zftw ] }
+      !!         plu  =  zsign / (e1e2t*e3t) { plu + dk[ zftw ] }
       !!      where  zsign=+1  if kahm =1 (laplacian or 1st pass of bilaplacian)
       !!                  =-1  if kahm =2 (2nd pass in case of bilaplacian)
@@ -369 +369 @@
                zuwslpj = 0.5 * ( wslpj(ji+1,jj,jk) + wslpj(ji,jj,jk) )
                ! coef. for the vertical dirative
-               zcoef0 = e1u(ji,jj) * e2u(ji,jj) / fse3u(ji,jj,jk)   &
+               zcoef0 = e1e2u(ji,jj) / fse3u(ji,jj,jk)   &
                   &   * ( zuwslpi * zuwslpi + zuwslpj * zuwslpj )
                ! weights for the i-k, j-k averaging at t- and f-points, resp.
@@ -403 +403 @@
                zvwslpj = 0.5 * ( wslpj(ji,jj+1,jk) + wslpj(ji,jj,jk) )
                ! coef. for the vertical derivative
-               zcoef0 = e1v(ji,jj) * e2v(ji,jj) / fse3v(ji,jj,jk)   &
+               zcoef0 = e1e2v(ji,jj) / fse3v(ji,jj,jk)   &
                   &   * ( zvwslpi * zvwslpi + zvwslpj * zvwslpj )
 !!gm caution here fmask multiplication already done in the def of ahmf...
@@ -439 +439 @@
                zvav = zfvw(ji,jk) - zfvw(ji,jk+1)
                ! harmonic operator applied to (pu,pv) and multiply by ahm
-               plu(ji,jj,jk) = zsign * ( plu(ji,jj,jk) + zuav ) / ( e1u(ji,jj)*e2u(ji,jj)*fse3u(ji,jj,jk) )
-               plv(ji,jj,jk) = zsign * ( plv(ji,jj,jk) + zvav ) / ( e1v(ji,jj)*e2v(ji,jj)*fse3v(ji,jj,jk) )
+               plu(ji,jj,jk) = zsign * ( plu(ji,jj,jk) + zuav ) / ( e1e2u(ji,jj)*fse3u(ji,jj,jk) )
+               plv(ji,jj,jk) = zsign * ( plv(ji,jj,jk) + zvav ) / ( e1e2v(ji,jj)*fse3v(ji,jj,jk) )
             END DO
          END DO