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

Timestamp:

Dec 14, 2015, 11:43:09 AM (9 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r2298:2396 into testing branch

Location:

LMDZ5/branches/testing

Files:

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

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

@@ -29 +29 @@
 
   USE dimphy
-  USE infotrac, ONLY: nbtr
+  USE infotrac_phy, ONLY: nbtr
   USE phys_local_var_mod, ONLY: omega
+  USE print_control_mod, ONLY: prt_level, lunout
   IMPLICIT NONE
 ! ======================================================================
@@ -60 +61 @@
 ! Ma---------output-R-adiabatic ascent mass flux (kg/m2/s)
 ! mip--------output-R-mass flux shed by adiabatic ascent (kg/m2/s)
-! Vprecip----output-R-vertical profile of precipitations (kg/m2/s)
+! Vprecip----output-R-vertical profile of total precipitation (kg/m2/s)
 ! Tconv------output-R-environment temperature seen by convective scheme (K)
 ! Cape-------output-R-CAPE (J/kg)
@@ -83 +84 @@
 
   include "clesphys.h"
-  include "dimensions.h"
 
   INTEGER iflag_clos
@@ -109 +109 @@
 !!       REAL Ma(klon,klev), mip(klon,klev),Vprecip(klon,klev)     !jyg
   REAL Ma(klon, klev), mip(klon, klev), Vprecip(klon, klev+1)      !jyg
+  REAL Vprecipi(klon, klev+1)                                      !jyg
   REAL wght(klon, klev)                                            !RL
 
@@ -214 +215 @@
   include "YOETHF.h"
   include "FCTTRE.h"
-  include "iniprint.h"
 !jyg<
   include "conema3.h"
@@ -415 +415 @@
                     iflag, d_t, d_q, d_u, d_v, d_tra, rain, kbas, ktop, &
                     cbmf, plcl, plfc, wbeff, sig1, w01, ptop2, sigd, &
-                    Ma, mip, Vprecip, upwd, dnwd, dnwdbis, qcondc, wd, &
+                    Ma, mip, Vprecip, Vprecipi, upwd, dnwd, dnwdbis, qcondc, wd, &
                     cape, cin, tvp, &
                     dd_t, dd_q, plim1, plim2, asupmax, supmax0, &
@@ -476 +476 @@
     END DO
   END DO
-!                                                   !jyg
-! --Separation neige/pluie (pour diagnostics)       !jyg
-  DO k = 1, klev                                    !jyg
-    DO i = 1, klon                                  !jyg
-      IF (t1(i,k)<rtt) THEN                         !jyg
-        pmflxs(i, k) = Vprecip(i, k)                !jyg
-      ELSE                                          !jyg
-        pmflxr(i, k) = Vprecip(i, k)                !jyg
-      END IF                                        !jyg
-    END DO                                          !jyg
-  END DO                                            !jyg
+!                                                     !jyg
+  IF (iflag_con == 30 .OR. iflag_ice_thermo ==0) THEN
+! --Separation neige/pluie (pour diagnostics)         !jyg
+    DO k = 1, klev                                    !jyg
+      DO i = 1, klon                                  !jyg
+        IF (t1(i,k)<rtt) THEN                         !jyg
+          pmflxs(i, k) = Vprecip(i, k)                !jyg
+        ELSE                                          !jyg
+          pmflxr(i, k) = Vprecip(i, k)                !jyg
+        END IF                                        !jyg
+      END DO                                          !jyg
+    END DO                                            !jyg
+  ELSE
+    DO k = 1, klev                                    !jyg
+      DO i = 1, klon                                  !jyg
+        pmflxs(i, k) = Vprecipi(i, k)                 !jyg
+        pmflxr(i, k) = Vprecip(i, k)-Vprecipi(i, k)   !jyg
+      END DO                                          !jyg
+    END DO                                            !jyg
+  ENDIF
 
 ! c      IF (if_ebil.ge.2) THEN