--- trunk/Sources/dyn3d/leapfrog.f	2015/07/07 17:49:23	154
+++ trunk/Sources/dyn3d/leapfrog.f	2016/09/01 10:30:53	207
@@ -16,8 +16,9 @@
     use caladvtrac_m, only: caladvtrac
     use caldyn_m, only: caldyn
     USE calfis_m, ONLY: calfis
-    USE comconst, ONLY: daysec, dtvr
+    USE comconst, ONLY: 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
@@ -26,6 +27,7 @@
     use dissip_m, only: dissip
     USE dynetat0_m, ONLY: day_ini
     use dynredem1_m, only: dynredem1
+    use enercin_m, only: enercin
     USE exner_hyb_m, ONLY: exner_hyb
     use filtreg_scal_m, only: filtreg_scal
     use fluxstokenc_m, only: fluxstokenc
@@ -34,7 +36,6 @@
     use inidissip_m, only: idissip
     use integrd_m, only: integrd
     use nr_util, only: assert
-    USE pressure_var, ONLY: p3d
     USE temps, ONLY: itau_dyn
     use writedynav_m, only: writedynav
     use writehist_m, only: writehist
@@ -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
@@ -98,6 +98,10 @@
     logical leapf
     real dt ! time step, in s
 
+    REAL p3d(iim + 1, jjm + 1, llm+1) ! pressure at layer interfaces, in Pa
+    ! ("p3d(i, j, l)" is at longitude "rlonv(i)", latitude "rlatu(j)",
+    ! for interface "l")
+
     !---------------------------------------------------
 
     print *, "Call sequence information: leapfrog"
@@ -125,8 +129,6 @@
           tetam1 = teta
           massem1 = masse
           psm1 = ps
-          finvmaold = masse
-          CALL filtreg_scal(finvmaold, direct = .false., intensive = .false.)
        end if
 
        ! Calcul des tendances dynamiques:
@@ -143,8 +145,7 @@
 
        ! 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)
@@ -160,8 +161,8 @@
 
           ! 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)
@@ -170,7 +171,7 @@
        end if
 
        IF (MOD(itau + 1, iphysiq) == 0 .AND. iflag_phys /= 0) THEN
-          CALL calfis(ucov, vcov, teta, q, pk, phis, phi, w, dufi, dvfi, &
+          CALL calfis(ucov, vcov, teta, q, p3d, 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)
@@ -220,8 +221,7 @@
        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)