Changeset 3148

Timestamp:

Jan 15, 2018, 2:41:25 PM (7 years ago)

Author:

musat

Message:

Bug fix for ratqsc (add save/OMP THREADPRIVATE) and itau_con counter
JYG/IM

Location:

LMDZ6/trunk/libf/phylmd

Files:

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

LMDZ6/trunk/libf/phylmd/phys_local_var_mod.F90

@@ -368 +368 @@
       LOGICAL, SAVE, ALLOCATABLE :: ptconv(:,:)
       !$OMP THREADPRIVATE(ptconv)
+      REAL, SAVE, ALLOCATABLE :: ratqsc(:,:)
+      !$OMP THREADPRIVATE(ratqsc)
 !>jyg+nrlmd
   !
@@ -731 +733 @@
 !
       ALLOCATE(ptconv(klon,klev))
+      ALLOCATE(ratqsc(klon,klev))
 !
       ALLOCATE(wbeff(klon), convoccur(klon), zmax_th(klon))
@@ -1022 +1025 @@
 !
       DEALLOCATE(ptconv)
+      DEALLOCATE(ratqsc)
 !
       DEALLOCATE(wbeff, convoccur, zmax_th)

LMDZ6/trunk/libf/phylmd/physiq_mod.F90

@@ -157 +157 @@
 !!!       d_s_the, d_dens_the, &            ! due to thermals
        !                                  
-       ptconv, &
+       ptconv, ratqsc, &
        wbeff, convoccur, zmax_th, &
        sens, flwp, fiwp,  &
@@ -901 +901 @@
     INTEGER kcbot(klon), kctop(klon), kdtop(klon)
     !
-    REAL ratqsc(klon,klev)
     real ratqsbas,ratqshaut,tau_ratqs
     save ratqsbas,ratqshaut,tau_ratqs
@@ -2663 +2662 @@
 
           DO i = 1, klon
-             IF (iflagctrl(i).le.1) itau_con(i)=itau_con(i)+1
+             IF (iflagctrl(i).le.1) itau_con(i)=itau_con(i)+cvpas
           ENDDO
           !