--- trunk/libf/dyn3d/caldyn.f90	2011/05/16 14:52:30	46
+++ trunk/libf/dyn3d/caldyn.f90	2013/06/24 15:39:52	70
@@ -5,39 +5,42 @@
 contains
 
   SUBROUTINE caldyn(itau, ucov, vcov, teta, ps, masse, pk, pkf, phis, phi, &
-       conser, du, dv, dteta, dp, w, pbaru, pbarv, time_0)
+       dudyn, dv, dteta, dp, w, pbaru, pbarv, time_0, conser)
 
-    ! From dyn3d/caldyn.F, v 1.1.1.1 2004/05/19 12:53:06
+    ! From dyn3d/caldyn.F, version 1.1.1.1 2004/05/19 12:53:06
     ! Auteur : P. Le Van
     ! Objet : calcul des tendances dynamiques
 
     use advect_m, only: advect
-    USE dimens_m, ONLY : iim, llm
-    USE paramet_m, ONLY : iip1, ip1jm, ip1jmp1, jjp1, llmp1
-    USE comvert, ONLY : ap, bp
-    USE comgeom, ONLY : airesurg, constang
+    USE comgeom, ONLY: airesurg, constang
+    USE dimens_m, ONLY: iim, llm
+    USE disvert_m, ONLY: ap, bp
+    use massdair_m, only: massdair
+    USE paramet_m, ONLY: iip1, ip1jm, ip1jmp1, jjp1, llmp1
     use sortvarc_m, only: sortvarc
 
     ! Arguments:
 
-    LOGICAL, INTENT(IN):: conser
     INTEGER, INTENT(IN):: itau
-    REAL vcov(ip1jm, llm), ucov(ip1jmp1, llm)
+    REAL ucov(ip1jmp1, llm), vcov(ip1jm, llm)
     real, intent(in):: teta(ip1jmp1, llm)
-    REAL, INTENT(IN):: ps(ip1jmp1), phis(ip1jmp1)
+    REAL, INTENT(IN):: ps(ip1jmp1)
+    real, intent(out):: masse(ip1jmp1, llm)
     REAL, INTENT(IN):: pk(iip1, jjp1, llm)
     REAL pkf(ip1jmp1, llm)
-    REAL vcont(ip1jm, llm), ucont(ip1jmp1, llm)
-    REAL phi(ip1jmp1, llm), masse(ip1jmp1, llm)
-    REAL dv(ip1jm, llm), du(ip1jmp1, llm)
+    REAL, INTENT(IN):: phis(ip1jmp1)
+    REAL, INTENT(IN):: phi(ip1jmp1, llm)
+    REAL dv(ip1jm, llm), dudyn(ip1jmp1, llm)
     REAL dteta(ip1jmp1, llm)
     real, INTENT(out):: dp(ip1jmp1)
+    REAL, INTENT(out):: w(ip1jmp1, llm)
     REAL pbaru(ip1jmp1, llm), pbarv(ip1jm, llm)
     REAL, intent(in):: time_0
-    REAL, INTENT(out):: w(ip1jmp1, llm)
+    LOGICAL, INTENT(IN):: conser
 
     ! Local:
 
+    REAL vcont(ip1jm, llm), ucont(ip1jmp1, llm)
     REAL ang(ip1jmp1, llm), p(ip1jmp1, llmp1)
     REAL massebx(ip1jmp1, llm), masseby(ip1jm, llm)
     REAL vorpot(ip1jm, llm)
@@ -60,10 +63,10 @@
     dp = convm(:, 1) / airesurg
     CALL vitvert(convm, w)
     CALL tourpot(vcov, ucov, massebxy, vorpot)
-    CALL dudv1(vorpot, pbaru, pbarv, du, dv)
+    CALL dudv1(vorpot, pbaru, pbarv, dudyn, dv)
     CALL enercin(vcov, ucov, vcont, ucont, ecin)
     CALL bernoui(ip1jmp1, llm, phi, ecin, bern)
-    CALL dudv2(teta, pkf, bern, du, dv)
+    CALL dudv2(teta, pkf, bern, dudyn, dv)
 
     DO l = 1, llm
        DO ij = 1, ip1jmp1
@@ -71,7 +74,7 @@
        END DO
     END DO
 
-    CALL advect(ang, vcov, teta, w, massebx, masseby, du, dv, dteta, conser)
+    CALL advect(ang, vcov, teta, w, massebx, masseby, dudyn, dv, dteta)
 
     ! WARNING probleme de peridocite de dv sur les PC/linux. Pb d'arrondi
     ! probablement. Observe sur le code compile avec pgf90 3.0-1