--- trunk/Sources/phylmd/Interface_surf/interfsurf_hq.f	2016/09/01 10:30:53	207
+++ trunk/Sources/phylmd/Interface_surf/interfsurf_hq.f	2016/12/07 17:37:21	209
@@ -4,12 +4,12 @@
 
 contains
 
-  SUBROUTINE interfsurf_hq(dtime, jour, rmu0, nisurf, knon, knindex, rlat, &
-       debut, nsoilmx, tsoil, qsol, u1_lay, v1_lay, temp_air, spechum, &
-       tq_cdrag, petAcoef, peqAcoef, petBcoef, peqBcoef, precip_rain, &
-       precip_snow, fder, rugos, rugoro, snow, qsurf, tsurf, p1lay, ps, &
-       radsol, evap, flux_t, fluxlat, dflux_l, dflux_s, tsurf_new, albedo, &
-       z0_new, pctsrf_new_sic, agesno, fqcalving, ffonte, run_off_lic_0)
+  SUBROUTINE interfsurf_hq(dtime, jour, rmu0, nisurf, knon, knindex, debut, &
+       tsoil, qsol, u1_lay, v1_lay, temp_air, spechum, tq_cdrag, petAcoef, &
+       peqAcoef, petBcoef, peqBcoef, precip_rain, precip_snow, fder, rugos, &
+       rugoro, snow, qsurf, tsurf, p1lay, ps, radsol, evap, flux_t, fluxlat, &
+       dflux_l, dflux_s, tsurf_new, albedo, z0_new, pctsrf_new_sic, agesno, &
+       fqcalving, ffonte, run_off_lic_0)
 
     ! Cette routine sert d'aiguillage entre l'atmosph\`ere et la surface
     ! en g\'en\'eral (sols continentaux, oc\'eans, glaces) pour les flux de
@@ -19,11 +19,10 @@
 
     USE abort_gcm_m, ONLY: abort_gcm
     use alboc_cd_m, only: alboc_cd
-    use alboc_m, only: alboc
     USE albsno_m, ONLY: albsno
     use calbeta_m, only: calbeta
     USE calcul_fluxs_m, ONLY: calcul_fluxs
-    use clesphys2, only: soil_model, cycle_diurne
+    use clesphys2, only: soil_model
     USE dimphy, ONLY: klon
     USE fonte_neige_m, ONLY: fonte_neige
     USE indicesol, ONLY: epsfra, is_lic, is_oce, is_sic, is_ter
@@ -42,13 +41,10 @@
     integer, intent(in):: knindex(:) ! (knon)
     ! index des points de la surface a traiter
 
-    real, intent(IN):: rlat(klon) ! latitudes
-
     logical, intent(IN):: debut ! 1er appel a la physique
     ! (si false calcul simplifie des fluxs sur les continents)
 
-    integer, intent(in):: nsoilmx
-    REAL tsoil(klon, nsoilmx)
+    REAL, intent(inout):: tsoil(:, :) ! (knon, nsoilmx)
 
     REAL, intent(INOUT):: qsol(klon)
     ! column-density of water in soil, in kg m-2
@@ -123,6 +119,7 @@
     real tsurf_temp(knon)
     real alb_neig(knon)
     real zfra(knon)
+    REAL, PARAMETER:: fmagic = 1. ! facteur magique pour r\'egler l'alb\'edo
 
     !-------------------------------------------------------------
 
@@ -142,7 +139,7 @@
        if (is_oce > is_sic) then
           print *, 'is_oce = ', is_oce, '> is_sic = ', is_sic
           call abort_gcm("interfsurf_hq", &
-               'L''ocean doit etre traite avant la banquise')
+               "L'ocean doit etre traite avant la banquise")
        endif
 
        first_call = .false.
@@ -177,8 +174,7 @@
             capsol(:knon), dif_grnd(:knon))
 
        IF (soil_model) THEN
-          CALL soil(dtime, is_ter, snow(:knon), tsurf, tsoil(:knon, :), &
-               soilcap, soilflux)
+          CALL soil(dtime, is_ter, snow(:knon), tsurf, tsoil, soilcap, soilflux)
           cal(1:knon) = RCPD / soilcap
           radsol(1:knon) = radsol(1:knon) + soilflux
        ELSE
@@ -208,7 +204,6 @@
        ! Surface "oc\'ean", appel \`a l'interface avec l'oc\'ean
 
        call read_sst(dtime, jour, knindex, debut, tsurf_temp)
-
        cal = 0.
        beta = 1.
        dif_grnd = 0.
@@ -220,14 +215,7 @@
             petBcoef(:knon), peqBcoef(:knon), tsurf_new, evap, &
             fluxlat(:knon), flux_t, dflux_s(:knon), dflux_l(:knon))
        fder = fder + dflux_s + dflux_l
-
-       ! Compute the albedo:
-       if (cycle_diurne) then
-          CALL alboc_cd(rmu0(knindex), albedo)
-       else
-          CALL alboc(jour, rlat(knindex), albedo)
-       endif
-
+       albedo = alboc_cd(rmu0(knindex)) * fmagic
        z0_new = sqrt(rugos**2 + rugoro**2)
     case (is_sic)
        ! Surface "glace de mer" appel a l'interface avec l'ocean
@@ -245,8 +233,8 @@
             capsol(:knon), dif_grnd(:knon))
 
        IF (soil_model) THEN
-          CALL soil(dtime, is_sic, snow(:knon), tsurf_new, tsoil(:knon, :), &
-               soilcap, soilflux)
+          CALL soil(dtime, is_sic, snow(:knon), tsurf_new, tsoil, soilcap, &
+               soilflux)
           cal(1:knon) = RCPD / soilcap
           radsol(1:knon) = radsol(1:knon) + soilflux
           dif_grnd = 0.
@@ -290,8 +278,7 @@
        ! Surface "glacier continentaux" appel a l'interface avec le sol
 
        IF (soil_model) THEN
-          CALL soil(dtime, is_lic, snow(:knon), tsurf, tsoil(:knon, :), &
-               soilcap, soilflux)
+          CALL soil(dtime, is_lic, snow(:knon), tsurf, tsoil, soilcap, soilflux)
           cal(1:knon) = RCPD / soilcap
           radsol(1:knon) = radsol(1:knon) + soilflux
        ELSE