Changeset 2142 for branches

Timestamp:

2010-10-01T12:04:53+02:00 (14 years ago)

Author:

sga

Message:

NEMO branch DEV_r1924_nocs_latphys. George Nurser.

DOC/NEMO_book.tex:

Removed local additions

NEMO/OPA_SRC/LDF/ldfslp.F90:

Calculate triad volumes as quarter of u- & v-volumes
Include tapering factor into zsxe, so now terms in wslp2
are implicitly multiplied by tapering factor²

Location:

branches/DEV_r1924_nocs_latphys

Files:

• DOC/NEMO_book.tex (modified) (1 diff)
• NEMO/OPA_SRC/LDF/ldfslp.F90 (modified) (9 diffs)

branches/DEV_r1924_nocs_latphys/DOC/NEMO_book.tex

@@ -131 +131 @@
 %% agn use maths shortcuts
 \usepackage{math_abbrev}
-
-%% agn give footer with commit hash
-%%    need to call (pdf)latex with --enable-write18
-\immediate\write18{sh ./vc -m}
-\input{vc}
-\fancyfoot[LE,LO]{\textcolor{gray}{\small{Rev: \VCRevisionMod}}}
-\fancyfoot[RE,RO]{\textcolor{gray}{\small{Time: \VCDateISO~\VCTime}}}
 
 %%% essai commande

branches/DEV_r1924_nocs_latphys/NEMO/OPA_SRC/LDF/ldfslp.F90

@@ -383 +383 @@
           zdnds, zddds, znum, zden,       &  !     "        "
           zsxe, za_sxe, zslopec, zdsloper,&  !     "        "
-          zfact, zepsln, zdx, zdy, zatempw,zatempu,zatempv, &   !     "        "
-          ze1ur,ze2vr,ze3wr,zdxt,zdxs,zdyt,zdys,zdzt,zdzs,zarea,zvolf
+          zfact, zepsln, zatempw,zatempu,zatempv, &   !     "        "
+          ze1ur,ze2vr,ze3wr,zdxt,zdxs,zdyt,zdys,zdzt,zdzs,zvolf
      REAL(wp), DIMENSION(jpi,jpj,jpk) ::   &
           zdkt,zdks
-     REAL(wp), DIMENSION(jpi,jpj,jpk,2) ::   &
-          zdelta2
      !!----------------------------------------------------------------------
 
@@ -556 +554 @@
         zdks(:,:,1) = 0.0
 
-        DO jk = 1, jpkm1
-           DO ji = 1, fs_jpim1   ! vector opt.
-              zdelta2(ji,:,jk,1)=MIN((fsdept(ji,:,jk)-fsdepw(ji,:,jk)),(fsdept(ji+1,:,jk)-fsdepw(ji+1,:,jk)))
-              zdelta2(ji,:,jk,2)=MIN((fsdepw(ji,:,jk+1)-fsdept(ji,:,jk)),(fsdepw(ji+1,:,jk+1)-fsdept(ji+1,:,jk)))
-           END DO
-        END DO
-
         ! interior (1=<jk=<jpk-1)
         DO ip=0,1
@@ -577 +568 @@
                        zdxs=zdis(ji,jj,jk)*ze1ur
 
-                       zdx=(e1t(ji+ip,jj)+e1u(ji,jj))/4
                        ze3wr=1.0/fse3w(ji+ip,jj,jk+kp)
                        zdzt=zdkt(ji+ip,jj,jk+kp)*ze3wr
@@ -588 +578 @@
                        za_sxe = MAX(-1.0,za_sxe)
                        zfact = 0.5*(1.0-za_sxe)*umask(ji,jj,jk)*tmask(ji+ip,jj,jk+kp)
-
-                       zarea=zdx*zdelta2(ji,jj,jk,kp+1)
-                       zvolf=zarea*e2t(ji+ip,jj)*zfact
+                       zsxe = zsxe*zfact
+
+                       zvolf = 0.25_wp*e1u(ji,jj)*e2u(ji,jj)*fse3u(ji,jj,jk)
 
                        ftu(ji,jj,jk)= ftu(ji,jj,jk)+zsxe*zdzt*zvolf*ze1ur
@@ -598 +588 @@
                        tfw(ji+ip,jj,jk+kp)=tfw(ji+ip,jj,jk+kp)+(zvolf*ze3wr)*zsxe*zdxt
                        sfw(ji+ip,jj,jk+kp)=sfw(ji+ip,jj,jk+kp)+(zvolf*ze3wr)*zsxe*zdxs
-                       wslp2(ji+ip,jj,jk+kp)=wslp2(ji+ip,jj,jk+kp)+(zarea*ze3wr/e1t(ji+ip,jj))*zfact*(zsxe)**2
+                       wslp2(ji+ip,jj,jk+kp)=wslp2(ji+ip,jj,jk+kp)+ &
+                            & ((zvolf*ze3wr)/(e1t(ji+ip,jj)*e2t(ji+ip,jj)))*(zsxe)**2
 
                     END DO
@@ -607 +598 @@
         END DO
 
-        DO jk = 1, jpkm1
-           DO jj = 1, jpjm1
-              zdelta2(:,jj,jk,1)=MIN((fsdept(:,jj,jk)-fsdepw(:,jj,jk)),(fsdept(:,jj+1,jk)-fsdepw(:,jj+1,jk)))
-              zdelta2(:,jj,jk,2)=MIN((fsdepw(:,jj,jk+1)-fsdept(:,jj,jk)),(fsdepw(:,jj+1,jk+1)-fsdept(:,jj+1,jk)))
-           END DO
-        END DO
-
         DO jp=0,1
            DO kp=0,1
@@ -625 +609 @@
                        zdys=zdjs(ji,jj,jk)*ze2vr
 
-                       zdy=(e2t(ji,jj+jp)+e2v(ji,jj))/4
                        ze3wr=1.0/fse3w(ji,jj+jp,jk+kp)
                        zdzt=zdkt(ji,jj+jp,jk+kp)*ze3wr
@@ -636 +619 @@
                        za_sxe = MAX(-1.0,za_sxe)
                        zfact = 0.5*(1.0-za_sxe)*vmask(ji,jj,jk)*tmask(ji,jj+jp,jk+kp)
-
-                       zarea=zdy*zdelta2(ji,jj,jk,kp+1)
-                       zvolf=zarea*e1t(ji,jj+jp)*zfact
+                       zsxe = zsxe*zfact
+
+                       zvolf = 0.25_wp*e1v(ji,jj)*e2v(ji,jj)*fse3v(ji,jj,jk)
 
                        ftv(ji,jj,jk)= ftv(ji,jj,jk)+zsxe*zdzt*zvolf*ze2vr
@@ -646 +629 @@
                        tfw(ji,jj+jp,jk+kp)=tfw(ji,jj+jp,jk+kp)+(zvolf*ze3wr)*zsxe*zdyt
                        sfw(ji,jj+jp,jk+kp)=sfw(ji,jj+jp,jk+kp)+(zvolf*ze3wr)*zsxe*zdys
-                       wslp2(ji,jj+jp,jk+kp)=wslp2(ji,jj+jp,jk+kp)+(zarea*ze3wr/e2t(ji,jj+jp))*zfact*(zsxe)**2
+                       wslp2(ji,jj+jp,jk+kp)=wslp2(ji,jj+jp,jk+kp)+ &
+                            & ((zvolf*ze3wr)/(e1t(ji,jj+jp)*e2t(ji,jj+jp)))*(zsxe)**2
 
                     END DO