--- trunk/libf/phylmd/physiq.f90	2010/06/08 15:37:21	35
+++ trunk/libf/phylmd/physiq.f90	2011/02/22 13:49:36	40
@@ -31,6 +31,7 @@
          ok_kzmin
     use clesphys2, only: iflag_con, ok_orolf, ok_orodr, nbapp_rad, &
          cycle_diurne, new_oliq, soil_model
+    use clmain_m, only: clmain
     use comgeomphy
     use conf_gcm_m, only: raz_date, offline
     use conf_phys_m, only: conf_phys
@@ -58,8 +59,8 @@
     use radepsi
     use radopt
     use temps, only: itau_phy, day_ref, annee_ref
-    use yoethf
-    use YOMCST, only: rcpd, rtt, rlvtt, rg, ra, rsigma, retv, romega
+    use yoethf_m
+    use SUPHEC_M, only: rcpd, rtt, rlvtt, rg, ra, rsigma, retv, romega
 
     ! Declaration des constantes et des fonctions thermodynamiques :
     use fcttre, only: thermcep, foeew, qsats, qsatl
@@ -404,7 +405,6 @@
 
     EXTERNAL alboc     ! calculer l'albedo sur ocean
     EXTERNAL ajsec     ! ajustement sec
-    EXTERNAL clmain    ! couche limite 
     !KE43
     EXTERNAL conema3  ! convect4.3
     EXTERNAL fisrtilp  ! schema de condensation a grande echelle (pluie)
@@ -1035,27 +1035,20 @@
 
     fder = dlw
 
-    CALL clmain(pdtphys, itap, date0, pctsrf, pctsrf_new, &
-         t_seri, q_seri, u_seri, v_seri, &
-         julien, rmu0, co2_ppm,  &
-         ok_veget, ocean, npas, nexca, ftsol, &
-         soil_model, cdmmax, cdhmax, &
-         ksta, ksta_ter, ok_kzmin, ftsoil, qsol,  &
-         paprs, pplay, fsnow, fqsurf, fevap, falbe, falblw, &
-         fluxlat, rain_fall, snow_fall, &
-         fsolsw, fsollw, sollwdown, fder, &
-         rlon, rlat, cuphy, cvphy, frugs, &
-         firstcal, lafin, agesno, rugoro, &
-         d_t_vdf, d_q_vdf, d_u_vdf, d_v_vdf, d_ts, &
-         fluxt, fluxq, fluxu, fluxv, cdragh, cdragm, &
-         q2, dsens, devap, &
-         ycoefh, yu1, yv1, t2m, q2m, u10m, v10m, &
-         pblh, capCL, oliqCL, cteiCL, pblT, &
-         therm, trmb1, trmb2, trmb3, plcl, &
-         fqcalving, ffonte, run_off_lic_0, &
-         fluxo, fluxg, tslab, seaice)
+    ! Couche limite:
 
-    !XXX Incrementation des flux
+    CALL clmain(pdtphys, itap, date0, pctsrf, pctsrf_new, t_seri, q_seri, &
+         u_seri, v_seri, julien, rmu0, co2_ppm, ok_veget, ocean, npas, nexca, &
+         ftsol, soil_model, cdmmax, cdhmax, ksta, ksta_ter, ok_kzmin, ftsoil, &
+         qsol, paprs, pplay, fsnow, fqsurf, fevap, falbe, falblw, fluxlat, &
+         rain_fall, snow_fall, fsolsw, fsollw, sollwdown, fder, rlon, rlat, &
+         cuphy, cvphy, frugs, firstcal, lafin, agesno, rugoro, d_t_vdf, &
+         d_q_vdf, d_u_vdf, d_v_vdf, d_ts, fluxt, fluxq, fluxu, fluxv, cdragh, &
+         cdragm, q2, dsens, devap, ycoefh, yu1, yv1, t2m, q2m, u10m, v10m, &
+         pblh, capCL, oliqCL, cteiCL, pblT, therm, trmb1, trmb2, trmb3, plcl, &
+         fqcalving, ffonte, run_off_lic_0, fluxo, fluxg, tslab, seaice)
+
+    ! Incrémentation des flux
 
     zxfluxt=0.
     zxfluxq=0.