--- trunk/Sources/phylmd/clmain.f	2015/07/08 17:03:45	155
+++ trunk/Sources/phylmd/clmain.f	2016/03/11 18:47:26	178
@@ -5,13 +5,13 @@
 contains
 
   SUBROUTINE clmain(dtime, itap, pctsrf, pctsrf_new, t, q, u, v, jour, rmu0, &
-       co2_ppm, ts, cdmmax, cdhmax, ksta, ksta_ter, ok_kzmin, ftsoil, qsol, &
+       ts, cdmmax, cdhmax, ksta, ksta_ter, ok_kzmin, ftsoil, qsol, &
        paprs, pplay, snow, qsurf, evap, falbe, fluxlat, rain_fall, snow_f, &
        solsw, sollw, fder, rlat, rugos, debut, agesno, rugoro, d_t, d_q, d_u, &
        d_v, d_ts, flux_t, flux_q, flux_u, flux_v, cdragh, cdragm, q2, &
        dflux_t, dflux_q, ycoefh, zu1, zv1, t2m, q2m, u10m, v10m, pblh, capcl, &
        oliqcl, cteicl, pblt, therm, trmb1, trmb2, trmb3, plcl, fqcalving, &
-       ffonte, run_off_lic_0, flux_o, flux_g, tslab)
+       ffonte, run_off_lic_0)
 
     ! From phylmd/clmain.F, version 1.6, 2005/11/16 14:47:19
     ! Author: Z. X. Li (LMD/CNRS), date: 1993/08/18
@@ -33,7 +33,6 @@
     use coefkzmin_m, only: coefkzmin
     USE conf_gcm_m, ONLY: prt_level
     USE conf_phys_m, ONLY: iflag_pbl
-    USE dimens_m, ONLY: iim, jjm
     USE dimphy, ONLY: klev, klon, zmasq
     USE dimsoil, ONLY: nsoilmx
     use hbtm_m, only: hbtm
@@ -56,7 +55,6 @@
     REAL, INTENT(IN):: u(klon, klev), v(klon, klev) ! vitesse
     INTEGER, INTENT(IN):: jour ! jour de l'annee en cours
     REAL, intent(in):: rmu0(klon) ! cosinus de l'angle solaire zenithal     
-    REAL, intent(in):: co2_ppm ! taux CO2 atmosphere
     REAL, INTENT(IN):: ts(klon, nbsrf) ! temperature du sol (en Kelvin)
     REAL, INTENT(IN):: cdmmax, cdhmax ! seuils cdrm, cdrh
     REAL, INTENT(IN):: ksta, ksta_ter
@@ -149,19 +147,8 @@
     !           hauteur de neige, en kg/m2/s
     REAL run_off_lic_0(klon)
 
-    REAL flux_o(klon), flux_g(klon)
-    !IM "slab" ocean
-    ! flux_g---output-R-  flux glace (pour OCEAN='slab  ')
-    ! flux_o---output-R-  flux ocean (pour OCEAN='slab  ')
-
-    REAL tslab(klon)
-    ! tslab-in/output-R temperature du slab ocean (en Kelvin) 
-    ! uniqmnt pour slab
-
     ! Local:
 
-    REAL y_flux_o(klon), y_flux_g(klon)
-    real ytslab(klon)
     REAL y_fqcalving(klon), y_ffonte(klon)
     real y_run_off_lic_0(klon)
 
@@ -185,7 +172,6 @@
     REAL ysnow_f(klon)
     ! solid water mass flux (kg/m2/s), positive down
 
-    REAL ysollw(klon), ysolsw(klon)
     REAL yfder(klon)
     REAL yrugm(klon), yrads(klon), yrugoro(klon)
 
@@ -224,11 +210,6 @@
 
     REAL yt2m(klon), yq2m(klon), yu10m(klon)
     REAL yustar(klon)
-    ! -- LOOP
-    REAL yu10mx(klon)
-    REAL yu10my(klon)
-    REAL ywindsp(klon)
-    ! -- LOOP
 
     REAL yt10m(klon), yq10m(klon)
     REAL ypblh(klon)
@@ -283,8 +264,6 @@
     yrain_f = 0.
     ysnow_f = 0.
     yfder = 0.
-    ysolsw = 0.
-    ysollw = 0.
     yrugos = 0.
     yu1 = 0.
     yv1 = 0.
@@ -303,9 +282,6 @@
     y_dflux_q = 0.
     ytsoil = 999999.
     yrugoro = 0.
-    yu10mx = 0.
-    yu10my = 0.
-    ywindsp = 0.
     d_ts = 0.
     yfluxlat = 0.
     flux_t = 0.
@@ -346,7 +322,6 @@
              i = ni(j)
              ypct(j) = pctsrf(i, nsrf)
              yts(j) = ts(i, nsrf)
-             ytslab(i) = tslab(i)
              ysnow(j) = snow(i, nsrf)
              yqsurf(j) = qsurf(i, nsrf)
              yalb(j) = falbe(i, nsrf)
@@ -354,18 +329,13 @@
              ysnow_f(j) = snow_f(i)
              yagesno(j) = agesno(i, nsrf)
              yfder(j) = fder(i)
-             ysolsw(j) = solsw(i, nsrf)
-             ysollw(j) = sollw(i, nsrf)
              yrugos(j) = rugos(i, nsrf)
              yrugoro(j) = rugoro(i)
              yu1(j) = u1lay(i)
              yv1(j) = v1lay(i)
-             yrads(j) = ysolsw(j) + ysollw(j)
+             yrads(j) = solsw(i, nsrf) + sollw(i, nsrf)
              ypaprs(j, klev+1) = paprs(i, klev+1)
              y_run_off_lic_0(j) = run_off_lic_0(i)
-             yu10mx(j) = u10m(i, nsrf)
-             yu10my(j) = v10m(i, nsrf)
-             ywindsp(j) = sqrt(yu10mx(j)*yu10mx(j)+yu10my(j)*yu10my(j))
           END DO
 
           ! For continent, copy soil water content
@@ -473,13 +443,12 @@
 
           ! calculer la diffusion de "q" et de "h"
           CALL clqh(dtime, itap, jour, debut, rlat, knon, nsrf, ni(:knon), &
-               pctsrf, ytsoil, yqsol, rmu0, co2_ppm, yrugos, yrugoro, yu1, &
+               pctsrf, ytsoil, yqsol, rmu0, yrugos, yrugoro, yu1, &
                yv1, coefh(:knon, :), yt, yq, yts, ypaprs, ypplay, ydelp, &
                yrads, yalb(:knon), ysnow, yqsurf, yrain_f, ysnow_f, yfder, &
-               ysolsw, yfluxlat, pctsrf_new, yagesno, y_d_t, y_d_q, &
+               yfluxlat, pctsrf_new, yagesno(:knon), y_d_t, y_d_q, &
                y_d_ts(:knon), yz0_new, y_flux_t, y_flux_q, y_dflux_t, &
-               y_dflux_q, y_fqcalving, y_ffonte, y_run_off_lic_0, y_flux_o, &
-               y_flux_g)
+               y_dflux_q, y_fqcalving, y_ffonte, y_run_off_lic_0)
 
           ! calculer la longueur de rugosite sur ocean
           yrugm = 0.
@@ -630,31 +599,6 @@
                 q2(i, k, nsrf) = yq2(j, k)
              END DO
           END DO
-          !IM "slab" ocean
-          IF (nsrf == is_oce) THEN
-             DO j = 1, knon
-                ! on projette sur la grille globale
-                i = ni(j)
-                IF (pctsrf_new(i, is_oce)>epsfra) THEN
-                   flux_o(i) = y_flux_o(j)
-                ELSE
-                   flux_o(i) = 0.
-                END IF
-             END DO
-          END IF
-
-          IF (nsrf == is_sic) THEN
-             DO j = 1, knon
-                i = ni(j)
-                ! On pond\`ere lorsque l'on fait le bilan au sol :
-                IF (pctsrf_new(i, is_sic)>epsfra) THEN
-                   flux_g(i) = y_flux_g(j)
-                ELSE
-                   flux_g(i) = 0.
-                END IF
-             END DO
-
-          END IF
        end IF if_knon
     END DO loop_surface