Index: LMDZ5/trunk/libf/phylmd/cv3p1_closure.F90
===================================================================
--- LMDZ5/trunk/libf/phylmd/cv3p1_closure.F90	(revision 2223)
+++ LMDZ5/trunk/libf/phylmd/cv3p1_closure.F90	(revision 2224)
@@ -53,5 +53,5 @@
 
   ! local variables:
-  INTEGER il, i, j, k, icbmax, i0(nloc), klfc
+  INTEGER il, i, j, k, icbmax, i0(nloc), klfc(nloc)
   REAL deltap, fac, w, amu
   REAL rhodp
@@ -525,8 +525,11 @@
 
 !CR:Compute k at plfc
+  DO il=1,ncum
+           klfc(il)=nl
+  ENDDO
   DO k=1,nl
      DO il=1,ncum
         if ((plfc(il).lt.ph(il,k)).and.(plfc(il).ge.ph(il,k+1))) then
-           klfc=k
+           klfc(il)=k
         endif
      ENDDO
@@ -540,6 +543,6 @@
 !CR: Add large-scale component to the mass-flux
 !encore connu sous le nom "Experience du tube de dentifrice"
-    if (coef_clos_ls.gt.0.) then 
-       cbmf1(il) = cbmf1(il) - coef_clos_ls*min(0.,1./RG*omega(il,klfc))
+    if ((coef_clos_ls.gt.0.).and.(plfc(il).gt.0.)) then 
+       cbmf1(il) = cbmf1(il) - coef_clos_ls*min(0.,1./RG*omega(il,klfc(il)))
     endif
 !RC
Index: LMDZ5/trunk/libf/phylmd/physiq.F90
===================================================================
--- LMDZ5/trunk/libf/phylmd/physiq.F90	(revision 2223)
+++ LMDZ5/trunk/libf/phylmd/physiq.F90	(revision 2224)
@@ -924,4 +924,11 @@
      print*, '================================================='
      !
+!CR: check sur le nb de traceurs de l eau
+     if ((iflag_ice_thermo.gt.0).and.(nqo==2)) then
+          WRITE (lunout, *) ' iflag_ice_thermo==1 requires 3 H2O tracers (H2Ov, H2Ol, H2Oi)', ' but nqo=', nqo, &
+          '. Might as well stop here.'
+          STOP
+     endif
+
      dnwd0=0.0
      ftd=0.0