--- trunk/Sources/phylmd/phytrac.f	2015/07/16 17:39:10	156
+++ trunk/Sources/phylmd/phytrac.f	2015/07/21 15:29:52	159
@@ -9,8 +9,8 @@
 
   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, pphis, da, &
-       phi, mp, upwd, dnwd, tr_seri, zmasse)
+       entr_therm, yu1, yv1, ftsol, pctsrf, frac_impa, frac_nucl, da, phi, &
+       mp, upwd, dnwd, tr_seri, zmasse, ncid_startphy, nid_ins)
 
     ! From phylmd/phytrac.F, version 1.15 2006/02/21 08:08:30 (SVN revision 679)
 
@@ -36,13 +36,14 @@
     use dimens_m, only: llm, nqmx
     use dimphy, only: klon
     use indicesol, only: nbsrf
-    use ini_histrac_m, only: ini_histrac
     use initrrnpb_m, only: initrrnpb
     use minmaxqfi_m, only: minmaxqfi
+    use netcdf95, only: nf95_inq_varid, nf95_get_var, nf95_put_var
     use nflxtr_m, only: nflxtr
     use nr_util, only: assert
     use o3_chem_m, only: o3_chem
     use phyetat0_m, only: rlat
+    use phyredem0_m, only: ncid_restartphy
     use press_coefoz_m, only: press_coefoz
     use radiornpb_m, only: radiornpb
     use regr_pr_comb_coefoz_m, only: regr_pr_comb_coefoz
@@ -89,8 +90,6 @@
     REAL frac_impa(klon, llm) ! fraction d'aerosols impactes
     REAL frac_nucl(klon, llm) ! fraction d'aerosols nuclees
 
-    real, intent(in):: pphis(klon)
-
     ! Kerry Emanuel
     real, intent(in):: da(klon, llm), phi(klon, llm, llm), mp(klon, llm)
     REAL, intent(in):: upwd(klon, llm) ! saturated updraft mass flux
@@ -102,7 +101,9 @@
     real, intent(in):: zmasse(:, :) ! (klon, llm)
     ! (column-density of mass of air in a cell, in kg m-2)
 
-    ! Variables local to the procedure:
+    integer, intent(in):: ncid_startphy, nid_ins
+
+    ! Local:
 
     integer nsplit
 
@@ -134,7 +135,6 @@
     SAVE scavtr
 
     CHARACTER itn
-    INTEGER, save:: nid_tra
 
     ! nature du traceur
 
@@ -170,7 +170,7 @@
     ! ! dans chaque couche 
 
     real ztra_th(klon, llm)
-    integer isplit
+    integer isplit, varid
 
     ! Controls:
     logical:: couchelimite = .true.
@@ -188,18 +188,12 @@
        PRINT *, 'Frequency of tracer output: ecrit_tra = ', ecrit_tra
        inirnpb = .true.
 
-       ! Initialisation des sorties :
-       call ini_histrac(nid_tra, pdtphys, nqmx - 2, lessivage)
-
        ! Initialisation de certaines variables pour le radon et le plomb 
        ! Initialisation du traceur dans le sol (couche limite radonique)
-       trs(:, :) = 0.
+       trs(:, 2:) = 0.
 
-       open (unit=99, file='starttrac', status='old', err=999, &
-            form='formatted')
-       read(unit=99, fmt=*) (trs(i, 1), i=1, klon)
-999    continue
-       close(unit=99)
+       call nf95_inq_varid(ncid_startphy, "trs", varid)
+       call nf95_get_var(ncid_startphy, varid, trs(:, 1))
 
        ! Initialisation de la fraction d'aerosols lessivee
 
@@ -400,21 +394,16 @@
     ENDIF
 
     ! Ecriture des sorties
-    call write_histrac(lessivage, itap, nid_tra)
+    call write_histrac(lessivage, itap, nid_ins)
 
     if (lafin) then
-       print *, "C'est la fin de la physique."
-       open(unit=99, file='restarttrac', form='formatted')
-       do i=1, klon
-          write(unit=99, fmt=*) trs(i, 1)
-       enddo
-       PRINT *, 'Ecriture du fichier restarttrac'
-       close(unit=99)
+       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_tra)
+    subroutine write_histrac(lessivage, itap, nid_ins)
 
       ! From phylmd/write_histrac.h, version 1.9 2006/02/21 08:08:30
 
@@ -423,50 +412,39 @@
       use histwrite_m, only: histwrite
       use temps, only: itau_phy
       use iniadvtrac_m, only: tname
-      use comgeomphy, only: airephy
       use dimphy, only: klon
       use grid_change, only: gr_phy_write_2d
       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_tra
+      integer, intent(in):: nid_ins
 
       ! Variables local to the procedure:
       integer it
       integer itau_w ! pas de temps ecriture
-      logical, parameter:: ok_sync = .true.
 
       !-----------------------------------------------------
 
       itau_w = itau_phy + itap
 
-      CALL histwrite(nid_tra, "phis", itau_w, gr_phy_write_2d(pphis))
-      CALL histwrite(nid_tra, "aire", itau_w, gr_phy_write_2d(airephy))
-      CALL histwrite(nid_tra, "zmasse", itau_w, gr_phy_write_3d(zmasse))
+      CALL histwrite(nid_ins, "zmasse", itau_w, gr_phy_write_3d(zmasse))
 
       DO it=1, nqmx - 2
-         CALL histwrite(nid_tra, tname(it+2), itau_w, &
+         CALL histwrite(nid_ins, tname(it+2), itau_w, &
               gr_phy_write_3d(tr_seri(:, :, it)))
          if (lessivage) THEN
-            CALL histwrite(nid_tra, "fl"//tname(it+2), itau_w, &
+            CALL histwrite(nid_ins, "fl"//tname(it+2), itau_w, &
                  gr_phy_write_3d(flestottr(:, :, it)))
          endif
-         CALL histwrite(nid_tra, "d_tr_th_"//tname(it+2), itau_w, &
+         CALL histwrite(nid_ins, "d_tr_th_"//tname(it+2), itau_w, &
               gr_phy_write_3d(d_tr_th(:, :, it)))
-         CALL histwrite(nid_tra, "d_tr_cv_"//tname(it+2), itau_w, &
+         CALL histwrite(nid_ins, "d_tr_cv_"//tname(it+2), itau_w, &
               gr_phy_write_3d(d_tr_cv(:, :, it)))
-         CALL histwrite(nid_tra, "d_tr_cl_"//tname(it+2), itau_w, &
+         CALL histwrite(nid_ins, "d_tr_cl_"//tname(it+2), itau_w, &
               gr_phy_write_3d(d_tr_cl(:, :, it)))
       ENDDO
 
-      CALL histwrite(nid_tra, "pplay", itau_w, gr_phy_write_3d(pplay))
-      CALL histwrite(nid_tra, "T", itau_w, gr_phy_write_3d(t_seri))
-
-      if (ok_sync) then
-         call histsync(nid_tra)
-      endif
-
     end subroutine write_histrac
 
   END SUBROUTINE phytrac