Changeset 263

Timestamp:

Jul 24, 2001, 9:32:34 AM (23 years ago)

Author:

lmdzadmin

Message:

rajout KE vectorise + sorties diverses
LF

File:

• LMDZ.3.3/branches/rel-LF/libf/phylmd/physiq.F (modified) (6 diffs)

LMDZ.3.3/branches/rel-LF/libf/phylmd/physiq.F

@@ -478 +478 @@
       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
@@ -1442 +1443 @@
      .                "inst(X)", zsto,zout)
 c
+         CALL histdef(nid_ins, "plul", "Large-scale Precip.", "mm/day",
+     .                iim,jjmp1,nhori, 1,1,1, -99, 32,
+     .                "inst(X)", zsto,zout)
+c
+         CALL histdef(nid_ins, "pluc", "Convective Precip.", "mm/day",
+     .                iim,jjmp1,nhori, 1,1,1, -99, 32,
+     .                "inst(X)", zsto,zout)
+
         CALL histdef(nid_ins, "qsol", "Surface humidity", "mm",
      .                iim,jjmp1,nhori, 1,1,1, -99, 32, 
@@ -1920 +1929 @@
 c$$$     .        ,bbase,dtvpdt1,dtvpdq1,dplcldt,dplcldr,
 c$$$     .        pori_con,plcl_con,dtma_con,dtlcl_con)
+          if (1.eq.1) 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,
+     .        rain_con, snow_con, ibas_con, itop_con,
+     .        upwd,dnwd,dnwd0,
+c    .        Ma,cape,tvp,(/(nint(rflag(i)),i=1,size(rflag))/),
+     .        Ma,cape,tvp,iflagctrl,
+     .       pbase
+     .        ,bbase,dtvpdt1,dtvpdq1,dplcldt,dplcldr)
+
+          else
+
           CALL conema (dtime,paprs,pplay,t_seri,q_seri,
      $        u_seri,v_seri,tr_seri,nbtr,
@@ -1930 +1953 @@
      .        ,bbase,dtvpdt1,dtvpdq1,dplcldt,dplcldr)
 c$$$     .        pori_con,plcl_con,dtma_con,dtlcl_con)
+          endif
           DO i = 1, klon
             ema_pcb(i)  = pbase(i)
@@ -2791 +2815 @@
      .                                   iim*jjmp1*klev,ndex3d)
 c
-      CALL gr_fi_ecrit(klev,klon,iim,jjm+1, zpt_conv, zx_tmp_3d)
+      CALL gr_fi_ecrit(klev,klon,iim,jjmp1, zpt_conv, zx_tmp_3d)
       CALL histwrite(nid_mth,"ptconv",itap,zx_tmp_3d,
      .                                   iim*(jjm+1)*klev,ndex3d)
 c
-      CALL gr_fi_ecrit(klev,klon,iim,jjm+1, ratqs, zx_tmp_3d)
+      CALL gr_fi_ecrit(klev,klon,iim,jjmp1, ratqs, zx_tmp_3d)
       CALL histwrite(nid_mth,"ratqs",itap,zx_tmp_3d,
      .                                   iim*(jjm+1)*klev,ndex3d)
@@ -2921 +2945 @@
       CALL histwrite(nid_ins,"psol",itap,zx_tmp_2d,iim*jjmp1,ndex2d)
 c
+      DO i = 1, klon
+         zx_tmp_fi2d(i) = rain_fall(i) + snow_fall(i)
+      ENDDO
+      CALL gr_fi_ecrit(1, klon,iim,jjmp1, zx_tmp_fi2d,zx_tmp_2d)
+      CALL histwrite(nid_ins,"rain",itap,zx_tmp_2d,iim*jjmp1,ndex2d)
+c
+      DO i = 1, klon
+         zx_tmp_fi2d(i) = rain_lsc(i) + snow_lsc(i)
+      ENDDO
+      CALL gr_fi_ecrit(1, klon,iim,jjmp1, zx_tmp_fi2d,zx_tmp_2d)
+      CALL histwrite(nid_ins,"plul",itap,zx_tmp_2d,iim*jjmp1,ndex2d)
+c
+      DO i = 1, klon
+         zx_tmp_fi2d(i) = rain_con(i) + snow_con(i)
+      ENDDO
+      CALL gr_fi_ecrit(1, klon,iim,jjmp1, zx_tmp_fi2d,zx_tmp_2d)
+      CALL histwrite(nid_ins,"pluc",itap,zx_tmp_2d,iim*jjmp1,ndex2d)
+
       CALL gr_fi_ecrit(1, klon,iim,jjmp1, zxtsol,zx_tmp_2d)
       CALL histwrite(nid_ins,"tsol",itap,zx_tmp_2d,iim*jjmp1,ndex2d)
-c
-      DO i = 1, klon
-         zx_tmp_fi2d(i) = rain_fall(i) + snow_fall(i)
-      ENDDO
-      CALL gr_fi_ecrit(1, klon,iim,jjmp1, zx_tmp_fi2d,zx_tmp_2d)
-      CALL histwrite(nid_ins,"rain",itap,zx_tmp_2d,iim*jjmp1,ndex2d)
 c
       CALL gr_fi_ecrit(1, klon,iim,jjmp1, snow_fall,zx_tmp_2d)