Changeset 1999 for LMDZ5/branches/testing/libf/dyn3dmem/leapfrog_loc.F

Timestamp:

Mar 20, 2014, 10:57:19 AM (10 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r1920:1997 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/dyn3dmem/leapfrog_loc.F (modified) (5 diffs)

LMDZ5/branches/testing/libf/dyn3dmem/leapfrog_loc.F

@@ -80 +80 @@
 !      include "mpif.h"
       
-      INTEGER         longcles
-      PARAMETER     ( longcles = 20 )
-      REAL  clesphy0( longcles )
+      INTEGER,PARAMETER :: longcles = 20
+      REAL,INTENT(IN) :: clesphy0( longcles ) ! not used
+      REAL,INTENT(IN) :: time_0 ! not used
+
+c   dynamical variables:
+      REAL,INTENT(IN) :: ucov0(ijb_u:ije_u,llm)    ! zonal covariant wind
+      REAL,INTENT(IN) :: vcov0(ijb_v:ije_v,llm)    ! meridional covariant wind
+      REAL,INTENT(IN) :: teta0(ijb_u:ije_u,llm)    ! potential temperature
+      REAL,INTENT(IN) :: q0(ijb_u:ije_u,llm,nqtot) ! advected tracers
+      REAL,INTENT(IN) :: ps0(ijb_u:ije_u)          ! surface pressure (Pa)
+      REAL,INTENT(IN) :: masse0(ijb_u:ije_u,llm)   ! air mass
+      REAL,INTENT(IN) :: phis0(ijb_u:ije_u)        ! geopotentiat at the surface
 
       real zqmin,zqmax
-
-c   variables dynamiques
-      REAL :: vcov0(ijb_v:ije_v,llm),ucov0(ijb_u:ije_u,llm) ! vents covariants
-      REAL :: teta0(ijb_u:ije_u,llm)                 ! temperature potentielle 
-      REAL :: q0(ijb_u:ije_u,llm,nqtot)              ! champs advectes
-      REAL :: ps0(ijb_u:ije_u)                       ! pression  au sol
-      REAL :: masse0(ijb_u:ije_u,llm)                ! masse d'air
-      REAL :: phis0(ijb_u:ije_u)                     ! geopotentiel au sol
 
 !      REAL,SAVE,ALLOCATABLE :: p (:,:  )               ! pression aux interfac.des couches
@@ -133 +134 @@
       REAL       time 
 
-      REAL  SSUM
-      REAL time_0 
+      REAL  SSUM 
 !      REAL,SAVE,ALLOCATABLE :: finvmaold(:,:)
 
@@ -670 +670 @@
       
       IF( forward. OR . leapf )  THEN
- 
- 
+! Ehouarn: NB: fields sent to advtrac are those at the beginning of the time step
          CALL caladvtrac_loc(q,pbaru,pbarv,
      *        p, masse, dq,  teta,
@@ -680 +679 @@
 !      enddo
 
-c
+! Ehouarn: Storage of mass flux for off-line tracers... not implemented...
+
       ENDIF ! of IF( forward. OR . leapf )
 
@@ -1140 +1140 @@
         endif
 c$OMP BARRIER
+        CALL massdair_loc(p,masse)
+c$OMP BARRIER
 
 cc$OMP END PARALLEL