Index: LMDZ6/trunk/libf/phylmd/surf_land_orchidee_mod.F90
===================================================================
--- LMDZ6/trunk/libf/phylmd/surf_land_orchidee_mod.F90	(revision 6014)
+++ LMDZ6/trunk/libf/phylmd/surf_land_orchidee_mod.F90	(revision 6015)
@@ -151,7 +151,7 @@
     INTEGER                                   :: ij, jj, igrid, ireal, index, nb
     INTEGER                                   :: error
-    REAL, DIMENSION(klon)                     :: swdown_vrai
-    REAL, DIMENSION(klon)                     :: run_off_lic        !! run off from land ice defined in ORCHIDEE, contains calving, melting and liquid precipitation
-    REAL, DIMENSION(klon)                     :: run_off_lic_frac   !! cell fraction corresponding to run_off_lic
+    REAL, DIMENSION(knon)                     :: swdown_vrai
+    REAL, DIMENSION(knon)                     :: run_off_lic        !! run off from land ice defined in ORCHIDEE, contains calving, melting and liquid precipitation
+    REAL, DIMENSION(knon)                     :: run_off_lic_frac   !! cell fraction corresponding to run_off_lic
     REAL, DIMENSION(klon)                     :: blowingsnow_flux   !! blowing snow flux
     CHARACTER (len = 20)                      :: modname = 'surf_land_orchidee'
@@ -198,6 +198,6 @@
 
 ! Pb de nomenclature
-    REAL, DIMENSION(klon)                     :: petA_orc, peqA_orc
-    REAL, DIMENSION(klon)                     :: petB_orc, peqB_orc
+    REAL, DIMENSION(knon)                     :: petA_orc, peqA_orc
+    REAL, DIMENSION(knon)                     :: petB_orc, peqB_orc
 ! Pb de correspondances de grilles
     INTEGER, DIMENSION(:), SAVE, ALLOCATABLE  :: ig, jg
@@ -208,5 +208,5 @@
 
 ! Essai cdrag
-    REAL, DIMENSION(klon)                     :: cdrag
+    REAL, DIMENSION(knon)                     :: cdrag
     INTEGER,SAVE                              :: offset
     !$OMP THREADPRIVATE(offset)
@@ -464,5 +464,5 @@
        ENDIF
         
-       ALLOCATE(coastalflow(klon), stat = error)
+       ALLOCATE(coastalflow(knon), stat = error)
        IF (error /= 0) THEN
           abort_message='Pb allocation coastalflow'
@@ -470,5 +470,5 @@
        ENDIF
        
-       ALLOCATE(riverflow(klon), stat = error)
+       ALLOCATE(riverflow(knon), stat = error)
        IF (error /= 0) THEN
           abort_message='Pb allocation riverflow'
@@ -674,7 +674,7 @@
   
     INTEGER,INTENT(IN)    :: knon
-    INTEGER,INTENT(IN)    :: knindex(klon)    
+    INTEGER,INTENT(IN)    :: knindex(knon)    
     INTEGER,INTENT(OUT)   :: offset
-    INTEGER,INTENT(OUT)   :: ktindex(klon)
+    INTEGER,INTENT(OUT)   :: ktindex(knon)
     
     INTEGER               :: ktindex_glo(knon_glo)
@@ -782,5 +782,5 @@
     INTEGER, DIMENSION(knon_glo,8)       :: neighbours_glo
     REAL, DIMENSION(klon_glo)            :: pctsrf_glo
-    INTEGER                              :: ktindex(klon)
+    INTEGER                              :: ktindex(knon)
 !
 ! End definition
Index: LMDZ6/trunk/libf/phylmd/surf_land_orchidee_nolic_mod.F90
===================================================================
--- LMDZ6/trunk/libf/phylmd/surf_land_orchidee_nolic_mod.F90	(revision 6014)
+++ LMDZ6/trunk/libf/phylmd/surf_land_orchidee_nolic_mod.F90	(revision 6015)
@@ -131,40 +131,40 @@
     REAL, INTENT(IN)                          :: date0
     INTEGER, INTENT(IN)                       :: knon
-    INTEGER, DIMENSION(klon), INTENT(IN)      :: knindex
+    INTEGER, DIMENSION(knon), INTENT(IN)      :: knindex
     LOGICAL, INTENT(IN)                       :: debut, lafin
     REAL, DIMENSION(klon,nbsrf), INTENT(IN)   :: pctsrf
     REAL, DIMENSION(klon), INTENT(IN)         :: rlon, rlat
-    REAL, DIMENSION(klon), INTENT(IN)         :: yrmu0 ! cosine of solar zenith angle
-    REAL, DIMENSION(klon), INTENT(IN)         :: plev
-    REAL, DIMENSION(klon), INTENT(IN)         :: u1_lay, v1_lay, gustiness
-    REAL, DIMENSION(klon), INTENT(IN)         :: temp_air, spechum
-    REAL, DIMENSION(klon), INTENT(IN)         :: epot_air, ccanopy
-    REAL, DIMENSION(klon), INTENT(IN)         :: tq_cdrag
-    REAL, DIMENSION(klon), INTENT(IN)         :: petAcoef, peqAcoef
-    REAL, DIMENSION(klon), INTENT(IN)         :: petBcoef, peqBcoef
-    REAL, DIMENSION(klon), INTENT(IN)         :: precip_rain, precip_snow
-    REAL, DIMENSION(klon), INTENT(IN)         :: lwdown, swnet, swdown, ps
-    REAL, DIMENSION(klon), INTENT(IN)         :: q2m, t2m
+    REAL, DIMENSION(knon), INTENT(IN)         :: yrmu0 ! cosine of solar zenith angle
+    REAL, DIMENSION(knon), INTENT(IN)         :: plev
+    REAL, DIMENSION(knon), INTENT(IN)         :: u1_lay, v1_lay, gustiness
+    REAL, DIMENSION(knon), INTENT(IN)         :: temp_air, spechum
+    REAL, DIMENSION(knon), INTENT(IN)         :: epot_air, ccanopy
+    REAL, DIMENSION(knon), INTENT(IN)         :: tq_cdrag
+    REAL, DIMENSION(knon), INTENT(IN)         :: petAcoef, peqAcoef
+    REAL, DIMENSION(knon), INTENT(IN)         :: petBcoef, peqBcoef
+    REAL, DIMENSION(knon), INTENT(IN)         :: precip_rain, precip_snow
+    REAL, DIMENSION(knon), INTENT(IN)         :: lwdown, swnet, swdown, ps
+    REAL, DIMENSION(knon), INTENT(IN)         :: q2m, t2m
 #ifdef ISO
-    REAL, DIMENSION(ntraciso,klon), INTENT(IN):: xtprecip_rain, xtprecip_snow
+    REAL, DIMENSION(ntraciso,knon), INTENT(IN):: xtprecip_rain, xtprecip_snow
 #endif
 
 ! Parametres de sortie
 !****************************************************************************************
-    REAL, DIMENSION(klon), INTENT(OUT)        :: evap, fluxsens, fluxlat, qsurf
+    REAL, DIMENSION(knon), INTENT(OUT)        :: evap, fluxsens, fluxlat, qsurf
 !PRSN
 #ifdef ISO
-    REAL, DIMENSION(ntraciso,klon), INTENT(OUT)        :: xtriverflow
-    REAL, DIMENSION(ntraciso,klon), INTENT(OUT)        :: xtcoastalflow
-    REAL, DIMENSION(ntraciso,klon), INTENT(OUT)        :: xtevap
-    REAL, DIMENSION(ntraciso,klon), INTENT(INOUT)      :: Rsol
+    REAL, DIMENSION(ntraciso,knon), INTENT(OUT)        :: xtriverflow
+    REAL, DIMENSION(ntraciso,knon), INTENT(OUT)        :: xtcoastalflow
+    REAL, DIMENSION(ntraciso,knon), INTENT(OUT)        :: xtevap
+    REAL, DIMENSION(ntraciso,knon), INTENT(INOUT)      :: Rsol
 #endif
 !PRSN
-    REAL, DIMENSION(klon), INTENT(OUT)        :: tsol_rad, tsurf_new
-    REAL, DIMENSION(klon), INTENT(OUT)        :: alb1_new, alb2_new
-    REAL, DIMENSION(klon), INTENT(OUT)        :: emis_new, z0m_new, z0h_new
-    REAL, DIMENSION(klon,nvm_lmdz), INTENT(OUT) :: veget
-    REAL, DIMENSION(klon,nvm_lmdz), INTENT(OUT) :: lai
-    REAL, DIMENSION(klon,nvm_lmdz), INTENT(OUT) :: height
+    REAL, DIMENSION(knon), INTENT(OUT)        :: tsol_rad, tsurf_new
+    REAL, DIMENSION(knon), INTENT(OUT)        :: alb1_new, alb2_new
+    REAL, DIMENSION(knon), INTENT(OUT)        :: emis_new, z0m_new, z0h_new
+    REAL, DIMENSION(knon,nvm_lmdz), INTENT(OUT) :: veget
+    REAL, DIMENSION(knon,nvm_lmdz), INTENT(OUT) :: lai
+    REAL, DIMENSION(knon,nvm_lmdz), INTENT(OUT) :: height
 
 ! Local
@@ -172,5 +172,5 @@
     INTEGER                                   :: ij, jj, igrid, ireal, index, nb
     INTEGER                                   :: error
-    REAL, DIMENSION(klon)                     :: swdown_vrai
+    REAL, DIMENSION(knon)                     :: swdown_vrai
     CHARACTER (len = 20)                      :: modname = 'surf_land_orchidee'
     CHARACTER (len = 80)                      :: abort_message
@@ -216,6 +216,6 @@
 
 ! Pb de nomenclature
-    REAL, DIMENSION(klon)                     :: petA_orc, peqA_orc
-    REAL, DIMENSION(klon)                     :: petB_orc, peqB_orc
+    REAL, DIMENSION(knon)                     :: petA_orc, peqA_orc
+    REAL, DIMENSION(knon)                     :: petB_orc, peqB_orc
 ! Pb de correspondances de grilles
     INTEGER, DIMENSION(:), SAVE, ALLOCATABLE  :: ig, jg
@@ -226,5 +226,5 @@
 
 ! Essai cdrag
-    REAL, DIMENSION(klon)                     :: cdrag
+    REAL, DIMENSION(knon)                     :: cdrag
     INTEGER,SAVE                              :: offset
     !$OMP THREADPRIVATE(offset)
@@ -488,5 +488,5 @@
        ENDIF
         
-       ALLOCATE(coastalflow(klon), stat = error)
+       ALLOCATE(coastalflow(knon), stat = error)
        IF (error /= 0) THEN
           abort_message='Pb allocation coastalflow'
@@ -494,5 +494,5 @@
        ENDIF
        
-       ALLOCATE(riverflow(klon), stat = error)
+       ALLOCATE(riverflow(knon), stat = error)
        IF (error /= 0) THEN
           abort_message='Pb allocation riverflow'
@@ -739,7 +739,7 @@
   
     INTEGER,INTENT(IN)    :: knon
-    INTEGER,INTENT(IN)    :: knindex(klon)    
+    INTEGER,INTENT(IN)    :: knindex(knon)    
     INTEGER,INTENT(OUT)   :: offset
-    INTEGER,INTENT(OUT)   :: ktindex(klon)
+    INTEGER,INTENT(OUT)   :: ktindex(knon)
     
     INTEGER               :: ktindex_glo(knon_glo)
@@ -830,5 +830,5 @@
 !****************************************************************************************
     INTEGER, INTENT(IN)                     :: knon
-    INTEGER, DIMENSION(klon), INTENT(IN)    :: knindex
+    INTEGER, DIMENSION(knon), INTENT(IN)    :: knindex
     REAL, DIMENSION(klon), INTENT(IN)       :: pctsrf
     
@@ -847,5 +847,5 @@
     INTEGER, DIMENSION(knon_glo,8)       :: neighbours_glo
     REAL, DIMENSION(klon_glo)            :: pctsrf_glo
-    INTEGER                              :: ktindex(klon)
+    INTEGER                              :: ktindex(knon)
 !
 ! End definition
Index: LMDZ6/trunk/libf/phylmd/surf_land_orchidee_nounstruct_mod.F90
===================================================================
--- LMDZ6/trunk/libf/phylmd/surf_land_orchidee_nounstruct_mod.F90	(revision 6014)
+++ LMDZ6/trunk/libf/phylmd/surf_land_orchidee_nounstruct_mod.F90	(revision 6015)
@@ -187,6 +187,6 @@
 
 ! Pb de nomenclature
-    REAL, DIMENSION(klon)                     :: petA_orc, peqA_orc
-    REAL, DIMENSION(klon)                     :: petB_orc, peqB_orc
+    REAL, DIMENSION(knon)                     :: petA_orc, peqA_orc
+    REAL, DIMENSION(knon)                     :: petB_orc, peqB_orc
 ! Pb de correspondances de grilles
     INTEGER, DIMENSION(:), SAVE, ALLOCATABLE  :: ig, jg
@@ -197,5 +197,5 @@
 
 ! Essai cdrag
-    REAL, DIMENSION(klon)                     :: cdrag
+    REAL, DIMENSION(knon)                     :: cdrag
     INTEGER,SAVE                              :: offset
     !$OMP THREADPRIVATE(offset)
@@ -347,5 +347,5 @@
        ENDDO
      
-       ALLOCATE(coastalflow(klon), stat = error)
+       ALLOCATE(coastalflow(knon), stat = error)
        IF (error /= 0) THEN
           abort_message='Pb allocation coastalflow'
@@ -353,5 +353,5 @@
        ENDIF
        
-       ALLOCATE(riverflow(klon), stat = error)
+       ALLOCATE(riverflow(knon), stat = error)
        IF (error /= 0) THEN
           abort_message='Pb allocation riverflow'