--- trunk/libf/phylmd/physiq.f90	2008/08/05 13:31:32	17
+++ trunk/libf/phylmd/physiq.f90	2008/10/15 16:19:57	20
@@ -10,7 +10,7 @@
 contains
 
   SUBROUTINE physiq(nq, firstcal, lafin, rdayvrai, gmtime, pdtphys, paprs, &
-       pplay, pphi, pphis, presnivs, u, v, t, qx, omega, d_u, d_v, &
+       pplay, pphi, pphis, u, v, t, qx, omega, d_u, d_v, &
        d_t, d_qx, d_ps, dudyn, PVteta)
 
     ! From phylmd/physiq.F, v 1.22 2006/02/20 09:38:28
@@ -81,9 +81,6 @@
 
     REAL pphis(klon) ! input geopotentiel du sol
 
-    REAL presnivs(llm)
-    ! (input pressions approximat. des milieux couches ( en PA))
-
     REAL u(klon, llm)  ! input vitesse dans la direction X (de O a E) en m/s
     REAL v(klon, llm)  ! input vitesse Y (de S a N) en m/s
     REAL t(klon, llm)  ! input temperature (K)
@@ -656,8 +653,7 @@
     INTEGER   ip_ebil  ! PRINT level for energy conserv. diag.
     SAVE      ip_ebil
     DATA      ip_ebil/0/
-    INTEGER   if_ebil ! level for energy conserv. dignostics
-    SAVE      if_ebil
+    INTEGER, SAVE:: if_ebil ! level for energy conservation diagnostics
     !+jld ec_conser
     REAL d_t_ec(klon, llm)    ! tendance du a la conersion Ec -> E thermique
     REAL ZRCPD
@@ -876,9 +872,9 @@
 
        !   Initialisation des sorties
 
-       call ini_histhf(pdtphys, presnivs, nid_hf, nid_hf3d)
-       call ini_histday(pdtphys, presnivs, ok_journe, nid_day, nq)
-       call ini_histins(pdtphys, presnivs, ok_instan, nid_ins)
+       call ini_histhf(pdtphys, nid_hf, nid_hf3d)
+       call ini_histday(pdtphys, ok_journe, nid_day, nq)
+       call ini_histins(pdtphys, ok_instan, nid_ins)
        CALL ymds2ju(annee_ref, 1, int(day_ref), 0., date0)
        !XXXPB Positionner date0 pour initialisation de ORCHIDEE
        WRITE(*, *) 'physiq date0 : ', date0
@@ -992,10 +988,9 @@
     ! Mettre en action les conditions aux limites (albedo, sst, etc.).
     ! Prescrire l'ozone et calculer l'albedo sur l'ocean.
 
-!!$    if (nq >= 5) then
-!!$       wo = qx(:, :, 5) * zmasse / dobson_u / 1e3
-!!$    else IF (MOD(itap - 1, lmt_pas) == 0) THEN
-    IF (MOD(itap - 1, lmt_pas) == 0) THEN
+    if (nq >= 5) then
+       wo = qx(:, :, 5) * zmasse / dobson_u / 1e3
+    else IF (MOD(itap - 1, lmt_pas) == 0) THEN
        CALL ozonecm(REAL(julien), rlat, paprs, wo)
     ENDIF
 
@@ -1284,7 +1279,7 @@
        ! (driver commun aux versions 3 et 4)
 
        IF (ok_cvl) THEN ! new driver for convectL
-          CALL concvl (iflag_con, pdtphys, paprs, pplay, t_seri, q_seri, &
+          CALL concvl(iflag_con, pdtphys, paprs, pplay, t_seri, q_seri, &
                u_seri, v_seri, tr_seri, ntra, &
                ema_work1, ema_work2, &
                d_t_con, d_q_con, d_u_con, d_v_con, d_tr, &
@@ -1850,7 +1845,7 @@
     call phytrac(rnpb, itap, lmt_pas, julien,  gmtime, firstcal, lafin, nq-2, &
          pdtphys, u, v, t, paprs, pplay, pmfu,  pmfd,  pen_u,  pde_u,  pen_d, &
          pde_d, ycoefh, fm_therm, entr_therm, yu1, yv1, ftsol, pctsrf, &
-         frac_impa,  frac_nucl, presnivs, pphis, pphi, albsol, rhcl, cldfra, &
+         frac_impa,  frac_nucl, pphis, pphi, albsol, rhcl, cldfra, &
          rneb,  diafra,  cldliq, itop_con, ibas_con, pmflxr, pmflxs, prfl, &
          psfl, da, phi, mp, upwd, dnwd, tr_seri, zmasse)