Changeset 2641 for LMDZ5/branches/testing/libf/dynphy_lonlat/calfis.F

Timestamp:

Sep 29, 2016, 11:26:46 PM (8 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r2593:2640 into testing branch

Location:

LMDZ5/branches/testing

Files:

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

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

@@ -34 +34 @@
       USE callphysiq_mod, ONLY: call_physiq
 #endif 
-
+      USE comconst_mod, ONLY: cpp, daysec, dtphys, dtvr, kappa, pi
+      USE comvert_mod, ONLY: preff, presnivs
+      
       IMPLICIT NONE
 c=======================================================================
@@ -89 +91 @@
 c    ------------------
 
-#include "dimensions.h"
-#include "paramet.h"
-#include "temps.h"
+      include "dimensions.h"
+      include "paramet.h"
 
       INTEGER ngridmx
       PARAMETER( ngridmx = 2+(jjm-1)*iim - 1/jjm   )
 
-#include "comconst.h"
-#include "comvert.h"
-#include "comgeom2.h"
-#include "iniprint.h"
+      include "comgeom2.h"
+      include "iniprint.h"
 
 c    Arguments :
@@ -142 +141 @@
 c
       REAL zrot(iip1,jjm,llm) ! AdlC May 2014
-      REAL zufi(ngridmx,llm), zvfi(ngridmx,llm), zrfi(ngridmx,llm)
+      REAL zufi(ngridmx,llm), zvfi(ngridmx,llm)
+      REAL zrfi(ngridmx,llm) ! relative wind vorticity
       REAL ztfi(ngridmx,llm),zqfi(ngridmx,llm,nqtot)
+      REAL zpk(ngridmx,llm)
 c
       REAL pcvgu(ngridmx,llm), pcvgv(ngridmx,llm)
@@ -212 +213 @@
 
 
-c   42. pression intercouches :
+c   42. pression intercouches et fonction d'Exner:
 c
 c   -----------------------------------------------------------------
@@ -223 +224 @@
        unskap   = 1./ kappa
 c
-      DO l = 1, llmp1
+      DO l = 1, llm
+        zpk(   1,l ) = ppk(1,1,l)
         zplev( 1,l ) = pp(1,1,l)
         ig0 = 2
           DO j = 2, jjm
              DO i =1, iim
+              zpk(   ig0,l ) = ppk(i,j,l)
               zplev( ig0,l ) = pp(i,j,l)
               ig0 = ig0 +1
              ENDDO
           ENDDO
+        zpk(   ngridmx,l ) = ppk(1,jjp1,l)
         zplev( ngridmx,l ) = pp(1,jjp1,l)
       ENDDO
+        zplev( 1,llmp1 ) = pp(1,1,llmp1)
+        ig0 = 2
+          DO j = 2, jjm
+             DO i =1, iim
+              zplev( ig0,llmp1 ) = pp(i,j,llmp1)
+              ig0 = ig0 +1
+             ENDDO
+          ENDDO
+        zplev( ngridmx,llmp1 ) = pp(1,jjp1,llmp1)
 c
 c
@@ -472 +485 @@
      &                   jD_cur,jH_cur_split,zdt_split,
      &                   zplev,zplay,
-     &                   zphi,zphis,
+     &                   zpk,zphi,zphis,
      &                   presnivs,
      &                   zufi,zvfi,zrfi,ztfi,zqfi,