--- trunk/libf/dyn3d/caldyn0.f90	2010/12/21 15:45:48	37
+++ trunk/dyn3d/caldyn0.f	2018/03/06 16:19:52	259
@@ -4,64 +4,77 @@
 
 contains
 
-  SUBROUTINE caldyn0(ucov, vcov, teta, ps, masse, pk, phis, phi, w, &
-       pbaru, pbarv)
+  SUBROUTINE caldyn0(ucov, vcov, teta, ps, pk, phis, phi)
 
-    ! From dyn3d/caldyn0.F, v 1.1.1.1 2004/05/19 12:53:07
-    ! Auteur :  P. Le Van
-    ! Objet: calcul des tendances dynamiques
-    ! Modif 04/93 F.Forget
-
-    USE dimens_m, ONLY : llm
-    USE paramet_m, ONLY : iip1, ip1jm, ip1jmp1, jjp1, llmp1
-    USE comvert, ONLY : ap, bp
-    USE comgeom, ONLY : airesurg
-
-    !   Arguments:
-    REAL, INTENT (IN) :: vcov(ip1jm, llm), ucov(ip1jmp1, llm)
-    REAL :: 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), psexbarxy(ip1jm)
-    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, l
+    ! 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_2d
+    use convmas_m, only: convmas
+    use covcont_m, only: covcont
+    USE dimens_m, ONLY: iim, jjm, llm
+    USE disvert_m, ONLY: ap, bp
+    use dynetat0_m, only: ang0, etot0, ptot0, stot0, ztot0
+    use enercin_m, only: enercin
+    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 sortvarc_m, only: sortvarc
+    use tourpot_m, only: tourpot
+    use vitvert_m, only: vitvert
+
+    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)
+    REAL, INTENT (IN):: pk(iip1, jjp1, llm)
+    REAL, INTENT (IN):: phis(ip1jmp1)
+    REAL, INTENT (IN):: phi(iim + 1, jjm + 1, llm)
+
+    ! Local:
+    real masse(ip1jmp1, llm)
+    REAL w(iim + 1, jjm + 1, llm)
+    REAL pbaru(ip1jmp1, llm), pbarv((iim + 1) * jjm, llm)
+    REAL vcont((iim + 1) * jjm, llm), ucont(ip1jmp1, llm)
+    REAL p(ip1jmp1, llmp1)
+    REAL massebx(ip1jmp1, llm), masseby((iim + 1) * jjm, llm)
+    REAL vorpot(iim + 1, jjm, llm)
+    real ecin(iim + 1, jjm + 1, llm), convm(iim + 1, jjm + 1, llm)
+    REAL massebxy(iim + 1, jjm, llm), dp(iim + 1, jjm + 1)
+    INTEGER l
+    real ang, etot, ptot, ztot, stot, rmsdpdt, rmsv
 
     !-----------------------------------------------------------------------
 
     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 psextbar(ps, psexbarxy)
     CALL massdair(p, masse)
     CALL massbar(masse, massebx, masseby)
     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
-
-    CALL vitvert(convm, w)
+    dp = convm(:, :, 1) / airesurg_2d
+    w = vitvert(convm)
     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, ang, etot, ptot, ztot, stot, rmsdpdt, rmsv)
+    PRINT *, 'ptot = ', ptot
+    PRINT *, 'etot = ', etot
+    PRINT *, 'ztot = ', ztot
+    PRINT *, 'stot = ', stot
+    PRINT *, 'ang = ', ang
+    etot0 = etot
+    ptot0 = ptot
+    ztot0 = ztot
+    stot0 = stot
+    ang0  = ang
 
   END SUBROUTINE caldyn0