--- trunk/libf/dyn3d/leapfrog.f90	2008/04/18 14:45:53	10
+++ trunk/libf/dyn3d/leapfrog.f90	2009/12/14 15:25:16	23
@@ -6,8 +6,7 @@
 
 contains
 
-  SUBROUTINE leapfrog(ucov, vcov, teta, ps, masse, phis, nq, q, clesphy0, &
-       time_0)
+  SUBROUTINE leapfrog(ucov, vcov, teta, ps, masse, phis, q, time_0)
 
     ! From dyn3d/leapfrog.F, version 1.6 2005/04/13 08:58:34
 
@@ -28,14 +27,13 @@
     ! Pour Van-Leer + Vapeur d'eau saturee, iadv(1)=4. (F.Codron, 10/99)
     ! Pour Van-Leer iadv=10 
 
-    use dimens_m, only: iim, jjm, llm, nqmx
-    use paramet_m, only: ip1jmp1, ip1jm, ijmllm, ijp1llm, jjp1, iip1, iip2
+    use dimens_m, only: iim, llm, nqmx
+    use paramet_m, only: ip1jmp1, ip1jm, ijmllm, ijp1llm, jjp1, iip1
     use comconst, only: dtvr, daysec, dtphys
     use comvert, only: ap, bp
     use conf_gcm_m, only: day_step, iconser, idissip, iphysiq, iperiod, nday, &
          offline, periodav
-    use logic, only: ok_guide, apdiss, apphys, conser, forward, iflag_phys, &
-         leapf, statcl
+    use logic, only: ok_guide, iflag_phys
     use comgeom
     use serre
     use temps, only: itaufin, day_ini, dt
@@ -48,9 +46,6 @@
     use pression_m, only: pression
     use pressure_var, only: p3d
 
-    integer nq
-    REAL clesphy0(:)
-
     ! Variables dynamiques:
     REAL vcov(ip1jm, llm), ucov(ip1jmp1, llm) ! vents covariants
     REAL teta(ip1jmp1, llm) ! temperature potentielle 
@@ -95,9 +90,10 @@
 
     REAL tppn(iim), tpps(iim), tpn, tps
 
-    INTEGER itau, itaufinp1
+    INTEGER itau ! index of the time step of the dynamics, starts at 0
+    integer itaufinp1
     INTEGER iday ! jour julien
-    REAL time ! Heure de la journee en fraction d'1 jour
+    REAL time ! time of day, as a fraction of day length
 
     REAL SSUM
     real finvmaold(ip1jmp1, llm)
@@ -106,7 +102,6 @@
     INTEGER ij, l
 
     REAL rdayvrai, rdaym_ini
-    LOGICAL:: callinigrads = .true.
 
     !+jld variables test conservation energie
     REAL ecin(ip1jmp1, llm), ecin0(ip1jmp1, llm)
@@ -119,7 +114,7 @@
     INTEGER:: ip_ebil_dyn = 0 ! PRINT level for energy conserv. diag.
 
     logical:: dissip_conservative = .true.
-    LOGICAL:: prem = .true.
+    logical forward, leapf, apphys, conser, apdiss
 
     !---------------------------------------------------
 
@@ -167,7 +162,6 @@
           ! gestion des appels de la physique et des dissipations:
 
           apphys = .FALSE.
-          statcl = .FALSE.
           conser = .FALSE.
           apdiss = .FALSE.
 
@@ -196,7 +190,8 @@
 
           ! integrations dynamique et traceurs:
           CALL integrd(2, vcovm1, ucovm1, tetam1, psm1, massem1, dv, du, &
-               dteta, dq, dp, vcov, ucov, teta, q, ps, masse, phis, finvmaold)
+               dteta, dq, dp, vcov, ucov, teta, q, ps, masse, phis, &
+               finvmaold, leapf)
 
           ! calcul des tendances physiques:
 
@@ -218,9 +213,9 @@
                      teta, q(:, :, 1), q(:, :, 2))
              ENDIF
 
-             CALL calfis(nq, lafin, rdayvrai, time, ucov, vcov, teta, q, &
+             CALL calfis(nqmx, lafin, rdayvrai, time, ucov, vcov, teta, q, &
                   masse, ps, pk, phis, phi, du, dv, dteta, dq, w, &
-                  clesphy0, dufi, dvfi, dtetafi, dqfi, dpfi)
+                  dufi, dvfi, dtetafi, dqfi, dpfi)
 
              ! ajout des tendances physiques:
              CALL addfi(nqmx, dtphys, &
@@ -319,7 +314,7 @@
           ENDIF
 
           IF (itau == itaufin) THEN
-             CALL dynredem1("restart.nc", 0., vcov, ucov, teta, q, masse, ps)
+             CALL dynredem1("restart.nc", vcov, ucov, teta, q, masse, ps)
              CLOSE(99)
           ENDIF
 
@@ -337,7 +332,7 @@
                 dt = 2. * dtvr
              END IF
           ELSE
-             ! ...... pas leapfrog .....
+             ! pas leapfrog
              leapf = .TRUE.
              dt = 2. * dtvr
           END IF