--- trunk/libf/dyn3d/integrd.f90	2011/05/16 14:52:30	46
+++ trunk/dyn3d/integrd.f	2014/07/15 13:43:24	102
@@ -4,40 +4,38 @@
 
 contains
 
-  SUBROUTINE integrd(vcovm1, ucovm1, tetam1, psm1, massem1, dv, du, &
-       dteta, dp, vcov, ucov, teta, q, ps, masse, finvmaold, dt, leapf)
+  SUBROUTINE integrd(vcovm1, ucovm1, tetam1, psm1, massem1, dv, dudyn, dteta, &
+       dp, vcov, ucov, teta, q, ps, masse, finvmaold, dt, leapf)
 
-    ! From dyn3d/integrd.F, version 1.1.1.1 2004/05/19 12:53:05
+    ! From dyn3d/integrd.F, version 1.1.1.1, 2004/05/19 12:53:05
     ! Author: P. Le Van 
     ! Objet: incrémentation des tendances dynamiques
 
-    USE comvert, ONLY : ap, bp
     USE comgeom, ONLY : aire, apoln, apols
     USE dimens_m, ONLY : iim, jjm, llm
+    USE disvert_m, ONLY : ap, bp
     USE filtreg_m, ONLY : filtreg
+    use massdair_m, only: massdair
     use nr_util, only: assert
     USE paramet_m, ONLY : iip1, iip2, ip1jm, ip1jmp1, jjp1, llmp1
-
-    ! Arguments: 
-
-    REAL vcov(ip1jm, llm), ucov((iim + 1) * (jjm + 1), llm)
-    real, intent(inout):: teta((iim + 1) * (jjm + 1), llm)
-    REAL q(:, :, :, :) ! (iim + 1, jjm + 1, llm, nq)
-    REAL, intent(inout):: ps((iim + 1) * (jjm + 1))
-    REAL masse((iim + 1) * (jjm + 1), llm)
+    use qminimum_m, only: qminimum
 
     REAL vcovm1(ip1jm, llm), ucovm1((iim + 1) * (jjm + 1), llm)
-    REAL tetam1((iim + 1) * (jjm + 1), llm), psm1((iim + 1) * (jjm + 1))
+    REAL, intent(inout):: tetam1((iim + 1) * (jjm + 1), llm)
+    REAL, intent(inout):: psm1((iim + 1) * (jjm + 1))
     real massem1((iim + 1) * (jjm + 1), llm)
-
-    REAL dv(ip1jm, llm), du((iim + 1) * (jjm + 1), llm)
+    REAL, intent(in):: dv(ip1jm, llm), dudyn((iim + 1) * (jjm + 1), llm)
     REAL dteta((iim + 1) * (jjm + 1), llm), dp((iim + 1) * (jjm + 1))
+    REAL, intent(inout):: vcov(ip1jm, llm), ucov((iim + 1) * (jjm + 1), llm)
+    real, intent(inout):: teta((iim + 1) * (jjm + 1), llm)
+    REAL q(:, :, :, :) ! (iim + 1, jjm + 1, llm, nq)
+    REAL, intent(inout):: ps((iim + 1) * (jjm + 1))
+    REAL, intent(inout):: masse((iim + 1) * (jjm + 1), llm)
     REAL finvmaold((iim + 1) * (jjm + 1), llm)
+    real, intent(in):: dt ! time step, in s
     LOGICAL, INTENT (IN) :: leapf
-    real, intent(in):: dt
-
-    ! Local variables: 
 
+    ! Local: 
     INTEGER nq
     REAL vscr(ip1jm), uscr((iim + 1) * (jjm + 1)), hscr((iim + 1) * (jjm + 1))
     real pscr((iim + 1) * (jjm + 1))
@@ -47,11 +45,8 @@
     REAL tpn, tps, tppn(iim), tpps(iim)
     REAL qpn, qps, qppn(iim), qpps(iim)
     REAL deltap((iim + 1) * (jjm + 1), llm)
-
     INTEGER l, ij, iq
 
-    REAL ssum
-
     !-----------------------------------------------------------------------
 
     call assert(size(q, 1) == iim + 1, size(q, 2) == jjm + 1, &
@@ -83,11 +78,11 @@
     END DO
 
     DO ij = 1, iim
-       tppn(ij) = aire(ij)*ps(ij)
+       tppn(ij) = aire(ij) * ps(ij)
        tpps(ij) = aire(ij+ip1jm) * ps(ij+ip1jm)
     END DO
-    tpn = ssum(iim, tppn, 1)/apoln
-    tps = ssum(iim, tpps, 1)/apols
+    tpn = sum(tppn)/apoln
+    tps = sum(tpps)/apols
     DO ij = 1, iip1
        ps(ij) = tpn
        ps(ij+ip1jm) = tps
@@ -99,35 +94,33 @@
     CALL massdair(p, masse)
 
     finvmasse = masse
-    CALL filtreg(finvmasse, jjp1, llm, -2, 2, .TRUE., 1)
+    CALL filtreg(finvmasse, jjp1, llm, -2, 2, .TRUE.)
 
     ! integration de ucov, vcov, h
 
     DO l = 1, llm
        DO ij = iip2, ip1jm
           uscr(ij) = ucov(ij, l)
-          ucov(ij, l) = ucovm1(ij, l) + dt*du(ij, l)
+          ucov(ij, l) = ucovm1(ij, l) + dt * dudyn(ij, l)
        END DO
 
        DO ij = 1, ip1jm
           vscr(ij) = vcov(ij, l)
-          vcov(ij, l) = vcovm1(ij, l) + dt*dv(ij, l)
+          vcov(ij, l) = vcovm1(ij, l) + dt * dv(ij, l)
        END DO
 
-       DO ij = 1, (iim + 1) * (jjm + 1)
-          hscr(ij) = teta(ij, l)
-          teta(ij, l) = tetam1(ij, l) * massem1(ij, l) / masse(ij, l) &
-               + dt * dteta(ij, l) / masse(ij, l)
-       END DO
+       hscr = teta(:, l)
+       teta(:, l) = tetam1(:, l) * massem1(:, l) / masse(:, l) &
+            + dt * dteta(:, l) / masse(:, l)
 
        ! Calcul de la valeur moyenne, unique aux poles pour teta
 
        DO ij = 1, iim
-          tppn(ij) = aire(ij)*teta(ij, l)
-          tpps(ij) = aire(ij+ip1jm)*teta(ij+ip1jm, l)
+          tppn(ij) = aire(ij) * teta(ij, l)
+          tpps(ij) = aire(ij+ip1jm) * teta(ij+ip1jm, l)
        END DO
-       tpn = ssum(iim, tppn, 1)/apoln
-       tps = ssum(iim, tpps, 1)/apols
+       tpn = sum(tppn)/apoln
+       tps = sum(tpps)/apols
 
        DO ij = 1, iip1
           teta(ij, l) = tpn
@@ -135,9 +128,9 @@
        END DO
 
        IF (leapf) THEN
-          CALL scopy((iim + 1) * (jjm + 1), uscr(1), 1, ucovm1(1, l), 1)
-          CALL scopy(ip1jm, vscr(1), 1, vcovm1(1, l), 1)
-          CALL scopy((iim + 1) * (jjm + 1), hscr(1), 1, tetam1(1, l), 1)
+          ucovm1(:, l)  =uscr
+          vcovm1(:, l) = vscr
+          tetam1(:, l) = hscr
        END IF
     END DO
 
@@ -154,11 +147,11 @@
     DO iq = 1, nq
        DO l = 1, llm
           DO ij = 1, iim
-             qppn(ij) = aire(ij)*q(ij, 1, l, iq)
-             qpps(ij) = aire(ij+ip1jm)*q(ij, jjm + 1, l, iq)
+             qppn(ij) = aire(ij) * q(ij, 1, l, iq)
+             qpps(ij) = aire(ij+ip1jm) * q(ij, jjm + 1, l, iq)
           END DO
-          qpn = ssum(iim, qppn, 1)/apoln
-          qps = ssum(iim, qpps, 1)/apols
+          qpn = sum(qppn)/apoln
+          qps = sum(qpps)/apols
 
           DO ij = 1, iip1
              q(ij, 1, l, iq) = qpn
@@ -167,13 +160,13 @@
        END DO
     END DO
 
-    CALL scopy((iim + 1) * (jjm + 1) * llm, finvmasse, 1, finvmaold, 1)
+    finvmaold = finvmasse
 
     ! Fin de l'integration de q
 
     IF (leapf) THEN
-       CALL scopy((iim + 1) * (jjm + 1), pscr, 1, psm1, 1)
-       CALL scopy((iim + 1) * (jjm + 1)*llm, massescr, 1, massem1, 1)
+       psm1 = pscr
+       massem1 = massescr
     END IF
 
   END SUBROUTINE integrd