--- trunk/dyn3d/leapfrog.f	2014/03/26 17:18:58	91
+++ trunk/Sources/dyn3d/leapfrog.f	2015/04/29 15:47:56	134
@@ -4,22 +4,24 @@
 
 contains
 
-  SUBROUTINE leapfrog(ucov, vcov, teta, ps, masse, phis, q, time_0)
+  SUBROUTINE leapfrog(ucov, vcov, teta, ps, masse, phis, q)
 
     ! From dyn3d/leapfrog.F, version 1.6, 2005/04/13 08:58:34 revision 616
     ! Authors: P. Le Van, L. Fairhead, F. Hourdin
-    ! Matsuno-leapfrog scheme.
+
+    ! Intégration temporelle du modèle : Matsuno-leapfrog scheme.
 
     use addfi_m, only: addfi
     use bilan_dyn_m, only: bilan_dyn
     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
@@ -51,8 +53,6 @@
     REAL, intent(inout):: q(:, :, :, :) ! (iim + 1, jjm + 1, llm, nqmx)
     ! mass fractions of advected fields
 
-    REAL, intent(in):: time_0
-
     ! Local:
 
     ! Variables dynamiques:
@@ -86,13 +86,10 @@
     REAL dtetafi(iim + 1, jjm + 1, llm), dqfi(iim + 1, jjm + 1, llm, nqmx)
 
     ! Variables pour le fichier histoire
-
     INTEGER itau ! index of the time step of the dynamics, starts at 0
     INTEGER itaufin
-    REAL time ! time of day, as a fraction of day length
     real finvmaold(iim + 1, jjm + 1, llm)
     INTEGER l
-    REAL rdayvrai, rdaym_ini
 
     ! Variables test conservation \'energie
     REAL ecin(iim + 1, jjm + 1, llm), ecin0(iim + 1, jjm + 1, llm)
@@ -120,21 +117,20 @@
        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:
        CALL geopot(teta, pk, pks, phis, phi)
        CALL caldyn(itau, ucov, vcov, teta, ps, masse, pk, pkf, phis, phi, &
-            dudyn, dv, dteta, dp, w, pbaru, pbarv, time_0, &
+            dudyn, dv, dteta, dp, w, pbaru, pbarv, &
             conser = MOD(itau, iconser) == 0)
 
        CALL caladvtrac(q, pbaru, pbarv, p3d, masse, teta, pk)
@@ -148,44 +144,34 @@
             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, &
-               phi, dudyn, dv, dteta, dp, w, pbaru, pbarv, time_0, &
-               conser = .false.)
+               phi, dudyn, dv, dteta, dp, w, pbaru, pbarv, conser = .false.)
 
           ! integrations dynamique et traceurs:
           CALL integrd(vcovm1, ucovm1, tetam1, psm1, massem1, dv, dudyn, &
                dteta, dp, vcov, ucov, teta, q(:, :, :, :2), ps, masse, &
                finvmaold, dtvr, leapf=.false.)
-       end if
-
-       IF (MOD(itau + 1, iphysiq) == 0 .AND. iflag_phys /= 0) THEN
-          ! Calcul des tendances physiques:
 
           forall (l = 1: llm + 1) p3d(:, :, l) = ap(l) + bp(l) * ps
           CALL exner_hyb(ps, p3d, pks, pk, pkf)
+       end if
 
-          rdaym_ini = itau * dtvr / daysec
-          rdayvrai = rdaym_ini + day_ini
-          time = REAL(mod(itau, day_step)) / day_step + time_0
-          IF (time > 1.) time = time - 1.
-
-          CALL calfis(rdayvrai, time, ucov, vcov, teta, q, ps, pk, phis, phi, &
-               w, dufi, dvfi, dtetafi, dqfi, lafin = itau + 1 == itaufin)
+       IF (MOD(itau + 1, iphysiq) == 0 .AND. iflag_phys /= 0) THEN
+          CALL calfis(itau / day_step + day_ini, &
+               REAL(mod(itau, day_step)) / day_step, ucov, vcov, teta, q, pk, &
+               phis, phi, w, dufi, dvfi, dtetafi, dqfi, &
+               lafin = itau + 1 == itaufin)
 
-          ! Ajout des tendances physiques:
           CALL addfi(ucov, vcov, teta, q, dufi, dvfi, dtetafi, dqfi)
        ENDIF
 
-       forall (l = 1: llm + 1) p3d(:, :, l) = ap(l) + bp(l) * ps
-       CALL exner_hyb(ps, p3d, pks, pk, pkf)
-
        IF (MOD(itau + 1, idissip) == 0) THEN
           ! Dissipation horizontale et verticale des petites \'echelles
 
@@ -234,7 +220,7 @@
     ! Calcul des tendances dynamiques:
     CALL geopot(teta, pk, pks, phis, phi)
     CALL caldyn(itaufin, ucov, vcov, teta, ps, masse, pk, pkf, phis, phi, &
-         dudyn, dv, dteta, dp, w, pbaru, pbarv, time_0, &
+         dudyn, dv, dteta, dp, w, pbaru, pbarv, &
          conser = MOD(itaufin, iconser) == 0)
 
   END SUBROUTINE leapfrog