Index: LMDZ4/trunk/libf/phylmd/cv3p_mixing.F
===================================================================
--- LMDZ4/trunk/libf/phylmd/cv3p_mixing.F	(revision 1040)
+++ LMDZ4/trunk/libf/phylmd/cv3p_mixing.F	(revision 1041)
@@ -417,4 +417,31 @@
 c
 c--     Compute liquid water static energy of mixed draughts
+c       IF (j .GT. i) THEN
+c        awat=elij(il,i,j)-(1.-ep(il,j))*clw(il,j)
+c        awat=amax1(awat,0.0)
+c       ELSE
+c        awat = 0.
+c       ENDIF
+c       Hent(il,i,j) = (1.-Sigij(il,i,j))*HP(il,i)
+c    :         + Sigij(il,i,j)*H(il,i)
+c    :         + (LV(il,j)+(cpd-cpv)*t(il,j))*awat
+cIM 301008 beg
+        Hent(il,i,j) = (1.-Sigij(il,i,j))*HP(il,i)
+     :         + Sigij(il,i,j)*H(il,i)
+
+        Elij(il,i,j) = Qent(il,i,j)-rs(il,j)
+        Elij(il,i,j) = Elij(il,i,j)
+     :    + ((h(il,j)-Hent(il,i,j))*rs(il,j)*LV(il,j)
+     :    / ((cpd*(1.-Qent(il,i,j))+Qent(il,i,j)*cpv)
+     :    * rrv*t(il,j)*t(il,j)))
+        Elij(il,i,j) = Elij(il,i,j)
+     :    / (1.+LV(il,j)*LV(il,j)*rs(il,j)
+     :    / ((cpd*(1.-Qent(il,i,j))+Qent(il,i,j)*cpv)
+     :    * rrv*t(il,j)*t(il,j)))
+
+        Elij(il,i,j) = max(elij(il,i,j),0.)
+
+        Elij(il,i,j) = min(elij(il,i,j),Qent(il,i,j))
+
         IF (j .GT. i) THEN
          awat=elij(il,i,j)-(1.-ep(il,j))*clw(il,j)
@@ -423,7 +450,11 @@
          awat = 0.
         ENDIF
-        Hent(il,i,j) = (1.-Sigij(il,i,j))*HP(il,i)
-     :         + Sigij(il,i,j)*H(il,i)
-     :         + (LV(il,j)+(cpd-cpv)*t(il,j))*awat
+
+c        print *,h(il,j)-hent(il,i,j),LV(il,j)*rs(il,j)/(cpd*rrv*t(il,j)*
+c    :         t(il,j))
+
+        Hent(il,i,j) =  Hent(il,i,j)+(LV(il,j)+(cpd-cpv)*t(il,j))
+     :         * awat
+cIM 301008 end
 c
 c      print *,'mix : i,j,hent(il,i,j),sigij(il,i,j) ',