Changeset 1864 for LMDZ5/branches/testing/libf/phylmd/concvl.F

Timestamp:

Sep 11, 2013, 11:45:01 AM (11 years ago)

Author:

Laurent Fairhead

Message:

Création d'une nouvelle testing:

merge des modifications du trunk entre r1796 et r1860

---

New testing version

merged modifications between r1796 and r1860 from the trunk

i.e.
svn merge -r1796:1860 ​http://svn.lmd.jussieu.fr/LMDZ/LMDZ5/trunk

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/phylmd/concvl.F (modified) (7 diffs)

LMDZ5/branches/testing/libf/phylmd/concvl.F

@@ -1 @@
-      SUBROUTINE concvl (iflag_con,iflag_clos,
+      SUBROUTINE concvl (iflag_clos,
      .             dtime,paprs,pplay,
      .             t,q,t_wake,q_wake,s_wake,u,v,tra,ntra,
-     .             ALE,ALP,work1,work2,
+     .             ALE,ALP,sig1,w01,
      .             d_t,d_q,d_u,d_v,d_tra,
      .             rain, snow, kbas, ktop, sigd,
@@ -70 +70 @@
 c======================================================================
 c
+
+#include "clesphys.h"
 #include "dimensions.h"
 c
-       INTEGER iflag_con,iflag_clos
+       INTEGER iflag_clos
 c
        REAL dtime, paprs(klon,klev+1),pplay(klon,klev)
@@ -80 +82 @@
        REAL tra(klon,klev,nbtr)
        INTEGER ntra
-       REAL work1(klon,klev),work2(klon,klev),ptop2(klon)
+       REAL sig1(klon,klev),w01(klon,klev),ptop2(klon)
        REAL pmflxr(klon,klev+1),pmflxs(klon,klev+1)
        REAL ALE(klon),ALP(klon)
@@ -354 +356 @@
       if (iflag_con.eq.30) then
 
-      print *, '-> cv_driver'      !jyg
+!      print *, '-> cv_driver'      !jyg
       CALL cv_driver(klon,klev,klevp1,ntra,iflag_con,
      :              t,q,qs,u,v,tra,
      $              em_p,em_ph,iflag,
      $              d_t,d_q,d_u,d_v,d_tra,rain,
-     $              Vprecip,cbmf,work1,work2,                  !jyg
+     $              Vprecip,cbmf,sig1,w01,                  !jyg
      $              kbas,ktop,
      $              dtime,Ma,upwd,dnwd,dnwdbis,qcondc,wd,cape,
@@ -365 +367 @@
      $              evap,ep,epmlmMm,eplaMm,                    !RomP
      $              wdtrainA,wdtrainM)                         !RomP
-      print *, 'cv_driver ->'      !jyg
+!      print *, 'cv_driver ->'      !jyg
 c
       DO i = 1,klon
@@ -376 +378 @@
       nloc=klon
       CALL cva_driver(klon,klev,klev+1,ntra,nloc,
-     $              iflag_con,iflag_mix,iflag_clos,dtime,
+     $              iflag_con,iflag_mix,iflag_ice_thermo,
+     $              iflag_clos,dtime,
      :              t,q,qs,t_wake,q_wake,qs_wake,s_wake,u,v,tra,
      $              em_p,em_ph,
@@ -382 +385 @@
      .              em_sig1feed,em_sig2feed,em_wght,
      .              iflag,d_t,d_q,d_u,d_v,d_tra,rain,kbas,ktop,
-     $              cbmf,plcl,plfc,wbeff,work1,work2,ptop2,sigd,
+     $              cbmf,plcl,plfc,wbeff,sig1,w01,ptop2,sigd,
      $              Ma,mip,Vprecip,upwd,dnwd,dnwdbis,qcondc,wd,
      $              cape,cin,tvp,