--- trunk/libf/dyn3d/caldyn0.f90	2009/12/14 15:25:16	23
+++ trunk/libf/dyn3d/caldyn0.f90	2013/11/15 17:48:30	73
@@ -12,15 +12,15 @@
     ! 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 massdair_m, only: massdair
     USE paramet_m, ONLY : iip1, ip1jm, ip1jmp1, jjp1, llmp1
-    USE comvert, ONLY : ap, bp
-    USE comgeom, ONLY : airesurg
-    USE pression_m, ONLY : pression
 
     !   Arguments:
     REAL, INTENT (IN) :: vcov(ip1jm, llm), ucov(ip1jmp1, llm)
-    REAL :: teta(ip1jmp1, llm)
+    REAL, INTENT(IN):: teta(ip1jmp1, llm)
     REAL, INTENT (IN) :: ps(ip1jmp1)
     REAL, INTENT (IN) :: phis(ip1jmp1)
     REAL, INTENT (IN) :: pk(iip1, jjp1, llm)
@@ -31,13 +31,13 @@
     !   Local:
 
     REAL :: p(ip1jmp1, llmp1)
-    REAL :: massebx(ip1jmp1, llm), masseby(ip1jm, llm), psexbarxy(ip1jm)
+    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)
 
-    INTEGER :: ij
+    INTEGER :: ij, l
 
     !-----------------------------------------------------------------------
 
@@ -46,8 +46,7 @@
     !   Calcul des tendances dynamiques:
 
     CALL covcont(llm, ucov, vcov, ucont, vcont)
-    CALL pression(ip1jmp1, ap, bp, ps, p)
-    CALL psextbar(ps, psexbarxy)
+    forall (l = 1: llm + 1) p(:, l) = ap(l) + bp(l) * ps
     CALL massdair(p, masse)
     CALL massbar(masse, massebx, masseby)
     CALL massbarxy(masse, massebxy)