Index: LMDZ6/trunk/libf/phylmd/lmdz_lscp.F90
===================================================================
--- LMDZ6/trunk/libf/phylmd/lmdz_lscp.F90	(revision 4685)
+++ LMDZ6/trunk/libf/phylmd/lmdz_lscp.F90	(revision 4686)
@@ -7,5 +7,5 @@
 !++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 SUBROUTINE lscp(klon,klev,dtime,missing_val,            &
-     paprs,pplay,temp,q,ptconv,ratqs,                      &
+     paprs,pplay,temp,qt,ptconv,ratqs,                  &
      d_t, d_q, d_ql, d_qi, rneb, rneblsvol, rneb_seri,  &
      pfraclr,pfracld,                                   &
@@ -123,5 +123,5 @@
   REAL, DIMENSION(klon,klev),      INTENT(IN)   :: pplay           ! mid-layer pressure [Pa]
   REAL, DIMENSION(klon,klev),      INTENT(IN)   :: temp            ! temperature (K)
-  REAL, DIMENSION(klon,klev),      INTENT(IN)   :: q               ! total specific humidity (= vapor phase) [kg/kg] 
+  REAL, DIMENSION(klon,klev),      INTENT(IN)   :: qt              ! total specific humidity (in vapor phase in input) [kg/kg] 
   INTEGER,                         INTENT(IN)   :: iflag_cld_th    ! flag that determines the distribution of convective clouds
   INTEGER,                         INTENT(IN)   :: iflag_ice_thermo! flag to activate the ice thermodynamics
@@ -143,6 +143,5 @@
   
   REAL, DIMENSION(klon,klev),      INTENT(INOUT)   :: zthl         ! liquid potential temperature [K]
-  REAL, DIMENSION(klon,klev),      INTENT(INOUT):: ratqs            ! function of pressure that sets the large-scale
-  REAL, DIMENSION(klon,klev),      INTENT(OUT):: beta             ! conversion rate of condensed water
+  REAL, DIMENSION(klon,klev),      INTENT(INOUT)   :: ratqs        ! function of pressure that sets the large-scale
 
 
@@ -172,4 +171,6 @@
   REAL, DIMENSION(klon,klev),      INTENT(OUT)  :: distcltop        ! distance to cloud top [m]
   REAL, DIMENSION(klon,klev),      INTENT(OUT)  :: temp_cltop       ! temperature of cloud top [K]
+  REAL, DIMENSION(klon,klev),      INTENT(OUT)  :: beta             ! conversion rate of condensed water
+
   ! fraction of aerosol scavenging through impaction and nucleation (for on-line)
   
@@ -191,6 +192,10 @@
   REAL, DIMENSION(klon,klev),      INTENT(OUT)  :: fcontrN          ! fraction of grid favourable to non-persistent contrails
   REAL, DIMENSION(klon,klev),      INTENT(OUT)  :: fcontrP          ! fraction of grid favourable to persistent contrails
-  REAL, DIMENSION(klon,klev),      INTENT(OUT)  :: cloudth_sth,cloudth_senv,cloudth_sigmath,cloudth_sigmaenv
-  
+  REAL, DIMENSION(klon,klev),      INTENT(OUT)  :: cloudth_sth      ! mean saturation deficit in thermals
+  REAL, DIMENSION(klon,klev),      INTENT(OUT)  :: cloudth_senv     ! mean saturation deficit in environment
+  REAL, DIMENSION(klon,klev),      INTENT(OUT)  :: cloudth_sigmath  ! std of saturation deficit in thermals
+  REAL, DIMENSION(klon,klev),      INTENT(OUT)  :: cloudth_sigmaenv ! std of saturation deficit in environment
+
+
 
   ! LOCAL VARIABLES:
@@ -360,5 +365,5 @@
     DO i = 1, klon
         zt(i)=temp(i,k)
-        zq(i)=q(i,k)
+        zq(i)=qt(i,k)
         !c_iso init of iso
     ENDDO
@@ -1207,5 +1212,5 @@
         d_ql(i,k) = (1-zfice(i))*zoliq(i)
         d_qi(i,k) = zfice(i)*zoliq(i)
-        d_q(i,k) = zq(i) - q(i,k)
+        d_q(i,k) = zq(i) - qt(i,k)
         ! c_iso: same for isotopes
         d_t(i,k) = zt(i) - temp(i,k)