--- trunk/phylmd/clqh.f	2018/07/20 17:08:44	283
+++ trunk/phylmd/Interface_surf/clqh.f	2018/07/26 13:11:22	294
@@ -98,9 +98,9 @@
     REAL run_off_lic_0(klon)! runof glacier au pas de temps precedent
 
     ! Local:
-    INTEGER knon
+
+    INTEGER k
     REAL evap(size(knindex)) ! (knon) evaporation au sol
-    INTEGER i, k
     REAL, dimension(size(knindex), klev):: cq, dq, ch, dh ! (knon, klev)
     REAL buf1(size(knindex)), buf2(size(knindex))
     REAL zx_coef(size(knindex), 2:klev) ! (knon, 2:klev)
@@ -117,83 +117,70 @@
 
     REAL gamah(size(knindex), 2:klev) ! (knon, 2:klev)
     real tsurf_new(size(knindex)) ! (knon)
-    real zzpk
 
     !----------------------------------------------------------------
 
-    knon = size(knindex)
-
-    if (iflag_pbl == 1) then
-       gamt(:, 2) = - 2.5e-3
-       gamt(:, 3:)= - 1e-3
-    else
-       gamt = 0.
-    endif
-
     psref = paprs(:, 1) ! pression de reference est celle au sol
     forall (k = 1:klev) pkf(:, k) = (psref / pplay(:, k))**RKAPPA
     h = RCPD * t * pkf
 
     ! Convertir les coefficients en variables convenables au calcul:
-    forall (k = 2:klev) zx_coef(:, k) = coef(:, k) * RG &
+    forall (k = 2:klev) zx_coef(:, k) = coef(:, k) &
          / (pplay(:, k - 1) - pplay(:, k)) &
-         * (paprs(:, k) * 2 / (t(:, k) + t(:, k - 1)) / RD)**2 * dtime * RG
+         * (paprs(:, k) * 2 / (t(:, k) + t(:, k - 1)) / RD)**2 * dtime * RG**2
 
     ! Preparer les flux lies aux contre-gardients
-    forall (k = 2:klev) gamah(:, k) = gamt(:, k) * (RD * (t(:, k - 1) &
-         + t(:, k)) / 2. / RG / paprs(:, k) * (pplay(:, k - 1) - pplay(:, k))) &
-         * RCPD * (psref(:) / paprs(:, k))**RKAPPA
-
-    DO i = 1, knon
-       buf1(i) = zx_coef(i, klev) + delp(i, klev)
-       cq(i, klev) = q(i, klev) * delp(i, klev) / buf1(i)
-       dq(i, klev) = zx_coef(i, klev) / buf1(i)
-
-       zzpk=(pplay(i, klev) / psref(i))**RKAPPA
-       buf2(i) = zzpk * delp(i, klev) + zx_coef(i, klev)
-       ch(i, klev) = (h(i, klev) * zzpk * delp(i, klev) &
-            - zx_coef(i, klev) * gamah(i, klev)) / buf2(i)
-       dh(i, klev) = zx_coef(i, klev) / buf2(i)
-    ENDDO
+
+    if (iflag_pbl == 1) then
+       gamt(:, 2) = - 2.5e-3
+       gamt(:, 3:)= - 1e-3
+       forall (k = 2:klev) gamah(:, k) = gamt(:, k) * (RD * (t(:, k - 1) &
+            + t(:, k)) / 2. / RG / paprs(:, k) * (pplay(:, k - 1) &
+            - pplay(:, k))) * RCPD * (psref / paprs(:, k))**RKAPPA
+    else
+       gamah = 0.
+    endif
+
+    buf1 = zx_coef(:, klev) + delp(:, klev)
+    cq(:, klev) = q(:, klev) * delp(:, klev) / buf1
+    dq(:, klev) = zx_coef(:, klev) / buf1
+
+    buf2 = delp(:, klev) / pkf(:, klev) + zx_coef(:, klev)
+    ch(:, klev) = (h(:, klev) / pkf(:, klev) * delp(:, klev) &
+         - zx_coef(:, klev) * gamah(:, klev)) / buf2
+    dh(:, klev) = zx_coef(:, klev) / buf2
 
     DO k = klev - 1, 2, - 1
-       DO i = 1, knon
-          buf1(i) = delp(i, k) + zx_coef(i, k) &
-               + zx_coef(i, k + 1) * (1. - dq(i, k + 1))
-          cq(i, k) = (q(i, k) * delp(i, k) &
-               + zx_coef(i, k + 1) * cq(i, k + 1)) / buf1(i)
-          dq(i, k) = zx_coef(i, k) / buf1(i)
-
-          zzpk=(pplay(i, k) / psref(i))**RKAPPA
-          buf2(i) = zzpk * delp(i, k) + zx_coef(i, k) &
-               + zx_coef(i, k + 1) * (1. - dh(i, k + 1))
-          ch(i, k) = (h(i, k) * zzpk * delp(i, k) &
-               + zx_coef(i, k + 1) * ch(i, k + 1) &
-               + zx_coef(i, k + 1) * gamah(i, k + 1) &
-               - zx_coef(i, k) * gamah(i, k)) / buf2(i)
-          dh(i, k) = zx_coef(i, k) / buf2(i)
-       ENDDO
+       buf1 = delp(:, k) + zx_coef(:, k) &
+            + zx_coef(:, k + 1) * (1. - dq(:, k + 1))
+       cq(:, k) = (q(:, k) * delp(:, k) &
+            + zx_coef(:, k + 1) * cq(:, k + 1)) / buf1
+       dq(:, k) = zx_coef(:, k) / buf1
+
+       buf2 = delp(:, k) / pkf(:, k) + zx_coef(:, k) &
+            + zx_coef(:, k + 1) * (1. - dh(:, k + 1))
+       ch(:, k) = (h(:, k) / pkf(:, k) * delp(:, k) &
+            + zx_coef(:, k + 1) * ch(:, k + 1) &
+            + zx_coef(:, k + 1) * gamah(:, k + 1) &
+            - zx_coef(:, k) * gamah(:, k)) / buf2
+       dh(:, k) = zx_coef(:, k) / buf2
     ENDDO
 
-    DO i = 1, knon
-       buf1(i) = delp(i, 1) + zx_coef(i, 2) * (1. - dq(i, 2))
-       cq(i, 1) = (q(i, 1) * delp(i, 1) &
-            + zx_coef(i, 2) * cq(i, 2)) / buf1(i)
-       dq(i, 1) = - 1. * RG / buf1(i)
-
-       zzpk=(pplay(i, 1) / psref(i))**RKAPPA
-       buf2(i) = zzpk * delp(i, 1) + zx_coef(i, 2) * (1. - dh(i, 2))
-       ch(i, 1) = (h(i, 1) * zzpk * delp(i, 1) &
-            + zx_coef(i, 2) * (gamah(i, 2) + ch(i, 2))) / buf2(i)
-       dh(i, 1) = - 1. * RG / buf2(i)
-    ENDDO
+    buf1 = delp(:, 1) + zx_coef(:, 2) * (1. - dq(:, 2))
+    cq(:, 1) = (q(:, 1) * delp(:, 1) + zx_coef(:, 2) * cq(:, 2)) / buf1
+    dq(:, 1) = - 1. * RG / buf1
+
+    buf2 = delp(:, 1) / pkf(:, 1) + zx_coef(:, 2) * (1. - dh(:, 2))
+    ch(:, 1) = (h(:, 1) / pkf(:, 1) * delp(:, 1) &
+         + zx_coef(:, 2) * (gamah(:, 2) + ch(:, 2))) / buf2
+    dh(:, 1) = - 1. * RG / buf2
 
     CALL interfsurf_hq(dtime, julien, rmu0, nisurf, knindex, debut, tsoil, &
-         qsol, u1lay, v1lay, t(:, 1), q(:, 1), tq_cdrag(:knon), ch(:, 1), &
-         cq(:, 1), dh(:, 1), dq(:, 1), precip_rain, precip_snow, rugos, &
-         rugoro, snow, qsurf, ts, pplay(:, 1), psref, radsol, evap, flux_t, &
-         fluxlat, dflux_l, dflux_s, tsurf_new, albedo, z0_new, pctsrf_new_sic, &
-         agesno, fqcalving, ffonte, run_off_lic_0)
+         qsol, u1lay, v1lay, t(:, 1), q(:, 1), tq_cdrag, ch(:, 1), cq(:, 1), &
+         dh(:, 1), dq(:, 1), precip_rain, precip_snow, rugos, rugoro, snow, &
+         qsurf, ts, pplay(:, 1), psref, radsol, evap, flux_t, fluxlat, &
+         dflux_l, dflux_s, tsurf_new, albedo, z0_new, pctsrf_new_sic, agesno, &
+         fqcalving, ffonte, run_off_lic_0)
 
     flux_q = - evap
     d_ts = tsurf_new - ts