Changeset 1518 for LMDZ5/trunk/libf/phylmd/cv3a_uncompress.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/cv3a_uncompress.F (modified) (5 diffs)

LMDZ5/trunk/libf/phylmd/cv3a_uncompress.F

@@ -1 +1 @@
       SUBROUTINE cv3a_uncompress(nloc,len,ncum,nd,ntra,idcum
      :         ,iflag,kbas,ktop
-     :         ,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
@@ -10 +10 @@
      :         ,asupmaxmin
      o         ,iflag1,kbas1,ktop1
-     :         ,precip1,cbmf1,sig1,w01,ptop21
+     :         ,precip1,cbmf1,plcl1,plfc1,wbeff1,sig1,w01,ptop21
      :         ,ft1,fq1,fu1,fv1,ftra1
-     :         ,Ma1,mip1,Vprecip1,upwd1,dnwd1,dnwd01
+     :         ,sigd1,Ma1,mip1,Vprecip1,upwd1,dnwd1,dnwd01
      :         ,qcondc1,wd1,cape1,cin1
      :         ,tvp1
@@ -35 +35 @@
       integer idcum(nloc)
       integer iflag(nloc),kbas(nloc),ktop(nloc)
-      real precip(nloc),cbmf(nloc)
+      real precip(nloc),cbmf(nloc),plcl(nloc),plfc(nloc)
+      real wbeff(len)
       real sig(nloc,nd), w0(nloc,nd),ptop2(nloc)
       real ft(nloc,nd), fq(nloc,nd), fu(nloc,nd), fv(nloc,nd)
       real ftra(nloc,nd,ntra)
+      real sigd(nloc)
       real Ma(nloc,nd),mip(nloc,nd),Vprecip(nloc,nd+1)
       real upwd(nloc,nd),dnwd(nloc,nd),dnwd0(nloc,nd)
@@ -51 +53 @@
 c outputs:
       integer iflag1(len),kbas1(len),ktop1(len)
-      real precip1(len),cbmf1(len)
+      real precip1(len),cbmf1(len),plcl1(nloc),plfc1(nloc)
+      real wbeff1(len)
       real sig1(len,nd), w01(len,nd),ptop21(len)
       real ft1(len,nd), fq1(len,nd), fu1(len,nd), fv1(len,nd)
       real ftra1(len,nd,ntra)
+      real sigd1(len)
       real Ma1(len,nd),mip1(len,nd),Vprecip1(len,nd+1)
       real upwd1(len,nd),dnwd1(len,nd),dnwd01(len,nd)
@@ -70 +74 @@
         do 2000 i=1,ncum
          ptop21(idcum(i))=ptop2(i)
+         sigd1(idcum(i))=sigd(i)
          precip1(idcum(i))=precip(i)
          cbmf1(idcum(i))=cbmf(i)
+         plcl1(idcum(i))=plcl(i)
+         plfc1(idcum(i))=plfc(i)
+         wbeff1(idcum(i))=wbeff(i)
          iflag1(idcum(i))=iflag(i)
          kbas1(idcum(i))=kbas(i)