--- trunk/Sources/phylmd/clqh.f	2015/07/08 17:03:45	155
+++ trunk/Sources/phylmd/clqh.f	2016/03/11 18:47:26	178
@@ -5,21 +5,20 @@
 contains
 
   SUBROUTINE clqh(dtime, itime, jour, debut, rlat, knon, nisurf, knindex, &
-       pctsrf, tsoil, qsol, rmu0, co2_ppm, rugos, rugoro, u1lay, v1lay, coef, &
+       pctsrf, tsoil, qsol, rmu0, rugos, rugoro, u1lay, v1lay, coef, &
        t, q, ts, paprs, pplay, delp, radsol, albedo, snow, qsurf, &
-       precip_rain, precip_snow, fder, swnet, fluxlat, pctsrf_new, agesno, &
-       d_t, d_q, d_ts, z0_new, flux_t, flux_q, dflux_s, dflux_l, fqcalving, &
-       ffonte, run_off_lic_0, flux_o, flux_g)
+       precip_rain, precip_snow, fder, fluxlat, pctsrf_new, agesno, d_t, d_q, &
+       d_ts, z0_new, flux_t, flux_q, dflux_s, dflux_l, fqcalving, ffonte, &
+       run_off_lic_0)
 
     ! Author: Z. X. Li (LMD/CNRS)
     ! Date: 1993/08/18
     ! Objet : diffusion verticale de "q" et de "h"
 
     USE conf_phys_m, ONLY: iflag_pbl
-    USE dimens_m, ONLY: iim, jjm
     USE dimphy, ONLY: klev, klon
     USE dimsoil, ONLY: nsoilmx
-    USE indicesol, ONLY: is_ter, nbsrf
+    USE indicesol, ONLY: nbsrf
     USE interfsurf_hq_m, ONLY: interfsurf_hq
     USE suphec_m, ONLY: rcpd, rd, rg, rkappa
 
@@ -29,7 +28,7 @@
     logical, intent(in):: debut
     real, intent(in):: rlat(klon)
     INTEGER, intent(in):: knon
-    integer nisurf
+    integer, intent(in):: nisurf
     integer, intent(in):: knindex(:) ! (knon)
     real, intent(in):: pctsrf(klon, nbsrf)
     REAL tsoil(klon, nsoilmx)
@@ -38,7 +37,6 @@
     ! column-density of water in soil, in kg m-2
 
     real, intent(in):: rmu0(klon) ! cosinus de l'angle solaire zenithal
-    REAL, intent(in):: co2_ppm ! taux CO2 atmosphere
     real rugos(klon) ! rugosite
     REAL rugoro(klon)
     REAL u1lay(klon) ! vitesse u de la 1ere couche (m / s)
@@ -67,10 +65,9 @@
     ! solid water mass flux (kg / m2 / s), positive down
 
     real, intent(inout):: fder(klon)
-    real swnet(klon)
     real fluxlat(klon)
     real pctsrf_new(klon, nbsrf)
-    REAL agesno(klon)
+    REAL, intent(inout):: agesno(:) ! (knon)
     REAL d_t(klon, klev) ! incrementation de "t"
     REAL d_q(klon, klev) ! incrementation de "q"
     REAL, intent(out):: d_ts(:) ! (knon) incrementation de "ts"
@@ -91,13 +88,6 @@
 
     REAL run_off_lic_0(klon)! runof glacier au pas de temps precedent
 
-    !IM "slab" ocean
-
-    REAL, intent(out):: flux_o(klon) ! flux entre l'ocean et l'atmosphere W / m2
-
-    REAL, intent(out):: flux_g(klon) 
-    ! flux entre l'ocean et la glace de mer W / m2
-
     ! Local:
 
     REAL evap(klon) ! evaporation au sol
@@ -112,7 +102,6 @@
     REAL zx_coef(klon, klev)
     REAL local_h(klon, klev) ! enthalpie potentielle
     REAL local_q(klon, klev)
-    REAL local_ts(klon)
     REAL psref(klon) ! pression de reference pour temperature potent.
     REAL zx_pkh(klon, klev), zx_pkf(klon, klev)
 
@@ -123,12 +112,9 @@
     REAL z_gamaq(klon, 2:klev), z_gamah(klon, 2:klev)
     REAL zdelz
 
-    real zlev1(klon)
     real temp_air(klon), spechum(klon)
-    real epot_air(klon), ccanopy(klon)
     real tq_cdrag(klon), petAcoef(klon), peqAcoef(klon)
     real petBcoef(klon), peqBcoef(klon)
-    real swdown(klon)
     real p1lay(klon)
 
     real fluxsens(klon)
@@ -159,7 +145,6 @@
 
     DO i = 1, knon
        psref(i) = paprs(i, 1) !pression de reference est celle au sol
-       local_ts(i) = ts(i)
     ENDDO
     DO k = 1, klev
        DO i = 1, knon
@@ -253,17 +238,8 @@
     peqBcoef(1:knon) = zx_dq(1:knon, 1)
     tq_cdrag(1:knon) =coef(:knon, 1)
     temp_air(1:knon) =t(1:knon, 1)
-    epot_air(1:knon) =local_h(1:knon, 1)
     spechum(1:knon)=q(1:knon, 1)
     p1lay(1:knon) = pplay(1:knon, 1)
-    zlev1(1:knon) = delp(1:knon, 1)
-
-    if(nisurf == is_ter) THEN 
-       swdown(:knon) = swnet(:knon) / (1 - albedo) 
-    else 
-       swdown(:knon) = swnet(:knon)
-    endif
-    ccanopy = co2_ppm
 
     CALL interfsurf_hq(itime, dtime, jour, rmu0, nisurf, knon, knindex, &
          pctsrf, rlat, debut, nsoilmx, tsoil, qsol, u1lay, v1lay, temp_air, &
@@ -271,7 +247,7 @@
          precip_rain, precip_snow, fder, rugos, rugoro, snow, qsurf, &
          ts(:knon), p1lay, psref, radsol, evap, fluxsens, fluxlat, dflux_l, &
          dflux_s, tsurf_new, albedo, z0_new, pctsrf_new, agesno, fqcalving, &
-         ffonte, run_off_lic_0, flux_o, flux_g)
+         ffonte, run_off_lic_0)
 
     flux_t(:knon, 1) = fluxsens(:knon)
     flux_q(:knon, 1) = - evap(:knon)