Changeset 939

Timestamp:

Apr 3, 2008, 4:39:32 PM (16 years ago)

Author:

lmdzadmin

Message:

Correction bug; on revient a la formulation Emanuel JYG
IM

File:

• LMDZ4/trunk/libf/phylmd/cv3_routines.F (modified) (3 diffs)

LMDZ4/trunk/libf/phylmd/cv3_routines.F

@@ -2075 +2075 @@
 c
 cjyg----
-        b6 = bfac*100.*sigd(il)*(ph(il,i)-ph(il,i+1))*sigt*afac
-        c6 = water(il,i+1) + wdtrain(il)*bfac
-         revap=0.5*(-b6+sqrt(b6*b6+4.*c6))
-         evap(il,i)=sigt*afac*revap
-         water(il,i)=revap*revap
+c       b6 = bfac*100.*sigd(il)*(ph(il,i)-ph(il,i+1))*sigt*afac
+c       c6 = water(il,i+1) + wdtrain(il)*bfac
+c        revap=0.5*(-b6+sqrt(b6*b6+4.*c6))
+c        evap(il,i)=sigt*afac*revap
+c        water(il,i)=revap*revap
 cc        print *,' i,b6,c6,revap,evap(il,i),water(il,i),wdtrain(il) ',
 cc     $            i,b6,c6,revap,evap(il,i),water(il,i),wdtrain(il)
@@ -2085 +2085 @@
 c
 c--------retour à la formulation originale d'Emanuel.
-      if (1.eq.0) then
       b6=bfac*50.*sigd(il)*(ph(il,i)-ph(il,i+1))*sigt*afac
       c6=water(il,i+1)+bfac*wdtrain(il)
@@ -2098 +2097 @@
      :                 /(sigd(il)*(ph(il,i)-ph(il,i+1))*50.)
       end if
-      endif
 ccc
 c    ***  calculate precipitating downdraft mass flux under     ***