--- trunk/Sources/phylmd/phytrac.f	2016/02/05 16:02:34	175
+++ trunk/Sources/phylmd/phytrac.f	2016/05/09 19:56:28	191
@@ -7,10 +7,10 @@
 
 contains
 
-  SUBROUTINE phytrac(itap, lmt_pas, julien, gmtime, firstcal, lafin, pdtphys, &
+  SUBROUTINE phytrac(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)
+       mp, upwd, dnwd, tr_seri, zmasse, ncid_startphy)
 
     ! From phylmd/phytrac.F, version 1.15 2006/02/21 08:08:30 (SVN revision 679)
 
@@ -28,7 +28,7 @@
 
     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 ctherm, only: iflag_thermals
@@ -49,8 +49,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
@@ -102,7 +102,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:
 
@@ -230,14 +230,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 if (iflag_con == 3) then
-             ! 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
@@ -397,7 +395,7 @@
     ENDIF
 
     ! Ecriture des sorties
-    call write_histrac(lessivage, itap, nid_ins)
+    call write_histrac(lessivage)
 
     if (lafin) then
        call nf95_inq_varid(ncid_restartphy, "trs", varid)
@@ -406,21 +404,17 @@
 
   contains
 
-    subroutine write_histrac(lessivage, itap, nid_ins)
+    subroutine write_histrac(lessivage)
 
       ! From phylmd/write_histrac.h, version 1.9 2006/02/21 08:08:30
 
-      use dimens_m, only: iim, jjm, llm
-      use histsync_m, only: histsync
+      use gr_phy_write_m, only: gr_phy_write
       use histwrite_m, only: histwrite
       use iniadvtrac_m, only: tname
-      use dimphy, only: klon
-      use grid_change, only: gr_phy_write_2d
-      use gr_phy_write_3d_m, only: gr_phy_write_3d
+      use ini_histins_m, only: nid_ins
+      use phyetat0_m, only: itau_phy
 
       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
@@ -430,21 +424,21 @@
 
       itau_w = itau_phy + itap
 
-      CALL histwrite(nid_ins, "zmasse", itau_w, gr_phy_write_3d(zmasse))
+      CALL histwrite(nid_ins, "zmasse", itau_w, gr_phy_write(zmasse))
 
       DO it=1, nqmx - 2
          CALL histwrite(nid_ins, tname(it+2), itau_w, &
-              gr_phy_write_3d(tr_seri(:, :, it)))
+              gr_phy_write(tr_seri(:, :, it)))
          if (lessivage) THEN
             CALL histwrite(nid_ins, "fl"//tname(it+2), itau_w, &
-                 gr_phy_write_3d(flestottr(:, :, it)))
+                 gr_phy_write(flestottr(:, :, it)))
          endif
          CALL histwrite(nid_ins, "d_tr_th_"//tname(it+2), itau_w, &
-              gr_phy_write_3d(d_tr_th(:, :, it)))
+              gr_phy_write(d_tr_th(:, :, it)))
          CALL histwrite(nid_ins, "d_tr_cv_"//tname(it+2), itau_w, &
-              gr_phy_write_3d(d_tr_cv(:, :, it)))
+              gr_phy_write(d_tr_cv(:, :, it)))
          CALL histwrite(nid_ins, "d_tr_cl_"//tname(it+2), itau_w, &
-              gr_phy_write_3d(d_tr_cl(:, :, it)))
+              gr_phy_write(d_tr_cl(:, :, it)))
       ENDDO
 
     end subroutine write_histrac