Index: /LMDZ6/trunk/libf/phylmd/surf_land_mod.F90
===================================================================
--- /LMDZ6/trunk/libf/phylmd/surf_land_mod.F90	(revision 5981)
+++ /LMDZ6/trunk/libf/phylmd/surf_land_mod.F90	(revision 5982)
@@ -29,9 +29,8 @@
 #endif               
                )
+!$gpum horizontal knon klon
 
     USE dimphy
     USE surface_data, ONLY    : ok_veget
-    USE carbon_cycle_mod
-
 
     ! See comments in each module surf_land_orchidee_xxx for compatiblity with ORCHIDEE
@@ -57,5 +56,5 @@
 #else
     ! Default version
-    USE surf_land_orchidee_mod
+    USE surf_land_orchidee_mod, ONLY : surf_land_orchidee
 #endif
 #endif
@@ -64,8 +63,8 @@
 #endif
     
-    USE surf_land_bucket_mod
-    USE surf_land_bucket_hetero_mod
-    USE calcul_fluxs_mod
-    USE indice_sol_mod
+    USE surf_land_bucket_mod, ONLY : surf_land_bucket
+    USE surf_land_bucket_hetero_mod, ONLY : surf_land_bucket_hetero
+    USE calcul_fluxs_mod, ONLY : calcul_flux_wind
+    USE indice_sol_mod, ONLY: nbsrf
 #ifdef ISO
     use infotrac_phy, ONLY: ntiso,niso
@@ -76,10 +75,10 @@
 #endif
 
-USE dimpft_mod_h
-        USE clesphys_mod_h
-    USE yomcst_mod_h
-USE print_control_mod, ONLY: lunout
+    USE dimpft_mod_h, ONLY: nvm_lmdz
+    USE clesphys_mod_h, ONLY : nsw, ok_bs
+    USE yomcst_mod_h, ONLY: RCPD, RKAPPA
+    USE print_control_mod, ONLY: lunout
     USE dimsoil_mod_h, ONLY: nsoilmx
-    USE compbl_mod_h
+    USE compbl_mod_h, ONLY: iflag_hetero_surf
 
 ! Input variables  
@@ -173,5 +172,5 @@
 
 !albedo SB >>>
-    REAL, DIMENSION(klon)      :: alb1_new,alb2_new
+    REAL, DIMENSION(knon)      :: alb1_new,alb2_new
 !albedo SB <<<
 
@@ -250,4 +249,5 @@
 
        ! temporary for keeping same results using lwdown_m instead of lwdown
+!$gpum nocall
        CALL surf_land_orchidee(itime, dtime, date0, knon, &
             knindex, rlon, rlat, yrmu0, pctsrf, &
@@ -306,4 +306,5 @@
         IF (klon .EQ. 1) THEN
           !
+!$gpum nocall
           CALL surf_land_bucket_hetero(itime, jour, knon, knindex, debut, dtime,&
               tsurf, p1lay, cdragh, precip_rain, precip_totsnow, temp_air, &