--- trunk/dyn3d/caldyn.f	2014/03/26 17:18:58	91
+++ trunk/dyn3d/caldyn.f	2014/09/04 10:05:52	104
@@ -12,19 +12,23 @@
     ! Objet : calcul des tendances dynamiques
 
     use advect_m, only: advect
+    use bernoui_m, only: bernoui
+    USE comconst, ONLY: daysec, dtvr
     USE comgeom, ONLY: airesurg, constang_2d
+    USE conf_gcm_m, ONLY: day_step
     use convmas_m, only: convmas
     USE dimens_m, ONLY: iim, jjm, llm
     USE disvert_m, ONLY: ap, bp
     use dteta1_m, only: dteta1
     use dudv1_m, only: dudv1
     use dudv2_m, only: dudv2
+    USE dynetat0_m, ONLY: day_ini
     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 sortvarc_m, only: sortvarc, ang, etot, ptot, rmsdpdt, rmsv, stot, ztot
     use tourpot_m, only: tourpot
     use vitvert_m, only: vitvert
 
@@ -37,7 +41,7 @@
     REAL, INTENT(IN):: pk(iip1, jjp1, llm)
     REAL, INTENT(IN):: pkf(ip1jmp1, llm)
     REAL, INTENT(IN):: phis(ip1jmp1)
-    REAL, INTENT(IN):: phi(ip1jmp1, llm)
+    REAL, INTENT(IN):: phi(iim + 1, jjm + 1, llm)
     REAL dudyn(:, :, :) ! (iim + 1, jjm + 1, llm)
     real dv((iim + 1) * jjm, llm)
     REAL, INTENT(out):: dteta(ip1jmp1, llm)
@@ -49,13 +53,14 @@
 
     ! Local:
     REAL vcont((iim + 1) * jjm, llm), ucont(ip1jmp1, llm)
-    REAL ang(iim + 1, jjm + 1, llm), p(ip1jmp1, llmp1)
+    REAL ang_3d(iim + 1, jjm + 1, llm), 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 bern(iim + 1, jjm + 1, llm)
     REAL massebxy(iim + 1, jjm, llm)
     INTEGER ij, l
+    real heure, time
 
     !-----------------------------------------------------------------------
 
@@ -72,11 +77,11 @@
     CALL tourpot(vcov, ucov, massebxy, vorpot)
     CALL dudv1(vorpot, pbaru, pbarv, dudyn(:, 2: jjm, :), dv)
     CALL enercin(vcov, ucov, vcont, ucont, ecin)
-    CALL bernoui(ip1jmp1, llm, phi, ecin, bern)
+    CALL bernoui(phi, ecin, bern)
     CALL dudv2(teta, pkf, bern, dudyn, dv)
 
-    forall (l = 1: llm) ang(:, :, l) = ucov(:, :, l) + constang_2d
-    CALL advect(ang, vcov, teta, w, massebx, masseby, dudyn, dv, dteta)
+    forall (l = 1: llm) ang_3d(:, :, l) = ucov(:, :, l) + constang_2d
+    CALL advect(ang_3d, vcov, teta, w, massebx, masseby, dudyn, dv, dteta)
 
     ! Warning problème de périodicité de dv sur les PC Linux. Problème
     ! d'arrondi probablement. Observé sur le code compilé avec pgf90
@@ -90,8 +95,22 @@
     END DO
 
     ! Sorties éventuelles des variables de contrôle :
-    IF (conser) CALL sortvarc(itau, ucov, teta, ps, masse, pk, phis, vorpot, &
-         phi, bern, dp, time_0)
+    IF (conser) then
+       CALL sortvarc(ucov, teta, ps, masse, pk, phis, vorpot, phi, bern, dp, &
+            resetvarc = .false.)
+       time = real(itau) / day_step + time_0
+       heure = mod(itau * dtvr / daysec, 1.) * 24.
+       IF (abs(heure-24.) <= 1e-4) heure = 0.
+
+       PRINT 3500, itau, int(day_ini + time), heure, time
+       PRINT 4000, ptot, rmsdpdt, etot, ztot, stot, rmsv, ang
+    end IF
+
+3500 FORMAT (4X, 'pas', I7, 5X, 'jour', i5, 1X, 'heure', F5.1, 4X, 'date', &
+         F10.5)
+4000 FORMAT (10X, 'masse', 4X, 'rmsdpdt', 7X, 'energie', 2X, 'enstrophie', &
+         2X, 'entropie', 3X, 'rmsv', 4X, 'mt.ang', /, 'GLOB  ', F10.6, &
+         E13.6, 5F10.3/)
 
   END SUBROUTINE caldyn