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

Timestamp:

Apr 13, 2015, 10:21:09 AM (9 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes 2216:2237 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/phylmd/fisrtilp.F90 (modified) (8 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_cldth,             &
+     ztv, zpspsk, ztla, zthl, iflag_cld_th,             &
      iflag_ice_thermo)
 
@@ -82 +82 @@
   INTEGER ninter ! sous-intervals pour la precipitation
   INTEGER ncoreczq  
-  INTEGER iflag_cldth
+  INTEGER iflag_cld_th
   INTEGER iflag_ice_thermo
   PARAMETER (ninter=5)
@@ -545 +545 @@
            enddo
 
-           if (iflag_cldth>=5) then
+           if (iflag_cld_th>=5) then
 
               call cloudth(klon,klev,k,ztv, &
@@ -559 +559 @@
            endif
 
-           if (iflag_cldth <= 4) then
+           if (iflag_cld_th <= 4) then
               lognormale = .true.
-           elseif (iflag_cldth >= 6) then
+           elseif (iflag_cld_th >= 6) then
               ! lognormale en l'absence des thermiques
               lognormale = fraca(:,k) < 1e-10
            else
-              ! Dans le cas iflag_cldth=5, on prend systématiquement la
+              ! Dans le cas iflag_cld_th=5, on prend systématiquement la
               ! bi-gaussienne
               lognormale = .false.
@@ -783 +783 @@
         else if (iflag_fisrtilp_qsat.gt.0) then
            DO i= 1, klon
-             if (lognormale(i)) then
-             zt(i)=Tbef(i)
-             else
              zt(i) = zt(i) + zcond(i) * RLVTT/RCPD/(1.0+RVTMP2*(zq(i)+zcond(i)))
-             endif
            ENDDO
         endif
@@ -800 +796 @@
 !                                     t_glace_max, exposant_glace)
               if (iflag_t_glace.eq.0) then
-                    zfice(i) = 1.0 - (Tbef(i)-t_glace_min_old) / (RTT-t_glace_min_old)
+                    zfice(i) = 1.0 - (zt(i)-t_glace_min_old) / (RTT-t_glace_min_old)
                     zfice(i) = MIN(MAX(zfice(i),0.0),1.0)
                     zfice(i) = zfice(i)**exposant_glace_old
@@ -809 +805 @@
          else
            DO i=1, klon
-              if (lognormale(i)) then
-                 zt(i)=Tbef(i)
-              else
 ! JBM: icefrac_lsc is now a function contained in icefrac_lsc_mod
 !              zfice(i) = icefrac_lsc(zt(i), t_glace_min, &
 !                                     t_glace_max, exposant_glace)
               if (iflag_t_glace.eq.0) then
-                    zfice(i) = 1.0 - (Tbef(i)-t_glace_min_old) / (RTT-t_glace_min_old)
+                    zfice(i) = 1.0 - (zt(i)-t_glace_min_old) / (RTT-t_glace_min_old)
                     zfice(i) = MIN(MAX(zfice(i),0.0),1.0)
                     zfice(i) = zfice(i)**exposant_glace_old
@@ -822 +815 @@
               zt(i) = zt(i) + (1.-zfice(i))*zcond(i) * RLVTT/RCPD/(1.0+RVTMP2*(zq(i)+zcond(i))) &
                        +zfice(i)*zcond(i) * RLSTT/RCPD/(1.0+RVTMP2*(zq(i)+zcond(i)))
-              endif
            ENDDO
          endif