Index: LMDZ6/branches/PBLSURF_GPUPORT/libf/phylmd/albedo.f90
===================================================================
--- LMDZ6/branches/PBLSURF_GPUPORT/libf/phylmd/albedo.f90	(revision 5920)
+++ LMDZ6/branches/PBLSURF_GPUPORT/libf/phylmd/albedo.f90	(revision 5921)
@@ -1,4 +1,4 @@
 ! $Id$
-module albedo
+module albedo_mod
 
 IMPLICIT NONE
@@ -6,6 +6,6 @@
 contains
 
-  SUBROUTINE alboc(klon, rjour, rlat, albedo)
-!$gpum horizontal klon
+  SUBROUTINE alboc(ngrid, rjour, rlat, albedo)
+!$gpum horizontal ngrid
 !    USE clesphys_mod_h
     USE yomcst_mod_h, ONLY : r_incl
@@ -23,9 +23,9 @@
     ! albedo (out,R): albedo obtenu (de 0 a 1)
     ! ======================================================================
-    INTEGER, INTENT(IN) :: klon
+    INTEGER, INTENT(IN) :: ngrid
     INTEGER npts ! il controle la precision de l'integration
     PARAMETER (npts=120) ! 120 correspond a l'interval 6 minutes
 
-    REAL rlat(klon), rjour, albedo(klon)
+    REAL rlat(ngrid), rjour, albedo(ngrid)
     REAL zdist, zlonsun, zpi, zdeclin
     REAL rmu, alb, srmu, salb, fauxo, aa, bb
@@ -46,5 +46,5 @@
        zdeclin = asin(sin(zlonsun*zpi/180.0)*sin(r_incl*zpi/180.0))
 
-       DO i = 1, klon
+       DO i = 1, ngrid
           aa = sin(rlat(i)*zpi/180.0)*sin(zdeclin)
           bb = cos(rlat(i)*zpi/180.0)*cos(zdeclin)
@@ -87,5 +87,5 @@
        zdeclin = asin(sin(zlonsun*zpi/180.0)*sin(r_incl*zpi/180.0))
 
-       DO i = 1, klon
+       DO i = 1, ngrid
           aa = sin(rlat(i)*zpi/180.0)*sin(zdeclin)
           bb = cos(rlat(i)*zpi/180.0)*cos(zdeclin)
@@ -123,6 +123,6 @@
   END SUBROUTINE alboc
   ! =====================================================================
-  SUBROUTINE alboc_cd(klon, rmu0, albedo)
-!$gpum horizontal klon
+  SUBROUTINE alboc_cd(ngrid, rmu0, albedo)
+!$gpum horizontal ngrid
   IMPLICIT NONE
 
@@ -138,7 +138,7 @@
     ! albedo (out): albedo de surface de l'ocean
     ! ======================================================================
-    INTEGER, INTENT(IN) :: klon
-    REAL, intent(in):: rmu0(klon)
-    real, intent(out):: albedo(klon)
+    INTEGER, INTENT(IN) :: ngrid
+    REAL, intent(in):: rmu0(ngrid)
+    real, intent(out):: albedo(ngrid)
 
     REAL fauxo
@@ -148,5 +148,5 @@
 
     IF (ancien_albedo) THEN
-       DO i = 1, klon
+       DO i = 1, ngrid
           fauxo = (1.47-acos(max(rmu0(i), 0.0)))/0.15
           albedo(i) = 0.03+.630/(1.+fauxo*fauxo)
@@ -154,5 +154,5 @@
        END DO
     ELSE
-       DO i = 1, klon
+       DO i = 1, ngrid
           albedo(i) = 0.058/(max(rmu0(i), 0.0)+0.30)
           albedo(i) = max(min(albedo(i),0.60), 0.04)
@@ -162,3 +162,3 @@
   END SUBROUTINE alboc_cd
 
-end module albedo
+end module albedo_mod
Index: LMDZ6/branches/PBLSURF_GPUPORT/libf/phylmd/surf_ocean_mod.F90
===================================================================
--- LMDZ6/branches/PBLSURF_GPUPORT/libf/phylmd/surf_ocean_mod.F90	(revision 5920)
+++ LMDZ6/branches/PBLSURF_GPUPORT/libf/phylmd/surf_ocean_mod.F90	(revision 5921)
@@ -32,5 +32,5 @@
 !$gpum horizontal knon klon
 
-    use albedo, only: alboc, alboc_cd
+    use albedo_mod, only: alboc, alboc_cd
     use bulk_flux_m, only: bulk_flux
     USE dimphy, ONLY: klon, zmasq
@@ -48,9 +48,9 @@
 #endif
 #endif
-    USE clesphys_mod_h
-    USE yomcst_mod_h
-USE limit_read_mod
+    USE clesphys_mod_h, ONLY: nsw, ok_bs, f_z0qh_oce, iflag_albedo, iflag_cycle_diurne, fmagic, pmagic, iflag_z0_oce, z0min 
+    USE yomcst_mod_h, ONLY: rd, retv, rg, rlvtt
+    USE limit_read_mod, ONLY: limit_read_rug_alb
     USE config_ocean_skin_m, ONLY: activate_ocean_skin
-    USE lmdz_checksum
+    USE lmdz_checksum, ONLY : checksum
     !
     ! This subroutine will make a call to ocean_XXX_noice according to the ocean mode (force,