Changeset 2408 for LMDZ5/branches/testing/libf/dynlonlat_phylonlat/calfis.F

Timestamp:

Dec 14, 2015, 11:43:09 AM (9 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r2298:2396 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/dynlonlat_phylonlat/calfis.F (modified) (6 diffs)

LMDZ5/branches/testing/libf/dynlonlat_phylonlat/calfis.F

@@ -139 +139 @@
       REAL zphi(ngridmx,llm),zphis(ngridmx)
 c
-      REAL zufi(ngridmx,llm), zvfi(ngridmx,llm)
+      REAL zrot(iip1,jjm,llm) ! AdlC May 2014
+      REAL zufi(ngridmx,llm), zvfi(ngridmx,llm), zrfi(ngridmx,llm)
       REAL ztfi(ngridmx,llm),zqfi(ngridmx,llm,nqtot)
 c
@@ -350 +351 @@
 
 
+C  Alvaro de la Camara (May 2014)
+C  46.1 Calcul de la vorticite et passage sur la grille physique
+C  --------------------------------------------------------------
+      DO l=1,llm
+        do i=1,iim
+          do j=1,jjm
+            zrot(i,j,l) = (pvcov(i+1,j,l) - pvcov(i,j,l)
+     $                   + pucov(i,j+1,l) - pucov(i,j,l)) 
+     $                   / (cu(i,j)+cu(i,j+1)) 
+     $                   / (cv(i+1,j)+cv(i,j)) *4
+          enddo
+        enddo
+      ENDDO
+
 c   46.champ v:
 c   -----------
@@ -362 +377 @@
      $         ( pdvcov(i,j-1,l)/cv(i,j-1) + pdvcov(i,j,l)/cv(i,j) )
             ENDDO
+               zrfi(ig0 + 1,l)= 0.25 *(zrot(iim,j-1,l)+zrot(iim,j,l)
+     &                                +zrot(1,j-1,l)+zrot(1,j,l))
+            DO i=2,iim
+               zrfi(ig0 + i,l)= 0.25 *(zrot(i-1,j-1,l)+zrot(i-1,j,l)
+     $                   +zrot(i,j-1,l)+zrot(i,j,l))   !  AdlC MAY 2014
+            ENDDO
          ENDDO
       ENDDO
@@ -391 +412 @@
          zvfi(1,l)  = SSUM(iim,zsin,1)/pi
          pcvgv(1,l) = SSUM(iim,zsinbis,1)/pi
-
+         zrfi(1, l) = 0.
       ENDDO
 
@@ -420 +441 @@
          zvfi(ngridmx,l)  = SSUM(iim,zsin,1)/pi
          pcvgv(ngridmx,l) = SSUM(iim,zsinbis,1)/pi
-
+         zrfi(ngridmx, l) = 0.
       ENDDO
 c
@@ -462 +483 @@
      .             presnivs,
      .             zufi,
-     .             zvfi,
+     .             zvfi, zrfi,
      .             ztfi,
      .             zqfi,