Changeset 353

Timestamp:

Mar 21, 2002, 4:09:32 PM (22 years ago)

Author:

lmdzadmin

Message:

2 changements pour les fichiers histoire:

• utilisation de l'entree "rectilineaire" de IOIPSL pour ne plus avoir

a

lancer ncregular a chaque fois

• le calendrier des fichiers histoire est maintenant base sur la date d'initialisation de la simulation plutot que sur la date de depart du

job

en cours

LF

Location:

LMDZ.3.3/branches/rel-LF/libf

Files:

• bibio/initdynav.F (modified) (1 diff)
• bibio/initfluxsto.F (modified) (4 diffs)
• bibio/inithist.F (modified) (4 diffs)
• bibio/writedynav.F (modified) (7 diffs)
• bibio/writehist.F (modified) (7 diffs)
• bibio/writephys.F90 (modified) (2 diffs)
• dyn3d/create_etat0_limit.F (modified) (1 diff)
• dyn3d/dynetat0.F (modified) (2 diffs)
• dyn3d/dynredem.F (modified) (6 diffs)
• dyn3d/gcm.F (modified) (2 diffs)
• dyn3d/limit_netcdf.F (modified) (1 diff)
• dyn3d/offlinenc.F (modified) (4 diffs)
• dyn3d/physdem.F (deleted)
• dyn3d/temps.h (modified) (1 diff)
• dyn3d/temps.inc (modified) (1 diff)
• phylmd/clmain.F (modified) (3 diffs)
• phylmd/condsurf.F (modified) (2 diffs)
• phylmd/initphysto.F (modified) (3 diffs)
• phylmd/interface_surf.F90 (modified) (7 diffs)
• phylmd/phyetat0.F (modified) (7 diffs)
• phylmd/physiq.F (modified) (56 diffs)
• phylmd/phytrac.F (modified) (2 diffs)

LMDZ.3.3/branches/rel-LF/libf/bibio/initdynav.F

@@ +1 @@
+c
+c $Header$
+c
       subroutine initdynav(infile,day0,anne0,tstep,t_ops,t_wrt
      .                     ,nq,fileid)

LMDZ.3.3/branches/rel-LF/libf/bibio/initfluxsto.F

@@ -66 +66 @@
       integer uhoriid, vhoriid, thoriid, zvertiid,dhoriid,dvertiid
       integer ii,jj
-      integer zan
+      integer zan, idayref
       logical ok_sync
 C
@@ -79 +79 @@
 C         
 
-      zan = anne_ini
-      CALL ymds2ju(zan, 1, 1, 0.0, zjulian)
-      zjulian = zjulian + day_ini
-      tau0 = 0
+      zan = annee_ref
+      idayref = day_ref
+      CALL ymds2ju(zan, 1, idayref, 0.0, zjulian)
+      tau0 = itau_dyn
         
         do jj = 1, jjp1
@@ -91 +91 @@
       enddo
  
-      call histbeg(infile, iip1, rlong, jjp1, rlat,
+      call histbeg(infile, iip1, rlong(:,1), jjp1, rlat(1,:),
      .             1, iip1, 1, jjp1,
      .             tau0, zjulian, tstep, uhoriid, fileid)
@@ -107 +107 @@
       enddo
 
-      call histbeg('fluxstokev.nc', iip1, rlong, jjm, rlat,
+      call histbeg('fluxstokev.nc', iip1, rlong(:,1), jjm, rlat(1,:),
      .             1, iip1, 1, jjm,
      .             tau0, zjulian, tstep, vhoriid, filevid)

LMDZ.3.3/branches/rel-LF/libf/bibio/inithist.F

@@ -64 +64 @@
       integer uhoriid, vhoriid, thoriid, zvertiid
       integer ii,jj
-      integer zan
+      integer zan, dayref
 C
 C  Initialisations
@@ -76 +76 @@
 
       zan = anne0
-      CALL ymds2ju(zan, 1, 1, 0.0, zjulian)
-      zjulian = zjulian + day0
-      tau0 = 0
+      dayref = day0
+      CALL ymds2ju(zan, 1, dayref, 0.0, zjulian)
+      tau0 = itau_dyn
       
       do jj = 1, jjp1
@@ -87 +87 @@
       enddo
        
-      call histbeg(infile, iip1, rlong, jjp1, rlat,
+      call histbeg(infile, iip1, rlong(:,1), jjp1, rlat(1,:),
      .             1, iip1, 1, jjp1,
      .             tau0, zjulian, tstep, uhoriid, fileid)
@@ -102 +102 @@
       enddo
 
-      call histbeg('dyn_histv.nc', iip1, rlong, jjm, rlat,
+      call histbeg('dyn_histv.nc', iip1, rlong(:,1), jjm, rlat(1,:),
      .             1, iip1, 1, jjm,
      .             tau0, zjulian, tstep, vhoriid, filevid)

LMDZ.3.3/branches/rel-LF/libf/bibio/writedynav.F

@@ -64 +64 @@
       REAL vnat(ip1jm,llm),unat(ip1jmp1,llm) 
       logical ok_sync
+      integer itau_w
 C
 C  Initialisations
@@ -76 +77 @@
       vnat = 999.999
       unat = 999.999
+      itau_w = itau_dyn + time
 
 C Passage aux composantes naturelles du vent
@@ -86 +88 @@
 C
       call gr_u_scal(llm, unat, us)
-      call histwrite(histid, 'u', time, us, 
+      call histwrite(histid, 'u', itau_w, us, 
      .               iip1*jjp1*llm, ndex3d)
 C
@@ -92 +94 @@
 C
       call gr_v_scal(llm, vnat, vs)
-      call histwrite(histid, 'v', time, vs, 
+      call histwrite(histid, 'v', itau_w, vs, 
      .               iip1*jjp1*llm, ndex3d)
 C
 C  Temperature potentielle moyennee
 C
-      call histwrite(histid, 'theta', time, teta, 
+      call histwrite(histid, 'theta', itau_w, teta, 
      .                iip1*jjp1*llm, ndex3d)
 C
@@ -105 +107 @@
         tm(ii) = teta(ii) * ppk(ii)/cpp
       enddo
-      call histwrite(histid, 'temp', time, tm, 
+      call histwrite(histid, 'temp', itau_w, tm, 
      .                iip1*jjp1*llm, ndex3d)
 C
 C  Geopotentiel
 C
-      call histwrite(histid, 'phi', time, phi, 
+      call histwrite(histid, 'phi', itau_w, phi, 
      .                iip1*jjp1*llm, ndex3d)
 C
@@ -122 +124 @@
             WRITE(str(2:3),'(i2.2)') iq
           ENDIF
-          call histwrite(histid, str, time, q(:,:,iq), 
+          call histwrite(histid, str, itau_w, q(:,:,iq), 
      .                   iip1*jjp1*llm, ndex3d)
         enddo
@@ -129 +131 @@
 C  Masse
 C
-       call histwrite(histid, 'masse', time, masse, iip1*jjp1, ndex2d)
+       call histwrite(histid, 'masse', itau_w, masse, iip1*jjp1, ndex2d)
 C
 C  Pression au sol
 C
-       call histwrite(histid, 'ps', time, ps, iip1*jjp1, ndex2d)
+       call histwrite(histid, 'ps', itau_w, ps, iip1*jjp1, ndex2d)
 C
 C  Geopotentiel au sol
 C
-       call histwrite(histid, 'phis', time, phis, iip1*jjp1, ndex2d)
+       call histwrite(histid, 'phis', itau_w, phis, iip1*jjp1, ndex2d)
 C
 C  Fin

LMDZ.3.3/branches/rel-LF/libf/bibio/writehist.F

@@ -63 +63 @@
       character*3 str
       logical ok_sync
+      integer itau_w
 C
 C  Initialisations
@@ -71 +72 @@
       ndex2d = 0
       ok_sync =.TRUE.
+      itau_w = itau_dyn + time
 C
 C  Appels a histwrite pour l'ecriture des variables a sauvegarder
@@ -76 +78 @@
 C  Vents U
 C
-      call histwrite(histid, 'ucov', time, ucov, 
+      call histwrite(histid, 'ucov', itau_w, ucov, 
      .               iip1*jjp1*llm, ndexu)
 
@@ -82 +84 @@
 C  Vents V
 C
-      call histwrite(histvid, 'vcov', time, vcov, 
+      call histwrite(histvid, 'vcov', itau_w, vcov, 
      .               iip1*jjm*llm, ndexv)
 
@@ -88 +90 @@
 C  Temperature potentielle
 C
-      call histwrite(histid, 'teta', time, teta, 
+      call histwrite(histid, 'teta', itau_w, teta, 
      .                iip1*jjp1*llm, ndexu)
 C
 C  Geopotentiel
 C
-      call histwrite(histid, 'phi', time, phi, 
+      call histwrite(histid, 'phi', itau_w, phi, 
      .                iip1*jjp1*llm, ndexu)
 C
@@ -105 +107 @@
             WRITE(str(2:3),'(i2.2)') iq
           ENDIF
-          call histwrite(histid, str, time, q(:,:,iq), 
+          call histwrite(histid, str, itau_w, q(:,:,iq), 
      .                   iip1*jjp1*llm, ndexu)
         enddo
@@ -112 +114 @@
 C  Masse
 C
-      call histwrite(histid, 'masse', time, masse, iip1*jjp1, ndex2d)
+      call histwrite(histid, 'masse', itau_w, masse, iip1*jjp1, ndex2d)
 C
 C  Pression au sol
 C
-      call histwrite(histid, 'ps', time, ps, iip1*jjp1, ndex2d)
+      call histwrite(histid, 'ps', itau_w, ps, iip1*jjp1, ndex2d)
 C
 C  Geopotentiel au sol
 C
-      call histwrite(histid, 'phis', time, phis, iip1*jjp1, ndex2d)
+      call histwrite(histid, 'phis', itau_w, phis, iip1*jjp1, ndex2d)
 C
 C  Fin

LMDZ.3.3/branches/rel-LF/libf/bibio/writephys.F90

@@ -93 +93 @@
   real, dimension(llm) :: zlev
   real                 :: date0, dtime
+  integer              :: itau_deb
 !
 ! Variables locales
@@ -121 +122 @@
 ! Initialisation du fichier
 !
-  call histbeg(nom_fichier, iim, temp_lon, jjm, temp_lat, &
-     &                 1, iim, 1, jjm, 0, date0, dtime, &
+  call histbeg(nom_fichier, iim, temp_lon(:,1), jjm, temp_lat(1,:), &
+     &                 1, iim, 1, jjm, itau_deb, date0, dtime, &
      &                 nhori, file_id)
   call histvert(file_id, "presnivs", "Vertical levels", "mb", &

LMDZ.3.3/branches/rel-LF/libf/dyn3d/create_etat0_limit.F

@@ -18 +18 @@
 
       LOGICAL interbar, extrap , oldice
-      PARAMETER ( interbar = .TRUE. , extrap = .FALSE. , oldice=.TRUE.)
+      PARAMETER ( interbar = .TRUE. , extrap = .FALSE. , oldice=.true.)
 #include "dimensions.h"
 #include "paramet.h"

LMDZ.3.3/branches/rel-LF/libf/dyn3d/dynetat0.F

@@ -82 +82 @@
       jm         = tab_cntrl(2)
       lllm       = tab_cntrl(3)
-      day_ini    = tab_cntrl(4)
-      anne_ini   = tab_cntrl(5)
+      day_ref    = tab_cntrl(4)
+      annee_ref  = tab_cntrl(5)
       rad        = tab_cntrl(6)
       omeg       = tab_cntrl(7)
@@ -115 +115 @@
         IF( tab_cntrl(27).EQ.1. ) ysinus = . TRUE. 
       ENDIF
+
+      day_ini = tab_cntrl(30)
+      itau_dyn = tab_cntrl(31)
 c   .................................................................
 c

LMDZ.3.3/branches/rel-LF/libf/dyn3d/dynredem.F

@@ -1 +1 @@
 c $Header$
 c
-      SUBROUTINE dynredem0(fichnom,idayref,anneeref,phis,nq)
+      SUBROUTINE dynredem0(fichnom,iday_end,phis,nq)
       USE IOIPSL
       IMPLICIT NONE
@@ -23 +23 @@
 c   Arguments:
 c   ----------
-      INTEGER*4 idayref,anneeref
+      INTEGER iday_end
       REAL phis(ip1jmp1)
       CHARACTER*(*) fichnom
@@ -56 +56 @@
       modname='dynredem'
 
-      call ymds2ju(anneeref,1,idayref,0.0, zjulian)
-      call ju2ymds(zjulian, yyears0,mmois0,jjour0,hours)
+      call ymds2ju(annee_ref, 1, iday_end, 0.0, zjulian)
+      call ju2ymds(zjulian, yyears0, mmois0, jjour0, hours)
         
 
@@ -66 +66 @@
        tab_cntrl(2)  = FLOAT(jjm)
        tab_cntrl(3)  = FLOAT(llm)
-       tab_cntrl(4)  = FLOAT(idayref)
-       tab_cntrl(5)  = FLOAT(anneeref)
+       tab_cntrl(4)  = FLOAT(day_ref)
+       tab_cntrl(5)  = FLOAT(annee_ref)
        tab_cntrl(6)  = rad
        tab_cntrl(7)  = omeg
@@ -106 +106 @@
        IF( ysinus )  tab_cntrl(27) = 1.
       ENDIF
+
+       tab_cntrl(30) = FLOAT(iday_end)
+       tab_cntrl(31) = FLOAT(itau_dyn + itaufin)
 c
 c    .........................................................
@@ -378 +381 @@
       ierr = NF_CLOSE(nid) ! fermer le fichier
 
-      PRINT*,'iim,jjm,llm,idayref',iim,jjm,llm,idayref
+      PRINT*,'iim,jjm,llm,iday_end',iim,jjm,llm,iday_end
       PRINT*,'rad,omeg,g,cpp,kappa',
      ,        rad,omeg,g,cpp,kappa

LMDZ.3.3/branches/rel-LF/libf/dyn3d/gcm.F

@@ -299 +299 @@
       PRINT 300, itau,itaufin,day_ini,day_end
 
-      CALL dynredem0("restart.nc",day_end,anne_ini,phis,nqmx)
+      CALL dynredem0("restart.nc", day_end, phis, nqmx)
 
       ecripar = .TRUE.
@@ -306 +306 @@
       t_ops = iecri * daysec
       t_wrt = iecri * daysec
-C      CALL inithist(dynhist_file,day_ini,anne_ini,time_step,
+C      CALL inithist(dynhist_file,day_ref,annee_ref,time_step,
 c     .              t_ops, t_wrt, nqmx, histid, histvid)
 
       t_ops = iperiod * time_step
       t_wrt = periodav * daysec
-      CALL initdynav(dynhistave_file,day_ini,anne_ini,time_step,
+      CALL initdynav(dynhistave_file,day_ref,annee_ref,time_step,
      .              t_ops, t_wrt, nqmx, histaveid)
 

LMDZ.3.3/branches/rel-LF/libf/dyn3d/limit_netcdf.F

@@ -226 +226 @@
      . dlon_msk, dlat_msk, champ_msk, interbar  )
 
-      CALL mask_c_o(imdep, jmdep, dlon_msk, dlat_msk,champ_msk,
-     .             iim, jjp1, rlonv, rlatu, champint)
-c      CALL gr_int_dyn(champint, masque, iim, jjp1)
-c      DO i = 1, iim
-c         masque(i,1) = FLOAT(NINT(masque(i,1)))
-c         masque(i,jjp1) = FLOAT(NINT(masque(i,jjp1)))
-c      ENDDO
       DO i = 1, iim
       DO j = 1, jjp1
-         mask(i,j) = champint(i,j)
-      ENDDO
-      ENDDO
-c      CALL gr_dyn_fi(1, iip1, jjp1, klon, masque, phy_nat0)
+         mask(i,j) = masque(i,j)
+      ENDDO
+      ENDDO
       ierr = NF_CLOSE(ncid)
 c

LMDZ.3.3/branches/rel-LF/libf/dyn3d/offlinenc.F

@@ -200 +200 @@
       else
          day_ini=0
-         anne_ini=0
+         annee_ref=0
       endif
 
@@ -347 +347 @@
       close(98)
 
-      CALL dynredem0("restart.nc",day_end,anne_ini,phis,nq)
+      CALL dynredem0("restart.nc",day_end,phis,nq)
 
 c-----------------------------------------------------------------------
@@ -398 +398 @@
          dynhistave_file = 'histmoy.nc'
          day_ini=0
-         anne_ini=0
+         annee_ref=0
          t_ops =(1./48.)*daysec
          t_wrt =(1./48.)*daysec
@@ -404 +404 @@
          mode=1
 
-c        CALL initdynav(dynhistave_file,day_ini,anne_ini,dtav,
+c        CALL initdynav(dynhistave_file,day_ini,annee_ref,dtav,
 c    .              t_ops, t_wrt, nq,mode, histaveid)
 

LMDZ.3.3/branches/rel-LF/libf/dyn3d/temps.h

@@ -4 +4 @@
 ! INCLUDE 'temps.h'
 
-      COMMON/temps/itaufin,dt, day_ini,day_end,anne_ini
+      COMMON/temps/itaufin, dt, day_ini, day_end, annee_ref, day_ref,
+     .             itau_dyn, itau_phy
 
-      INTEGER  itaufin
-      INTEGER*4 day_ini,day_end,anne_ini
-      REAL     dt
+      INTEGER   itaufin
+      INTEGER*4 itau_dyn, itau_phy
+      INTEGER*4 day_ini, day_end, annee_ref, day_ref
+      REAL      dt
 
 !-----------------------------------------------------------------------

LMDZ.3.3/branches/rel-LF/libf/dyn3d/temps.inc

@@ +1 @@
+!
+! $Header$
+!
 !-----------------------------------------------------------------------
 ! INCLUDE 'temps.h'
 
-      COMMON/temps/itaufin,dt, &
-     &  day_ini,day_end,anne_ini
+      COMMON/temps/itaufin, dt, &
+     &  day_ini, day_end, annee_ref, day_ref, itau_dyn, itau_phy
 
       INTEGER  itaufin
-      INTEGER*4 day_ini,day_end,anne_ini
+      INTEGER*4 itau_dyn, itau_phy
+      INTEGER*4 day_ini, day_end, annee_ref, day_ref
       REAL     dt
 

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

@@ -201 +201 @@
       SAVE debugindex
       DATA debugindex/.false./
+      integer idayref
 #include "temps.h"
       
@@ -208 +209 @@
 ! initialisation sorties netcdf
 !
-          CALL ymds2ju(anne_ini, 1, 1, 0.0, zjulian)
-          zjulian = zjulian + day_ini
+          idayref = day_ini
+          CALL ymds2ju(annee_ref, 1, idayref, 0.0, zjulian)
           CALL gr_fi_ecrit(1,klon,iim,jjm+1,rlon,zx_lon)
           DO i = 1, iim
@@ -217 +218 @@
           CALL gr_fi_ecrit(1,klon,iim,jjm+1,rlat,zx_lat)
           cldebug='sous_index'
-          CALL histbeg(cldebug, iim,zx_lon,jjm+1,zx_lat,1,iim,1,jjm
-     $        +1, 0,zjulian,dtime,nhoridbg,nidbg) 
+          CALL histbeg(cldebug, iim,zx_lon(:,1),jjm+1,zx_lat(1,:),
+     $        1,iim,1,jjm
+     $        +1, itau_phy,zjulian,dtime,nhoridbg,nidbg) 
 ! no vertical axis
           cl_surf(1)='ter'

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

@@ -67 +67 @@
 c  .............   modif  (  P. Le Van )  ...........
 
-       anneelim  = anne_ini
-       anneemax  = anne_ini + nannemax
+       anneelim  = annee_ref
+       anneemax  = annee_ref + nannemax
 c
 c
@@ -83 +83 @@
          PRINT *,' PBS ! Le jour a lire sur le fichier limit ne se '
          PRINT *,' trouve pas sur les ',nannemax,' annees a partir de '
-         PRINT *,' l annee de debut', anne_ini
+         PRINT *,' l annee de debut', annee_ref
            CALL EXIT(1)
 c

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

@@ -68 +68 @@
       integer uhoriid, vhoriid, thoriid, zvertiid
       integer ii,jj
-      integer zan
+      integer zan, idayref
       logical ok_sync
       REAL zx_lon(iim,jjm+1), zx_lat(iim,jjm+1)
@@ -85 +85 @@
 
       zan = anneeref
-      CALL ymds2ju(zan, 1, 1, 0.0, zjulian)
-      zjulian = zjulian + dayref
+      idayref = dayref
+      CALL ymds2ju(zan, 1, idayref, 0.0, zjulian)
       tau0 = 0
         
@@ -97 +97 @@
 
 
-      call histbeg(infile, iim, zx_lon, jjm+1, zx_lat,
+      call histbeg(infile, iim, zx_lon(:,1), jjm+1, zx_lat(1,:),
      .             1, iim, 1, jjm+1,
      .             tau0, zjulian, tstep, nhoriid, fileid)

LMDZ.3.3/branches/rel-LF/libf/phylmd/interface_surf.F90

@@ -1239 +1239 @@
   INTEGER :: ndexct(iim*(jjm+1)),ndexcs(iim*(jjm+1))
   REAL :: zx_lon(iim,jjm+1), zx_lat(iim,jjm+1), zjulian
+  integer :: idayref, itau_w
   include 'param_cou.h'
   include 'inc_cpl.h'
-  include 'temps.h'
+  include 'temps.inc'
 !
 ! Initialisation
@@ -1310 +1311 @@
 ! initialisation sorties netcdf
 !
-    CALL ymds2ju(anne_ini, 1, 1, 0.0, zjulian)
-    zjulian = zjulian + day_ini
+    idayref = day_ini
+    CALL ymds2ju(annee_ref, 1, idayref, 0.0, zjulian)
     CALL gr_fi_ecrit(1,klon,iim,jjm+1,rlon,zx_lon)
     DO i = 1, iim
@@ -1319 +1320 @@
     CALL gr_fi_ecrit(1,klon,iim,jjm+1,rlat,zx_lat)
     clintocplnam="cpl_atm_tauflx"
-    CALL histbeg(clintocplnam, iim,zx_lon,jjm+1,zx_lat,1,iim,1,jjm+1, &
-       & 0,zjulian,dtime,nhoridct,nidct) 
+    CALL histbeg(clintocplnam, iim,zx_lon(:,1),jjm+1,zx_lat(1,:),1,iim,1,jjm+1, &
+       & itau_phy,zjulian,dtime,nhoridct,nidct) 
 ! no vertical axis
     CALL histdef(nidct, 'tauxe','tauxe', &
@@ -1338 +1339 @@
 
     clfromcplnam="cpl_atm_sst"
-    CALL histbeg(clfromcplnam, iim,zx_lon,jjm+1,zx_lat,1,iim,1,jjm+1, &
+    CALL histbeg(clfromcplnam, iim,zx_lon(:,1),jjm+1,zx_lat(1,:),1,iim,1,jjm+1, &
        & 0,zjulian,dtime,nhoridcs,nidcs) 
 ! no vertical axis
@@ -1419 +1420 @@
 !
       ndexcs(:)=0
-      CALL histwrite(nidcs,cl_read(1),itime,read_sst,iim*(jjm+1),ndexcs)
-      CALL histwrite(nidcs,cl_read(2),itime,read_sic,iim*(jjm+1),ndexcs)
-      CALL histwrite(nidcs,cl_read(3),itime,read_alb_sic,iim*(jjm+1),ndexcs)
-      CALL histwrite(nidcs,cl_read(4),itime,read_sit,iim*(jjm+1),ndexcs)
+      itau_w = itau_phy + itime
+      CALL histwrite(nidcs,cl_read(1),itau_w,read_sst,iim*(jjm+1),ndexcs)
+      CALL histwrite(nidcs,cl_read(2),itau_w,read_sic,iim*(jjm+1),ndexcs)
+      CALL histwrite(nidcs,cl_read(3),itau_w,read_alb_sic,iim*(jjm+1),ndexcs)
+      CALL histwrite(nidcs,cl_read(4),itau_w,read_sit,iim*(jjm+1),ndexcs)
       CALL histsync(nidcs)
 ! pas utile      IF (npas-itime.LT.nexca )CALL histclo(nidcs)
@@ -1582 +1584 @@
 !
       ndexct(:)=0
-      CALL histwrite(nidct,'tauxe',itime,wri_taux,iim*(jjm+1),ndexct)
-      CALL histwrite(nidct,'tauyn',itime,wri_tauy,iim*(jjm+1),ndexct)
-      CALL histwrite(nidct,'tmp_lon',itime,tmp_lon,iim*(jjm+1),ndexct)
-      CALL histwrite(nidct,'tmp_lat',itime,tmp_lat,iim*(jjm+1),ndexct)
+      CALL histwrite(nidct,'tauxe',itau_w,wri_taux,iim*(jjm+1),ndexct)
+      CALL histwrite(nidct,'tauyn',itau_w,wri_tauy,iim*(jjm+1),ndexct)
+      CALL histwrite(nidct,'tmp_lon',itau_w,tmp_lon,iim*(jjm+1),ndexct)
+      CALL histwrite(nidct,'tmp_lat',itau_w,tmp_lat,iim*(jjm+1),ndexct)
 
 !
@@ -1596 +1598 @@
 ! envoi au coupleur
 !
-      CALL histwrite(nidct,cl_writ(1),itime,wri_sol_ice,iim*(jjm+1),ndexct)
-      CALL histwrite(nidct,cl_writ(2),itime,wri_sol_sea,iim*(jjm+1),ndexct)
-      CALL histwrite(nidct,cl_writ(3),itime,wri_nsol_ice,iim*(jjm+1),ndexct)
-      CALL histwrite(nidct,cl_writ(4),itime,wri_nsol_sea,iim*(jjm+1),ndexct)
-      CALL histwrite(nidct,cl_writ(5),itime,wri_fder_ice,iim*(jjm+1),ndexct)
-      CALL histwrite(nidct,cl_writ(6),itime,wri_evap_ice,iim*(jjm+1),ndexct)
-      CALL histwrite(nidct,cl_writ(7),itime,wri_evap_sea,iim*(jjm+1),ndexct)
-      CALL histwrite(nidct,cl_writ(8),itime,wri_rain,iim*(jjm+1),ndexct)
-      CALL histwrite(nidct,cl_writ(9),itime,wri_snow,iim*(jjm+1),ndexct)
-      CALL histwrite(nidct,cl_writ(10),itime,wri_rcoa,iim*(jjm+1),ndexct)
-      CALL histwrite(nidct,cl_writ(11),itime,wri_rriv,iim*(jjm+1),ndexct)
-      CALL histwrite(nidct,cl_writ(12),itime,wri_tauxx,iim*(jjm+1),ndexct)
-      CALL histwrite(nidct,cl_writ(13),itime,wri_tauyy,iim*(jjm+1),ndexct)
-      CALL histwrite(nidct,cl_writ(14),itime,wri_tauzz,iim*(jjm+1),ndexct)
-      CALL histwrite(nidct,cl_writ(15),itime,wri_tauxx,iim*(jjm+1),ndexct)
-      CALL histwrite(nidct,cl_writ(16),itime,wri_tauyy,iim*(jjm+1),ndexct)
-      CALL histwrite(nidct,cl_writ(17),itime,wri_tauzz,iim*(jjm+1),ndexct)
+      CALL histwrite(nidct,cl_writ(1),itau_w,wri_sol_ice,iim*(jjm+1),ndexct)
+      CALL histwrite(nidct,cl_writ(2),itau_w,wri_sol_sea,iim*(jjm+1),ndexct)
+      CALL histwrite(nidct,cl_writ(3),itau_w,wri_nsol_ice,iim*(jjm+1),ndexct)
+      CALL histwrite(nidct,cl_writ(4),itau_w,wri_nsol_sea,iim*(jjm+1),ndexct)
+      CALL histwrite(nidct,cl_writ(5),itau_w,wri_fder_ice,iim*(jjm+1),ndexct)
+      CALL histwrite(nidct,cl_writ(6),itau_w,wri_evap_ice,iim*(jjm+1),ndexct)
+      CALL histwrite(nidct,cl_writ(7),itau_w,wri_evap_sea,iim*(jjm+1),ndexct)
+      CALL histwrite(nidct,cl_writ(8),itau_w,wri_rain,iim*(jjm+1),ndexct)
+      CALL histwrite(nidct,cl_writ(9),itau_w,wri_snow,iim*(jjm+1),ndexct)
+      CALL histwrite(nidct,cl_writ(10),itau_w,wri_rcoa,iim*(jjm+1),ndexct)
+      CALL histwrite(nidct,cl_writ(11),itau_w,wri_rriv,iim*(jjm+1),ndexct)
+      CALL histwrite(nidct,cl_writ(12),itau_w,wri_tauxx,iim*(jjm+1),ndexct)
+      CALL histwrite(nidct,cl_writ(13),itau_w,wri_tauyy,iim*(jjm+1),ndexct)
+      CALL histwrite(nidct,cl_writ(14),itau_w,wri_tauzz,iim*(jjm+1),ndexct)
+      CALL histwrite(nidct,cl_writ(15),itau_w,wri_tauxx,iim*(jjm+1),ndexct)
+      CALL histwrite(nidct,cl_writ(16),itau_w,wri_tauyy,iim*(jjm+1),ndexct)
+      CALL histwrite(nidct,cl_writ(17),itau_w,wri_tauzz,iim*(jjm+1),ndexct)
       CALL histsync(nidct)
 ! pas utile      IF (lafin) CALL histclo(nidct)

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

@@ +1 @@
+c
+c $Header$
+c
       SUBROUTINE phyetat0 (fichnom,dtime,co2_ppm,solaire,
      .            rlat,rlon, pctsrf, tsol,tsoil,deltat,qsol,snow,
@@ -16 +19 @@
 #include "dimsoil.h"
 #include "clesphys.h"
+#include "temps.h"
 c======================================================================
       CHARACTER*(*) fichnom
@@ -37 +41 @@
       real fder(klon)
       REAL frugs(klon,nbsrf)
-      REAL agesno(klon)
+      REAL agesno(klon,nbsrf)
       REAL zmea(klon)
       REAL zstd(klon)
@@ -161 +165 @@
 
       ENDIF
+
+      itau_phy = tab_cntrl(15)
+
 c
 c Lecture des latitudes (coordonnees):
@@ -874 +881 @@
             xmax = MAX(frugs(i,1),xmax)
          ENDDO
-         PRINT*,'Neige du sol <RUG>', xmin, xmax
+         PRINT*,'rugosite <RUG>', xmin, xmax
          DO nsrf = 2, nbsrf
          DO i = 1, klon
@@ -888 +895 @@
       IF (ierr.NE.NF_NOERR) THEN
          PRINT*, 'phyetat0: Le champ <AGESNO> est absent'
-         PRINT*, "          Valeur par default: 50"
-         DO i = 1, klon
-            agesno(i) = 50.0
-         ENDDO
-      ELSE
-#ifdef NC_DOUBLE
-         ierr = NF_GET_VAR_DOUBLE(nid, nvarid, agesno)
-#else
-         ierr = NF_GET_VAR_REAL(nid, nvarid, agesno)
+         PRINT*, '          Mais je vais essayer de lire AGESNO**'
+         DO nsrf = 1, nbsrf
+           IF (nsrf.GT.99) THEN
+             PRINT*, "Trop de sous-mailles"
+             CALL abort
+           ENDIF
+           WRITE(str2,'(i2.2)') nsrf
+           ierr = NF_INQ_VARID (nid, "AGESNO"//str2, nvarid)
+           IF (ierr.NE.NF_NOERR) THEN
+              PRINT*, "phyetat0: Le champ <AGESNO"//str2//"> est absent"
+              agesno = 50.0
+           ENDIF
+#ifdef NC_DOUBLE
+           ierr = NF_GET_VAR_DOUBLE(nid, nvarid, agesno(1,nsrf))
+#else
+           ierr = NF_GET_VAR_REAL(nid, nvarid, agesno(1,nsrf))
+#endif
+           IF (ierr.NE.NF_NOERR) THEN
+             PRINT*, "phyetat0: Lecture echouee pour <AGESNO"//str2//">"
+             CALL abort
+           ENDIF
+           xmin = 1.0E+20
+           xmax = -1.0E+20
+           DO i = 1, klon
+              xmin = MIN(agesno(i,nsrf),xmin)
+              xmax = MAX(agesno(i,nsrf),xmax)
+           ENDDO
+           PRINT*,'Age de la neige AGESNO**:', nsrf, xmin, xmax
+         ENDDO
+      ELSE
+         PRINT*, 'phyetat0: Le champ <AGESNO> est present'
+         PRINT*, '          J ignore donc les autres AGESNO**'
+#ifdef NC_DOUBLE
+         ierr = NF_GET_VAR_DOUBLE(nid, nvarid, agesno(1,1))
+#else
+         ierr = NF_GET_VAR_REAL(nid, nvarid, agesno(1,1))
 #endif
          IF (ierr.NE.NF_NOERR) THEN
-            PRINT*, 'phyetat0: Lecture echouee pour <AGESNO>'
+            PRINT*, "phyetat0: Lecture echouee pour <AGESNO>"
             CALL abort
          ENDIF
@@ -905 +939 @@
          xmax = -1.0E+20
          DO i = 1, klon
-            xmin = MIN(agesno(i),xmin)
-            xmax = MAX(agesno(i),xmax)
-         ENDDO
-         PRINT*,'Age de la neige agesno:', xmin, xmax
-      ENDIF
-c
+            xmin = MIN(agesno(i,1),xmin)
+            xmax = MAX(agesno(i,1),xmax)
+         ENDDO
+         PRINT*,'Age de la neige <AGESNO>', xmin, xmax
+         DO nsrf = 2, nbsrf
+         DO i = 1, klon
+            agesno(i,nsrf) = agesno(i,1)
+         ENDDO
+         ENDDO
+      ENDIF
+
 c
       ierr = NF_INQ_VARID (nid, "ZMEA", nvarid)

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

@@ -360 +360 @@
 c
       INTEGER julien
-      INTEGER idayvrai
-      SAVE idayvrai
 c
       INTEGER lmt_pas
@@ -555 +553 @@
       SAVE ecrit_reg   ! frequence d'ecriture
 c
+      integer itau_w   ! pas de temps ecriture = itap + itau_phy
 c
 c
@@ -589 +588 @@
       logical ok_sync
       real date0
+      integer idayref
 
 C essai writephys
@@ -761 +761 @@
 c Gestion calendrier
 
-         CALL ymds2ju(anne_ini, 1, 1, 0.0, zjulian)
-         zjulian = zjulian + day_ini
-
 c
       IF (ok_journe) THEN
 c
-         CALL ymds2ju(anne_ini, 1, 1, 0.0, zjulian)
-         zjulian = zjulian + day_ini
+         idayref = day_ref
+         CALL ymds2ju(annee_ref, 1, idayref, 0.0, zjulian)
 c
          CALL gr_fi_ecrit(1,klon,iim,jjmp1,rlon,zx_lon)
@@ -779 +776 @@
          ENDDO
          CALL gr_fi_ecrit(1,klon,iim,jjmp1,rlat,zx_lat)
+         write(*,*)'zx_lon = ',zx_lon(:,1)
+         write(*,*)'zx_lat = ',zx_lat(1,:)
          CALL histbeg("histday", iim,zx_lon(:,1), jjmp1,zx_lat(1,:),
-     .                 1,iim,1,jjmp1, 0, zjulian, dtime, 
+     .                 1,iim,1,jjmp1, itau_phy, zjulian, dtime, 
      .                 nhori, nid_day)
+         write(*,*)'Journee ', itau_phy, zjulian
          CALL histvert(nid_day, "presnivs", "Vertical levels", "mb",
      .                 klev, presnivs, nvert)
@@ -1002 +1002 @@
       IF (ok_mensuel) THEN
 c
-         CALL ymds2ju(anne_ini, 1, 1, 0.0, zjulian)
-         zjulian = zjulian + day_ini
+         idayref = day_ref
+         CALL ymds2ju(annee_ref, 1, idayref, 0.0, zjulian)
 c
          CALL gr_fi_ecrit(1,klon,iim,jjmp1,rlon,zx_lon)
@@ -1015 +1015 @@
          CALL gr_fi_ecrit(1,klon,iim,jjmp1,rlat,zx_lat)
          CALL histbeg("histmth.nc", iim,zx_lon(:,1), jjmp1,zx_lat(1,:),
-     .                 1,iim,1,jjmp1, 0, zjulian, dtime, 
+     .                 1,iim,1,jjmp1, itau_phy, zjulian, dtime, 
      .                 nhori, nid_mth)
+         write(*,*)'Mensuel ', itau_phy, zjulian
          CALL histvert(nid_mth, "presnivs", "Vertical levels", "mb",
      .                 klev, presnivs, nvert)
@@ -1446 +1447 @@
       IF (ok_instan) THEN
 c
-         CALL ymds2ju(anne_ini, 1, 1, 0.0, zjulian)
-         zjulian = zjulian + day_ini
+         idayref = day_ref
+         CALL ymds2ju(annee_ref, 1, idayref, 0.0, zjulian)
 c
          CALL gr_fi_ecrit(1,klon,iim,jjmp1,rlon,zx_lon)
@@ -1458 +1459 @@
          ENDDO
          CALL gr_fi_ecrit(1,klon,iim,jjmp1,rlat,zx_lat)
-         CALL histbeg("histins", iim,zx_lon, jjmp1,zx_lat,
-     .                 1,iim,1,jjmp1, 0, zjulian, dtime,
+         CALL histbeg("histins", iim,zx_lon(:,1), jjmp1,zx_lat(1,:),
+     .                 1,iim,1,jjmp1, itau_phy, zjulian, dtime,
      .                 nhori, nid_ins)
+         write(*,*)'Inst ', itau_phy, zjulian
          CALL histvert(nid_ins, "presnivs", "Vertical levels", "mb",
      .                 klev, presnivs, nvert)
@@ -1763 +1765 @@
 c
       IF (MOD(itap-1,lmt_pas) .EQ. 0) THEN
-         idayvrai = NINT(xjour)
-         PRINT *,' PHYS cond  julien ',julien,idayvrai
+         PRINT *,' PHYS cond  julien ',julien
          CALL ozonecm( FLOAT(julien), rlat, paprs, wo)
       ENDIF
@@ -2398 +2399 @@
          zsto = dtime
          zout = dtime * FLOAT(ecrit_day)
+         itau_w = itau_phy + itap
 
          i = NINT(zout/zsto)
@@ -2418 +2420 @@
 C
       CALL gr_fi_ecrit(1, klon,iim,jjmp1, zxtsol,zx_tmp_2d)
-      CALL histwrite(nid_day,"tsol",itap,zx_tmp_2d,iim*jjmp1,ndex2d)
+      CALL histwrite(nid_day,"tsol",itau_w,zx_tmp_2d,iim*jjmp1,ndex2d)
 c     call writephy(fid_day,prof2d_av,'tsol',zxtsol,
 c    .              'Surface Temperature','K')
@@ -2425 +2427 @@
       zx_tmp_fi2d(1 : klon) = ftsol(1 : klon, is_ter)
       CALL gr_fi_ecrit(1, klon,iim,jjmp1, zx_tmp_fi2d ,zx_tmp_2d)
-      CALL histwrite(nid_day,"tter",itap,zx_tmp_2d,iim*jjmp1,ndex2d)
+      CALL histwrite(nid_day,"tter",itau_w,zx_tmp_2d,iim*jjmp1,ndex2d)
 c     call writephy(fid_day,prof2d_av,'tter',ftsol(1 : klon, is_ter),
 c    .              'Surface Temperature','K')
@@ -2431 +2433 @@
       zx_tmp_fi2d(1 : klon) = ftsol(1 : klon, is_lic)
       CALL gr_fi_ecrit(1, klon,iim,jjmp1, zxtsol,zx_tmp_2d)
-      CALL histwrite(nid_day,"tlic",itap,zx_tmp_2d,iim*jjmp1,ndex2d)
+      CALL histwrite(nid_day,"tlic",itau_w,zx_tmp_2d,iim*jjmp1,ndex2d)
 c     call writephy(fid_day,prof2d_av,'tlic',ftsol(1 : klon, is_lic),
 c    .              'Surface Temperature','K')
@@ -2437 +2439 @@
       zx_tmp_fi2d(1 : klon) = ftsol(1 : klon, is_oce)
       CALL gr_fi_ecrit(1, klon,iim,jjmp1, zxtsol,zx_tmp_2d)
-      CALL histwrite(nid_day,"toce",itap,zx_tmp_2d,iim*jjmp1,ndex2d)
+      CALL histwrite(nid_day,"toce",itau_w,zx_tmp_2d,iim*jjmp1,ndex2d)
 c     call writephy(fid_day,prof2d_av,'toce',ftsol(1 : klon, is_oce),
 c    .              'Surface Temperature','K')
@@ -2443 +2445 @@
       zx_tmp_fi2d(1 : klon) = ftsol(1 : klon, is_sic)
       CALL gr_fi_ecrit(1, klon,iim,jjmp1, zxtsol,zx_tmp_2d)
-      CALL histwrite(nid_day,"tsic",itap,zx_tmp_2d,iim*jjmp1,ndex2d)
+      CALL histwrite(nid_day,"tsic",itau_w,zx_tmp_2d,iim*jjmp1,ndex2d)
 c     call writephy(fid_day,prof2d_av,'tsic',ftsol(1 : klon, is_sic),
 c    .              'Surface Temperature','K')
@@ -2451 +2453 @@
       ENDDO
       CALL gr_fi_ecrit(1, klon,iim,jjmp1, zx_tmp_fi2d,zx_tmp_2d)
-      CALL histwrite(nid_day,"psol",itap,zx_tmp_2d,iim*jjmp1,ndex2d)
+      CALL histwrite(nid_day,"psol",itau_w,zx_tmp_2d,iim*jjmp1,ndex2d)
 c Essai writephys
       varname = 'psol'
@@ -2463 +2465 @@
       ENDDO
       CALL gr_fi_ecrit(1, klon,iim,jjmp1, zx_tmp_fi2d,zx_tmp_2d)
-      CALL histwrite(nid_day,"rain",itap,zx_tmp_2d,iim*jjmp1,ndex2d)
+      CALL histwrite(nid_day,"rain",itau_w,zx_tmp_2d,iim*jjmp1,ndex2d)
 c     call writephy(fid_day,prof2d_av,'rain',zx_tmp_fi2d,
 c    .              'Precipitation','mm/day')
@@ -2470 +2472 @@
 c
       CALL gr_fi_ecrit(1, klon,iim,jjmp1, snow_fall,zx_tmp_2d)
-      CALL histwrite(nid_day,"snow",itap,zx_tmp_2d,iim*jjmp1,ndex2d)
+      CALL histwrite(nid_day,"snow",itau_w,zx_tmp_2d,iim*jjmp1,ndex2d)
 c     call writephy(fid_day,prof2d_av,'snow',snow_fall,
 c    .              'Snow','mm/day')
 c
       CALL gr_fi_ecrit(1, klon,iim,jjmp1, zxsnow,zx_tmp_2d)
-      CALL histwrite(nid_day,"snow_cov",itap,zx_tmp_2d,iim*jjmp1,ndex2d)
+      CALL histwrite(nid_day,"snow_cov",itau_w,zx_tmp_2d,iim*jjmp1,
+     .               ndex2d)
 c     call writephy(fid_day,prof2d_av,'snow_cov',zxsnow,
 c    .              'Snow cover','mm')
 c
       CALL gr_fi_ecrit(1, klon,iim,jjmp1, evap,zx_tmp_2d)
-      CALL histwrite(nid_day,"evap",itap,zx_tmp_2d,iim*jjmp1,ndex2d)
+      CALL histwrite(nid_day,"evap",itau_w,zx_tmp_2d,iim*jjmp1,ndex2d)
 c     call writephy(fid_day,prof2d_av,'evap',evap,
 c    .              'Evaporation','mm/day')
 c
       CALL gr_fi_ecrit(1, klon,iim,jjmp1, topsw,zx_tmp_2d)
-      CALL histwrite(nid_day,"tops",itap,zx_tmp_2d,iim*jjmp1,ndex2d)
+      CALL histwrite(nid_day,"tops",itau_w,zx_tmp_2d,iim*jjmp1,ndex2d)
 c     call writephy(fid_day,prof2d_av,'tops',topsw,
 c    .              'Solar rad. at TOA','W/m2')
 c
       CALL gr_fi_ecrit(1, klon,iim,jjmp1, toplw,zx_tmp_2d)
-      CALL histwrite(nid_day,"topl",itap,zx_tmp_2d,iim*jjmp1,ndex2d)
+      CALL histwrite(nid_day,"topl",itau_w,zx_tmp_2d,iim*jjmp1,ndex2d)
 c     call writephy(fid_day,prof2d_av,'topl',toplw,
 c    .              'IR rad. at TOA','W/m2')
 c
       CALL gr_fi_ecrit(1, klon,iim,jjmp1, solsw,zx_tmp_2d)
-      CALL histwrite(nid_day,"sols",itap,zx_tmp_2d,iim*jjmp1,ndex2d)
+      CALL histwrite(nid_day,"sols",itau_w,zx_tmp_2d,iim*jjmp1,ndex2d)
 c     call writephy(fid_day,prof2d_av,'sols',solsw,
 c    .              'Solar rad. at surf.','W/m2')
 c
       CALL gr_fi_ecrit(1, klon,iim,jjmp1, sollw,zx_tmp_2d)
-      CALL histwrite(nid_day,"soll",itap,zx_tmp_2d,iim*jjmp1,ndex2d)
+      CALL histwrite(nid_day,"soll",itau_w,zx_tmp_2d,iim*jjmp1,ndex2d)
 c     call writephy(fid_day,prof2d_av,'soll',sollw,
 c    .              'IR rad. at surface','W/m2')
 c
       CALL gr_fi_ecrit(1, klon,iim,jjmp1, sollwdown,zx_tmp_2d)
-      CALL histwrite(nid_day,"solldown",itap,zx_tmp_2d,iim*jjmp1,ndex2d)
+      CALL histwrite(nid_day,"solldown",itau_w,zx_tmp_2d,iim*jjmp1,
+     .               ndex2d)
 c     call writephy(fid_day,prof2d_av,'solldown',sollwdown,
 c    .              'Down. IR rad. at surface','W/m2')
 c
       CALL gr_fi_ecrit(1, klon,iim,jjmp1, bils,zx_tmp_2d)
-      CALL histwrite(nid_day,"bils",itap,zx_tmp_2d,iim*jjmp1,ndex2d)
+      CALL histwrite(nid_day,"bils",itau_w,zx_tmp_2d,iim*jjmp1,ndex2d)
 c     call writephy(fid_day,prof2d_av,'bils',bils,
 c    .              'Surf. total heat flux','W/m2')
 c
       CALL gr_fi_ecrit(1, klon,iim,jjmp1, sens,zx_tmp_2d)
-      CALL histwrite(nid_day,"sens",itap,zx_tmp_2d,iim*jjmp1,ndex2d)
+      CALL histwrite(nid_day,"sens",itau_w,zx_tmp_2d,iim*jjmp1,ndex2d)
 c     call writephy(fid_day,prof2d_av,'sens',sens,
 c    .              'Sensible heat flux','W/m2')
 c
       CALL gr_fi_ecrit(1, klon,iim,jjmp1, fder,zx_tmp_2d)
-      CALL histwrite(nid_day,"fder",itap,zx_tmp_2d,iim*jjmp1,ndex2d)
+      CALL histwrite(nid_day,"fder",itau_w,zx_tmp_2d,iim*jjmp1,ndex2d)
 c     call writephy(fid_day,prof2d_av,'fder',fder,
 c    .              'Heat flux derivation','W/m2')
@@ -2529 +2533 @@
         zx_tmp_fi2d(1 : klon) = pctsrf( 1 : klon, nsrf)
         CALL gr_fi_ecrit(1, klon,iim,jjmp1, zx_tmp_fi2d , zx_tmp_2d)
-        CALL histwrite(nid_day,"pourc_"//clnsurf(nsrf),itap,
+        CALL histwrite(nid_day,"pourc_"//clnsurf(nsrf),itau_w,
      $      zx_tmp_2d,iim*jjmp1,ndex2d) 
 c       call writephy(fid_day,prof2d_av,'pourc_'//clnsurf(nsrf),
@@ -2537 +2541 @@
         zx_tmp_fi2d(1 : klon) = ftsol( 1 : klon, nsrf)
         CALL gr_fi_ecrit(1, klon,iim,jjmp1, zx_tmp_fi2d , zx_tmp_2d)
-        CALL histwrite(nid_day,"tsol_"//clnsurf(nsrf),itap,
+        CALL histwrite(nid_day,"tsol_"//clnsurf(nsrf),itau_w,
      $      zx_tmp_2d,iim*jjmp1,ndex2d) 
 c       call writephy(fid_day,prof2d_av,'tsol_'//clnsurf(nsrf),
@@ -2545 +2549 @@
         zx_tmp_fi2d(1 : klon) = fluxt( 1 : klon, 1, nsrf)
         CALL gr_fi_ecrit(1, klon,iim,jjmp1, zx_tmp_fi2d , zx_tmp_2d)
-        CALL histwrite(nid_day,"sens_"//clnsurf(nsrf),itap,
+        CALL histwrite(nid_day,"sens_"//clnsurf(nsrf),itau_w,
      $      zx_tmp_2d,iim*jjmp1,ndex2d) 
 c       call writephy(fid_day,prof2d_av,'sens_'//clnsurf(nsrf),
@@ -2553 +2557 @@
         zx_tmp_fi2d(1 : klon) = fluxlat( 1 : klon, nsrf)
         CALL gr_fi_ecrit(1, klon,iim,jjmp1, zx_tmp_fi2d , zx_tmp_2d)
-        CALL histwrite(nid_day,"lat_"//clnsurf(nsrf),itap,
+        CALL histwrite(nid_day,"lat_"//clnsurf(nsrf),itau_w,
      $      zx_tmp_2d,iim*jjmp1,ndex2d) 
 c       call writephy(fid_day,prof2d_av,'lat_'//clnsurf(nsrf),
@@ -2561 +2565 @@
         zx_tmp_fi2d(1 : klon) = fluxu( 1 : klon, 1, nsrf)
         CALL gr_fi_ecrit(1, klon,iim,jjmp1, zx_tmp_fi2d , zx_tmp_2d)
-        CALL histwrite(nid_day,"taux_"//clnsurf(nsrf),itap,
+        CALL histwrite(nid_day,"taux_"//clnsurf(nsrf),itau_w,
      $      zx_tmp_2d,iim*jjmp1,ndex2d) 
 c       call writephy(fid_day,prof2d_av,'taux_'//clnsurf(nsrf),
@@ -2569 +2573 @@
         zx_tmp_fi2d(1 : klon) = fluxv( 1 : klon, 1, nsrf)
         CALL gr_fi_ecrit(1, klon,iim,jjmp1, zx_tmp_fi2d , zx_tmp_2d)
-        CALL histwrite(nid_day,"tauy_"//clnsurf(nsrf),itap,
+        CALL histwrite(nid_day,"tauy_"//clnsurf(nsrf),itau_w,
      $      zx_tmp_2d,iim*jjmp1,ndex2d)
 c       call writephy(fid_day,prof2d_av,'tauy_'//clnsurf(nsrf),
@@ -2577 +2581 @@
         zx_tmp_fi2d(1 : klon) = falbe( 1 : klon, nsrf)
         CALL gr_fi_ecrit(1, klon,iim,jjmp1, zx_tmp_fi2d , zx_tmp_2d)
-        CALL histwrite(nid_day,"albe_"//clnsurf(nsrf),itap,
+        CALL histwrite(nid_day,"albe_"//clnsurf(nsrf),itau_w,
      $      zx_tmp_2d,iim*jjmp1,ndex2d) 
 c       call writephy(fid_day,prof2d_av,'albe_'//clnsurf(nsrf),
@@ -2588 +2592 @@
         zx_tmp_fi2d(1 : klon) = frugs( 1 : klon, nsrf)
         CALL gr_fi_ecrit(1, klon,iim,jjmp1, zx_tmp_fi2d , zx_tmp_2d)
-        CALL histwrite(nid_day,"rugs_"//clnsurf(nsrf),itap,
+        CALL histwrite(nid_day,"rugs_"//clnsurf(nsrf),itau_w,
      $      zx_tmp_2d,iim*jjmp1,ndex2d) 
 c       call writephy(fid_day,prof2d_av,'rugs_'//clnsurf(nsrf),
@@ -2600 +2604 @@
 c$$$      ENDDO
 c$$$      CALL gr_fi_ecrit(1, klon,iim,jjmp1, zx_tmp_fi2d,zx_tmp_2d)
-c$$$      CALL histwrite(nid_day,"sicf",itap,zx_tmp_2d,iim*jjmp1,ndex2d)
+c$$$      CALL histwrite(nid_day,"sicf",itau_w,zx_tmp_2d,iim*jjmp1,ndex2d)
 c
       CALL gr_fi_ecrit(1, klon,iim,jjmp1, cldl,zx_tmp_2d)
-      CALL histwrite(nid_day,"cldl",itap,zx_tmp_2d,iim*jjmp1,ndex2d)
+      CALL histwrite(nid_day,"cldl",itau_w,zx_tmp_2d,iim*jjmp1,ndex2d)
 c     call writephy(fid_day,prof2d_av,'cldl',cldl,
 c    .              'Low-level cloudiness','-')
 c
       CALL gr_fi_ecrit(1, klon,iim,jjmp1, cldm,zx_tmp_2d)
-      CALL histwrite(nid_day,"cldm",itap,zx_tmp_2d,iim*jjmp1,ndex2d)
+      CALL histwrite(nid_day,"cldm",itau_w,zx_tmp_2d,iim*jjmp1,ndex2d)
 c     call writephy(fid_day,prof2d_av,'cldm',cldm,
 c    .              'Mid-level cloudiness','-')
 c
       CALL gr_fi_ecrit(1, klon,iim,jjmp1, cldh,zx_tmp_2d)
-      CALL histwrite(nid_day,"cldh",itap,zx_tmp_2d,iim*jjmp1,ndex2d)
+      CALL histwrite(nid_day,"cldh",itau_w,zx_tmp_2d,iim*jjmp1,ndex2d)
 c     call writephy(fid_day,prof2d_av,'cldh',cldh,
 c    .              'High-level cloudiness','-')
 c
       CALL gr_fi_ecrit(1, klon,iim,jjmp1, cldt,zx_tmp_2d)
-      CALL histwrite(nid_day,"cldt",itap,zx_tmp_2d,iim*jjmp1,ndex2d)
+      CALL histwrite(nid_day,"cldt",itau_w,zx_tmp_2d,iim*jjmp1,ndex2d)
 c     call writephy(fid_day,prof2d_av,'cldt',cldt,
 c    .              'Total cloudiness','-')
 c
       CALL gr_fi_ecrit(1, klon,iim,jjmp1, cldq,zx_tmp_2d)
-      CALL histwrite(nid_day,"cldq",itap,zx_tmp_2d,iim*jjmp1,ndex2d)
+      CALL histwrite(nid_day,"cldq",itau_w,zx_tmp_2d,iim*jjmp1,ndex2d)
 c     call writephy(fid_day,prof2d_av,'cldq',cldq,
 c    .              'Cloud liquid water path','-')
@@ -2630 +2634 @@
 c
       CALL gr_fi_ecrit(klev,klon,iim,jjmp1, t_seri, zx_tmp_3d)
-      CALL histwrite(nid_day,"temp",itap,zx_tmp_3d,
+      CALL histwrite(nid_day,"temp",itau_w,zx_tmp_3d,
      .                                   iim*jjmp1*klev,ndex3d)
 c Essai writephys
@@ -2639 +2643 @@
 c
       CALL gr_fi_ecrit(klev,klon,iim,jjmp1, qx(1,1,ivap), zx_tmp_3d)
-      CALL histwrite(nid_day,"ovap",itap,zx_tmp_3d,
+      CALL histwrite(nid_day,"ovap",itau_w,zx_tmp_3d,
      .                                   iim*jjmp1*klev,ndex3d)
 c     call writephy(fid_day,prof3d_av,'ovap',qx(1,1,ivap),
@@ -2645 +2649 @@
 c
       CALL gr_fi_ecrit(klev,klon,iim,jjmp1, zphi, zx_tmp_3d)
-      CALL histwrite(nid_day,"geop",itap,zx_tmp_3d,
+      CALL histwrite(nid_day,"geop",itau_w,zx_tmp_3d,
      .                                   iim*jjmp1*klev,ndex3d)
 c     call writephy(fid_day,prof3d_av,'geop',zphi,
@@ -2651 +2655 @@
 c
       CALL gr_fi_ecrit(klev,klon,iim,jjmp1, u_seri, zx_tmp_3d)
-      CALL histwrite(nid_day,"vitu",itap,zx_tmp_3d,
+      CALL histwrite(nid_day,"vitu",itau_w,zx_tmp_3d,
      .                                   iim*jjmp1*klev,ndex3d)
 c     call writephy(fid_day,prof3d_av,'vitu',u_seri,
@@ -2657 +2661 @@
 c
       CALL gr_fi_ecrit(klev,klon,iim,jjmp1, v_seri, zx_tmp_3d)
-      CALL histwrite(nid_day,"vitv",itap,zx_tmp_3d,
+      CALL histwrite(nid_day,"vitv",itau_w,zx_tmp_3d,
      .                                   iim*jjmp1*klev,ndex3d)
 c     call writephy(fid_day,prof3d_av,'vitv',v_seri,
@@ -2663 +2667 @@
 c
       CALL gr_fi_ecrit(klev,klon,iim,jjmp1, omega, zx_tmp_3d)
-      CALL histwrite(nid_day,"vitw",itap,zx_tmp_3d,
+      CALL histwrite(nid_day,"vitw",itau_w,zx_tmp_3d,
      .                                   iim*jjmp1*klev,ndex3d)
 c     call writephy(fid_day,prof3d_av,'vitw',omega,
@@ -2669 +2673 @@
 c
       CALL gr_fi_ecrit(klev,klon,iim,jjmp1, pplay, zx_tmp_3d)
-      CALL histwrite(nid_day,"pres",itap,zx_tmp_3d,
+      CALL histwrite(nid_day,"pres",itau_w,zx_tmp_3d,
      .                                   iim*jjmp1*klev,ndex3d)
 c     call writephy(fid_day,prof3d_av,'pres',pplay,
@@ -2690 +2694 @@
          zsto = dtime
          zout = dtime * ecrit_mth
+         itau_w = itau_phy + itap
 
          i = NINT(zout/zsto)
@@ -2700 +2705 @@
 
       CALL gr_fi_ecrit(1, klon,iim,jjmp1, zxtsol,zx_tmp_2d)
-      CALL histwrite(nid_mth,"tsol",itap,zx_tmp_2d,iim*jjmp1,ndex2d)
+      CALL histwrite(nid_mth,"tsol",itau_w,zx_tmp_2d,iim*jjmp1,ndex2d)
 c
       DO i = 1, klon
@@ -2706 +2711 @@
       ENDDO
       CALL gr_fi_ecrit(1, klon,iim,jjmp1, zx_tmp_fi2d,zx_tmp_2d)
-      CALL histwrite(nid_mth,"psol",itap,zx_tmp_2d,iim*jjmp1,ndex2d)
+      CALL histwrite(nid_mth,"psol",itau_w,zx_tmp_2d,iim*jjmp1,ndex2d)
 c
       CALL gr_fi_ecrit(1, klon,iim,jjmp1, zxqsol,zx_tmp_2d)
-      CALL histwrite(nid_mth,"qsol",itap,zx_tmp_2d,iim*jjmp1,ndex2d)
+      CALL histwrite(nid_mth,"qsol",itau_w,zx_tmp_2d,iim*jjmp1,ndex2d)
 c
       DO i = 1, klon
@@ -2715 +2720 @@
       ENDDO
       CALL gr_fi_ecrit(1, klon,iim,jjmp1, zx_tmp_fi2d,zx_tmp_2d)
-      CALL histwrite(nid_mth,"rain",itap,zx_tmp_2d,iim*jjmp1,ndex2d)
+      CALL histwrite(nid_mth,"rain",itau_w,zx_tmp_2d,iim*jjmp1,ndex2d)
 c
       DO i = 1, klon
@@ -2721 +2726 @@
       ENDDO
       CALL gr_fi_ecrit(1, klon,iim,jjmp1, zx_tmp_fi2d,zx_tmp_2d)
-      CALL histwrite(nid_mth,"plul",itap,zx_tmp_2d,iim*jjmp1,ndex2d)
+      CALL histwrite(nid_mth,"plul",itau_w,zx_tmp_2d,iim*jjmp1,ndex2d)
 c
       DO i = 1, klon
@@ -2727 +2732 @@
       ENDDO
       CALL gr_fi_ecrit(1, klon,iim,jjmp1, zx_tmp_fi2d,zx_tmp_2d)
-      CALL histwrite(nid_mth,"pluc",itap,zx_tmp_2d,iim*jjmp1,ndex2d)
+      CALL histwrite(nid_mth,"pluc",itau_w,zx_tmp_2d,iim*jjmp1,ndex2d)
 c
       CALL gr_fi_ecrit(1, klon,iim,jjmp1, snow_fall,zx_tmp_2d)
-      CALL histwrite(nid_mth,"snow",itap,zx_tmp_2d,iim*jjmp1,ndex2d)
+      CALL histwrite(nid_mth,"snow",itau_w,zx_tmp_2d,iim*jjmp1,ndex2d)
 c
       CALL gr_fi_ecrit(1, klon,iim,jjmp1, zxsnow,zx_tmp_2d)
-      CALL histwrite(nid_mth,"snow_cov",itap,zx_tmp_2d,iim*jjmp1,ndex2d)
+      CALL histwrite(nid_mth,"snow_cov",itau_w,zx_tmp_2d,iim*jjmp1,
+     .               ndex2d)
 c
       CALL gr_fi_ecrit(1, klon,iim,jjmp1, evap,zx_tmp_2d)
-      CALL histwrite(nid_mth,"evap",itap,zx_tmp_2d,iim*jjmp1,ndex2d)
+      CALL histwrite(nid_mth,"evap",itau_w,zx_tmp_2d,iim*jjmp1,ndex2d)
 c
       CALL gr_fi_ecrit(1, klon,iim,jjmp1, topsw,zx_tmp_2d)
-      CALL histwrite(nid_mth,"tops",itap,zx_tmp_2d,iim*jjmp1,ndex2d)
+      CALL histwrite(nid_mth,"tops",itau_w,zx_tmp_2d,iim*jjmp1,ndex2d)
 c
       CALL gr_fi_ecrit(1, klon,iim,jjmp1, toplw,zx_tmp_2d)
-      CALL histwrite(nid_mth,"topl",itap,zx_tmp_2d,iim*jjmp1,ndex2d)
+      CALL histwrite(nid_mth,"topl",itau_w,zx_tmp_2d,iim*jjmp1,ndex2d)
 c
       CALL gr_fi_ecrit(1, klon,iim,jjmp1, solsw,zx_tmp_2d)
-      CALL histwrite(nid_mth,"sols",itap,zx_tmp_2d,iim*jjmp1,ndex2d)
+      CALL histwrite(nid_mth,"sols",itau_w,zx_tmp_2d,iim*jjmp1,ndex2d)
 c
       CALL gr_fi_ecrit(1, klon,iim,jjmp1, sollw,zx_tmp_2d)
-      CALL histwrite(nid_mth,"soll",itap,zx_tmp_2d,iim*jjmp1,ndex2d)
+      CALL histwrite(nid_mth,"soll",itau_w,zx_tmp_2d,iim*jjmp1,ndex2d)
 c
       CALL gr_fi_ecrit(1, klon,iim,jjmp1, sollwdown,zx_tmp_2d)
-      CALL histwrite(nid_mth,"solldown",itap,zx_tmp_2d,iim*jjmp1,ndex2d)
+      CALL histwrite(nid_mth,"solldown",itau_w,zx_tmp_2d,iim*jjmp1,
+     .               ndex2d)
 c
       CALL gr_fi_ecrit(1, klon,iim,jjmp1, topsw0,zx_tmp_2d)
-      CALL histwrite(nid_mth,"tops0",itap,zx_tmp_2d,iim*jjmp1,ndex2d)
+      CALL histwrite(nid_mth,"tops0",itau_w,zx_tmp_2d,iim*jjmp1,ndex2d)
 c
       CALL gr_fi_ecrit(1, klon,iim,jjmp1, toplw0,zx_tmp_2d)
-      CALL histwrite(nid_mth,"topl0",itap,zx_tmp_2d,iim*jjmp1,ndex2d)
+      CALL histwrite(nid_mth,"topl0",itau_w,zx_tmp_2d,iim*jjmp1,ndex2d)
 c
       CALL gr_fi_ecrit(1, klon,iim,jjmp1, solsw0,zx_tmp_2d)
-      CALL histwrite(nid_mth,"sols0",itap,zx_tmp_2d,iim*jjmp1,ndex2d)
+      CALL histwrite(nid_mth,"sols0",itau_w,zx_tmp_2d,iim*jjmp1,ndex2d)
 c
       CALL gr_fi_ecrit(1, klon,iim,jjmp1, sollw0,zx_tmp_2d)
-      CALL histwrite(nid_mth,"soll0",itap,zx_tmp_2d,iim*jjmp1,ndex2d)
+      CALL histwrite(nid_mth,"soll0",itau_w,zx_tmp_2d,iim*jjmp1,ndex2d)
 c
       CALL gr_fi_ecrit(1, klon,iim,jjmp1, bils,zx_tmp_2d)
-      CALL histwrite(nid_mth,"bils",itap,zx_tmp_2d,iim*jjmp1,ndex2d)
+      CALL histwrite(nid_mth,"bils",itau_w,zx_tmp_2d,iim*jjmp1,ndex2d)
 c
       CALL gr_fi_ecrit(1, klon,iim,jjmp1, sens,zx_tmp_2d)
-      CALL histwrite(nid_mth,"sens",itap,zx_tmp_2d,iim*jjmp1,ndex2d)
+      CALL histwrite(nid_mth,"sens",itau_w,zx_tmp_2d,iim*jjmp1,ndex2d)
 c
       CALL gr_fi_ecrit(1, klon,iim,jjmp1, fder,zx_tmp_2d)
-      CALL histwrite(nid_mth,"fder",itap,zx_tmp_2d,iim*jjmp1,ndex2d)
+      CALL histwrite(nid_mth,"fder",itau_w,zx_tmp_2d,iim*jjmp1,ndex2d)
 c
 c
@@ -2779 +2786 @@
 c      ENDDO
 c      CALL gr_fi_ecrit(1, klon,iim,jjmp1, zx_tmp_fi2d,zx_tmp_2d)
-c      CALL histwrite(nid_mth,"frtu",itap,zx_tmp_2d,iim*jjmp1,ndex2d)
+c      CALL histwrite(nid_mth,"frtu",itau_w,zx_tmp_2d,iim*jjmp1,ndex2d)
 c
 c      DO i = 1, klon
@@ -2785 +2792 @@
 c      ENDDO
 c      CALL gr_fi_ecrit(1, klon,iim,jjmp1, zx_tmp_fi2d,zx_tmp_2d)
-c      CALL histwrite(nid_mth,"frtv",itap,zx_tmp_2d,iim*jjmp1,ndex2d)
+c      CALL histwrite(nid_mth,"frtv",itau_w,zx_tmp_2d,iim*jjmp1,ndex2d)
 c
       DO nsrf = 1, nbsrf
@@ -2791 +2798 @@
         zx_tmp_fi2d(1 : klon) = pctsrf( 1 : klon, nsrf)
         CALL gr_fi_ecrit(1, klon,iim,jjmp1, zx_tmp_fi2d , zx_tmp_2d)
-        CALL histwrite(nid_mth,"pourc_"//clnsurf(nsrf),itap,
+        CALL histwrite(nid_mth,"pourc_"//clnsurf(nsrf),itau_w,
      $      zx_tmp_2d,iim*jjmp1,ndex2d) 
 C 
         zx_tmp_fi2d(1 : klon) = ftsol( 1 : klon, nsrf)
         CALL gr_fi_ecrit(1, klon,iim,jjmp1, zx_tmp_fi2d , zx_tmp_2d)
-        CALL histwrite(nid_mth,"tsol_"//clnsurf(nsrf),itap,
+        CALL histwrite(nid_mth,"tsol_"//clnsurf(nsrf),itau_w,
      $      zx_tmp_2d,iim*jjmp1,ndex2d)
 C
         zx_tmp_fi2d(1 : klon) = fluxt( 1 : klon, 1, nsrf)
         CALL gr_fi_ecrit(1, klon,iim,jjmp1, zx_tmp_fi2d , zx_tmp_2d)
-        CALL histwrite(nid_mth,"sens_"//clnsurf(nsrf),itap,
+        CALL histwrite(nid_mth,"sens_"//clnsurf(nsrf),itau_w,
      $      zx_tmp_2d,iim*jjmp1,ndex2d)
 C
         zx_tmp_fi2d(1 : klon) = fluxlat( 1 : klon, nsrf)
         CALL gr_fi_ecrit(1, klon,iim,jjmp1, zx_tmp_fi2d , zx_tmp_2d)
-        CALL histwrite(nid_mth,"lat_"//clnsurf(nsrf),itap,
+        CALL histwrite(nid_mth,"lat_"//clnsurf(nsrf),itau_w,
      $      zx_tmp_2d,iim*jjmp1,ndex2d) 
 C
         zx_tmp_fi2d(1 : klon) = fluxu( 1 : klon, 1, nsrf)
         CALL gr_fi_ecrit(1, klon,iim,jjmp1, zx_tmp_fi2d , zx_tmp_2d)
-        CALL histwrite(nid_mth,"taux_"//clnsurf(nsrf),itap,
+        CALL histwrite(nid_mth,"taux_"//clnsurf(nsrf),itau_w,
      $      zx_tmp_2d,iim*jjmp1,ndex2d) 
 C      
         zx_tmp_fi2d(1 : klon) = fluxv( 1 : klon, 1, nsrf)
         CALL gr_fi_ecrit(1, klon,iim,jjmp1, zx_tmp_fi2d , zx_tmp_2d)
-        CALL histwrite(nid_mth,"tauy_"//clnsurf(nsrf),itap,
+        CALL histwrite(nid_mth,"tauy_"//clnsurf(nsrf),itau_w,
      $      zx_tmp_2d,iim*jjmp1,ndex2d)
 C 
         zx_tmp_fi2d(1 : klon) = falbe( 1 : klon, nsrf)
         CALL gr_fi_ecrit(1, klon,iim,jjmp1, zx_tmp_fi2d , zx_tmp_2d)
-        CALL histwrite(nid_mth,"albe_"//clnsurf(nsrf),itap,
+        CALL histwrite(nid_mth,"albe_"//clnsurf(nsrf),itau_w,
      $      zx_tmp_2d,iim*jjmp1,ndex2d)
 C
         zx_tmp_fi2d(1 : klon) = frugs( 1 : klon, nsrf)
         CALL gr_fi_ecrit(1, klon,iim,jjmp1, zx_tmp_fi2d , zx_tmp_2d)
-        CALL histwrite(nid_mth,"rugs_"//clnsurf(nsrf),itap,
+        CALL histwrite(nid_mth,"rugs_"//clnsurf(nsrf),itau_w,
      $      zx_tmp_2d,iim*jjmp1,ndex2d)
 c
       zx_tmp_fi2d(1 : klon) = agesno( 1 : klon, nsrf)
       CALL gr_fi_ecrit(1, klon,iim,jjmp1, agesno,zx_tmp_2d)
-      CALL histwrite(nid_mth,"ages_"//clnsurf(nsrf),itap
+      CALL histwrite(nid_mth,"ages_"//clnsurf(nsrf),itau_w
      $    ,zx_tmp_2d,iim*jjmp1,ndex2d)
 
@@ -2839 +2846 @@
 c$$$      ENDDO
 c$$$      CALL gr_fi_ecrit(1, klon,iim,jjmp1, zx_tmp_fi2d,zx_tmp_2d)
-c$$$      CALL histwrite(nid_mth,"sicf",itap,zx_tmp_2d,iim*jjmp1,ndex2d)
+c$$$      CALL histwrite(nid_mth,"sicf",itau_w,zx_tmp_2d,iim*jjmp1,ndex2d)
 c
       CALL gr_fi_ecrit(1, klon,iim,jjmp1, albsol,zx_tmp_2d)
-      CALL histwrite(nid_mth,"albs",itap,zx_tmp_2d,iim*jjmp1,ndex2d)
+      CALL histwrite(nid_mth,"albs",itau_w,zx_tmp_2d,iim*jjmp1,ndex2d)
       CALL gr_fi_ecrit(1, klon,iim,jjmp1, albsollw,zx_tmp_2d)
-      CALL histwrite(nid_mth,"albslw",itap,zx_tmp_2d,iim*jjmp1,ndex2d)
+      CALL histwrite(nid_mth,"albslw",itau_w,zx_tmp_2d,iim*jjmp1,ndex2d)
 c
       CALL gr_fi_ecrit(1, klon,iim,jjmp1, cdragm,zx_tmp_2d)
-      CALL histwrite(nid_mth,"cdrm",itap,zx_tmp_2d,iim*jjmp1,ndex2d)
+      CALL histwrite(nid_mth,"cdrm",itau_w,zx_tmp_2d,iim*jjmp1,ndex2d)
 c
       CALL gr_fi_ecrit(1, klon,iim,jjmp1, cdragh,zx_tmp_2d)
-      CALL histwrite(nid_mth,"cdrh",itap,zx_tmp_2d,iim*jjmp1,ndex2d)
+      CALL histwrite(nid_mth,"cdrh",itau_w,zx_tmp_2d,iim*jjmp1,ndex2d)
 c
       CALL gr_fi_ecrit(1, klon,iim,jjmp1, cldl,zx_tmp_2d)
-      CALL histwrite(nid_mth,"cldl",itap,zx_tmp_2d,iim*jjmp1,ndex2d)
+      CALL histwrite(nid_mth,"cldl",itau_w,zx_tmp_2d,iim*jjmp1,ndex2d)
 c
       CALL gr_fi_ecrit(1, klon,iim,jjmp1, cldm,zx_tmp_2d)
-      CALL histwrite(nid_mth,"cldm",itap,zx_tmp_2d,iim*jjmp1,ndex2d)
+      CALL histwrite(nid_mth,"cldm",itau_w,zx_tmp_2d,iim*jjmp1,ndex2d)
 c
       CALL gr_fi_ecrit(1, klon,iim,jjmp1, cldh,zx_tmp_2d)
-      CALL histwrite(nid_mth,"cldh",itap,zx_tmp_2d,iim*jjmp1,ndex2d)
+      CALL histwrite(nid_mth,"cldh",itau_w,zx_tmp_2d,iim*jjmp1,ndex2d)
 c
       CALL gr_fi_ecrit(1, klon,iim,jjmp1, cldt,zx_tmp_2d)
-      CALL histwrite(nid_mth,"cldt",itap,zx_tmp_2d,iim*jjmp1,ndex2d)
+      CALL histwrite(nid_mth,"cldt",itau_w,zx_tmp_2d,iim*jjmp1,ndex2d)
 c
       CALL gr_fi_ecrit(1, klon,iim,jjmp1, cldq,zx_tmp_2d)
-      CALL histwrite(nid_mth,"cldq",itap,zx_tmp_2d,iim*jjmp1,ndex2d)
+      CALL histwrite(nid_mth,"cldq",itau_w,zx_tmp_2d,iim*jjmp1,ndex2d)
 c
       CALL gr_fi_ecrit(1, klon,iim,jjmp1, ue,zx_tmp_2d)
-      CALL histwrite(nid_mth,"ue",itap,zx_tmp_2d,iim*jjmp1,ndex2d)
+      CALL histwrite(nid_mth,"ue",itau_w,zx_tmp_2d,iim*jjmp1,ndex2d)
 c
       CALL gr_fi_ecrit(1, klon,iim,jjmp1, ve,zx_tmp_2d)
-      CALL histwrite(nid_mth,"ve",itap,zx_tmp_2d,iim*jjmp1,ndex2d)
+      CALL histwrite(nid_mth,"ve",itau_w,zx_tmp_2d,iim*jjmp1,ndex2d)
 c
       CALL gr_fi_ecrit(1, klon,iim,jjmp1, uq,zx_tmp_2d)
-      CALL histwrite(nid_mth,"uq",itap,zx_tmp_2d,iim*jjmp1,ndex2d)
+      CALL histwrite(nid_mth,"uq",itau_w,zx_tmp_2d,iim*jjmp1,ndex2d)
 c
       CALL gr_fi_ecrit(1, klon,iim,jjmp1, vq,zx_tmp_2d)
-      CALL histwrite(nid_mth,"vq",itap,zx_tmp_2d,iim*jjmp1,ndex2d)
+      CALL histwrite(nid_mth,"vq",itau_w,zx_tmp_2d,iim*jjmp1,ndex2d)
 cKE43
       IF (iflag_con .GE. 3) THEN ! sb
 c
       CALL gr_fi_ecrit(1, klon,iim,jjmp1, cape,zx_tmp_2d)
-      CALL histwrite(nid_mth,"cape",itap,zx_tmp_2d,iim*jjmp1,ndex2d)
+      CALL histwrite(nid_mth,"cape",itau_w,zx_tmp_2d,iim*jjmp1,ndex2d)
 c
       CALL gr_fi_ecrit(1, klon,iim,jjmp1,pbase,zx_tmp_2d)
-      CALL histwrite(nid_mth,"pbase",itap,zx_tmp_2d,iim*jjmp1,ndex2d)
+      CALL histwrite(nid_mth,"pbase",itau_w,zx_tmp_2d,iim*jjmp1,ndex2d)
 c
       CALL gr_fi_ecrit(1, klon,iim,jjmp1,ema_pct,zx_tmp_2d)
-      CALL histwrite(nid_mth,"ptop",itap,zx_tmp_2d,iim*jjmp1,ndex2d)
+      CALL histwrite(nid_mth,"ptop",itau_w,zx_tmp_2d,iim*jjmp1,ndex2d)
 c
       CALL gr_fi_ecrit(1, klon,iim,jjmp1,ema_cbmf,zx_tmp_2d)
-      CALL histwrite(nid_mth,"fbase",itap,zx_tmp_2d,iim*jjmp1,ndex2d)
+      CALL histwrite(nid_mth,"fbase",itau_w,zx_tmp_2d,iim*jjmp1,ndex2d)
 c
 c
@@ -2900 +2907 @@
 C
       CALL gr_fi_ecrit(klev,klon,iim,jjmp1, t_seri, zx_tmp_3d)
-      CALL histwrite(nid_mth,"temp",itap,zx_tmp_3d,
+      CALL histwrite(nid_mth,"temp",itau_w,zx_tmp_3d,
      .                                   iim*jjmp1*klev,ndex3d)
 c
       CALL gr_fi_ecrit(klev,klon,iim,jjmp1, qx(1,1,ivap), zx_tmp_3d)
-      CALL histwrite(nid_mth,"ovap",itap,zx_tmp_3d,
+      CALL histwrite(nid_mth,"ovap",itau_w,zx_tmp_3d,
      .                                   iim*jjmp1*klev,ndex3d)
 c
       CALL gr_fi_ecrit(klev,klon,iim,jjmp1, zphi, zx_tmp_3d)
-      CALL histwrite(nid_mth,"geop",itap,zx_tmp_3d,
+      CALL histwrite(nid_mth,"geop",itau_w,zx_tmp_3d,
      .                                   iim*jjmp1*klev,ndex3d)
 c
       CALL gr_fi_ecrit(klev,klon,iim,jjmp1, u_seri, zx_tmp_3d)
-      CALL histwrite(nid_mth,"vitu",itap,zx_tmp_3d,
+      CALL histwrite(nid_mth,"vitu",itau_w,zx_tmp_3d,
      .                                   iim*jjmp1*klev,ndex3d)
 c
       CALL gr_fi_ecrit(klev,klon,iim,jjmp1, v_seri, zx_tmp_3d)
-      CALL histwrite(nid_mth,"vitv",itap,zx_tmp_3d,
+      CALL histwrite(nid_mth,"vitv",itau_w,zx_tmp_3d,
      .                                   iim*jjmp1*klev,ndex3d)
 c
       CALL gr_fi_ecrit(klev,klon,iim,jjmp1, omega, zx_tmp_3d)
-      CALL histwrite(nid_mth,"vitw",itap,zx_tmp_3d,
+      CALL histwrite(nid_mth,"vitw",itau_w,zx_tmp_3d,
      .                                   iim*jjmp1*klev,ndex3d)
 c
       CALL gr_fi_ecrit(klev,klon,iim,jjmp1, pplay, zx_tmp_3d)
-      CALL histwrite(nid_mth,"pres",itap,zx_tmp_3d,
+      CALL histwrite(nid_mth,"pres",itau_w,zx_tmp_3d,
      .                                   iim*jjmp1*klev,ndex3d)
 c
       CALL gr_fi_ecrit(klev,klon,iim,jjmp1, cldfra, zx_tmp_3d)
-      CALL histwrite(nid_mth,"rneb",itap,zx_tmp_3d,
+      CALL histwrite(nid_mth,"rneb",itau_w,zx_tmp_3d,
      .                                   iim*jjmp1*klev,ndex3d)
 c
       CALL gr_fi_ecrit(klev,klon,iim,jjmp1, zx_rh, zx_tmp_3d)
-      CALL histwrite(nid_mth,"rhum",itap,zx_tmp_3d,
+      CALL histwrite(nid_mth,"rhum",itau_w,zx_tmp_3d,
      .                                   iim*jjmp1*klev,ndex3d)
 c
       CALL gr_fi_ecrit(klev,klon,iim,jjmp1, cldliq, zx_tmp_3d)
-      CALL histwrite(nid_mth,"oliq",itap,zx_tmp_3d,
+      CALL histwrite(nid_mth,"oliq",itau_w,zx_tmp_3d,
      .                                   iim*jjmp1*klev,ndex3d)
 c
       CALL gr_fi_ecrit(klev,klon,iim,jjmp1, d_t_dyn, zx_tmp_3d)
-      CALL histwrite(nid_mth,"dtdyn",itap,zx_tmp_3d,
+      CALL histwrite(nid_mth,"dtdyn",itau_w,zx_tmp_3d,
      .                                   iim*jjmp1*klev,ndex3d)
 c
       CALL gr_fi_ecrit(klev,klon,iim,jjmp1, d_q_dyn, zx_tmp_3d)
-      CALL histwrite(nid_mth,"dqdyn",itap,zx_tmp_3d,
+      CALL histwrite(nid_mth,"dqdyn",itau_w,zx_tmp_3d,
      .                                   iim*jjmp1*klev,ndex3d)
 c
       CALL gr_fi_ecrit(klev,klon,iim,jjmp1, d_t_con, zx_tmp_3d)
-      CALL histwrite(nid_mth,"dtcon",itap,zx_tmp_3d,
+      CALL histwrite(nid_mth,"dtcon",itau_w,zx_tmp_3d,
      .                                   iim*jjmp1*klev,ndex3d)
 c
       CALL gr_fi_ecrit(klev,klon,iim,jjmp1, d_q_con, zx_tmp_3d)
-      CALL histwrite(nid_mth,"dqcon",itap,zx_tmp_3d,
+      CALL histwrite(nid_mth,"dqcon",itau_w,zx_tmp_3d,
      .                                   iim*jjmp1*klev,ndex3d)
 c
       CALL gr_fi_ecrit(klev,klon,iim,jjmp1, d_t_lsc, zx_tmp_3d)
-      CALL histwrite(nid_mth,"dtlsc",itap,zx_tmp_3d,
+      CALL histwrite(nid_mth,"dtlsc",itau_w,zx_tmp_3d,
      .                                   iim*jjmp1*klev,ndex3d)
 c
       CALL gr_fi_ecrit(klev,klon,iim,jjmp1, d_q_lsc, zx_tmp_3d)
-      CALL histwrite(nid_mth,"dqlsc",itap,zx_tmp_3d,
+      CALL histwrite(nid_mth,"dqlsc",itau_w,zx_tmp_3d,
      .                                   iim*jjmp1*klev,ndex3d)
 c
       CALL gr_fi_ecrit(klev,klon,iim,jjmp1, d_t_vdf, zx_tmp_3d)
-      CALL histwrite(nid_mth,"dtvdf",itap,zx_tmp_3d,
+      CALL histwrite(nid_mth,"dtvdf",itau_w,zx_tmp_3d,
      .                                   iim*jjmp1*klev,ndex3d)
 c
       CALL gr_fi_ecrit(klev,klon,iim,jjmp1, d_q_vdf, zx_tmp_3d)
-      CALL histwrite(nid_mth,"dqvdf",itap,zx_tmp_3d,
+      CALL histwrite(nid_mth,"dqvdf",itau_w,zx_tmp_3d,
      .                                   iim*jjmp1*klev,ndex3d)
 c
       CALL gr_fi_ecrit(klev,klon,iim,jjmp1, d_t_eva, zx_tmp_3d)
-      CALL histwrite(nid_mth,"dteva",itap,zx_tmp_3d,
+      CALL histwrite(nid_mth,"dteva",itau_w,zx_tmp_3d,
      .                                   iim*jjmp1*klev,ndex3d)
 c
       CALL gr_fi_ecrit(klev,klon,iim,jjmp1, d_q_eva, zx_tmp_3d)
-      CALL histwrite(nid_mth,"dqeva",itap,zx_tmp_3d,
+      CALL histwrite(nid_mth,"dqeva",itau_w,zx_tmp_3d,
      .                                   iim*jjmp1*klev,ndex3d)
 c
       CALL gr_fi_ecrit(klev,klon,iim,jjmp1, zpt_conv, zx_tmp_3d)
-      CALL histwrite(nid_mth,"ptconv",itap,zx_tmp_3d,
+      CALL histwrite(nid_mth,"ptconv",itau_w,zx_tmp_3d,
      .                                   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,
+      CALL histwrite(nid_mth,"ratqs",itau_w,zx_tmp_3d,
      .                                   iim*(jjmp1)*klev,ndex3d)
 c
       CALL gr_fi_ecrit(klev,klon,iim,jjmp1, d_t_ajs, zx_tmp_3d)
-      CALL histwrite(nid_mth,"dtajs",itap,zx_tmp_3d,
+      CALL histwrite(nid_mth,"dtajs",itau_w,zx_tmp_3d,
      .                                   iim*jjmp1*klev,ndex3d)
 c
       CALL gr_fi_ecrit(klev,klon,iim,jjmp1, d_q_ajs, zx_tmp_3d)
-      CALL histwrite(nid_mth,"dqajs",itap,zx_tmp_3d,
+      CALL histwrite(nid_mth,"dqajs",itau_w,zx_tmp_3d,
      .                                   iim*jjmp1*klev,ndex3d)
 c
       CALL gr_fi_ecrit(klev,klon,iim,jjmp1, heat, zx_tmp_3d)
-      CALL histwrite(nid_mth,"dtswr",itap,zx_tmp_3d,
+      CALL histwrite(nid_mth,"dtswr",itau_w,zx_tmp_3d,
      .                                   iim*jjmp1*klev,ndex3d)
 c
       CALL gr_fi_ecrit(klev,klon,iim,jjmp1, heat0, zx_tmp_3d)
-      CALL histwrite(nid_mth,"dtsw0",itap,zx_tmp_3d,
+      CALL histwrite(nid_mth,"dtsw0",itau_w,zx_tmp_3d,
      .                                   iim*jjmp1*klev,ndex3d)
 c
       CALL gr_fi_ecrit(klev,klon,iim,jjmp1, cool, zx_tmp_3d)
-      CALL histwrite(nid_mth,"dtlwr",itap,zx_tmp_3d,
+      CALL histwrite(nid_mth,"dtlwr",itau_w,zx_tmp_3d,
      .                                   iim*jjmp1*klev,ndex3d)
 c
       CALL gr_fi_ecrit(klev,klon,iim,jjmp1, cool0, zx_tmp_3d)
-      CALL histwrite(nid_mth,"dtlw0",itap,zx_tmp_3d,
+      CALL histwrite(nid_mth,"dtlw0",itau_w,zx_tmp_3d,
      .                                   iim*jjmp1*klev,ndex3d)
 c
       CALL gr_fi_ecrit(klev,klon,iim,jjmp1, d_u_vdf, zx_tmp_3d)
-      CALL histwrite(nid_mth,"duvdf",itap,zx_tmp_3d,
+      CALL histwrite(nid_mth,"duvdf",itau_w,zx_tmp_3d,
      .                                   iim*jjmp1*klev,ndex3d)
 c
       CALL gr_fi_ecrit(klev,klon,iim,jjmp1, d_v_vdf, zx_tmp_3d)
-      CALL histwrite(nid_mth,"dvvdf",itap,zx_tmp_3d,
+      CALL histwrite(nid_mth,"dvvdf",itau_w,zx_tmp_3d,
      .                                   iim*jjmp1*klev,ndex3d)
 c
       IF (ok_orodr) THEN
       CALL gr_fi_ecrit(klev,klon,iim,jjmp1, d_u_oro, zx_tmp_3d)
-      CALL histwrite(nid_mth,"duoro",itap,zx_tmp_3d,
+      CALL histwrite(nid_mth,"duoro",itau_w,zx_tmp_3d,
      .                                   iim*jjmp1*klev,ndex3d)
 c
       CALL gr_fi_ecrit(klev,klon,iim,jjmp1, d_v_oro, zx_tmp_3d)
-      CALL histwrite(nid_mth,"dvoro",itap,zx_tmp_3d,
+      CALL histwrite(nid_mth,"dvoro",itau_w,zx_tmp_3d,
      .                                   iim*jjmp1*klev,ndex3d)
 c
@@ -3032 +3039 @@
       IF (ok_orolf) THEN
       CALL gr_fi_ecrit(klev,klon,iim,jjmp1, d_u_lif, zx_tmp_3d)
-      CALL histwrite(nid_mth,"dulif",itap,zx_tmp_3d,
+      CALL histwrite(nid_mth,"dulif",itau_w,zx_tmp_3d,
      .                                   iim*jjmp1*klev,ndex3d)
 c
       CALL gr_fi_ecrit(klev,klon,iim,jjmp1, d_v_lif, zx_tmp_3d)
-      CALL histwrite(nid_mth,"dvlif",itap,zx_tmp_3d,
+      CALL histwrite(nid_mth,"dvlif",itau_w,zx_tmp_3d,
      .                                   iim*jjmp1*klev,ndex3d)
       ENDIF
 C
       CALL gr_fi_ecrit(klev,klon,iim,jjmp1, wo, zx_tmp_3d)
-      CALL histwrite(nid_mth,"ozone",itap,zx_tmp_3d,
+      CALL histwrite(nid_mth,"ozone",itau_w,zx_tmp_3d,
      .                                   iim*jjmp1*klev,ndex3d)
 c
@@ -3049 +3056 @@
          CALL gr_fi_ecrit(klev,klon,iim,jjmp1, qx(1,1,iq+2), zx_tmp_3d)
          WRITE(str2,'(i2.2)') iq
-         CALL histwrite(nid_mth,"trac"//str2,itap,zx_tmp_3d,
+         CALL histwrite(nid_mth,"trac"//str2,itau_w,zx_tmp_3d,
      .                                   iim*jjmp1*klev,ndex3d)
       ELSE
@@ -3061 +3068 @@
 c
       CALL gr_fi_ecrit(klev,klon,iim,jjmp1, upwd, zx_tmp_3d)
-      CALL histwrite(nid_mth,"upwd",itap,zx_tmp_3d,
+      CALL histwrite(nid_mth,"upwd",itau_w,zx_tmp_3d,
      .                                   iim*jjmp1*klev,ndex3d)
 c
       CALL gr_fi_ecrit(klev,klon,iim,jjmp1, dnwd, zx_tmp_3d)
-      CALL histwrite(nid_mth,"dnwd",itap,zx_tmp_3d,
+      CALL histwrite(nid_mth,"dnwd",itau_w,zx_tmp_3d,
      .                                   iim*jjmp1*klev,ndex3d)
 c
       CALL gr_fi_ecrit(klev,klon,iim,jjmp1, dnwd0, zx_tmp_3d)
-      CALL histwrite(nid_mth,"dnwd0",itap,zx_tmp_3d,
+      CALL histwrite(nid_mth,"dnwd0",itau_w,zx_tmp_3d,
      .                                   iim*jjmp1*klev,ndex3d)
 c
       CALL gr_fi_ecrit(klev,klon,iim,jjmp1, Ma, zx_tmp_3d)
-      CALL histwrite(nid_mth,"Ma",itap,zx_tmp_3d,
+      CALL histwrite(nid_mth,"Ma",itau_w,zx_tmp_3d,
      .                                   iim*jjmp1*klev,ndex3d)
 c
@@ -3094 +3101 @@
          zsto = dtime * ecrit_ins
          zout = dtime * ecrit_ins
+         itau_w = itau_phy + itap
 
          i = NINT(zout/zsto)
@@ -3107 +3115 @@
       ENDDO
       CALL gr_fi_ecrit(1, klon,iim,jjmp1, zx_tmp_fi2d,zx_tmp_2d)
-      CALL histwrite(nid_ins,"psol",itap,zx_tmp_2d,iim*jjmp1,ndex2d)
+      CALL histwrite(nid_ins,"psol",itau_w,zx_tmp_2d,iim*jjmp1,ndex2d)
 c
       DO i = 1, klon
@@ -3113 +3121 @@
       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)
+      CALL histwrite(nid_ins,"rain",itau_w,zx_tmp_2d,iim*jjmp1,ndex2d)
 c
       DO i = 1, klon
@@ -3119 +3127 @@
       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)
+      CALL histwrite(nid_ins,"plul",itau_w,zx_tmp_2d,iim*jjmp1,ndex2d)
 c
       DO i = 1, klon
@@ -3125 +3133 @@
       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 histwrite(nid_ins,"pluc",itau_w,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)
+      CALL histwrite(nid_ins,"tsol",itau_w,zx_tmp_2d,iim*jjmp1,ndex2d)
 c
       CALL gr_fi_ecrit(1, klon,iim,jjmp1, snow_fall,zx_tmp_2d)
-      CALL histwrite(nid_ins,"snow",itap,zx_tmp_2d,iim*jjmp1,ndex2d)
+      CALL histwrite(nid_ins,"snow",itau_w,zx_tmp_2d,iim*jjmp1,ndex2d)
 
 c
       CALL gr_fi_ecrit(1, klon,iim,jjmp1, toplw,zx_tmp_2d)
-      CALL histwrite(nid_ins,"topl",itap,zx_tmp_2d,iim*jjmp1,ndex2d)
+      CALL histwrite(nid_ins,"topl",itau_w,zx_tmp_2d,iim*jjmp1,ndex2d)
 c
       CALL gr_fi_ecrit(1, klon,iim,jjmp1, evap,zx_tmp_2d)
-      CALL histwrite(nid_ins,"evap",itap,zx_tmp_2d,iim*jjmp1,ndex2d)
+      CALL histwrite(nid_ins,"evap",itau_w,zx_tmp_2d,iim*jjmp1,ndex2d)
 c
       CALL gr_fi_ecrit(1, klon,iim,jjmp1, solsw,zx_tmp_2d)
-      CALL histwrite(nid_ins,"sols",itap,zx_tmp_2d,iim*jjmp1,ndex2d)
+      CALL histwrite(nid_ins,"sols",itau_w,zx_tmp_2d,iim*jjmp1,ndex2d)
 c
       CALL gr_fi_ecrit(1, klon,iim,jjmp1, sollw,zx_tmp_2d)
-      CALL histwrite(nid_ins,"soll",itap,zx_tmp_2d,iim*jjmp1,ndex2d)
+      CALL histwrite(nid_ins,"soll",itau_w,zx_tmp_2d,iim*jjmp1,ndex2d)
 c
       CALL gr_fi_ecrit(1, klon,iim,jjmp1, sollwdown,zx_tmp_2d)
-      CALL histwrite(nid_ins,"solldown",itap,zx_tmp_2d,iim*jjmp1,ndex2d)
+      CALL histwrite(nid_ins,"solldown",itau_w,zx_tmp_2d,iim*jjmp1,
+     .                ndex2d)
 c
       CALL gr_fi_ecrit(1, klon,iim,jjmp1, bils,zx_tmp_2d)
-      CALL histwrite(nid_ins,"bils",itap,zx_tmp_2d,iim*jjmp1,ndex2d)
+      CALL histwrite(nid_ins,"bils",itau_w,zx_tmp_2d,iim*jjmp1,ndex2d)
 c
       CALL gr_fi_ecrit(1, klon,iim,jjmp1, sens,zx_tmp_2d)
-      CALL histwrite(nid_ins,"sens",itap,zx_tmp_2d,iim*jjmp1,ndex2d)
+      CALL histwrite(nid_ins,"sens",itau_w,zx_tmp_2d,iim*jjmp1,ndex2d)
 c
       CALL gr_fi_ecrit(1, klon,iim,jjmp1, fder,zx_tmp_2d)
-      CALL histwrite(nid_ins,"fder",itap,zx_tmp_2d,iim*jjmp1,ndex2d)
+      CALL histwrite(nid_ins,"fder",itau_w,zx_tmp_2d,iim*jjmp1,ndex2d)
 c
       CALL gr_fi_ecrit(1, klon,iim,jjmp1, d_ts(1,is_oce),zx_tmp_2d)
-      CALL histwrite(nid_ins,"dtsvdfo",itap,zx_tmp_2d,iim*jjmp1,ndex2d)
+      CALL histwrite(nid_ins,"dtsvdfo",itau_w,zx_tmp_2d,iim*jjmp1,
+     .               ndex2d)
 c
       CALL gr_fi_ecrit(1, klon,iim,jjmp1, d_ts(1,is_ter),zx_tmp_2d)
-      CALL histwrite(nid_ins,"dtsvdft",itap,zx_tmp_2d,iim*jjmp1,ndex2d)
+      CALL histwrite(nid_ins,"dtsvdft",itau_w,zx_tmp_2d,iim*jjmp1,
+     .               ndex2d)
 c
       CALL gr_fi_ecrit(1, klon,iim,jjmp1, d_ts(1,is_lic),zx_tmp_2d)
-      CALL histwrite(nid_ins,"dtsvdfg",itap,zx_tmp_2d,iim*jjmp1,ndex2d)
+      CALL histwrite(nid_ins,"dtsvdfg",itau_w,zx_tmp_2d,iim*jjmp1,
+     .               ndex2d)
 c
       CALL gr_fi_ecrit(1, klon,iim,jjmp1, d_ts(1,is_sic),zx_tmp_2d)
-      CALL histwrite(nid_ins,"dtsvdfi",itap,zx_tmp_2d,iim*jjmp1,ndex2d)
+      CALL histwrite(nid_ins,"dtsvdfi",itau_w,zx_tmp_2d,iim*jjmp1,
+     .               ndex2d)
 
       DO nsrf = 1, nbsrf
@@ -3174 +3187 @@
         zx_tmp_fi2d(1 : klon) = pctsrf( 1 : klon, nsrf)
         CALL gr_fi_ecrit(1, klon,iim,jjmp1, zx_tmp_fi2d , zx_tmp_2d)
-        CALL histwrite(nid_ins,"pourc_"//clnsurf(nsrf),itap,
+        CALL histwrite(nid_ins,"pourc_"//clnsurf(nsrf),itau_w,
      $      zx_tmp_2d,iim*jjmp1,ndex2d) 
 C 
         zx_tmp_fi2d(1 : klon) = fluxt( 1 : klon, 1, nsrf)
         CALL gr_fi_ecrit(1, klon,iim,jjmp1, zx_tmp_fi2d , zx_tmp_2d)
-        CALL histwrite(nid_ins,"sens_"//clnsurf(nsrf),itap,
+        CALL histwrite(nid_ins,"sens_"//clnsurf(nsrf),itau_w,
      $      zx_tmp_2d,iim*jjmp1,ndex2d) 
 C
         zx_tmp_fi2d(1 : klon) = fluxlat( 1 : klon, nsrf)
         CALL gr_fi_ecrit(1, klon,iim,jjmp1, zx_tmp_fi2d , zx_tmp_2d)
-        CALL histwrite(nid_ins,"lat_"//clnsurf(nsrf),itap,
+        CALL histwrite(nid_ins,"lat_"//clnsurf(nsrf),itau_w,
      $      zx_tmp_2d,iim*jjmp1,ndex2d) 
 C
         zx_tmp_fi2d(1 : klon) = ftsol( 1 : klon, nsrf)
         CALL gr_fi_ecrit(1, klon,iim,jjmp1, zx_tmp_fi2d , zx_tmp_2d)
-        CALL histwrite(nid_ins,"tsol_"//clnsurf(nsrf),itap,
+        CALL histwrite(nid_ins,"tsol_"//clnsurf(nsrf),itau_w,
      $      zx_tmp_2d,iim*jjmp1,ndex2d) 
 C
         zx_tmp_fi2d(1 : klon) = fluxu( 1 : klon, 1, nsrf)
         CALL gr_fi_ecrit(1, klon,iim,jjmp1, zx_tmp_fi2d , zx_tmp_2d)
-        CALL histwrite(nid_ins,"taux_"//clnsurf(nsrf),itap,
+        CALL histwrite(nid_ins,"taux_"//clnsurf(nsrf),itau_w,
      $      zx_tmp_2d,iim*jjmp1,ndex2d) 
 C      
         zx_tmp_fi2d(1 : klon) = fluxv( 1 : klon, 1, nsrf)
         CALL gr_fi_ecrit(1, klon,iim,jjmp1, zx_tmp_fi2d , zx_tmp_2d)
-        CALL histwrite(nid_ins,"tauy_"//clnsurf(nsrf),itap,
+        CALL histwrite(nid_ins,"tauy_"//clnsurf(nsrf),itau_w,
      $      zx_tmp_2d,iim*jjmp1,ndex2d)
 C
         zx_tmp_fi2d(1 : klon) = frugs( 1 : klon, nsrf)
         CALL gr_fi_ecrit(1, klon,iim,jjmp1, zx_tmp_fi2d , zx_tmp_2d)
-        CALL histwrite(nid_ins,"rugs_"//clnsurf(nsrf),itap,
+        CALL histwrite(nid_ins,"rugs_"//clnsurf(nsrf),itau_w,
      $      zx_tmp_2d,iim*jjmp1,ndex2d) 
 C
         zx_tmp_fi2d(1 : klon) = falbe( 1 : klon, nsrf)
         CALL gr_fi_ecrit(1, klon,iim,jjmp1, zx_tmp_fi2d , zx_tmp_2d)
-        CALL histwrite(nid_ins,"albe_"//clnsurf(nsrf),itap,
+        CALL histwrite(nid_ins,"albe_"//clnsurf(nsrf),itau_w,
      $      zx_tmp_2d,iim*jjmp1,ndex2d) 
 C 
       END DO  
       CALL gr_fi_ecrit(1, klon,iim,jjmp1, albsol,zx_tmp_2d)
-      CALL histwrite(nid_ins,"albs",itap,zx_tmp_2d,iim*jjmp1,ndex2d)
+      CALL histwrite(nid_ins,"albs",itau_w,zx_tmp_2d,iim*jjmp1,ndex2d)
       CALL gr_fi_ecrit(1, klon,iim,jjmp1, albsollw,zx_tmp_2d)
-      CALL histwrite(nid_ins,"albslw",itap,zx_tmp_2d,iim*jjmp1,ndex2d)
+      CALL histwrite(nid_ins,"albslw",itau_w,zx_tmp_2d,iim*jjmp1,ndex2d)
 c
       CALL gr_fi_ecrit(1, klon,iim,jjmp1, zxsnow,zx_tmp_2d)
-      CALL histwrite(nid_ins,"snow_cov",itap,zx_tmp_2d,iim*jjmp1,ndex2d)
+      CALL histwrite(nid_ins,"snow_cov",itau_w,zx_tmp_2d,iim*jjmp1,
+     .               ndex2d)
 c
       CALL gr_fi_ecrit(1, klon,iim,jjmp1, zxrugs,zx_tmp_2d)
-      CALL histwrite(nid_ins,"rugs",itap,zx_tmp_2d,iim*jjmp1,ndex2d)
+      CALL histwrite(nid_ins,"rugs",itau_w,zx_tmp_2d,iim*jjmp1,ndex2d)
 c
 c Champs 3D:
 c
       CALL gr_fi_ecrit(klev,klon,iim,jjmp1, t_seri, zx_tmp_3d)
-      CALL histwrite(nid_ins,"temp",itap,zx_tmp_3d,
+      CALL histwrite(nid_ins,"temp",itau_w,zx_tmp_3d,
      .                                   iim*jjmp1*klev,ndex3d)
 c
       CALL gr_fi_ecrit(klev,klon,iim,jjmp1, u_seri, zx_tmp_3d)
-      CALL histwrite(nid_ins,"vitu",itap,zx_tmp_3d,
+      CALL histwrite(nid_ins,"vitu",itau_w,zx_tmp_3d,
      .                                   iim*jjmp1*klev,ndex3d)
 c
       CALL gr_fi_ecrit(klev,klon,iim,jjmp1, v_seri, zx_tmp_3d)
-      CALL histwrite(nid_ins,"vitv",itap,zx_tmp_3d,
+      CALL histwrite(nid_ins,"vitv",itau_w,zx_tmp_3d,
      .                                   iim*jjmp1*klev,ndex3d)
 c
       CALL gr_fi_ecrit(klev,klon,iim,jjmp1, zphi, zx_tmp_3d)
-      CALL histwrite(nid_ins,"geop",itap,zx_tmp_3d,
+      CALL histwrite(nid_ins,"geop",itau_w,zx_tmp_3d,
      .                                   iim*jjmp1*klev,ndex3d)
 c
       CALL gr_fi_ecrit(klev,klon,iim,jjmp1, pplay, zx_tmp_3d)
-      CALL histwrite(nid_ins,"pres",itap,zx_tmp_3d,
+      CALL histwrite(nid_ins,"pres",itau_w,zx_tmp_3d,
      .                                   iim*jjmp1*klev,ndex3d)
 c
       CALL gr_fi_ecrit(klev,klon,iim,jjmp1, d_t_vdf, zx_tmp_3d)
-      CALL histwrite(nid_ins,"dtvdf",itap,zx_tmp_3d,
+      CALL histwrite(nid_ins,"dtvdf",itau_w,zx_tmp_3d,
      .                                   iim*jjmp1*klev,ndex3d)
 c
       CALL gr_fi_ecrit(klev,klon,iim,jjmp1, d_q_vdf, zx_tmp_3d)
-      CALL histwrite(nid_ins,"dqvdf",itap,zx_tmp_3d,
+      CALL histwrite(nid_ins,"dqvdf",itau_w,zx_tmp_3d,
      .                                   iim*jjmp1*klev,ndex3d)
 
@@ -3339 +3353 @@
 c
       IF (lafin) THEN
+         itau_phy = itau_phy + itap
 ccc         IF (ok_oasis) CALL quitcpl
          CALL phyredem ("restartphy.nc",dtime,radpas,co2_ppm,solaire,

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

@@ -235 +235 @@
          itap=0
 C         
-         CALL ymds2ju(anne_ini, 1, 1, 0.0, zjulian)
-         zjulian = zjulian + day_ini
+         CALL ymds2ju(annee_ref, 1, 1, 0.0, zjulian)
+         zjulian = zjulian + day_ref
 c
          CALL gr_fi_ecrit(1,klon,iim,jjm+1,xlon,zx_lon)
@@ -247 +247 @@
 c         ENDDO
          CALL gr_fi_ecrit(1,klon,iim,jjm+1,xlat,zx_lat)
-         CALL histbeg("histrac", iim,zx_lon, jjm+1,zx_lat,
-     .                 1,iim,1,jjm+1, 0, zjulian, pdtphys,
+         CALL histbeg("histrac", iim,zx_lon(:,1), jjm+1,zx_lat(1,:),
+     .                 1,iim,1,jjm+1, itau_phy, zjulian, pdtphys,
      .                 nhori, nid_tra)
          CALL histvert(nid_tra, "presnivs", "Vertical levels", "mb",