--- trunk/dyn3d/leapfrog.f	2014/04/04 11:30:34	96
+++ trunk/dyn3d/leapfrog.f	2014/09/19 17:36:20	115
@@ -15,11 +15,12 @@
     use caladvtrac_m, only: caladvtrac
     use caldyn_m, only: caldyn
     USE calfis_m, ONLY: calfis
-    USE comconst, ONLY: daysec, dtphys, dtvr
+    USE comconst, ONLY: daysec, dtvr
     USE comgeom, ONLY: aire_2d, apoln, apols
     USE disvert_m, ONLY: ap, bp
     USE conf_gcm_m, ONLY: day_step, iconser, iperiod, iphysiq, nday, offline, &
-         iflag_phys, ok_guide, iecri
+         iflag_phys, iecri
+    USE conf_guide_m, ONLY: ok_guide
     USE dimens_m, ONLY: iim, jjm, llm, nqmx
     use dissip_m, only: dissip
     USE dynetat0_m, ONLY: day_ini
@@ -120,15 +121,14 @@
        else
           ! Matsuno
           dt = dtvr
-          if (ok_guide .and. (itaufin - itau - 1) * dtvr > 21600.) &
-               call guide(itau, ucov, vcov, teta, q, masse, ps)
+          if (ok_guide) call guide(itau, ucov, vcov, teta, q(:, :, :, 1), ps)
           vcovm1 = vcov
           ucovm1 = ucov
           tetam1 = teta
           massem1 = masse
           psm1 = ps
           finvmaold = masse
-          CALL filtreg(finvmaold, jjm + 1, llm, - 2, 2, .TRUE.)
+          CALL filtreg(finvmaold, direct = .false., intensive = .false.)
        end if
 
        ! Calcul des tendances dynamiques:
@@ -148,11 +148,11 @@
             dp, vcov, ucov, teta, q(:, :, :, :2), ps, masse, finvmaold, dt, &
             leapf)
 
+       forall (l = 1: llm + 1) p3d(:, :, l) = ap(l) + bp(l) * ps
+       CALL exner_hyb(ps, p3d, pks, pk, pkf)
+
        if (.not. leapf) then
           ! Matsuno backward
-          forall (l = 1: llm + 1) p3d(:, :, l) = ap(l) + bp(l) * ps
-          CALL exner_hyb(ps, p3d, pks, pk, pkf)
-
           ! Calcul des tendances dynamiques:
           CALL geopot(teta, pk, pks, phis, phi)
           CALL caldyn(itau + 1, ucov, vcov, teta, ps, masse, pk, pkf, phis, &
@@ -163,10 +163,10 @@
           CALL integrd(vcovm1, ucovm1, tetam1, psm1, massem1, dv, dudyn, &
                dteta, dp, vcov, ucov, teta, q(:, :, :, :2), ps, masse, &
                finvmaold, dtvr, leapf=.false.)
-       end if
 
-       forall (l = 1: llm + 1) p3d(:, :, l) = ap(l) + bp(l) * ps
-       CALL exner_hyb(ps, p3d, pks, pk, pkf)
+          forall (l = 1: llm + 1) p3d(:, :, l) = ap(l) + bp(l) * ps
+          CALL exner_hyb(ps, p3d, pks, pk, pkf)
+       end if
 
        IF (MOD(itau + 1, iphysiq) == 0 .AND. iflag_phys /= 0) THEN
           ! Calcul des tendances physiques: