Index: trunk/LMDZ.GENERIC/libf/phystd/condensation_generic_mod.F90
===================================================================
--- trunk/LMDZ.GENERIC/libf/phystd/condensation_generic_mod.F90	(revision 2703)
+++ trunk/LMDZ.GENERIC/libf/phystd/condensation_generic_mod.F90	(revision 2704)
@@ -87,9 +87,4 @@
         do iq=1,nq
                 if((is_generic(iq)==1) .and. (index(noms(iq),"vap") .ne. 0)) then
-!                       Let's get the index of our tracers (we look for igcm _generic_vap and igcm_generic_ice)
-                        ! tname_ice = trim(noms(iq)(1:len(tname_ice)-3))//"ice" 
-                        ! print*,trim(adjustl(trim(noms(iq))(9:len(trim(noms(iq)))-4))) !testing here, should go away
-                        print*,noms(iq)(9:len(trim(noms(iq)))-4)
-                        ! stop
                         ! Hyp : vap tracer index comes right before ice tracer index in traceur.def
                         igcm_generic_vap=iq
@@ -97,16 +92,9 @@
                         ! Need to call specie_parameters of the considered specie 
                         call specie_parameters(noms(iq)(9:len(trim(noms(iq)))-4))
-                        ! Evaporate generic clouds (all of them)
                         Lcp=RLVTT/cpp !need to be init here, otherwise we don't know RLVTT yet
-                        call evap_generic(ngrid,nlayer,nq,ptimestep,pt,pq,pdq,pdt,&
-                                        igcm_generic_vap,igcm_generic_ice, &
-                                        dqevap,dtevap,qevap,tevap)
-                                ! note: we use qevap but not tevap in largescale/moistadj
-                                ! otherwise is a big mess
 
                         !  Vertical loop (from top to bottom)
                         DO k = nlayer, 1, -1
-                                zt(1:ngrid)=pt(1:ngrid,k)+(pdt(1:ngrid,k)+dtevap(1:ngrid,k))*ptimestep
-                                zq(1:ngrid)=qevap(1:ngrid,k,igcm_generic_vap) 
+                                zt(1:ngrid)=pt(1:ngrid,k)+pdt(1:ngrid,k)*ptimestep
 
                                 ! Computes Psat and the partial condensation
@@ -117,9 +105,5 @@
                                         !	    zt(i)=15.   ! check too low temperatures
                                         endif
-                                        call Psat_generic(zt(i),local_p,metallicity,psat_tmp,zqs_temp) !useless ? 
-                                        zqs(i)=zqs_temp ! useless ?
-                                        zt(i)=pt(i,k)+pdt(i,k)*ptimestep
                                         zx_q(i) = pq(i,k,igcm_generic_vap)+pdq(i,k,igcm_generic_vap)*ptimestep
-                                        ! dqevap(i,k)=0.
                                         ! iterative process to stabilize the scheme when large water amounts JL12
                                         zcond(i) = 0.0d0
@@ -141,5 +125,5 @@
 
                                 !Tendances de t et q
-                                pdqvaplsc(1:ngrid,k,igcm_generic_vap)  = dqevap(1:ngrid,k) - zcond(1:ngrid)
+                                pdqvaplsc(1:ngrid,k,igcm_generic_vap)  = - zcond(1:ngrid) 
                                 pdqliqlsc(1:ngrid,k,igcm_generic_ice) = - pdqvaplsc(1:ngrid,k,igcm_generic_vap)
                                 pdtlsc(1:ngrid,k)  = pdtlsc(1:ngrid,k) + pdqliqlsc(1:ngrid,k,igcm_generic_ice)*Lcp