--- trunk/dyn3d/caldyn0.f90	2014/02/28 17:52:47	79
+++ trunk/Sources/dyn3d/caldyn0.f	2015/07/24 14:27:59	161
@@ -7,21 +7,25 @@
   SUBROUTINE caldyn0(ucov, vcov, teta, ps, masse, pk, phis, phi, w, &
        pbaru, pbarv)
 
-    ! From dyn3d/caldyn0.F, version 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
     ! Authors:  P. Le Van, F. Forget
     ! Objet : calcul des tendances dynamiques
 
+    use bernoui_m, only: bernoui
     USE comgeom, ONLY: airesurg
+    use convmas_m, only: convmas
+    use covcont_m, only: covcont
     USE dimens_m, ONLY: iim, jjm, llm
     USE disvert_m, ONLY: ap, bp
     use flumass_m, only: flumass
+    use massbar_m, only: massbar
     use massbarxy_m, only: massbarxy
     use massdair_m, only: massdair
     USE paramet_m, ONLY: iip1, ip1jmp1, jjp1, llmp1
-    use sortvarc0_m, only: sortvarc0
+    use sortvarc_m, only: sortvarc
     use tourpot_m, only: tourpot
+    use vitvert_m, only: vitvert
 
-    ! Arguments:
     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)
@@ -29,8 +33,8 @@
     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 (IN):: phi(iim + 1, jjm + 1, llm)
+    REAL, INTENT(out):: w(:, :, :) ! (iim + 1, jjm + 1, llm)
     REAL, intent(out):: pbaru(ip1jmp1, llm), pbarv((iim + 1) * jjm, llm)
 
     ! Local:
@@ -38,8 +42,7 @@
     REAL p(ip1jmp1, llmp1)
     REAL massebx(ip1jmp1, llm), masseby((iim + 1) * jjm, llm)
     REAL vorpot(iim + 1, jjm, llm)
-    real ecin(ip1jmp1, llm), convm(ip1jmp1, llm)
-    REAL bern(ip1jmp1, llm)
+    real ecin(iim + 1, jjm + 1, llm), convm(ip1jmp1, llm)
     REAL massebxy(iim + 1, jjm, llm), dp(ip1jmp1)
     INTEGER l
 
@@ -58,8 +61,8 @@
     CALL vitvert(convm, w)
     CALL tourpot(vcov, ucov, massebxy, vorpot)
     CALL enercin(vcov, ucov, vcont, ucont, ecin)
-    CALL bernoui(ip1jmp1, llm, phi, ecin, bern)
-    CALL sortvarc0(ucov, teta, ps, masse, pk, phis, vorpot, phi, bern, dp)
+    CALL sortvarc(ucov, teta, ps, masse, pk, phis, vorpot, phi, &
+         bernoui(phi, ecin), dp, resetvarc = .true.)
 
   END SUBROUTINE caldyn0