Changeset 2839 for LMDZ5/branches/testing/libf/phylmd/concvl.F90

Timestamp:

Mar 30, 2017, 4:16:38 PM (7 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r2785:2838 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/phylmd/concvl.F90 (modified) (4 diffs)

LMDZ5/branches/testing/libf/phylmd/concvl.F90

@@ -5 +5 @@
                   d_t, d_q, d_u, d_v, d_tra, &
                   rain, snow, kbas, ktop, sigd, &
-                  cbmf, plcl, plfc, wbeff, upwd, dnwd, dnwdbis, &
+                  cbmf, plcl, plfc, wbeff, convoccur, &
+                  upwd, dnwd, dnwdbis, &
                   Ma, mip, Vprecip, &
                   cape, cin, tvp, Tconv, iflag, &
@@ -157 +158 @@
   REAL qs(klon, klev), qs_wake(klon, klev)
   REAL cbmf(klon), plcl(klon), plfc(klon), wbeff(klon)
+  REAL convoccur(klon)
 !LF          SAVE cbmf
 !IM/JYG      REAL, SAVE, ALLOCATABLE :: cbmf(:)
@@ -228 +230 @@
     ALLOCATE (t1(klon,klev))
     ALLOCATE (q1(klon,klev))
+!
+    convoccur(:) = 0.
+!
     itap = 0
     igout = klon/2 + 1/klon
@@ -450 +455 @@
   END DO
 
+  IF (iflag_con==3) THEN
+    DO i = 1,klon
+      IF (wbeff(i) > 100. .OR. wbeff(i) == 0 .OR. iflag(i) > 3) THEN
+        wbeff(i) = 0.
+        convoccur(i) = 0.  
+      ELSE
+        convoccur(i) = 1.
+      ENDIF
+    ENDDO
+  ENDIF
+
   IF (iflag_con==30) THEN
     DO itra = 1, ntra