--- trunk/libf/bibio/writedynav.f90	2012/01/10 19:02:02	56
+++ trunk/libf/bibio/writedynav.f90	2012/07/26 14:37:37	62
@@ -4,27 +4,17 @@
 
 contains
 
-  subroutine writedynav(nq, time, vcov, ucov, teta, ppk, phi, q, masse, ps, &
-       phis)
+  subroutine writedynav(vcov, ucov, teta, ppk, phi, q, masse, ps, phis, time)
 
     ! From LMDZ4/libf/bibio/writedynav.F, version 1.1.1.1 2004/05/19 12:53:05
-    ! Ecriture du fichier histoire au format IOIPSL
+    ! Écriture du fichier histoire au format IOIPSL
+    ! L. Fairhead, LMD, 03/99
 
     ! Appels successifs des routines histwrite
 
-    ! Entree:
-    ! time: temps de l'ecriture
-    ! vcov: vents v covariants
-    ! ucov: vents u covariants
-    ! phi : geopotentiel instantane
-    ! q : traceurs
-    ! ps :pression au sol
-    ! phis : geopotentiel au sol
-
-    ! L. Fairhead, LMD, 03/99
-
+    use covnat_m, only: covnat
     USE histwrite_m, ONLY: histwrite
-    USE histcom, ONLY: histsync
+    USE histsync_m, ONLY: histsync
     USE dimens_m, ONLY: llm
     USE paramet_m, ONLY: iip1, ijp1llm, ip1jm, ip1jmp1, jjp1
     USE comconst, ONLY: cpp
@@ -32,15 +22,15 @@
     USE iniadvtrac_m, ONLY: ttext
     use initdynav_m, only: histaveid
 
-    INTEGER nq
-    REAL vcov(ip1jm, llm), ucov(ip1jmp1, llm) 
+    REAL, intent(in):: vcov(ip1jm, llm), ucov(ip1jmp1, llm) ! vents covariants
     REAL, intent(in):: teta(ip1jmp1*llm) ! temperature potentielle
-    real phi(ip1jmp1, llm), ppk(ip1jmp1*llm) 
-    REAL ps(ip1jmp1)
+    real, intent(in):: phi(ip1jmp1, llm) ! geopotentiel instantane
+    real, intent(in):: ppk(ip1jmp1*llm) 
+    REAL, intent(in):: ps(ip1jmp1) ! pression au sol
     real, intent(in):: masse(ip1jmp1, llm) 
-    REAL phis(ip1jmp1) 
-    REAL q(ip1jmp1, llm, nq)
-    integer, intent(in):: time
+    REAL, intent(in):: phis(ip1jmp1) ! geopotentiel au sol
+    REAL, intent(in):: q(:, :, :, :) ! (iim + 1, jjm + 1, llm, nqmx) traceurs
+    integer, intent(in):: time ! temps de l'ecriture
 
     ! Variables locales
     integer ndex2d(iip1*jjp1), ndex3d(iip1*jjp1*llm), iq, ii, ll
@@ -89,8 +79,8 @@
     call histwrite(histaveid, 'phi', itau_w, phi)
 
     ! Traceurs
-    DO iq=1, nq
-       call histwrite(histaveid, ttext(iq), itau_w, q(:, :, iq))
+    DO iq = 1, size(q, 4)
+       call histwrite(histaveid, ttext(iq), itau_w, q(:, :, :, iq))
     enddo
 
     ! Masse