--- trunk/libf/phylmd/phytrac.f90	2010/06/02 11:01:12	34
+++ trunk/libf/phylmd/phytrac.f90	2012/04/20 14:58:43	61
@@ -8,13 +8,12 @@
 contains
 
   SUBROUTINE phytrac(rnpb, itap, lmt_pas, julien, gmtime, firstcal, lafin, &
-       nq_phys, 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, pphis, pphi, albsol, rh, cldfra, rneb, &
-       diafra, cldliq, pmflxr, pmflxs, prfl, psfl, da, &
-       phi, mp, upwd, dnwd, tr_seri, zmasse)
+       nq_phys, pdtphys, u, 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, pphis, albsol, rh, cldfra, rneb, diafra, cldliq, &
+       pmflxr, pmflxs, prfl, psfl, da, phi, mp, upwd, dnwd, tr_seri, zmasse)
 
-    ! From phylmd/phytrac.F, version 1.15 2006/02/21 08:08:30
+    ! From phylmd/phytrac.F, version 1.15 2006/02/21 08:08:30 (SVN revision 679)
 
     ! Authors: Frédéric Hourdin, Abderrahmane Idelkadi, Marie-Alice
     ! Foujols, Olivia
@@ -24,13 +23,17 @@
     ! les vrais traceurs (en nombre "nbtr", sans la vapeur d'eau ni l'eau
     ! liquide) dans "phytrac".
 
+    ! Modifications pour les traceurs :
+    ! - uniformisation des parametrisations ds phytrac
+    ! - stockage des moyennes des champs necessaires en mode traceur off-line 
+
     use dimens_m, only: llm
     use indicesol, only: nbsrf
     use dimphy, only: klon, nbtr
     use clesphys, only: ecrit_tra
     use clesphys2, only: iflag_con
     use abort_gcm_m, only: abort_gcm
-    use YOMCST, only: rg
+    use SUPHEC_M, only: rg
     use ctherm, only: iflag_thermals
     use regr_pr_comb_coefoz_m, only: regr_pr_comb_coefoz
     use phyetat0_m, only: rlat
@@ -38,7 +41,7 @@
     use ini_histrac_m, only: ini_histrac
     use radiornpb_m, only: radiornpb
     use minmaxqfi_m, only: minmaxqfi
-    use numer_rec, only: assert
+    use nr_util, only: assert
     use press_coefoz_m, only: press_coefoz
 
     logical, intent(in):: rnpb
@@ -56,8 +59,7 @@
     real, intent(inout):: tr_seri(:, :, :) ! (klon, llm, nbtr)
     ! (mass fractions of tracers, excluding water, at mid-layers)
 
-    real u(klon, llm)
-    real v(klon, llm)
+    real, intent(in):: u(klon, llm)
     real rh(klon, llm)     ! humidite relative
     real cldliq(klon, llm) ! eau liquide nuageuse
     real cldfra(klon, llm) ! fraction nuageuse (tous les nuages)
@@ -74,8 +76,7 @@
     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):: pphis(klon)
     logical, intent(in):: firstcal ! first call to "calfis"
     logical, intent(in):: lafin ! fin de la physique
 
@@ -454,7 +455,7 @@
       ! From phylmd/write_histrac.h, version 1.9 2006/02/21 08:08:30
 
       use dimens_m, only: iim, jjm, llm
-      use histcom, only: histsync
+      use histsync_m, only: histsync
       use histwrite_m, only: histwrite
       use temps, only: itau_phy
       use iniadvtrac_m, only: tnom