--- trunk/phylmd/Interface_surf/interfsurf_hq.f	2014/09/04 10:05:52	104
+++ trunk/Sources/phylmd/Interface_surf/interfsurf_hq.f	2015/06/18 13:49:26	150
@@ -12,13 +12,14 @@
        tsurf_new, alb_new, alblw, z0_new, pctsrf_new, agesno, fqcalving, &
        ffonte, run_off_lic_0, flux_o, flux_g)
 
-    ! Cette routine sert d'aiguillage entre l'atmosphère et la surface
-    ! en général (sols continentaux, océans, glaces) pour les flux de
-    ! chaleur et d'humidité.
+    ! 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
+    ! chaleur et d'humidit\'e.
 
     ! Laurent Fairhead, February 2000
 
     USE abort_gcm_m, ONLY: abort_gcm
+    use alboc_m, only: alboc
     USE albsno_m, ONLY: albsno
     use calbeta_m, only: calbeta
     USE calcul_fluxs_m, ONLY: calcul_fluxs
@@ -39,7 +40,7 @@
     integer, intent(IN):: nisurf ! index de la surface a traiter
     integer, intent(IN):: knon ! nombre de points de la surface a traiter
 
-    integer, intent(in):: knindex(klon)
+    integer, intent(in):: knindex(:) ! (knon)
     ! index des points de la surface a traiter
 
     real, intent(IN):: pctsrf(klon, nbsrf)
@@ -83,20 +84,19 @@
     ! rugos rugosite
     ! rugoro rugosite orographique
     real, intent(INOUT):: snow(klon), qsurf(klon)
-    real, intent(IN):: tsurf(:) ! (knon) température de surface
+    real, intent(IN):: tsurf(:) ! (knon) temp\'erature de surface
     real, dimension(klon), intent(IN):: p1lay
     ! p1lay pression 1er niveau (milieu de couche)
     real, dimension(klon), intent(IN):: ps
     ! ps pression au sol
     REAL, DIMENSION(klon), INTENT(INOUT):: radsol
     ! radsol rayonnement net aus sol (LW + SW)
-    real, dimension(klon), intent(INOUT):: evap
-    ! evap evaporation totale
+    real, intent(INOUT):: evap(klon) ! evaporation totale
     real, dimension(klon), intent(OUT):: fluxsens, fluxlat
     ! fluxsens flux de chaleur sensible
     ! fluxlat flux de chaleur latente
     real, dimension(klon), intent(OUT):: dflux_l, dflux_s
-    real, intent(OUT):: tsurf_new(knon) ! température au sol
+    real, intent(OUT):: tsurf_new(knon) ! temp\'erature au sol
     real, intent(OUT):: alb_new(klon) ! albedo
     real, dimension(klon), intent(OUT):: alblw
     real, dimension(klon), intent(OUT):: z0_new
@@ -105,7 +105,7 @@
     ! pctsrf_new nouvelle repartition des surfaces
     real, dimension(klon), intent(INOUT):: agesno
 
-    ! Flux d'eau "perdue" par la surface et nécessaire pour que limiter la
+    ! Flux d'eau "perdue" par la surface et n\'ecessaire pour que limiter la
     ! hauteur de neige, en kg/m2/s
     !jld a rajouter real, dimension(klon), intent(INOUT):: fqcalving
     real, dimension(klon), intent(INOUT):: fqcalving
@@ -207,10 +207,9 @@
 
        ! calcul albedo: lecture albedo fichier boundary conditions
        ! puis ajout albedo neige
-       call interfsur_lim(itime, dtime, jour, nisurf, knon, knindex, &
-            debut, alb_new, z0_new)
+       call interfsur_lim(itime, dtime, jour, knindex, debut, alb_new, z0_new)
 
-       ! calcul snow et qsurf, hydrol adapté
+       ! calcul snow et qsurf, hydrol adapt\'e
        CALL calbeta(nisurf, snow(:knon), qsol(:knon), beta(:knon), &
             capsol(:knon), dif_grnd(:knon))
 
@@ -221,16 +220,19 @@
        ELSE
           cal = RCPD * capsol
        ENDIF
-       CALL calcul_fluxs(nisurf, dtime, tsurf, p1lay(:knon), cal(:knon), beta(:knon), &
-            tq_cdrag(:knon), ps(:knon), qsurf(:knon), radsol(:knon), &
-            dif_grnd(:knon), temp_air(:knon), spechum(:knon), u1_lay(:knon), v1_lay(:knon), petAcoef(:knon), peqAcoef(:knon), &
-            petBcoef(:knon), peqBcoef(:knon), tsurf_new, evap(:knon), fluxlat(:knon), fluxsens(:knon), dflux_s(:knon), &
-            dflux_l(:knon))
+       CALL calcul_fluxs(nisurf, dtime, tsurf, p1lay(:knon), cal(:knon), &
+            beta(:knon), tq_cdrag(:knon), ps(:knon), qsurf(:knon), &
+            radsol(:knon), dif_grnd(:knon), temp_air(:knon), spechum(:knon), &
+            u1_lay(:knon), v1_lay(:knon), petAcoef(:knon), peqAcoef(:knon), &
+            petBcoef(:knon), peqBcoef(:knon), tsurf_new, evap(:knon), &
+            fluxlat(:knon), fluxsens(:knon), dflux_s(:knon), dflux_l(:knon))
 
        CALL fonte_neige(nisurf, dtime, tsurf, p1lay(:knon), beta(:knon), &
-            tq_cdrag(:knon), ps(:knon), precip_rain(:knon), precip_snow(:knon), snow(:knon), qsol(:knon), &
-            temp_air(:knon), spechum(:knon), u1_lay(:knon), v1_lay(:knon), petAcoef(:knon), peqAcoef(:knon), petBcoef(:knon), &
-            peqBcoef(:knon), tsurf_new, evap(:knon), fqcalving(:knon), ffonte(:knon), run_off_lic_0(:knon))
+            tq_cdrag(:knon), ps(:knon), precip_rain(:knon), &
+            precip_snow(:knon), snow(:knon), qsol(:knon), temp_air(:knon), &
+            spechum(:knon), u1_lay(:knon), v1_lay(:knon), petAcoef(:knon), &
+            peqAcoef(:knon), petBcoef(:knon), peqBcoef(:knon), tsurf_new, &
+            evap(:knon), fqcalving(:knon), ffonte(:knon), run_off_lic_0(:knon))
 
        call albsno(klon, knon, dtime, agesno, alb_neig, precip_snow)
        where (snow(1 : knon) < 0.0001) agesno(1 : knon) = 0.
@@ -243,10 +245,10 @@
        ! Remplissage des pourcentages de surface
        pctsrf_new(:, nisurf) = pctsrf(:, nisurf)
     case (is_oce)
-       ! Surface "ocean" appel à l'interface avec l'océan
+       ! Surface "ocean" appel \`a l'interface avec l'oc\'ean
        ! lecture conditions limites
-       call interfoce_lim(itime, dtime, jour, klon, knon, knindex, debut, &
-            tsurf_temp, pctsrf_new)
+       call interfoce_lim(itime, dtime, jour, knindex, debut, tsurf_temp, &
+            pctsrf_new)
 
        cal = 0.
        beta = 1.
@@ -273,7 +275,7 @@
 
        ! calcul albedo
        if (minval(rmu0) == maxval(rmu0) .and. minval(rmu0) == -999.999) then
-          CALL alboc(FLOAT(jour), rlat, alb_eau)
+          CALL alboc(jour, rlat, alb_eau)
        else ! cycle diurne
           CALL alboc_cd(rmu0, alb_eau)
        endif
@@ -287,8 +289,8 @@
        ! Surface "glace de mer" appel a l'interface avec l'ocean
 
        ! ! lecture conditions limites
-       CALL interfoce_lim(itime, dtime, jour, klon, knon, knindex, &
-            debut, tsurf_new, pctsrf_new)
+       CALL interfoce_lim(itime, dtime, jour, knindex, debut, tsurf_new, &
+            pctsrf_new)
 
        DO ii = 1, knon
           tsurf_new(ii) = tsurf(ii)
@@ -318,9 +320,10 @@
 
        CALL calcul_fluxs(nisurf, dtime, tsurf_temp, p1lay(:knon), cal(:knon), &
             beta(:knon), tq_cdrag(:knon), ps(:knon), qsurf(:knon), &
-            radsol(:knon), dif_grnd(:knon), temp_air(:knon), spechum(:knon), u1_lay(:knon), v1_lay(:knon), petAcoef(:knon), &
-            peqAcoef(:knon), petBcoef(:knon), peqBcoef(:knon), tsurf_new, evap(:knon), fluxlat(:knon), fluxsens(:knon), &
-            dflux_s(:knon), dflux_l(:knon))
+            radsol(:knon), dif_grnd(:knon), temp_air(:knon), spechum(:knon), &
+            u1_lay(:knon), v1_lay(:knon), petAcoef(:knon), peqAcoef(:knon), &
+            petBcoef(:knon), peqBcoef(:knon), tsurf_new, evap(:knon), &
+            fluxlat(:knon), fluxsens(:knon), dflux_s(:knon), dflux_l(:knon))
 
        !IM: flux entre l'ocean et la glace de mer pour le "slab" ocean
        DO i = 1, knon
@@ -330,9 +333,11 @@
        ENDDO
 
        CALL fonte_neige(nisurf, dtime, tsurf_temp, p1lay(:knon), beta(:knon), &
-            tq_cdrag(:knon), ps(:knon), precip_rain(:knon), precip_snow(:knon), snow(:knon), qsol(:knon), &
-            temp_air(:knon), spechum(:knon), u1_lay(:knon), v1_lay(:knon), petAcoef(:knon), peqAcoef(:knon), petBcoef(:knon), &
-            peqBcoef(:knon), tsurf_new, evap(:knon), fqcalving(:knon), ffonte(:knon), run_off_lic_0(:knon))
+            tq_cdrag(:knon), ps(:knon), precip_rain(:knon), &
+            precip_snow(:knon), snow(:knon), qsol(:knon), temp_air(:knon), &
+            spechum(:knon), u1_lay(:knon), v1_lay(:knon), petAcoef(:knon), &
+            peqAcoef(:knon), petBcoef(:knon), peqBcoef(:knon), tsurf_new, &
+            evap(:knon), fqcalving(:knon), ffonte(:knon), run_off_lic_0(:knon))
 
        ! calcul albedo
 
@@ -372,16 +377,19 @@
        beta = 1.0
        dif_grnd = 0.0
 
-       call calcul_fluxs(nisurf, dtime, tsurf, p1lay(:knon), cal(:knon), beta(:knon), &
-            tq_cdrag(:knon), ps(:knon), qsurf(:knon), radsol(:knon), &
-            dif_grnd(:knon), temp_air(:knon), spechum(:knon), u1_lay(:knon), v1_lay(:knon), petAcoef(:knon), peqAcoef(:knon), &
-            petBcoef(:knon), peqBcoef(:knon), tsurf_new, evap(:knon), fluxlat(:knon), fluxsens(:knon), dflux_s(:knon), &
-            dflux_l(:knon))
+       call calcul_fluxs(nisurf, dtime, tsurf, p1lay(:knon), cal(:knon), &
+            beta(:knon), tq_cdrag(:knon), ps(:knon), qsurf(:knon), &
+            radsol(:knon), dif_grnd(:knon), temp_air(:knon), spechum(:knon), &
+            u1_lay(:knon), v1_lay(:knon), petAcoef(:knon), peqAcoef(:knon), &
+            petBcoef(:knon), peqBcoef(:knon), tsurf_new, evap(:knon), &
+            fluxlat(:knon), fluxsens(:knon), dflux_s(:knon), dflux_l(:knon))
 
        call fonte_neige(nisurf, dtime, tsurf, p1lay(:knon), beta(:knon), &
-            tq_cdrag(:knon), ps(:knon), precip_rain(:knon), precip_snow(:knon), snow(:knon), qsol(:knon), &
-            temp_air(:knon), spechum(:knon), u1_lay(:knon), v1_lay(:knon), petAcoef(:knon), peqAcoef(:knon), petBcoef(:knon), &
-            peqBcoef(:knon), tsurf_new, evap(:knon), fqcalving(:knon), ffonte(:knon), run_off_lic_0(:knon))
+            tq_cdrag(:knon), ps(:knon), precip_rain(:knon), &
+            precip_snow(:knon), snow(:knon), qsol(:knon), temp_air(:knon), &
+            spechum(:knon), u1_lay(:knon), v1_lay(:knon), petAcoef(:knon), &
+            peqAcoef(:knon), petBcoef(:knon), peqBcoef(:knon), tsurf_new, &
+            evap(:knon), fqcalving(:knon), ffonte(:knon), run_off_lic_0(:knon))
 
        ! calcul albedo
        CALL albsno(klon, knon, dtime, agesno, alb_neig, precip_snow)