--- trunk/libf/phylmd/phytrac.f90	2008/03/31 12:24:17	7
+++ trunk/libf/phylmd/phytrac.f90	2008/07/25 19:59:34	13
@@ -13,7 +13,7 @@
        nqmax, pdtphys, u, v, t_seri, paprs, pplay, pmfu, pmfd, pen_u, &
        pde_u, pen_d, pde_d, coefh, fm_therm, entr_therm, yu1, yv1, ftsol, &
        pctsrf, frac_impa, frac_nucl, presnivs, pphis, &
-       pphi, albsol, sh, rh, cldfra, rneb, diafra, cldliq, itop_con, &
+       pphi, albsol, rh, cldfra, rneb, diafra, cldliq, itop_con, &
        ibas_con, pmflxr, pmflxs, prfl, psfl, da, phi, mp, upwd, dnwd, tr_seri)
 
     ! From phylmd/phytrac.F, version 1.15 2006/02/21 08:08:30
@@ -33,7 +33,8 @@
     use dimens_m, only: iim, jjm, llm
     use indicesol, only: nbsrf
     use dimphy, only: klon, nbtr
-    use clesphys, only: ecrit_tra, iflag_con
+    use clesphys, only: ecrit_tra
+    use clesphys2, only: iflag_con
     use abort_gcm_m, only: abort_gcm
     use YOMCST, only: rg
     use ctherm, only: iflag_thermals
@@ -66,7 +67,6 @@
 
     real u(klon, llm)
     real v(klon, llm)
-    real sh(klon, llm)     ! humidite specifique
     real rh(klon, llm)     ! humidite relative
     real cldliq(klon, llm) ! eau liquide nuageuse
     real cldfra(klon, llm) ! fraction nuageuse (tous les nuages)
@@ -80,7 +80,9 @@
     real, intent(in):: paprs(klon, llm+1)
     ! (pression pour chaque inter-couche, en Pa)
 
-    real pplay(klon, llm)  ! pression pour le mileu de chaque couche (en Pa)
+    real, intent(in):: pplay(klon, llm)
+    ! (pression pour le mileu de chaque couche, en Pa)
+
     real pphi(klon, llm) ! geopotentiel
     real pphis(klon)
     REAL, intent(in):: presnivs(llm)
@@ -279,10 +281,10 @@
           if (iflag_con.eq.2) then
              ! tiedke
              CALL nflxtr(pdtphys, pmfu, pmfd, pen_u, pde_u, pen_d, pde_d, &
-                  pplay, paprs, tr_seri(1, 1, it), d_tr_cv(1, 1, it))
+                  paprs, tr_seri(1, 1, it), d_tr_cv(1, 1, it))
           else if (iflag_con.eq.3) then
              ! KE
-             call cvltr(pdtphys, da, phi, mp, paprs, pplay, &
+             call cvltr(pdtphys, da, phi, mp, paprs, &
                   tr_seri(1, 1, it), upwd, dnwd, d_tr_cv(1, 1, it))
           endif
 
@@ -778,7 +780,7 @@
 
     use dimens_m, only: llm
     use dimphy, only: klon, nbtr
-    use nrutil, only: assert
+    use numer_rec, only: assert
 
     IMPLICIT none
 
@@ -814,7 +816,7 @@
 
     use dimens_m, only: llm
     use dimphy, only: klon
-    use nrutil, only: assert
+    use numer_rec, only: assert
 
     IMPLICIT none