Changeset 2879

Timestamp:

May 15, 2017, 10:59:45 AM (8 years ago)

Author:

Laurent Fairhead

Message:

Inclusion of r2877 corrections in CM6.0.10-LR branch

Location:

LMDZ5/branches/IPSLCM6.0.10/libf/phylmd

Files:

• phys_local_var_mod.F90 (modified) (3 diffs)
• physiq_mod.F90 (modified) (2 diffs)

LMDZ5/branches/IPSLCM6.0.10/libf/phylmd/phys_local_var_mod.F90

@@ -346 +346 @@
 !!!
 !!!ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc
+      LOGICAL, SAVE, ALLOCATABLE :: ptconv(:,:)
+!$OMP THREADPRIVATE(ptconv)
 !>jyg+nrlmd
   !
@@ -673 +675 @@
       ALLOCATE(cdragm_x(klon), cdragm_w(klon))
       ALLOCATE(kh(klon), kh_x(klon), kh_w(klon))
+!
+      ALLOCATE(ptconv(klon,klev))
 !
       ALLOCATE(wbeff(klon), convoccur(klon), zmax_th(klon))
@@ -931 +935 @@
       DEALLOCATE(kh, kh_x, kh_w)
 !
+      DEALLOCATE(ptconv)
+!
       DEALLOCATE(wbeff, convoccur, zmax_th)
       DEALLOCATE(zq2m, zt2m, weak_inversion)

LMDZ5/branches/IPSLCM6.0.10/libf/phylmd/physiq_mod.F90

@@ -155 +155 @@
 !!!       d_s_the, d_dens_the, &            ! due to thermals
        !                                  
+       ptconv, &
        wbeff, convoccur, zmax_th, &
        sens, flwp, fiwp,  &
@@ -875 +876 @@
     save iflag_cld_th
     !$OMP THREADPRIVATE(iflag_cld_th)
-    logical ptconv(klon,klev)
+!IM     logical ptconv(klon,klev) !passe dans phys_local_var_mod
     !IM cf. AM 081204 BEG
     logical ptconvth(klon,klev)