--- trunk/dyn3d/caldyn0.f90	2013/11/15 18:47:43	77
+++ trunk/dyn3d/caldyn0.f90	2014/02/05 17:51:07	78
@@ -7,44 +7,48 @@
   SUBROUTINE caldyn0(ucov, vcov, teta, ps, masse, pk, phis, phi, w, &
        pbaru, pbarv)
 
-    ! From dyn3d/caldyn0.F, v 1.1.1.1 2004/05/19 12:53:07
+    ! From dyn3d/caldyn0.F, version 1.1.1.1 2004/05/19 12:53:07
     ! Auteur :  P. Le Van
-    ! Objet: calcul des tendances dynamiques
+    ! Objet : calcul des tendances dynamiques
     ! Modif 04/93 F.Forget
 
-    USE comgeom, ONLY : airesurg
-    USE dimens_m, ONLY : llm
-    USE disvert_m, ONLY : ap, bp
+    USE comgeom, ONLY: airesurg
+    USE dimens_m, ONLY: llm
+    USE disvert_m, ONLY: ap, bp
+    use flumass_m, only: flumass
+    use massbarxy_m, only: massbarxy
     use massdair_m, only: massdair
-    USE paramet_m, ONLY : iip1, ip1jm, ip1jmp1, jjp1, llmp1
+    USE paramet_m, ONLY: iip1, ip1jm, ip1jmp1, jjp1, llmp1
+    use sortvarc0_m, only: sortvarc0
+    use tourpot_m, only: tourpot
 
-    !   Arguments:
-    REAL, INTENT (IN) :: vcov(ip1jm, llm), ucov(ip1jmp1, llm)
+    ! Arguments:
+    REAL, INTENT (IN):: ucov(ip1jmp1, llm), vcov(ip1jm, llm)
     REAL, INTENT(IN):: teta(ip1jmp1, llm)
-    REAL, INTENT (IN) :: ps(ip1jmp1)
-    REAL, INTENT (IN) :: phis(ip1jmp1)
-    REAL, INTENT (IN) :: pk(iip1, jjp1, llm)
-    REAL :: vcont(ip1jm, llm), ucont(ip1jmp1, llm)
-    REAL :: phi(ip1jmp1, llm), masse(ip1jmp1, llm)
-    REAL :: pbaru(ip1jmp1, llm), pbarv(ip1jm, llm)
-
-    !   Local:
-
-    REAL :: p(ip1jmp1, llmp1)
-    REAL :: massebx(ip1jmp1, llm), masseby(ip1jm, llm)
-    REAL :: vorpot(ip1jm, llm)
-    REAL :: w(ip1jmp1, llm), ecin(ip1jmp1, llm), convm(ip1jmp1, llm)
-    REAL :: bern(ip1jmp1, llm)
-    REAL :: massebxy(ip1jm, llm), dp(ip1jmp1)
+    REAL, INTENT (IN):: ps(ip1jmp1)
+    real, intent(out):: masse(ip1jmp1, llm)
+    REAL, INTENT (IN):: pk(iip1, jjp1, llm)
+    REAL, INTENT (IN):: phis(ip1jmp1)
+    REAL, INTENT (IN):: phi(ip1jmp1, llm)
+    REAL, intent(out):: w(ip1jmp1, llm)
+    REAL, intent(out):: pbaru(ip1jmp1, llm), pbarv(ip1jm, llm)
+
+    ! Local:
+
+    REAL vcont(ip1jm, llm), ucont(ip1jmp1, llm)
+    REAL p(ip1jmp1, llmp1)
+    REAL massebx(ip1jmp1, llm), masseby(ip1jm, llm)
+    REAL vorpot(ip1jm, llm)
+    real ecin(ip1jmp1, llm), convm(ip1jmp1, llm)
+    REAL bern(ip1jmp1, llm)
+    REAL massebxy(ip1jm, llm), dp(ip1jmp1)
 
-    INTEGER :: ij, l
+    INTEGER ij, l
 
     !-----------------------------------------------------------------------
 
     PRINT *, 'Call sequence information: caldyn0'
 
-    !   Calcul des tendances dynamiques:
-
     CALL covcont(llm, ucov, vcov, ucont, vcont)
     forall (l = 1: llm + 1) p(:, l) = ap(l) + bp(l) * ps
     CALL massdair(p, masse)
@@ -52,11 +56,7 @@
     CALL massbarxy(masse, massebxy)
     CALL flumass(massebx, masseby, vcont, ucont, pbaru, pbarv)
     CALL convmas(pbaru, pbarv, convm)
-
-    DO ij = 1, ip1jmp1
-       dp(ij) = convm(ij, 1)/airesurg(ij)
-    END DO
-
+    dp = convm(:, 1) / airesurg
     CALL vitvert(convm, w)
     CALL tourpot(vcov, ucov, massebxy, vorpot)
     CALL enercin(vcov, ucov, vcont, ucont, ecin)