--- trunk/libf/dyn3d/leapfrog.f90	2012/08/29 14:47:17	64
+++ trunk/libf/dyn3d/leapfrog.f90	2013/06/24 15:39:52	70
@@ -6,7 +6,7 @@
 
   SUBROUTINE leapfrog(ucov, vcov, teta, ps, masse, phis, q, time_0)
 
-    ! From dyn3d/leapfrog.F, version 1.6, 2005/04/13 08:58:34
+    ! 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.
 
@@ -17,15 +17,16 @@
     USE calfis_m, ONLY: calfis
     USE comconst, ONLY: daysec, dtphys, dtvr
     USE comgeom, ONLY: aire_2d, apoln, apols
-    USE comvert, ONLY: ap, bp
+    USE disvert_m, ONLY: ap, bp
     USE conf_gcm_m, ONLY: day_step, iconser, iperiod, iphysiq, nday, offline, &
-         iflag_phys, ok_guide
+         iflag_phys, ok_guide, iecri
     USE dimens_m, ONLY: iim, jjm, llm, nqmx
     use dissip_m, only: dissip
     USE dynetat0_m, ONLY: day_ini
     use dynredem1_m, only: dynredem1
     USE exner_hyb_m, ONLY: exner_hyb
     use filtreg_m, only: filtreg
+    use fluxstokenc_m, only: fluxstokenc
     use geopot_m, only: geopot
     USE guide_m, ONLY: guide
     use inidissip_m, only: idissip
@@ -34,6 +35,7 @@
     USE pressure_var, ONLY: p3d
     USE temps, ONLY: itau_dyn
     use writedynav_m, only: writedynav
+    use writehist_m, only: writehist
 
     ! Variables dynamiques:
     REAL, intent(inout):: ucov(:, :, :) ! (iim + 1, jjm + 1, llm) vent covariant
@@ -43,8 +45,8 @@
     ! potential temperature
 
     REAL, intent(inout):: ps(:, :) ! (iim + 1, jjm + 1) pression au sol, en Pa
-    REAL masse((iim + 1) * (jjm + 1), llm) ! masse d'air
-    REAL phis((iim + 1) * (jjm + 1)) ! geopotentiel au sol
+    REAL, intent(inout):: masse(:, :, :) ! (iim + 1, jjm + 1, llm) masse d'air
+    REAL, intent(in):: phis(:, :) ! (iim + 1, jjm + 1) surface geopotential
 
     REAL, intent(inout):: q(:, :, :, :) ! (iim + 1, jjm + 1, llm, nqmx)
     ! mass fractions of advected fields
@@ -55,9 +57,9 @@
 
     ! Variables dynamiques:
 
-    REAL pks((iim + 1) * (jjm + 1)) ! exner au sol
+    REAL pks(iim + 1, jjm + 1) ! exner au sol
     REAL pk(iim + 1, jjm + 1, llm) ! exner au milieu des couches
-    REAL pkf((iim + 1) * (jjm + 1), llm) ! exner filt.au milieu des couches
+    REAL pkf(iim + 1, jjm + 1, llm) ! exner filtré au milieu des couches
     REAL phi(iim + 1, jjm + 1, llm) ! geopotential
     REAL w((iim + 1) * (jjm + 1), llm) ! vitesse verticale
 
@@ -68,7 +70,7 @@
     ! Variables dynamiques au pas - 1
     REAL vcovm1(iim + 1, jjm, llm), ucovm1(iim + 1, jjm + 1, llm)
     REAL tetam1(iim + 1, jjm + 1, llm), psm1(iim + 1, jjm + 1)
-    REAL massem1((iim + 1) * (jjm + 1), llm)
+    REAL massem1(iim + 1, jjm + 1, llm)
 
     ! Tendances dynamiques
     REAL dv((iim + 1) * jjm, llm), dudyn((iim + 1) * (jjm + 1), llm)
@@ -89,7 +91,7 @@
     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)
+    real finvmaold(iim + 1, jjm + 1, llm)
     INTEGER l
     REAL rdayvrai, rdaym_ini
 
@@ -133,7 +135,7 @@
        end if
 
        ! Calcul des tendances dynamiques:
-       CALL geopot((iim + 1) * (jjm + 1), teta, pk, pks, phis, phi)
+       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, &
             conser=MOD(itau, iconser)==0)
@@ -145,7 +147,7 @@
        IF (offline) CALL fluxstokenc(pbaru, pbarv, masse, teta, phi, phis, &
             dtvr, itau)
 
-       ! Integrations dynamique et traceurs:
+       ! Intégrations dynamique et traceurs:
        CALL integrd(vcovm1, ucovm1, tetam1, psm1, massem1, dv, dudyn, dteta, &
             dp, vcov, ucov, teta, q(:, :, :, :2), ps, masse, finvmaold, dt, &
             leapf)
@@ -156,7 +158,7 @@
           CALL exner_hyb(ps, p3d, pks, pk, pkf)
 
           ! Calcul des tendances dynamiques:
-          CALL geopot((iim + 1) * (jjm + 1), teta, pk, pks, phis, phi)
+          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.)
@@ -168,7 +170,7 @@
        end if
 
        IF (MOD(itau + 1, iphysiq) == 0 .AND. iflag_phys /= 0) THEN
-          ! calcul des tendances physiques:
+          ! Calcul des tendances physiques:
 
           forall (l = 1: llm + 1) p3d(:, :, l) = ap(l) + bp(l) * ps
           CALL exner_hyb(ps, p3d, pks, pk, pkf)
@@ -180,11 +182,11 @@
 
           CALL calfis(rdayvrai, time, ucov, vcov, teta, q, masse, ps, pk, &
                phis, phi, dudyn, dv, dq, w, dufi, dvfi, dtetafi, dqfi, dpfi, &
-               lafin=itau+1==itaufin)
+               lafin = itau + 1 == itaufin)
 
-          ! ajout des tendances physiques:
-          CALL addfi(nqmx, dtphys, ucov, vcov, teta, q, ps, dufi, dvfi, &
-               dtetafi, dqfi, dpfi)
+          ! Ajout des tendances physiques:
+          CALL addfi(nqmx, ucov, vcov, teta, q, ps, dufi, dvfi, dtetafi, &
+               dqfi, dpfi)
        ENDIF
 
        forall (l = 1: llm + 1) p3d(:, :, l) = ap(l) + bp(l) * ps
@@ -229,16 +231,21 @@
           call bilan_dyn(ps, masse, pk, pbaru, pbarv, teta, phi, ucov, vcov, &
                q(:, :, :, 1))
        ENDIF
+
+       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)
+       END IF
     end do time_integration
 
     CALL dynredem1("restart.nc", vcov, ucov, teta, q, masse, ps, &
-         itau=itau_dyn+itaufin)
+         itau = itau_dyn + itaufin)
 
     ! Calcul des tendances dynamiques:
-    CALL geopot((iim + 1) * (jjm + 1), teta, pk, pks, phis, phi)
+    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, &
-         conser=MOD(itaufin, iconser)==0)
+         conser = MOD(itaufin, iconser) == 0)
 
   END SUBROUTINE leapfrog