Changeset 2220 for LMDZ5/branches/testing/libf/phylmd/fisrtilp.F90

Timestamp:

Mar 3, 2015, 2:41:13 PM (10 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes -r2186:2216 into testing branch

Location:

LMDZ5/branches/testing

Files:

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

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

@@ -8 +8 @@
      frac_impa, frac_nucl, beta,                        &
      prfl, psfl, rhcl, zqta, fraca,                     &
-     ztv, zpspsk, ztla, zthl, iflag_cldcon,             &
+     ztv, zpspsk, ztla, zthl, iflag_cldth,             &
      iflag_ice_thermo)
 
@@ -82 +82 @@
   INTEGER ninter ! sous-intervals pour la precipitation
   INTEGER ncoreczq  
-  INTEGER iflag_cldcon
+  INTEGER iflag_cldth
   INTEGER iflag_ice_thermo
   PARAMETER (ninter=5)
@@ -545 +545 @@
            enddo
 
-           if (iflag_cldcon>=5) then
+           if (iflag_cldth>=5) then
 
               call cloudth(klon,klev,k,ztv, &
@@ -559 +559 @@
            endif
 
-           if (iflag_cldcon <= 4) then
+           if (iflag_cldth <= 4) then
               lognormale = .true.
-           elseif (iflag_cldcon >= 6) then
+           elseif (iflag_cldth >= 6) then
               ! lognormale en l'absence des thermiques
               lognormale = fraca(:,k) < 1e-10
            else
-              ! Dans le cas iflag_cldcon=5, on prend systématiquement la
+              ! Dans le cas iflag_cldth=5, on prend systématiquement la
               ! bi-gaussienne
               lognormale = .false.