Index: LMDZ4/branches/LMDZ4-dev/libf/phylmd/clcdrag.F90
===================================================================
--- LMDZ4/branches/LMDZ4-dev/libf/phylmd/clcdrag.F90	(revision 1167)
+++ LMDZ4/branches/LMDZ4-dev/libf/phylmd/clcdrag.F90	(revision 1168)
@@ -93,5 +93,5 @@
            FRIH = AMAX1(1./ (1.+3.*CB*zri(i)*ZSCF), 0.1 )
 !!$  PB          zcfh1(i) = zcdn(i) * FRIH
-           zcfh1(i) = 0.8 * zcdn(i) * FRIH
+           zcfh1(i) = f_cdrag_stable * zcdn(i) * FRIH
            pcfm(i) = zcfm1(i)
            pcfh(i) = zcfh1(i)
@@ -106,5 +106,5 @@
            zcfm2(i) = zcdn(i)*amax1((1.-2.0*cb*zri(i)*zucf),0.1)
 !!$PB            zcfh2(i) = zcdn(i)*amax1((1.-3.0*cb*zri(i)*zucf),0.1)
-           zcfh2(i) = 0.8 * zcdn(i)*amax1((1.-3.0*cb*zri(i)*zucf),0.1)
+           zcfh2(i) = f_cdrag_ter*zcdn(i)*amax1((1.-3.0*cb*zri(i)*zucf),0.1)
            pcfm(i) = zcfm2(i)
            pcfh(i) = zcfh2(i)
@@ -114,5 +114,5 @@
         ENDIF
         zcr = (0.0016/(zcdn(i)*SQRT(zdu2)))*ABS(ztvd-ztsolv)**(1./3.)
-        IF(nsrf.EQ.is_oce) pcfh(i) =0.8* zcdn(i)*(1.0+zcr**1.25)**(1./1.25)
+        IF(nsrf.EQ.is_oce) pcfh(i) =f_cdrag_oce* zcdn(i)*(1.0+zcr**1.25)**(1./1.25)
      ENDIF
   END DO
Index: LMDZ4/branches/LMDZ4-dev/libf/phylmd/clesphys.h
===================================================================
--- LMDZ4/branches/LMDZ4-dev/libf/phylmd/clesphys.h	(revision 1167)
+++ LMDZ4/branches/LMDZ4-dev/libf/phylmd/clesphys.h	(revision 1168)
@@ -35,4 +35,9 @@
 ! Hauteur (imposee) du contenu en eau du sol
            REAL qsol0
+! Frottement au sol (Cdrag)
+       Real f_cdrag_stable,f_cdrag_ter,f_cdrag_oce
+! Rugoro
+       Real f_rugoro
+
 !IM lev_histhf  : niveau sorties 6h
 !IM lev_histday : niveau sorties journalieres
@@ -58,4 +63,5 @@
      &     , top_height, overlap, cdmmax, cdhmax, ksta, ksta_ter        &
      &     , ok_kzmin, fmagic, pmagic                                   &
+     &     , f_cdrag_stable,f_cdrag_ter,f_cdrag_oce,f_rugoro            &
      &     , lev_histhf, lev_histday, lev_histmth                       &
      &     , type_run, ok_isccp, ok_regdyn                              &
Index: LMDZ4/branches/LMDZ4-dev/libf/phylmd/conf_phys.F90
===================================================================
--- LMDZ4/branches/LMDZ4-dev/libf/phylmd/conf_phys.F90	(revision 1167)
+++ LMDZ4/branches/LMDZ4-dev/libf/phylmd/conf_phys.F90	(revision 1168)
@@ -84,4 +84,7 @@
   integer,SAVE        :: iflag_cldcon_omp, ip_ebil_phy_omp
   integer,SAVE        :: iflag_ratqs_omp
+
+  Real,SAVE           :: f_cdrag_stable_omp,f_cdrag_ter_omp,f_cdrag_oce_omp
+  Real,SAVE           :: f_rugoro_omp   
 
 ! Local
@@ -1102,4 +1105,39 @@
 !
 !
+! PARAMETRES CDRAG
+!
+!Config Key  = f_cdrag_stable
+!Config Desc =
+!Config Def  = 0.8
+!Config Help =
+!
+  f_cdrag_stable_omp = 0.8
+  call getin('f_cdrag_stable',f_cdrag_stable_omp)
+!
+!Config Key  = f_cdrag_ter
+!Config Desc =
+!Config Def  = 0.8
+!Config Help =
+!
+  f_cdrag_ter_omp = 0.8
+  call getin('f_cdrag_ter',f_cdrag_ter_omp)
+!
+!Config Key  = f_cdrag_oce
+!Config Desc =
+!Config Def  = 0.8
+!Config Help =
+!
+  f_cdrag_oce_omp = 0.8
+  call getin('f_cdrag_oce',f_cdrag_oce_omp)
+!
+! RUGORO
+!Config Key  = f_rugoro
+!Config Desc =
+!Config Def  = 0.
+!Config Help =
+!
+  f_rugoro_omp = 0.
+  call getin('f_rugoro',f_rugoro_omp)
+
 ! PARAMETERS FOR CONVECTIVE INHIBITION BY TROPOS. DRYNESS
 !
@@ -1337,4 +1375,8 @@
     cvl_corr = cvl_corr_omp
     ok_lic_melt = ok_lic_melt_omp
+    f_cdrag_stable=f_cdrag_stable_omp
+    f_cdrag_ter=f_cdrag_ter_omp
+    f_cdrag_oce=f_cdrag_oce_omp
+    f_rugoro=f_rugoro_omp
     supcrit1 = supcrit1_omp
     supcrit2 = supcrit2_omp
@@ -1460,4 +1502,8 @@
   write(numout,*)' inertie_ice = ', inertie_ice
   write(numout,*)' inertie_sno = ', inertie_sno
+  write(numout,*)' f_cdrag_stable = ',f_cdrag_stable
+  write(numout,*)' f_cdrag_ter = ',f_cdrag_ter
+  write(numout,*)' f_cdrag_oce = ',f_cdrag_oce
+  write(numout,*)' f_rugoro = ',f_rugoro
   write(numout,*)' supcrit1 = ', supcrit1
   write(numout,*)' supcrit2 = ', supcrit2
Index: LMDZ4/branches/LMDZ4-dev/libf/phylmd/phys_output_mod.F90
===================================================================
--- LMDZ4/branches/LMDZ4-dev/libf/phylmd/phys_output_mod.F90	(revision 1167)
+++ LMDZ4/branches/LMDZ4-dev/libf/phylmd/phys_output_mod.F90	(revision 1168)
@@ -483,5 +483,5 @@
   real, dimension(nfiles), save     :: latmax_reg        = (/ 90., 90., 90., 90., 21. /)
 
-   levmax = (/ klev, klev, klev, klev, 17 /)
+   levmax = (/ klev, klev, klev, klev, klev /)
 
    name_files(1) = 'histmth'
@@ -515,4 +515,18 @@
    ecrit_files(5) = ecrit_LES
  
+!! Lectures des parametres de sorties dans physiq.def
+   call getin('phys_out_regfkey',ok_reglim)
+   call getin('phys_out_lonmin',lonmin_reg)
+   call getin('phys_out_lonmax',lonmax_reg)
+   call getin('phys_out_latmin',latmin_reg)
+   call getin('phys_out_latmax',latmax_reg)
+   call getin('phys_out_levmin',levmin)
+   call getin('phys_out_levmax',levmax)
+   call getin('phys_out_filenames',name_files)
+   call getin('phys_out_filetypes',type_ecri)
+   call getin('phys_out_filekeys',clef_files)
+   call getin('phys_out_filelevels',lev_files)
+   call getin('phys_out_filetimesteps',ecrit_files)
+
 !!!!!!!!!!!!!!!!!!!!!!! Boucle sur les fichiers !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 ! Appel de histbeg et histvert pour creer le fichier et les niveaux verticaux !!
Index: LMDZ4/branches/LMDZ4-dev/libf/phylmd/physiq.F
===================================================================
--- LMDZ4/branches/LMDZ4-dev/libf/phylmd/physiq.F	(revision 1167)
+++ LMDZ4/branches/LMDZ4-dev/libf/phylmd/physiq.F	(revision 1168)
@@ -1,3 +1,2 @@
-c
 c#define IO_DEBUG
 
@@ -1384,9 +1383,10 @@
          ENDIF
 
-           rugoro=0.
+           DO i=1,klon
+             rugoro(i) = f_rugoro * MAX(1.0e-05, zstd(i)*zsig(i)/2.0)
+           ENDDO
+
 c34EK
          IF (ok_orodr) THEN
-
-           rugoro=0.
 
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
