--- trunk/dyn3d/caldyn0.f	2014/09/04 10:05:52	104
+++ trunk/dyn3d/caldyn0.f90	2019/06/13 14:40:06	328
@@ -4,18 +4,20 @@
 
 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, 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 comgeom, ONLY: airesurg_2d
     use convmas_m, only: convmas
-    USE dimens_m, ONLY: iim, jjm, llm
+    use covcont_m, only: covcont
+    USE dimensions, 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
@@ -29,22 +31,22 @@
     REAL, INTENT(IN):: vcov(:, :, :) ! (iim + 1, jjm, llm) ! vent covariant
     REAL, INTENT(IN):: teta(ip1jmp1, llm)
     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(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:
+    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(ip1jmp1, llm)
-    REAL bern(iim + 1, jjm + 1, llm)
-    REAL massebxy(iim + 1, jjm, llm), dp(ip1jmp1)
+    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
 
     !-----------------------------------------------------------------------
 
@@ -57,13 +59,22 @@
     CALL massbarxy(masse, massebxy)
     CALL flumass(massebx, masseby, vcont, ucont, pbaru, pbarv)
     CALL convmas(pbaru, pbarv, convm)
-    dp = convm(:, 1) / airesurg
-    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(phi, ecin, bern)
-    CALL sortvarc(ucov, teta, ps, masse, pk, phis, vorpot, phi, bern, dp, &
-         resetvarc = .true.)
+    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