Index: LMDZ6/trunk/libf/phylmd/lmdz_lscp.F90
===================================================================
--- LMDZ6/trunk/libf/phylmd/lmdz_lscp.F90	(revision 5210)
+++ LMDZ6/trunk/libf/phylmd/lmdz_lscp.F90	(revision 5211)
@@ -119,5 +119,5 @@
 USE lmdz_lscp_ini, ONLY : RCPD, RLSTT, RLVTT, RLMLT, RVTMP2, RTT, RD, RG
 USE lmdz_lscp_ini, ONLY : ok_poprecip
-USE lmdz_lscp_ini, ONLY : ok_external_lognormal, ok_ice_supersat, ok_unadjusted_clouds, iflag_icefrac
+USE lmdz_lscp_ini, ONLY : ok_ice_supersat, ok_unadjusted_clouds, iflag_icefrac
 
 IMPLICIT NONE
@@ -968,47 +968,11 @@
 
 
-                  !--If .TRUE., calls an externalised version of the generalised
-                  !--lognormal condensation scheme (Bony and Emanuel 2001)
-                  !--Numerically, convergence is conserved with this option
-                  !--The objective is to simplify LSCP
-                  ELSEIF ( ok_external_lognormal ) THEN
-                          
+                  ELSE
+                  !--generalised lognormal condensation scheme (Bony and Emanuel 2001)
+
                    CALL condensation_lognormal( &
                        klon, Tbef, zq, zqs, gammasat, ratqs(:,k), &
                        keepgoing, rneb(:,k), zqn, qvc)
 
-
-                 ELSE !--Generalised lognormal (Bony and Emanuel 2001)
-
-                  DO i=1,klon !todoan : check if loop in i is needed
-
-                      IF (keepgoing(i)) THEN
-
-                        zpdf_sig(i)=ratqs(i,k)*zq(i)
-                        zpdf_k(i)=-sqrt(log(1.+(zpdf_sig(i)/zq(i))**2))
-                        zpdf_delta(i)=log(zq(i)/(gammasat(i)*zqs(i)))
-                        zpdf_a(i)=zpdf_delta(i)/(zpdf_k(i)*sqrt(2.))
-                        zpdf_b(i)=zpdf_k(i)/(2.*sqrt(2.))
-                        zpdf_e1(i)=zpdf_a(i)-zpdf_b(i)
-                        zpdf_e1(i)=sign(min(ABS(zpdf_e1(i)),5.),zpdf_e1(i))
-                        zpdf_e1(i)=1.-erf(zpdf_e1(i))
-                        zpdf_e2(i)=zpdf_a(i)+zpdf_b(i)
-                        zpdf_e2(i)=sign(min(ABS(zpdf_e2(i)),5.),zpdf_e2(i))
-                        zpdf_e2(i)=1.-erf(zpdf_e2(i))
-
-                          IF (zpdf_e1(i).LT.1.e-10) THEN
-                              rneb(i,k)=0.
-                              zqn(i)=zqs(i)
-                              !--AB grid-mean vapor in the cloud - we assume saturation adjustment
-                              qvc(i) = 0.
-                          ELSE
-                              rneb(i,k)=0.5*zpdf_e1(i)
-                              zqn(i)=zq(i)*zpdf_e2(i)/zpdf_e1(i)
-                              !--AB grid-mean vapor in the cloud - we assume saturation adjustment
-                              qvc(i) = rneb(i,k) * zqs(i)
-                          ENDIF
-
-                      ENDIF ! keepgoing
-                  ENDDO ! loop on klon
 
                   ENDIF ! .NOT. ok_ice_supersat
Index: LMDZ6/trunk/libf/phylmd/lmdz_lscp_ini.F90
===================================================================
--- LMDZ6/trunk/libf/phylmd/lmdz_lscp_ini.F90	(revision 5210)
+++ LMDZ6/trunk/libf/phylmd/lmdz_lscp_ini.F90	(revision 5211)
@@ -144,6 +144,4 @@
 
   !--Parameters for condensation and ice supersaturation
-  LOGICAL, SAVE, PROTECTED :: ok_external_lognormal=.FALSE.  ! if True, the lognormal condensation scheme is calculated in the lmdz_lscp_condensation routine
-  !$OMP THREADPRIVATE(ok_external_lognormal)
 
   LOGICAL, SAVE, PROTECTED :: ok_ice_supersat=.FALSE.        ! activates the condensation scheme that allows for ice supersaturation
@@ -417,5 +415,4 @@
     CALL getin_p('snow_fallspeed_cld',snow_fallspeed_cld)
     ! for condensation and ice supersaturation
-    CALL getin_p('ok_external_lognormal',ok_external_lognormal)
     CALL getin_p('ok_unadjusted_clouds',ok_unadjusted_clouds)
     CALL getin_p('ok_weibull_warm_clouds',ok_weibull_warm_clouds)
@@ -498,5 +495,4 @@
     WRITE(lunout,*) 'lscp_ini, snow_fallspeed_cld:', snow_fallspeed_cld
     ! for condensation and ice supersaturation
-    WRITE(lunout,*) 'lscp_ini, ok_external_lognormal:', ok_external_lognormal
     WRITE(lunout,*) 'lscp_ini, ok_ice_supersat:', ok_ice_supersat
     WRITE(lunout,*) 'lscp_ini, ok_unadjusted_clouds:', ok_unadjusted_clouds
@@ -541,10 +537,4 @@
 
 
-    !--Check flags for condensation and ice supersaturation
-    IF ( ok_external_lognormal .AND. ok_ice_supersat ) THEN
-      abort_message = 'in lscp, ok_external_lognormal=y is incompatible with ok_ice_supersat=y'
-      CALL abort_physic (modname,abort_message,1)
-    ENDIF
-
     IF ( ok_weibull_warm_clouds .AND. .NOT. ok_ice_supersat ) THEN
       abort_message = 'in lscp, ok_weibull_warm_clouds=y needs ok_ice_supersat=y'