--- trunk/Sources/phylmd/phytrac.f	2016/03/15 17:51:30	181
+++ trunk/Sources/phylmd/phytrac.f	2016/06/08 12:23:41	202
@@ -7,12 +7,14 @@
 
 contains
 
-  SUBROUTINE phytrac(itap, lmt_pas, julien, gmtime, firstcal, lafin, pdtphys, &
-       t_seri, paprs, pplay, pmfu, pmfd, pde_u, pen_d, coefh, fm_therm, &
-       entr_therm, yu1, yv1, ftsol, pctsrf, frac_impa, frac_nucl, da, phi, &
-       mp, upwd, dnwd, tr_seri, zmasse, ncid_startphy, nid_ins, itau_phy)
-
-    ! From phylmd/phytrac.F, version 1.15 2006/02/21 08:08:30 (SVN revision 679)
+  SUBROUTINE phytrac(julien, gmtime, firstcal, lafin, pdtphys, t_seri, paprs, &
+       pplay, pmfu, pmfd, pde_u, pen_d, coefh, fm_therm, entr_therm, yu1, &
+       yv1, ftsol, pctsrf, frac_impa, frac_nucl, da, phi, mp, upwd, dnwd, &
+       tr_seri, zmasse, ncid_startphy)
+
+    ! From phylmd/phytrac.F, version 1.15 2006/02/21 08:08:30 (SVN
+    ! revision 679) and phylmd/write_histrac.h, version 1.9 2006/02/21
+    ! 08:08:30
 
     ! Authors: Fr\'ed\'eric Hourdin, Abderrahmane Idelkadi, Marie-Alice
     ! Foujols, Olivia
@@ -27,15 +29,17 @@
     ! - stockage des moyennes des champs n\'ecessaires en mode traceur off-line 
 
     use abort_gcm_m, only: abort_gcm
-    use clesphys, only: ecrit_tra
-    use clesphys2, only: iflag_con
+    use clesphys2, only: conv_emanuel
     use cltrac_m, only: cltrac
     use cltracrn_m, only: cltracrn
+    USE conf_gcm_m, ONLY: lmt_pas
     use ctherm, only: iflag_thermals
     use cvltr_m, only: cvltr
     use dimens_m, only: llm, nqmx
     use dimphy, only: klon
+    use histwrite_phy_m, only: histwrite_phy
     use indicesol, only: nbsrf
+    use iniadvtrac_m, only: tname
     use initrrnpb_m, only: initrrnpb
     use minmaxqfi_m, only: minmaxqfi
     use netcdf, only: NF90_FILL_float
@@ -49,9 +53,8 @@
     use radiornpb_m, only: radiornpb
     use regr_pr_comb_coefoz_m, only: regr_pr_comb_coefoz
     use SUPHEC_M, only: rg
+    use time_phylmdz, only: itap
 
-    integer, intent(in):: itap ! number of calls to "physiq"
-    integer, intent(in):: lmt_pas ! number of time steps of "physics" per day
     integer, intent(in):: julien !jour julien, 1 <= julien <= 360
     real, intent(in):: gmtime ! heure de la journ\'ee en fraction de jour
     logical, intent(in):: firstcal ! first call to "calfis"
@@ -102,7 +105,7 @@
     real, intent(in):: zmasse(:, :) ! (klon, llm)
     ! (column-density of mass of air in a cell, in kg m-2)
 
-    integer, intent(in):: ncid_startphy, nid_ins, itau_phy
+    integer, intent(in):: ncid_startphy
 
     ! Local:
 
@@ -186,7 +189,6 @@
 
     if (firstcal) then
        print *, 'phytrac: pdtphys = ', pdtphys
-       PRINT *, 'Frequency of tracer output: ecrit_tra = ', ecrit_tra
        inirnpb = .true.
 
        ! Initialisation de certaines variables pour le radon et le plomb 
@@ -230,15 +232,12 @@
     if (convection) then
        ! Calcul de l'effet de la convection
        DO it=1, nqmx - 2
-          if (iflag_con == 2) then
-             ! Tiedke
-             CALL nflxtr(pdtphys, pmfu, pmfd, pde_u, pen_d, paprs, &
-                  tr_seri(:, :, it), d_tr_cv(:, :, it))
-          else
-             ! iflag_con >= 3
-             ! Emanuel
+          if (conv_emanuel) then
              call cvltr(pdtphys, da, phi, mp, paprs, tr_seri(:, :, it), upwd, &
                   dnwd, d_tr_cv(:, :, it))
+          else
+             CALL nflxtr(pdtphys, pmfu, pmfd, pde_u, pen_d, paprs, &
+                  tr_seri(:, :, it), d_tr_cv(:, :, it))
           endif
 
           DO k = 1, llm
@@ -398,54 +397,22 @@
     ENDIF
 
     ! Ecriture des sorties
-    call write_histrac(lessivage, itap, nid_ins)
+    CALL histwrite_phy("zmasse", zmasse)
+    DO it=1, nqmx - 2
+       CALL histwrite_phy(tname(it+2), tr_seri(:, :, it))
+       if (lessivage) THEN
+          CALL histwrite_phy("fl"//tname(it+2), flestottr(:, :, it))
+       endif
+       CALL histwrite_phy("d_tr_th_"//tname(it+2), d_tr_th(:, :, it))
+       CALL histwrite_phy("d_tr_cv_"//tname(it+2), d_tr_cv(:, :, it))
+       CALL histwrite_phy("d_tr_cl_"//tname(it+2), d_tr_cl(:, :, it))
+    ENDDO
 
     if (lafin) then
        call nf95_inq_varid(ncid_restartphy, "trs", varid)
        call nf95_put_var(ncid_restartphy, varid, trs(:, 1))
     endif
 
-  contains
-
-    subroutine write_histrac(lessivage, itap, nid_ins)
-
-      ! From phylmd/write_histrac.h, version 1.9 2006/02/21 08:08:30
-
-      use histwrite_m, only: histwrite
-      use iniadvtrac_m, only: tname
-      use gr_phy_write_3d_m, only: gr_phy_write_3d
-
-      logical, intent(in):: lessivage
-      integer, intent(in):: itap ! number of calls to "physiq"
-      integer, intent(in):: nid_ins
-
-      ! Variables local to the procedure:
-      integer it
-      integer itau_w ! pas de temps ecriture
-
-      !-----------------------------------------------------
-
-      itau_w = itau_phy + itap
-
-      CALL histwrite(nid_ins, "zmasse", itau_w, gr_phy_write_3d(zmasse))
-
-      DO it=1, nqmx - 2
-         CALL histwrite(nid_ins, tname(it+2), itau_w, &
-              gr_phy_write_3d(tr_seri(:, :, it)))
-         if (lessivage) THEN
-            CALL histwrite(nid_ins, "fl"//tname(it+2), itau_w, &
-                 gr_phy_write_3d(flestottr(:, :, it)))
-         endif
-         CALL histwrite(nid_ins, "d_tr_th_"//tname(it+2), itau_w, &
-              gr_phy_write_3d(d_tr_th(:, :, it)))
-         CALL histwrite(nid_ins, "d_tr_cv_"//tname(it+2), itau_w, &
-              gr_phy_write_3d(d_tr_cv(:, :, it)))
-         CALL histwrite(nid_ins, "d_tr_cl_"//tname(it+2), itau_w, &
-              gr_phy_write_3d(d_tr_cl(:, :, it)))
-      ENDDO
-
-    end subroutine write_histrac
-
   END SUBROUTINE phytrac
 
 end module phytrac_m