Changeset 1127 for LMDZ4/branches/LMDZ4-dev/libf/phylmd/cva_driver.F

Timestamp:

Mar 19, 2009, 11:38:04 AM (16 years ago)

Author:

idelkadi

Message:

Corrections sur les wakes et la convection pour surmonter le probleme de l'eau negative

File:

• LMDZ4/branches/LMDZ4-dev/libf/phylmd/cva_driver.F (modified) (10 diffs)

LMDZ4/branches/LMDZ4-dev/libf/phylmd/cva_driver.F

@@ -2 +2 @@
      &                   iflag_con,iflag_mix,
      &                   iflag_clos,delt,
-     &                   t1,q1,qs1,t1_wake,q1_wake,qs1_wake,
+     &                   t1,q1,qs1,t1_wake,q1_wake,qs1_wake,s1_wake,
      &                   u1,v1,tra1,
      &                   p1,ph1,
@@ -50 +50 @@
 C      q1_wake       Real           Input        specific hum(unsat draught envt)
 C      qs1_wake      Real           Input        sat specific hum(unsat draughts envt)
+C      s1_wake       Real           Input        fractionnal area covered by wakes
 C      u1            Real           Input        u-wind
 C      v1            Real           Input        v-wind
@@ -121 +122 @@
       real q1_wake(len,nd)
       real qs1_wake(len,nd)
+      real s1_wake(len)
       real u1(len,nd)
       real v1(len,nd)
@@ -198 +200 @@
 !       Must be defined at same grid levels as T.
 !
+!s_wake: Array of fractionnal area occupied by the wakes.
+!
 !  u:   Array of zonal wind velocity (m/s) of dimension ND, witth first
 !       index corresponding with the lowest model level. Defined at
@@ -358 +362 @@
       real t(nloc,klev),q(nloc,klev),qs(nloc,klev)
       real t_wake(nloc,klev),q_wake(nloc,klev),qs_wake(nloc,klev)
+      real s_wake(nloc)
       real u(nloc,klev),v(nloc,klev)
       real gz(nloc,klev),h(nloc,klev)     ,hm(nloc,klev)
@@ -531 +536 @@
         print*,'Emanuel version 3 nouvelle'
        endif 
-
+!       print*,'t1, q1 ',t1,q1
        CALL cv3_prelim(len,nd,ndp1,t1,q1,p1,ph1      ! nd->na
      o               ,lv1,cpn1,tv1,gz1,h1,hm1,th1)
@@ -668 +673 @@
 
       if (iflag_con.eq.3) then
-     
+!       print*,'ncum tv1 ',ncum,tv1 
+!       print*,'tvp1 ',tvp1
        CALL cv3a_compress( len,nloc,ncum,nd,ntra
      :    ,iflag1,nk1,icb1,icbs1
      :    ,plcl1,tnk1,qnk1,gznk1,hnk1,unk1,vnk1
      :    ,wghti1,pbase1,buoybase1
-     :    ,t1,q1,qs1,t1_wake,q1_wake,qs1_wake,u1,v1,gz1,th1,th1_wake
+     :    ,t1,q1,qs1,t1_wake,q1_wake,qs1_wake,s1_wake
+     :    ,u1,v1,gz1,th1,th1_wake
      :    ,tra1
      :    ,h1     ,lv1     ,cpn1   ,p1,ph1,tv1    ,tp1,tvp1,clw1
@@ -682 +689 @@
      o    ,plcl,tnk,qnk,gznk,hnk,unk,vnk
      o    ,wghti,pbase,buoybase
-     o    ,t,q,qs,t_wake,q_wake,qs_wake,u,v,gz,th,th_wake
+     o    ,t,q,qs,t_wake,q_wake,qs_wake,s_wake
+     o    ,u,v,gz,th,th_wake
      o    ,tra
      o    ,h     ,lv     ,cpn    ,p,ph,tv    ,tp,tvp,clw
@@ -688 +696 @@
      o    ,sig,w0,ptop2
      o    ,Ale,Alp  ) 
+
+!       print*,'tv ',tv
+!       print*,'tvp ',tvp
 
       endif
@@ -856 +867 @@
        CALL cv3_yield(nloc,ncum,nd,nd,ntra            ! na->nd
      :                     ,icb,inb,delt
-     :                     ,t,q,t_wake,q_wake,u,v,tra
+     :                     ,t,q,t_wake,q_wake,s_wake,u,v,tra
      :                     ,gz,p,ph,h,hp,lv,cpn,th,th_wake
      :                     ,ep,clw,m,tp,mp,qp,up,vp,trap