--- trunk/Sources/dyn3d/leapfrog.f	2015/04/29 15:47:56	134
+++ trunk/Sources/dyn3d/leapfrog.f	2015/07/24 14:27:59	161
@@ -18,6 +18,7 @@
     USE calfis_m, ONLY: calfis
     USE comconst, ONLY: daysec, dtvr
     USE comgeom, ONLY: aire_2d, apoln, apols
+    use covcont_m, only: covcont
     USE disvert_m, ONLY: ap, bp
     USE conf_gcm_m, ONLY: day_step, iconser, iperiod, iphysiq, nday, offline, &
          iflag_phys, iecri
@@ -27,7 +28,7 @@
     USE dynetat0_m, ONLY: day_ini
     use dynredem1_m, only: dynredem1
     USE exner_hyb_m, ONLY: exner_hyb
-    use filtreg_m, only: filtreg
+    use filtreg_scal_m, only: filtreg_scal
     use fluxstokenc_m, only: fluxstokenc
     use geopot_m, only: geopot
     USE guide_m, ONLY: guide
@@ -88,7 +89,6 @@
     ! Variables pour le fichier histoire
     INTEGER itau ! index of the time step of the dynamics, starts at 0
     INTEGER itaufin
-    real finvmaold(iim + 1, jjm + 1, llm)
     INTEGER l
 
     ! Variables test conservation \'energie
@@ -108,7 +108,9 @@
 
     ! On initialise la pression et la fonction d'Exner :
     forall (l = 1: llm + 1) p3d(:, :, l) = ap(l) + bp(l) * ps
-    CALL exner_hyb(ps, p3d, pks, pk, pkf)
+    CALL exner_hyb(ps, p3d, pks, pk)
+    pkf = pk
+    CALL filtreg_scal(pkf, direct = .true., intensive = .true.)
 
     time_integration: do itau = 0, itaufin - 1
        leapf = mod(itau, iperiod) /= 0
@@ -123,8 +125,6 @@
           tetam1 = teta
           massem1 = masse
           psm1 = ps
-          finvmaold = masse
-          CALL filtreg(finvmaold, direct = .false., intensive = .false.)
        end if
 
        ! Calcul des tendances dynamiques:
@@ -141,11 +141,12 @@
 
        ! Int\'egrations dynamique et traceurs:
        CALL integrd(vcovm1, ucovm1, tetam1, psm1, massem1, dv, dudyn, dteta, &
-            dp, vcov, ucov, teta, q(:, :, :, :2), ps, masse, finvmaold, dt, &
-            leapf)
+            dp, vcov, ucov, teta, q(:, :, :, :2), ps, masse, dt, leapf)
 
        forall (l = 1: llm + 1) p3d(:, :, l) = ap(l) + bp(l) * ps
-       CALL exner_hyb(ps, p3d, pks, pk, pkf)
+       CALL exner_hyb(ps, p3d, pks, pk)
+       pkf = pk
+       CALL filtreg_scal(pkf, direct = .true., intensive = .true.)
 
        if (.not. leapf) then
           ! Matsuno backward
@@ -156,17 +157,19 @@
 
           ! 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.)
+               dteta, dp, vcov, ucov, teta, q(:, :, :, :2), ps, masse, dtvr, &
+               leapf=.false.)
 
           forall (l = 1: llm + 1) p3d(:, :, l) = ap(l) + bp(l) * ps
-          CALL exner_hyb(ps, p3d, pks, pk, pkf)
+          CALL exner_hyb(ps, p3d, pks, pk)
+          pkf = pk
+          CALL filtreg_scal(pkf, direct = .true., intensive = .true.)
        end if
 
        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, &
+          CALL calfis(ucov, vcov, teta, q, pk, phis, phi, w, dufi, dvfi, &
+               dtetafi, dqfi, dayvrai = itau / day_step + day_ini, &
+               time = REAL(mod(itau, day_step)) / day_step, &
                lafin = itau + 1 == itaufin)
 
           CALL addfi(ucov, vcov, teta, q, dufi, dvfi, dtetafi, dqfi)
@@ -210,12 +213,11 @@
 
        IF (MOD(itau + 1, iecri * day_step) == 0) THEN
           CALL geopot(teta, pk, pks, phis, phi)
-          CALL writehist(itau, vcov, ucov, teta, phi, q, masse, ps)
+          CALL writehist(itau, vcov, ucov, teta, phi, masse, ps)
        END IF
     end do time_integration
 
-    CALL dynredem1("restart.nc", vcov, ucov, teta, q, masse, ps, &
-         itau = itau_dyn + itaufin)
+    CALL dynredem1(vcov, ucov, teta, q, masse, ps, itau = itau_dyn + itaufin)
 
     ! Calcul des tendances dynamiques:
     CALL geopot(teta, pk, pks, phis, phi)