Changeset 767

Timestamp:

Jun 4, 2007, 4:39:50 PM (17 years ago)

Author:

Laurent Fairhead

Message:

Merge entre la version V3_conv et le HEAD
YM, JG, LF

File:

• LMDZ4/trunk/libf/phylmd/ini_histhf3d.h (modified) (3 diffs)

LMDZ4/trunk/libf/phylmd/ini_histhf3d.h

@@ -1 @@
-c
 c $Header$
 c
@@ -12 +11 @@
         CALL ymds2ju(annee_ref, 1, idayref, 0.0, zjulian)
 c
-        CALL gr_fi_ecrit(1,klon,iim,jjmp1,rlon,zx_lon)
-        DO i = 1, iim
-         zx_lon(i,1) = rlon(i+1)
-         zx_lon(i,jjmp1) = rlon(i+1)
-        ENDDO
-c
-        CALL gr_fi_ecrit(1,klon,iim,jjmp1,rlat,zx_lat)
-        CALL histbeg("histhf3d", iim,zx_lon(:,1), jjmp1,zx_lat(1,:),
-     .                 1,iim,1,jjmp1, itau_phy, zjulian, dtime, 
+
+cym         CALL gr_fi_ecrit(1,klon,iim,jjmp1,rlon,zx_lon)
+cym         DO i = 1, iim
+cym            zx_lon(i,1) = rlon(i+1)
+cym            zx_lon(i,jjmp1) = rlon(i+1)
+cym         ENDDO
+
+cym         CALL gr_fi_ecrit(1,klon,iim,jjmp1,rlat,zx_lat)
+
+cccIM      CALL histbeg("histhf", iim,zx_lon, jjmp1,zx_lat,
+cym         CALL histbeg("histhf3d", iim,zx_lon(:,1), jjmp1,zx_lat(1,:),
+cym     .                 1,iim,1,jjmp1, itau_phy, zjulian, dtime, 
+cym     .                 nhori, nid_hf3d)
+         CALL histbeg_phy("histhf3d", itau_phy, zjulian, dtime, 
      .                 nhori, nid_hf3d)
-c
+
         CALL histvert(nid_hf3d, "presnivs", "Vertical levels", "mb",
      .                 klev, presnivs/100., nvert)
@@ -29 +33 @@
 c
         CALL histdef(nid_hf3d, "temp", "Air temperature", "K",
-     .                iim,jjmp1,nhori, klev,1,klev,nvert, 32,
-     .                "inst(X)", zstohf, zstohf)
+     .                iim,jjphy_nb,nhori, klev,1,klev,nvert, 32,
+     .                "inst(X)", zstohf,zout)
 c
         CALL histdef(nid_hf3d, "ovap", "Specific humidity", "kg/kg",
-     .                iim,jjmp1,nhori, klev,1,klev,nvert, 32,
-     .                "inst(X)", zstohf, zstohf)
+     .                iim,jjphy_nb,nhori, klev,1,klev,nvert, 32,
+     .                "inst(X)", zstohf,zout)
 c
         CALL histdef(nid_hf3d, "vitu", "Zonal wind", "m/s",
-     .                iim,jjmp1,nhori, klev,1,klev,nvert, 32,
-     .                "inst(X)", zstohf, zstohf)
+     .                iim,jjphy_nb,nhori, klev,1,klev,nvert, 32,
+     .                "inst(X)", zstohf,zout)
 c
         CALL histdef(nid_hf3d, "vitv", "Meridional wind", "m/s",
-     .                iim,jjmp1,nhori, klev,1,klev,nvert, 32,
-     .                "inst(X)", zstohf, zstohf)
+     .                iim,jjphy_nb,nhori, klev,1,klev,nvert, 32,
+     .                "inst(X)", zstohf,zout)
 c
         CALL histend(nid_hf3d)