Changeset 254 for LMDZ.3.3/trunk

Timestamp:

Jul 4, 2001, 4:58:03 PM (23 years ago)

Author:

lmdz

Message:

Inclusion de la version vectorisee de KE FH
LF

Location:

LMDZ.3.3/trunk/libf/phylmd

Files:

• conemav.F (added)
• convect1.F (added)
• convect2.F (added)
• physiq.F (modified) (11 diffs)
• printflag.F (modified) (1 diff)
• zilch.F (added)

LMDZ.3.3/trunk/libf/phylmd/physiq.F

@@ -472 +472 @@
       SAVE bbase
       REAL rflag(klon)          ! flag fonctionnement de convect
+      INTEGER iflagctrl(klon)          ! flag fonctionnement de convect
 c -- convect43:
       INTEGER ntra              ! nb traceurs pour convect4.3
@@ -691 +692 @@
 cKE43
 c Initialisation pour la convection de K.E. (sb):
-         IF (iflag_con.EQ.4) THEN
+         IF (iflag_con.GE.3) THEN
 
          PRINT*, "*** Convection de Kerry Emanuel 4.3  "
@@ -1086 +1087 @@
      .                "ave(X)", zsto,zout)
 cKE43
-      IF (iflag_con .EQ. 4) THEN ! sb
+      IF (iflag_con .GE. 3) THEN ! sb
 c
          CALL histdef(nid_mth, "cape", "Conv avlbl pot ener", "J/Kg",
@@ -1271 +1272 @@
 c
 cKE43
-      IF (iflag_con.EQ.4) THEN ! (sb)
+      IF (iflag_con.GE.3) THEN ! (sb)
 c
          CALL histdef(nid_mth, "upwd", "saturated updraft", "Kg/m2/s",
@@ -1713 +1714 @@
          itop_con(i) = klev+1 - kctop(i)
       ENDDO
-      ELSE IF (iflag_con.EQ.3) THEN
-          stop'reactiver le call conlmd dans physiq.F'
-c     CALL conccm (dtime,paprs,pplay,t_seri,q_seri,conv_q,
-c    s             d_t_con, d_q_con, 
-c    s             rain_con, snow_con, ibas_con, itop_con)
-cKE43
-      ELSE IF (iflag_con.EQ.4) THEN
+      ELSE IF (iflag_con.GE.3) THEN
 c nb of tracers for the KE convection:
           if (nqmax .GE. 4) then
@@ -1726 +1721 @@
               ntra = 1 
           endif
-cke43 (arguments inutiles enleves => des SAVE dans conema43?)
-c$$$          CALL conema43(dtime,paprs,pplay,t_seri,q_seri,
-c$$$     $        u_seri,v_seri,tr_seri,nbtr,
-c$$$     .        ema_workcbmf,
-c$$$     .        d_t_con,d_q_con,d_u_con,d_v_con,d_tr,
-c$$$     .        wdn, tdn, qdn,
-c$$$     .        rain_con, snow_con, ibas_con, itop_con,
-c$$$     .        upwd,dnwd,dnwd0,bas,top,Ma,cape,tvp,rflag,
-c$$$     .        pbase
-c$$$     .        ,bbase,dtvpdt1,dtvpdq1,dplcldt,dplcldr,
-c$$$     .        pori_con,plcl_con,dtma_con,dtlcl_con)
-          CALL conema (dtime,paprs,pplay,t_seri,q_seri,
-     $        u_seri,v_seri,tr_seri,nbtr,
+          if (iflag_con.eq.4) then ! vectorise
+          CALL conemav (dtime,paprs,pplay,t_seri,q_seri,
+     .        u_seri,v_seri,tr_seri,nbtr,
      .        ema_work1,ema_work2,
      .        d_t_con,d_q_con,d_u_con,d_v_con,d_tr,
-c$$$     .        wdn, tdn, qdn,
      .        rain_con, snow_con, ibas_con, itop_con,
-     .        upwd,dnwd,dnwd0,bas,top,Ma,cape,tvp,rflag,
-     .        pbase
+     .        upwd,dnwd,dnwd0,
+c    .        Ma,cape,tvp,(/(nint(rflag(i)),i=1,size(rflag))/),
+     .        Ma,cape,tvp,iflagctrl,
+     .       pbase
      .        ,bbase,dtvpdt1,dtvpdq1,dplcldt,dplcldr)
-c$$$     .        pori_con,plcl_con,dtma_con,dtlcl_con)
+
+          else
+
+          CALL conema (dtime,paprs,pplay,t_seri,q_seri,
+     .        u_seri,v_seri,tr_seri,nbtr,
+     .        ema_work1,ema_work2,
+     .        d_t_con,d_q_con,d_u_con,d_v_con,d_tr,
+     .        rain_con, snow_con, ibas_con, itop_con,
+     .        upwd,dnwd,dnwd0,bas,top,
+     .        Ma,cape,tvp,rflag,
+     .       pbase
+     .        ,bbase,dtvpdt1,dtvpdq1,dplcldt,dplcldr)
+          endif
+
+
           DO i = 1, klon
             ema_pcb(i)  = pbase(i)
@@ -1809 +1809 @@
       IF (nqmax.GT.2) THEN !--melange convectif de traceurs
 c
-          IF (iflag_con .NE. 2 .AND.  iflag_con .NE. 4 ) THEN 
+          IF (iflag_con .NE. 2 .AND.  iflag_con .LT. 3 ) THEN 
               PRINT*, 'Pour l instant, seul conflx fonctionne ',
      $            'avec traceurs', iflag_con
@@ -2101 +2101 @@
 C Pascale : il faut quand meme apeller phytrac car il gere les sorties
 cKE43       des traceurs => il faut donc mettre des flags a .false.
-      IF (iflag_con.EQ.4) THEN
+      IF (iflag_con.GE.3) THEN
 c           on ajoute les tendances calculees par KE43
         DO iq=1, nqmax-2 ! Sandrine a -3 ???
@@ -2440 +2440 @@
       CALL histwrite(nid_mth,"vq",itap,zx_tmp_2d,iim*jjmp1,ndex2d)
 cKE43
-      IF (iflag_con .EQ. 4) THEN ! sb
+      IF (iflag_con .GE. 3) THEN ! sb
 c
       CALL gr_fi_ecrit(1, klon,iim,jjmp1, cape,zx_tmp_2d)
@@ -2542 +2542 @@
       CALL gr_fi_ecrit(klev,klon,iim,jjmp1, zpt_conv, zx_tmp_3d)
       CALL histwrite(nid_mth,"ptconv",itap,zx_tmp_3d,
-     .                                   iim*jjmp1*klev,ndex3d)
+     .                                   iim*(jjmp1)*klev,ndex3d)
 c
       CALL gr_fi_ecrit(klev,klon,iim,jjmp1, ratqs, zx_tmp_3d)
       CALL histwrite(nid_mth,"ratqs",itap,zx_tmp_3d,
-     .                                   iim*jjmp1*klev,ndex3d)
+     .                                   iim*(jjmp1)*klev,ndex3d)
 c
       CALL gr_fi_ecrit(klev,klon,iim,jjmp1, d_t_ajs, zx_tmp_3d)
@@ -2619 +2619 @@
       ENDIF
 cKE43
-      IF (iflag_con.EQ.4) THEN ! (sb)
+      IF (iflag_con.GE.3) THEN ! (sb)
 c
       CALL gr_fi_ecrit(klev,klon,iim,jjmp1, upwd, zx_tmp_3d)

LMDZ.3.3/trunk/libf/phylmd/printflag.F

@@ -35 +35 @@
      ,          ******'
        ELSE IF ( iflag_con.EQ. 3 )   THEN
-           PRINT *,' *****           Shema  convection    CCM      
+           PRINT *,' *****   Shema  convection Emanuel version LMD
+     ,          ******'
+       ELSE IF ( iflag_con.EQ. 4 )   THEN
+           PRINT *,' *****   Shema  convection Emanuel version 4vec
      ,          ******'
        ENDIF