Changeset 992 for LMDZ4/trunk

Timestamp:

Aug 7, 2008, 6:43:31 PM (16 years ago)

Author:

Laurent Fairhead

Message:

Corrections il y avait incohérence, puisque l'on homogénéise les tendances
totales et pas celles dues aux seules descentes précipitantes. JYG
LF

File:

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

LMDZ4/trunk/libf/phylmd/cv3_routines.F

@@ -3006 +3006 @@
        csum(il)=0.0
        dsum(il)=0.0
-      enddo
-
+        esum(il)=0.0
+        fsum(il)=0.0
+        gsum(il)=0.0
+        hsum(il)=0.0
+      enddo
+c
+      do i=1,nl
+       do il=1,ncum
+          th_wake(il,i)=t_wake(il,i)*(1000.0/p(il,i))**rdcp
+       enddo
+      enddo
+c
       do i=1,nl
        do il=1,ncum
         if (i.le.(icb(il)-1) .and. iflag(il) .le. 1) then
-      asum(il)=asum(il)+ft(il,i)*(ph(il,i)-ph(il,i+1))
-      bsum(il)=bsum(il)+fr(il,i)*(lv(il,i)+(cl-cpd)*(t(il,i)-t(il,1)))
+cjyg  Saturated part : use T profile
+      asum(il)=asum(il)+(ft(il,i)-ftd(il,i))*(ph(il,i)-ph(il,i+1))
+      bsum(il)=bsum(il)+(fr(il,i)-fqd(il,i))
+     :              *(lv(il,i)+(cl-cpd)*(t(il,i)-t(il,1)))
      :                  *(ph(il,i)-ph(il,i+1))
       csum(il)=csum(il)+(lv(il,i)+(cl-cpd)*(t(il,i)-t(il,1)))
      :                      *(ph(il,i)-ph(il,i+1))
       dsum(il)=dsum(il)+t(il,i)*(ph(il,i)-ph(il,i+1))/th(il,i)
+cjyg  Unsaturated part : use T_wake profile
+      esum(il)=esum(il)+ftd(il,i)*(ph(il,i)-ph(il,i+1))
+      fsum(il)=fsum(il)+fqd(il,i)
+     :              *(lv(il,i)+(cl-cpd)*(t_wake(il,i)-t_wake(il,1)))
+     :                  *(ph(il,i)-ph(il,i+1))
+      gsum(il)=gsum(il)+(lv(il,i)+(cl-cpd)*(t_wake(il,i)-t_wake(il,1)))
+     :                      *(ph(il,i)-ph(il,i+1))
+      hsum(il)=hsum(il)+t_wake(il,i)
+     ;                      *(ph(il,i)-ph(il,i+1))/th_wake(il,i)
         endif
        enddo
@@ -3025 +3046 @@
        do il=1,ncum
         if (i.le.(icb(il)-1) .and. iflag(il) .le. 1) then
-         ft(il,i)=asum(il)*t(il,i)/(th(il,i)*dsum(il))
-         fr(il,i)=bsum(il)/csum(il)
+         ftd(il,i)=esum(il)*t_wake(il,i)/(th_wake(il,i)*hsum(il))
+         fqd(il,i)=fsum(il)/gsum(il)
+         ft(il,i)=ftd(il,i)+asum(il)*t(il,i)/(th(il,i)*dsum(il))
+         fr(il,i)=fqd(il,i)+bsum(il)/csum(il)
         endif
        enddo
       enddo
-
 c
 c   ***           reset counter and return           ***