--- trunk/libf/bibio/initdynav.f90	2012/01/10 19:02:02	56
+++ trunk/libf/bibio/initdynav.f90	2012/07/26 14:37:37	62
@@ -14,14 +14,17 @@
     ! au format IOIPSL. Initialisation du fichier histoire moyenne.
 
     use calendar, ONLY: ymds2ju
-    USE comvert, ONLY : nivsigs
-    USE comgeom, ONLY : rlatu, rlonv
-    USE dimens_m, ONLY : llm
-    USE histcom, ONLY: histbeg_totreg, histdef, histend, histvert
-    USE iniadvtrac_m, ONLY : ttext
-    USE nr_util, ONLY : pi
-    USE paramet_m, ONLY : iip1, jjp1
-    USE temps, ONLY : itau_dyn
+    USE comvert, ONLY: nivsigs
+    USE comgeom, ONLY: rlatu, rlonv
+    USE dimens_m, ONLY: llm
+    USE histbeg_totreg_m, ONLY: histbeg_totreg
+    USE histdef_m, ONLY: histdef
+    USE histend_m, ONLY: histend
+    USE histvert_m, ONLY: histvert
+    USE iniadvtrac_m, ONLY: ttext
+    USE nr_util, ONLY: pi
+    USE paramet_m, ONLY: iip1, jjp1
+    USE temps, ONLY: itau_dyn
 
     integer, intent(in):: day0, anne0 ! date de reference
     real, intent(in):: tstep ! frequence d'ecriture
@@ -30,65 +33,45 @@
     real, intent(in):: t_wrt ! frequence d'ecriture sur le fichier
 
     ! Variables locales
-    integer thoriid, zvertiid
-    real zjulian
+    integer horiid, zvertiid
+    real julian
     integer iq
-    real rlong(iip1, jjp1), rlat(iip1, jjp1)
     integer ii, jj
-    integer zan, dayref
 
     !----------------------------------------------------
 
     print *, "Call sequence information: initdynav"
 
-    zan = anne0
-    dayref = day0
-    CALL ymds2ju(zan, 1, dayref, 0.0, zjulian)
-
-    do jj = 1, jjp1
-       do ii = 1, iip1
-          rlong(ii, jj) = rlonv(ii) * 180. / pi
-          rlat(ii, jj) = rlatu(jj) * 180. / pi
-       enddo
-    enddo
-
-    call histbeg_totreg('dyn_hist_ave.nc', rlong(:, 1), rlat(1, :), 1, iip1, &
-         1, jjp1, itau_dyn, zjulian, tstep, thoriid, histaveid)
+    CALL ymds2ju(anne0, 1, day0, 0., julian)
+    call histbeg_totreg('dyn_hist_ave.nc', rlonv * 180. / pi, &
+         rlatu * 180. / pi, 1, iip1, 1, jjp1, itau_dyn, julian, tstep, &
+         horiid, histaveid)
     call histvert(histaveid, 'sigss', 'Niveaux sigma', 'Pa', llm, nivsigs, &
          zvertiid)
 
-    call histdef(histaveid, 'u', 'vents u scalaires moyennes', &
-         'm/s', iip1, jjp1, thoriid, llm, 1, llm, zvertiid, &
-         'ave(X)', t_ops, t_wrt)
-    call histdef(histaveid, 'v', 'vents v scalaires moyennes', &
-         'm/s', iip1, jjp1, thoriid, llm, 1, llm, zvertiid, &
-         'ave(X)', t_ops, t_wrt)
-    call histdef(histaveid, 'temp', 'temperature moyennee', 'K', &
-         iip1, jjp1, thoriid, llm, 1, llm, zvertiid, &
-         'ave(X)', t_ops, t_wrt)
-    call histdef(histaveid, 'theta', 'temperature potentielle', 'K', &
-         iip1, jjp1, thoriid, llm, 1, llm, zvertiid, &
-         'ave(X)', t_ops, t_wrt)
-    call histdef(histaveid, 'phi', 'geopotentiel moyenne', '-', &
-         iip1, jjp1, thoriid, llm, 1, llm, zvertiid, &
-         'ave(X)', t_ops, t_wrt)
+    call histdef(histaveid, 'u', 'vents u scalaires moyennes', 'm/s', iip1, &
+         jjp1, horiid, llm, 1, llm, zvertiid, 'ave(X)', t_ops, t_wrt)
+    call histdef(histaveid, 'v', 'vents v scalaires moyennes', 'm/s', iip1, &
+         jjp1, horiid, llm, 1, llm, zvertiid, 'ave(X)', t_ops, t_wrt)
+    call histdef(histaveid, 'temp', 'temperature moyennee', 'K', iip1, jjp1, &
+         horiid, llm, 1, llm, zvertiid, 'ave(X)', t_ops, t_wrt)
+    call histdef(histaveid, 'theta', 'temperature potentielle', 'K', iip1, &
+         jjp1, horiid, llm, 1, llm, zvertiid, 'ave(X)', t_ops, t_wrt)
+    call histdef(histaveid, 'phi', 'geopotentiel moyenne', '-', iip1, jjp1, &
+         horiid, llm, 1, llm, zvertiid, 'ave(X)', t_ops, t_wrt)
 
     ! Traceurs
     DO iq = 1, nq
-       call histdef(histaveid, ttext(iq), ttext(iq), '-', &
-            iip1, jjp1, thoriid, llm, 1, llm, zvertiid, &
-            'ave(X)', t_ops, t_wrt)
+       call histdef(histaveid, ttext(iq), ttext(iq), '-', iip1, jjp1, &
+            horiid, llm, 1, llm, zvertiid, 'ave(X)', t_ops, t_wrt)
     enddo
 
-    call histdef(histaveid, 'masse', 'masse', 'kg', &
-         iip1, jjp1, thoriid, 1, 1, 1, -99, &
-         'ave(X)', t_ops, t_wrt)
-    call histdef(histaveid, 'ps', 'pression naturelle au sol', 'Pa', &
-         iip1, jjp1, thoriid, 1, 1, 1, -99, &
-         'ave(X)', t_ops, t_wrt)
-    call histdef(histaveid, 'phis', 'geopotentiel au sol', '-', &
-         iip1, jjp1, thoriid, 1, 1, 1, -99, &
-         'ave(X)', t_ops, t_wrt)
+    call histdef(histaveid, 'masse', 'masse', 'kg', iip1, jjp1, horiid, 1, &
+         1, 1, -99, 'ave(X)', t_ops, t_wrt)
+    call histdef(histaveid, 'ps', 'pression naturelle au sol', 'Pa', iip1, &
+         jjp1, horiid, 1, 1, 1, -99, 'ave(X)', t_ops, t_wrt)
+    call histdef(histaveid, 'phis', 'geopotentiel au sol', '-', iip1, jjp1, &
+         horiid, 1, 1, 1, -99, 'ave(X)', t_ops, t_wrt)
 
     call histend(histaveid)