--- trunk/libf/dyn3d/caldyn.f90	2011/07/01 15:00:48	47
+++ trunk/dyn3d/caldyn.f90	2014/02/05 17:51:07	78
@@ -7,38 +7,44 @@
   SUBROUTINE caldyn(itau, ucov, vcov, teta, ps, masse, pk, pkf, phis, phi, &
        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_2d
+    USE dimens_m, ONLY: iim, jjm, 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 sortvarc_m, only: sortvarc
+    use tourpot_m, only: tourpot
 
     ! Arguments:
-
-    LOGICAL, INTENT(IN):: conser
     INTEGER, INTENT(IN):: itau
-    REAL vcov(ip1jm, llm), ucov(ip1jmp1, llm)
+    REAL, INTENT(IN):: ucov(:, :, :) ! (iim + 1, jjm + 1, llm) vent covariant
+    REAL, INTENT(IN):: vcov(:, :, :) ! (iim + 1, jjm, llm) ! vent covariant
     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), dudyn(ip1jmp1, llm)
+    REAL, INTENT(IN):: phis(ip1jmp1)
+    REAL, INTENT(IN):: phi(ip1jmp1, llm)
+    REAL dudyn(ip1jmp1, llm), dv(ip1jm, 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 ang(ip1jmp1, llm), p(ip1jmp1, llmp1)
+    REAL vcont(ip1jm, llm), ucont(ip1jmp1, llm)
+    REAL ang(iim + 1, jjm + 1, llm), p(ip1jmp1, llmp1)
     REAL massebx(ip1jmp1, llm), masseby(ip1jm, llm)
     REAL vorpot(ip1jm, llm)
     real ecin(ip1jmp1, llm), convm(ip1jmp1, llm)
@@ -65,12 +71,7 @@
     CALL bernoui(ip1jmp1, llm, phi, ecin, bern)
     CALL dudv2(teta, pkf, bern, dudyn, dv)
 
-    DO l = 1, llm
-       DO ij = 1, ip1jmp1
-          ang(ij, l) = ucov(ij, l) + constang(ij)
-       END DO
-    END DO
-
+    forall (l = 1: llm) ang(:, :, l) = ucov(:, :, l) + constang_2d
     CALL advect(ang, vcov, teta, w, massebx, masseby, dudyn, dv, dteta)
 
     ! WARNING probleme de peridocite de dv sur les PC/linux. Pb d'arrondi