--- trunk/phylmd/clqh.f	2018/07/20 17:53:18	285
+++ trunk/phylmd/Interface_surf/clqh.f	2018/07/26 16:02:11	297
@@ -14,10 +14,11 @@
     ! Date: 1993 Aug. 18th
     ! Objet : diffusion verticale de "q" et de "h"
 
-    USE conf_phys_m, ONLY: iflag_pbl
+    use climb_hq_down_m, only: climb_hq_down
+    use climb_hq_up_m, only: climb_hq_up
     USE dimphy, ONLY: klev, klon
     USE interfsurf_hq_m, ONLY: interfsurf_hq
-    USE suphec_m, ONLY: rcpd, rd, rg, rkappa
+    USE suphec_m, ONLY: rkappa
 
     REAL, intent(in):: dtime ! intervalle du temps (s)
     integer, intent(in):: julien ! jour de l'annee en cours
@@ -99,104 +100,28 @@
 
     ! Local:
 
-    INTEGER knon, k
+    INTEGER k
     REAL evap(size(knindex)) ! (knon) evaporation au sol
     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)
-    REAL h(size(knindex), klev) ! (knon, klev) enthalpie potentielle
-    REAL local_q(size(knindex), klev) ! (knon, klev)
-
-    REAL psref(size(knindex)) ! (knon)
-    ! pression de reference pour temperature potentielle
-
     REAL pkf(size(knindex), klev) ! (knon, klev)
-
-    REAL gamt(size(knindex), 2:klev) ! (knon, 2:klev)
-    ! contre-gradient pour la chaleur sensible, en K m-1
-
-    REAL gamah(size(knindex), 2:klev) ! (knon, 2:klev)
     real tsurf_new(size(knindex)) ! (knon)
 
     !----------------------------------------------------------------
 
-    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 &
-         / (pplay(:, k - 1) - pplay(:, k)) &
-         * (paprs(:, k) * 2 / (t(:, k) + t(:, k - 1)) / RD)**2 * dtime * RG
-
-    ! 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
-
-    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
-       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
-
-    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
+    forall (k = 1:klev) pkf(:, k) = (paprs(:, 1) / pplay(:, k))**RKAPPA
+    ! (La pression de r\'ef\'erence est celle au sol.)
 
+    call climb_hq_down(pkf, cq, dq, ch, dh, paprs, pplay, t, coef, dtime, &
+         delp, q)
     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), paprs(:, 1), 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
-
-    h(:, 1) = ch(:, 1) + dh(:, 1) * flux_t * dtime
-    local_q(:, 1) = cq(:, 1) + dq(:, 1) * flux_q * dtime
-
-    DO k = 2, klev
-       h(:, k) = ch(:, k) + dh(:, k) * h(:, k - 1)
-       local_q(:, k) = cq(:, k) + dq(:, k) * local_q(:, k - 1)
-    ENDDO
-
-    d_t = h / pkf / RCPD - t
-    d_q = local_q - q
+    call climb_hq_up(d_t, d_q, cq, dq, ch, dh, flux_t, flux_q, dtime, pkf, t, q)
 
   END SUBROUTINE clqh