Changeset 1518 for LMDZ5/trunk/libf/phylmd/cva_driver.F

Timestamp:

May 12, 2011, 3:32:22 PM (13 years ago)

Author:

idelkadi

Message:

Modifications des routines de convection :

• correction de bug : le champ sigd n'etait pas decompresse avant d'etre sorti de la convection.
• sortir de nouveaux champs de convection (plcl, plfc, wb)

File:

• LMDZ5/trunk/libf/phylmd/cva_driver.F (modified) (11 diffs)

LMDZ5/trunk/libf/phylmd/cva_driver.F

@@ -11 +11 @@
      &                   sig1feed1,sig2feed1,wght1,
      o                   iflag1,ft1,fq1,fu1,fv1,ftra1,
-     &                   precip1,kbas1,ktop1,cbmf1,
+     &                   precip1,kbas1,ktop1,
+     &                   cbmf1,plcl1,plfc1,wbeff1,
      &                   sig1,w01,                  !input/output
-     &                   ptop21,sigd,
+     &                   ptop21,sigd1,
      &                   Ma1,mip1,Vprecip1,upwd1,dnwd1,dnwd01,
      &                   qcondc1,wd1,
@@ -150 +151 @@
       integer ktop1(len)
       real cbmf1(len)
-!      real cbmflast(len)
+      real plcl1(klon)
+      real plfc1(klon)
+      real wbeff1(klon)
       real sig1(len,klev)      !input/output
       real w01(len,klev)       !input/output
       real ptop21(len)
+      real sigd1(len)
       real Ma1(len,nd)
       real mip1(len,nd)
@@ -320 +324 @@
 c$OMP THREADPRIVATE(debut)
 
-      real plcl1(klon)
       real tnk1(klon)
       real thnk1(klon)
@@ -365 +368 @@
       integer inb(nloc), inbis(nloc)
 
-      real cbmf(nloc),plcl(nloc)
+      real cbmf(nloc),plcl(nloc),plfc(nloc),wbeff(nloc)
       real t(nloc,klev),q(nloc,klev),qs(nloc,klev)
       real t_wake(nloc,klev),q_wake(nloc,klev),qs_wake(nloc,klev)
@@ -495 +498 @@
       call  zilch(cbmf1   ,nword1)
       call  zilch(ptop21  ,nword1)
+      sigd1=0.
       call  zilch(Ma1     ,nword2)
       call  zilch(mip1    ,nword2)
@@ -794 +798 @@
      o                       ,sig,w0,ptop2,cape,cin,m,iflag,coef_clos
      :                       ,Plim1,Plim2,asupmax,supmax0
-     :                       ,asupmaxmin,cbmf)
+     :                       ,asupmaxmin,cbmf,plfc,wbeff)
+       
+        print *,'cv3p1_closure-> plfc,wbeff ', plfc(1),wbeff(1)
        ENDIF
       endif   ! iflag_con.eq.3
@@ -863 +869 @@
       if (debut) THEN 
        print *,'cv_unsat-> '
-       debut=.FALSE.
       endif !(debut) THEN
 !
@@ -889 +894 @@
      :                    ,tls,tps,qcondc,wd
      :                    ,ftd,fqd)
-!      print *,' cv3_yield -> fqd(1) = ',fqd(1,1)
-      endif
-
+      endif
+c
+      if (debut) THEN 
+       print *,' cv3_yield -> fqd(1) = ',fqd(1,1)
+      endif !(debut) THEN
+c
       if (iflag_con.eq.4) then
        CALL cv_yield(nloc,ncum,nd,nk,icb,inb,delt
@@ -912 +920 @@
        CALL cv3a_uncompress(nloc,len,ncum,nd,ntra,idcum
      :          ,iflag,icb,inb
-     :          ,precip,cbmf,sig,w0,ptop2
+     :          ,precip,cbmf,plcl,plfc,wbeff,sig,w0,ptop2
      :          ,ft,fq,fu,fv,ftra
-     :          ,Ma,mip,Vprecip,upwd,dnwd,dnwd0
+     :          ,sigd,Ma,mip,Vprecip,upwd,dnwd,dnwd0
      ;          ,qcondc,wd,cape,cin
      :          ,tvp
@@ -921 +929 @@
      :          ,asupmaxmin
      o          ,iflag1,kbas1,ktop1
-     o          ,precip1,cbmf1,sig1,w01,ptop21
+     o          ,precip1,cbmf1,plcl1,plfc1,wbeff1,sig1,w01,ptop21
      o          ,ft1,fq1,fu1,fv1,ftra1
-     o          ,Ma1,mip1,Vprecip1,upwd1,dnwd1,dnwd01
+     o          ,sigd1,Ma1,mip1,Vprecip1,upwd1,dnwd1,dnwd01
      o          ,qcondc1,wd1,cape1,cin1
      o          ,tvp1
@@ -944 +952 @@
 
       ENDIF ! ncum>0
+c
+      if (debut) THEN 
+       print *,' cv_compress -> '
+       debut=.FALSE.
+      endif !(debut) THEN
+c
 
 9999  continue