Changeset 2408 for LMDZ5/branches/testing/libf/phylmd/write_histday_seri.h

Timestamp:

Dec 14, 2015, 11:43:09 AM (9 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r2298:2396 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/phylmd/write_histday_seri.h (modified) (11 diffs)

LMDZ5/branches/testing/libf/phylmd/write_histday_seri.h

@@ -7 +7 @@
 !
       ndex2d = 0
-      itau_w = itau_phy + itap + start_time * day_step / iphysiq
+      itau_w = itau_phy + itap + start_time * day_step_phy
 !
 ! Champs 2D:
@@ -20 +20 @@
       ok_msk=.FALSE.
       msk(1:klon)=pctsrf(1:klon,is_ter)
-      CALL moyglo_pondaire(klon, zx_tmp_fi2d, airephy,  &
-           ok_msk, msk, moyglo)
-      zx_tmp_fi2d(1:klon)=moyglo
-!
-      CALL gr_fi_ecrit(1, klon,iim,jjmp1, zx_tmp_fi2d,zx_tmp_2d)
+      CALL moyglo_pondaire(klon, zx_tmp_fi2d, cell_area,  &
+           ok_msk, msk, moyglo)
+      zx_tmp_fi2d(1:klon)=moyglo
+!
+      CALL gr_fi_ecrit(1, klon,nbp_lon,nbp_lat, zx_tmp_fi2d,zx_tmp_2d)
       CALL histwrite(nid_day_seri,"bilTOA",itau_w, &
-                     zx_tmp_2d,iim*jjmp1,ndex2d)
-!
-      ok_msk=.FALSE.
-      CALL moyglo_pondaire(klon, bils, airephy,  &
-           ok_msk, msk, moyglo)
-      zx_tmp_fi2d(1:klon)=moyglo
-!
-      CALL gr_fi_ecrit(1, klon,iim,jjmp1, zx_tmp_fi2d,zx_tmp_2d)
+                     zx_tmp_2d,nbp_lon*nbp_lat,ndex2d)
+!
+      ok_msk=.FALSE.
+      CALL moyglo_pondaire(klon, bils, cell_area,  &
+           ok_msk, msk, moyglo)
+      zx_tmp_fi2d(1:klon)=moyglo
+!
+      CALL gr_fi_ecrit(1, klon,nbp_lon,nbp_lat, zx_tmp_fi2d,zx_tmp_2d)
       CALL histwrite(nid_day_seri,"bils",itau_w, &
-                     zx_tmp_2d,iim*jjmp1,ndex2d)
+                     zx_tmp_2d,nbp_lon*nbp_lat,ndex2d)
 !
       DO k=1, klev
@@ -45 +45 @@
 !
       CALL moyglo_pondaima(klon, klev, zx_tmp_fi3d,  &
-           airephy, paprs, moyglo)
-      zx_tmp_fi2d(1:klon)=moyglo
-!
-      CALL gr_fi_ecrit(1, klon,iim,jjmp1, zx_tmp_fi2d,zx_tmp_2d)
+           cell_area, paprs, moyglo)
+      zx_tmp_fi2d(1:klon)=moyglo
+!
+      CALL gr_fi_ecrit(1, klon,nbp_lon,nbp_lat, zx_tmp_fi2d,zx_tmp_2d)
       CALL histwrite(nid_day_seri,"ecin",itau_w, &
-                     zx_tmp_2d,iim*jjmp1,ndex2d) 
+                     zx_tmp_2d,nbp_lon*nbp_lat,ndex2d) 
 !
 !IM 151004 BEG
@@ -62 +62 @@
 !
       CALL moyglo_pondaima(klon, klev, zx_tmp_fi3d,  &
-           airephy, paprs, moyglo)
-      zx_tmp_fi2d(1:klon)=moyglo
-!
-      CALL gr_fi_ecrit(1, klon,iim,jjmp1, zx_tmp_fi2d,zx_tmp_2d)
+           cell_area, paprs, moyglo)
+      zx_tmp_fi2d(1:klon)=moyglo
+!
+      CALL gr_fi_ecrit(1, klon,nbp_lon,nbp_lat, zx_tmp_fi2d,zx_tmp_2d)
       CALL histwrite(nid_day_seri,"momang",itau_w,zx_tmp_2d, &
-                     iim*jjmp1,ndex2d)
+                     nbp_lon*nbp_lat,ndex2d)
 !
 ! friction torque
@@ -76 +76 @@
 !
       ok_msk=.FALSE.
-      CALL moyglo_pondaire(klon, zx_tmp_fi2d, airephy,  &
-           ok_msk, msk, moyglo)
-      zx_tmp_fi2d(1:klon)=moyglo
-!
-      CALL gr_fi_ecrit(1, klon,iim,jjmp1, zx_tmp_fi2d,zx_tmp_2d)
+      CALL moyglo_pondaire(klon, zx_tmp_fi2d, cell_area,  &
+           ok_msk, msk, moyglo)
+      zx_tmp_fi2d(1:klon)=moyglo
+!
+      CALL gr_fi_ecrit(1, klon,nbp_lon,nbp_lat, zx_tmp_fi2d,zx_tmp_2d)
       CALL histwrite(nid_day_seri,"frictor",itau_w,zx_tmp_2d, &
-                     iim*jjmp1,ndex2d)
+                     nbp_lon*nbp_lat,ndex2d)
 !
 ! mountain torque
 !
 !IM 190504 BEG
-      CALL gr_fi_dyn(1,klon,iim+1,jjm+1,airephy,airedyn)
-      CALL gr_fi_dyn(klev+1,klon,iim+1,jjm+1,paprs,padyn)
-      CALL gr_fi_dyn(1,klon,iim+1,jjm+1,rlat,rlatdyn)
+      CALL gr_fi_dyn(1,klon,nbp_lon+1,nbp_lat,cell_area,airedyn)
+      CALL gr_fi_dyn(klev+1,klon,nbp_lon+1,nbp_lat,paprs,padyn)
+      CALL gr_fi_dyn(1,klon,nbp_lon+1,nbp_lat,rlat,rlatdyn)
       mountor=0.
       airetot=0.
-      DO j = 1, jjmp1
-       DO i = 1, iim+1
-        ij=i+(iim+1)*(j-1)
+      DO j = 1, nbp_lat
+       DO i = 1, nbp_lon+1
+        ij=i+(nbp_lon+1)*(j-1)
         zx_tmp(ij)=0.
         DO k = 1, klev
@@ -113 +113 @@
 !
 !IM 190504 END
-      zx_tmp_2d(1:iim,1:jjmp1)=mountor
+      zx_tmp_2d(1:nbp_lon,1:nbp_lat)=mountor
       CALL histwrite(nid_day_seri,"mountor",itau_w,zx_tmp_2d, &
-                     iim*jjmp1,ndex2d)
+                     nbp_lon*nbp_lat,ndex2d)
 !
       ENDIF !(1.EQ.0) THEN
 !
 !
-      CALL gr_fi_dyn(1,klon,iim+1,jjm+1,airephy,airedyn)
-      CALL gr_fi_ecrit(1,klon,iim,jjmp1,airephy,zx_tmp_2d)
+      CALL gr_fi_dyn(1,klon,nbp_lon+1,nbp_lat,cell_area,airedyn)
+      CALL gr_fi_ecrit(1,klon,nbp_lon,nbp_lat,cell_area,zx_tmp_2d)
       airetot=0.
-!     DO j = 1, jjmp1
-!      DO i = 1, iim+1
-!       ij=i+(iim+1)*(j-1)
+!     DO j = 1, nbp_lat
+!      DO i = 1, nbp_lon+1
+!       ij=i+(nbp_lon+1)*(j-1)
 !       DO k = 1, klev
 !        airetot=airetot+airedyn(i,j)
@@ -134 +134 @@
 !
       DO i=1, klon
-       airetot=airetot+airephy(i)
+       airetot=airetot+cell_area(i)
       ENDDO
 !     IF(itap.EQ.1) PRINT*,'airetotphy=',airetot
 !
       airetot=0.
-      DO j=1, jjmp1
-       DO i=1, iim
+      DO j=1, nbp_lat
+       DO i=1, nbp_lon
         airetot=airetot+zx_tmp_2d(i,j)
        ENDDO
@@ -149 +149 @@
 !
       zx_tmp_fi2d(1:klon)=aam/airetot
-      CALL gr_fi_ecrit(1,klon,iim,jjmp1,zx_tmp_fi2d,zx_tmp_2d)
+      CALL gr_fi_ecrit(1,klon,nbp_lon,nbp_lat,zx_tmp_fi2d,zx_tmp_2d)
       CALL histwrite(nid_day_seri,"momang",itau_w,zx_tmp_2d, &
-                     iim*jjmp1,ndex2d)
+                     nbp_lon*nbp_lat,ndex2d)
 !
       zx_tmp_fi2d(1:klon)=torsfc/airetot
-      CALL gr_fi_ecrit(1,klon,iim,jjmp1,zx_tmp_fi2d,zx_tmp_2d)
+      CALL gr_fi_ecrit(1,klon,nbp_lon,nbp_lat,zx_tmp_fi2d,zx_tmp_2d)
       CALL histwrite(nid_day_seri,"torsfc",itau_w,zx_tmp_2d, &
-                     iim*jjmp1,ndex2d)
+                     nbp_lon*nbp_lat,ndex2d)
 !
 !IM 151004 END
 !
       CALL moyglo_pondmass(klon, klev, t_seri, &
-           airephy, paprs, moyglo)
-      zx_tmp_fi2d(1:klon)=moyglo
-!
-      CALL gr_fi_ecrit(1,klon,iim,jjmp1,zx_tmp_fi2d,zx_tmp_2d)
+           cell_area, paprs, moyglo)
+      zx_tmp_fi2d(1:klon)=moyglo
+!
+      CALL gr_fi_ecrit(1,klon,nbp_lon,nbp_lat,zx_tmp_fi2d,zx_tmp_2d)
       CALL histwrite(nid_day_seri,"tamv",itau_w, &
-                     zx_tmp_2d,iim*jjmp1,ndex2d)
-!
-      ok_msk=.FALSE.
-      CALL moyglo_pondaire(klon, paprs(:,1), airephy,  &
-           ok_msk, msk, moyglo)
-      zx_tmp_fi2d(1:klon)=moyglo
-!
-      CALL gr_fi_ecrit(1, klon,iim,jjmp1, zx_tmp_fi2d,zx_tmp_2d)
+                     zx_tmp_2d,nbp_lon*nbp_lat,ndex2d)
+!
+      ok_msk=.FALSE.
+      CALL moyglo_pondaire(klon, paprs(:,1), cell_area,  &
+           ok_msk, msk, moyglo)
+      zx_tmp_fi2d(1:klon)=moyglo
+!
+      CALL gr_fi_ecrit(1, klon,nbp_lon,nbp_lat, zx_tmp_fi2d,zx_tmp_2d)
       CALL histwrite(nid_day_seri,"psol",itau_w, &
-                     zx_tmp_2d,iim*jjmp1,ndex2d)
-!
-      ok_msk=.FALSE.
-      CALL moyglo_pondaire(klon, evap, airephy,  &
-           ok_msk, msk, moyglo)
-      zx_tmp_fi2d(1:klon)=moyglo
-!
-      CALL gr_fi_ecrit(1, klon,iim,jjmp1, zx_tmp_fi2d,zx_tmp_2d)
+                     zx_tmp_2d,nbp_lon*nbp_lat,ndex2d)
+!
+      ok_msk=.FALSE.
+      CALL moyglo_pondaire(klon, evap, cell_area,  &
+           ok_msk, msk, moyglo)
+      zx_tmp_fi2d(1:klon)=moyglo
+!
+      CALL gr_fi_ecrit(1, klon,nbp_lon,nbp_lat, zx_tmp_fi2d,zx_tmp_2d)
       CALL histwrite(nid_day_seri,"evap",itau_w, &
-                     zx_tmp_2d,iim*jjmp1,ndex2d)
+                     zx_tmp_2d,nbp_lon*nbp_lat,ndex2d)
 !
 !     DO i=1, klon
@@ -192 +192 @@
 !     ok_msk=.TRUE.
 !     msk(1:klon)=pctsrf(1:klon,is_ter)
-!     CALL moyglo_pondaire(klon, zx_tmp_fi2d, airephy, 
+!     CALL moyglo_pondaire(klon, zx_tmp_fi2d, cell_area, 
 !    .                     ok_msk, msk, moyglo)
 !     zx_tmp_fi2d(1:klon)=moyglo
 !
-!     CALL gr_fi_ecrit(1, klon,iim,jjmp1,zx_tmp_fi2d,zx_tmp_2d)
+!     CALL gr_fi_ecrit(1, klon,nbp_lon,nbp_lat,zx_tmp_fi2d,zx_tmp_2d)
 !     CALL histwrite(nid_day_seri,"SnowFrac",
-!    .               itau_w,zx_tmp_2d,iim*jjmp1,ndex2d) 
+!    .               itau_w,zx_tmp_2d,nbp_lon*nbp_lat,ndex2d) 
 !
 !     DO i=1, klon
@@ -208 +208 @@
 !     ok_msk=.TRUE.
 !     msk(1:klon)=pctsrf(1:klon,is_ter)
-!     CALL moyglo_pondaire(klon, zx_tmp_fi2d, airephy, 
+!     CALL moyglo_pondaire(klon, zx_tmp_fi2d, cell_area, 
 !    .     ok_msk, msk, moyglo)
 !     zx_tmp_fi2d(1:klon)=moyglo
 !
-!     CALL gr_fi_ecrit(1, klon,iim,jjmp1,zx_tmp_fi2d,zx_tmp_2d)
+!     CALL gr_fi_ecrit(1, klon,nbp_lon,nbp_lat,zx_tmp_fi2d,zx_tmp_2d)
 !     CALL histwrite(nid_day_seri,"snow_depth",itau_w,
-!    .               zx_tmp_2d,iim*jjmp1,ndex2d)
+!    .               zx_tmp_2d,nbp_lon*nbp_lat,ndex2d)
 !
       DO i=1, klon
@@ -222 +222 @@
       ok_msk=.TRUE.
       msk(1:klon)=pctsrf(1:klon,is_oce)
-      CALL moyglo_pondaire(klon, zx_tmp_fi2d, airephy,  &
-           ok_msk, msk, moyglo)
-      zx_tmp_fi2d(1:klon)=moyglo
-!
-      CALL gr_fi_ecrit(1, klon,iim,jjmp1, zx_tmp_fi2d, zx_tmp_2d)
+      CALL moyglo_pondaire(klon, zx_tmp_fi2d, cell_area,  &
+           ok_msk, msk, moyglo)
+      zx_tmp_fi2d(1:klon)=moyglo
+!
+      CALL gr_fi_ecrit(1, klon,nbp_lon,nbp_lat, zx_tmp_fi2d, zx_tmp_2d)
       CALL histwrite(nid_day_seri,"tsol_"//clnsurf(is_oce), &
-                     itau_w,zx_tmp_2d,iim*jjmp1,ndex2d) 
+                     itau_w,zx_tmp_2d,nbp_lon*nbp_lat,ndex2d) 
 !
 !=================================================================