--- trunk/dyn3d/caldyn.f	2018/02/05 10:39:38	254
+++ trunk/dyn3d/caldyn.f	2018/03/20 09:35:59	265
@@ -5,7 +5,7 @@
 contains
 
   SUBROUTINE caldyn(itau, ucov, vcov, teta, ps, masse, pk, pkf, phis, phi, &
-       dudyn, dv, dteta, dp, w, pbaru, pbarv, conser)
+       du, dv, dteta, dp, w, pbaru, pbarv, conser)
 
     ! From dyn3d/caldyn.F, version 1.1.1.1, 2004/05/19 12:53:06
     ! Author: P. Le Van
@@ -18,19 +18,19 @@
     USE conf_gcm_m, ONLY: day_step
     use convmas_m, only: convmas
     use covcont_m, only: covcont
-    USE dimens_m, ONLY: iim, jjm, llm
+    USE dimensions, 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 dynetat0_m, ONLY: day_ini, 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, ang, etot, ptot, rmsdpdt, rmsv, stot, ztot
+    use sortvarc_m, only: sortvarc
     use tourpot_m, only: tourpot
     use vitvert_m, only: vitvert
 
@@ -44,7 +44,7 @@
     REAL, INTENT(IN):: pkf(ip1jmp1, llm)
     REAL, INTENT(IN):: phis(ip1jmp1)
     REAL, INTENT(IN):: phi(iim + 1, jjm + 1, llm)
-    REAL dudyn(:, :, :) ! (iim + 1, jjm + 1, llm)
+    REAL du(:, :, :) ! (iim + 1, jjm + 1, llm)
     real dv((iim + 1) * jjm, llm)
     REAL, INTENT(out):: dteta(:, :, :) ! (iim + 1, jjm + 1, llm)
     real, INTENT(out):: dp(:, :) ! (iim + 1, jjm + 1)
@@ -63,6 +63,7 @@
     REAL massebxy(iim + 1, jjm, llm)
     INTEGER ij, l
     real heure, time
+    real ang, etot, ptot, ztot, stot, rmsdpdt, rmsv
 
     !-----------------------------------------------------------------------
 
@@ -77,13 +78,13 @@
     dp = convm(:, :, 1) / airesurg_2d
     w = vitvert(convm)
     CALL tourpot(vcov, ucov, massebxy, vorpot)
-    CALL dudv1(vorpot, pbaru, pbarv, dudyn(:, 2: jjm, :), dv)
+    CALL dudv1(vorpot, pbaru, pbarv, du(:, 2: jjm, :), dv)
     CALL enercin(vcov, ucov, vcont, ucont, ecin)
     bern = bernoui(phi, ecin)
-    CALL dudv2(teta, pkf, bern, dudyn, dv)
+    CALL dudv2(teta, pkf, bern, du, dv)
 
     forall (l = 1: llm) ang_3d(:, :, l) = ucov(:, :, l) + constang_2d
-    CALL advect(ang_3d, vcov, teta, w, massebx, masseby, dudyn, dv, dteta)
+    CALL advect(ang_3d, vcov, teta, w, massebx, masseby, du, 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
@@ -99,13 +100,15 @@
     ! Sorties éventuelles des variables de contrôle :
     IF (conser) then
        CALL sortvarc(ucov, teta, ps, masse, pk, phis, vorpot, phi, bern, dp, &
-            resetvarc = .false.)
+            ang, etot, ptot, ztot, stot, rmsdpdt, rmsv)
+
        time = real(itau) / day_step
        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
+       PRINT 4000, ptot / ptot0, rmsdpdt, etot / etot0, ztot / ztot0, &
+            stot / stot0, sqrt(rmsv / ptot), ang / ang0
     end IF
 
 3500 FORMAT (4X, 'pas', I7, 5X, 'jour', i5, 1X, 'heure', F5.1, 4X, 'date', &