Changeset 1128 for LMDZ4

Timestamp:

Mar 19, 2009, 12:30:08 PM (16 years ago)

Author:

idelkadi

Message:

Rajout d'arguments dans la subroutine concvl.F

File:

• LMDZ4/branches/LMDZ4-dev/libf/phylmd/concvl.F (modified) (6 diffs)

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

@@ -5 +5 @@
       SUBROUTINE concvl (iflag_con,iflag_clos,
      .             dtime,paprs,pplay,
-     .             t,q,t_wake,q_wake,u,v,tra,ntra,
+     .             t,q,t_wake,q_wake,s_wake,u,v,tra,ntra,
      .             ALE,ALP,work1,work2,
      .             d_t,d_q,d_u,d_v,d_tra,
@@ -25 +25 @@
 c
       USE dimphy
-      USE infotrac, ONLY : nbtr
       IMPLICIT none
 c======================================================================
@@ -68 +67 @@
 c
 #include "dimensions.h"
+cccccc#include "dimphy.h"
+c
+      integer NTRAC
+      PARAMETER (NTRAC=nqmx-2)
 c
        INTEGER iflag_con,iflag_clos
@@ -74 +77 @@
        REAL t(klon,klev),q(klon,klev),u(klon,klev),v(klon,klev)
        REAL t_wake(klon,klev),q_wake(klon,klev)
-       REAL tra(klon,klev,nbtr)
+       Real s_wake(klon)
+       REAL tra(klon,klev,ntrac)
        INTEGER ntra
        REAL work1(klon,klev),work2(klon,klev),ptop2(klon)
@@ -82 +86 @@
        REAL d_t(klon,klev),d_q(klon,klev),d_u(klon,klev),d_v(klon,klev)
        REAL dd_t(klon,klev),dd_q(klon,klev)
-       REAL d_tra(klon,klev,nbtr)
+       REAL d_tra(klon,klev,ntrac)
        REAL rain(klon),snow(klon)
 c
@@ -346 +350 @@
       CALL cva_driver(klon,klev,klev+1,ntra,nloc,
      $              iflag_con,iflag_mix,iflag_clos,dtime,
-     :              t,q,qs,t_wake,q_wake,qs_wake,u,v,tra,
+     :              t,q,qs,t_wake,q_wake,qs_wake,s_wake,u,v,tra,
      $              em_p,em_ph,
      .              ALE,ALP,