--- trunk/Sources/phylmd/phyetat0.f	2016/02/05 16:02:34	175
+++ trunk/Sources/phylmd/phyetat0.f	2017/03/28 12:46:28	215
@@ -8,33 +8,38 @@
   ! latitude and longitude of a point of the scalar grid identified
   ! by a simple index, in degrees
 
+  integer, save:: itau_phy
+
   private klon
 
 contains
 
-  SUBROUTINE phyetat0(pctsrf, tsol, tsoil, qsurf, qsol, snow, albe, evap, &
+  SUBROUTINE phyetat0(pctsrf, ftsol, ftsoil, qsurf, qsol, snow, albe, evap, &
        rain_fall, snow_fall, solsw, sollw, fder, radsol, frugs, agesno, zmea, &
        zstd, zsig, zgam, zthe, zpic, zval, t_ancien, q_ancien, ancien_ok, &
-       rnebcon, ratqs, clwcon, run_off_lic_0, sig1, w01, ncid_startphy, &
-       itau_phy)
+       rnebcon, ratqs, clwcon, run_off_lic_0, sig1, w01, ncid_startphy)
 
     ! From phylmd/phyetat0.F, version 1.4 2005/06/03 10:03:07
     ! Author: Z.X. Li (LMD/CNRS)
     ! Date: 1993/08/18
     ! Objet : lecture de l'état initial pour la physique
 
+    USE conf_gcm_m, ONLY: raz_date
     use dimphy, only: zmasq, klev
     USE dimsoil, ONLY : nsoilmx
     USE indicesol, ONLY : epsfra, is_lic, is_oce, is_sic, is_ter, nbsrf
     use netcdf, only: nf90_global, nf90_inq_varid, NF90_NOERR, NF90_NOWRITE
-    use netcdf95, only: nf95_close, nf95_get_att, nf95_get_var, &
-         nf95_inq_varid, nf95_inquire_variable, NF95_OPEN
+    use netcdf95, only: nf95_get_att, nf95_get_var, nf95_inq_varid, &
+         nf95_inquire_variable, NF95_OPEN
 
     REAL, intent(out):: pctsrf(klon, nbsrf)
-    REAL, intent(out):: tsol(klon, nbsrf)
-    REAL, intent(out):: tsoil(klon, nsoilmx, nbsrf)
+    REAL, intent(out):: ftsol(klon, nbsrf)
+    REAL, intent(out):: ftsoil(klon, nsoilmx, nbsrf)
     REAL, intent(out):: qsurf(klon, nbsrf)
-    REAL, intent(out):: qsol(:) ! (klon)
+
+    REAL, intent(out):: qsol(:)
+    ! (klon) column-density of water in soil, in kg m-2
+
     REAL, intent(out):: snow(klon, nbsrf)
     REAL, intent(out):: albe(klon, nbsrf)
     REAL, intent(out):: evap(klon, nbsrf)
@@ -62,7 +67,7 @@
     real, intent(out):: w01(klon, klev) 
     ! vertical velocity within adiabatic updraft
 
-    integer, intent(out):: ncid_startphy, itau_phy
+    integer, intent(out):: ncid_startphy
 
     ! Local:
     REAL fractint(klon)
@@ -76,7 +81,11 @@
     ! Fichier contenant l'état initial :
     call NF95_OPEN("startphy.nc", NF90_NOWRITE, ncid_startphy)
 
-    call nf95_get_att(ncid_startphy, nf90_global, "itau_phy", itau_phy)
+    IF (raz_date) then
+       itau_phy = 0
+    else
+       call nf95_get_att(ncid_startphy, nf90_global, "itau_phy", itau_phy)
+    end IF
 
     ! Lecture des latitudes (coordonnees):
 
@@ -140,17 +149,15 @@
     fractint = pctsrf(:, is_ter) + pctsrf(:, is_lic)
     DO i = 1 , klon
        IF ( abs(fractint(i) - zmasq(i) ) > EPSFRA ) THEN
-          WRITE(*, *) 'phyetat0: attention fraction terre pas ', &
-               'coherente ', i, zmasq(i), pctsrf(i, is_ter) &
-               , pctsrf(i, is_lic)
+          print *, 'phyetat0: attention fraction terre pas ', &
+               'coherente ', i, zmasq(i), pctsrf(i, is_ter), pctsrf(i, is_lic)
        ENDIF
     END DO
     fractint = pctsrf(:, is_oce) + pctsrf(:, is_sic)
     DO i = 1 , klon
        IF ( abs( fractint(i) - (1. - zmasq(i))) > EPSFRA ) THEN
-          WRITE(*, *) 'phyetat0 attention fraction ocean pas ', &
-               'coherente ', i, zmasq(i) , pctsrf(i, is_oce) &
-               , pctsrf(i, is_sic)
+          print *, 'phyetat0 attention fraction ocean pas ', &
+               'coherente ', i, zmasq(i) , pctsrf(i, is_oce), pctsrf(i, is_sic)
        ENDIF
     END DO
 
@@ -158,25 +165,23 @@
     call NF95_INQ_VARID(ncid_startphy, "TS", varid)
     call nf95_inquire_variable(ncid_startphy, varid, ndims = ndims)
     if (ndims == 2) then
-       call NF95_GET_VAR(ncid_startphy, varid, tsol)
+       call NF95_GET_VAR(ncid_startphy, varid, ftsol)
     else
        print *, "Found only one surface type for soil temperature."
-       call nf95_get_var(ncid_startphy, varid, tsol(:, 1))
-       tsol(:, 2:nbsrf) = spread(tsol(:, 1), dim = 2, ncopies = nbsrf - 1)
+       call nf95_get_var(ncid_startphy, varid, ftsol(:, 1))
+       ftsol(:, 2:nbsrf) = spread(ftsol(:, 1), dim = 2, ncopies = nbsrf - 1)
     end if
 
     ! Lecture des temperatures du sol profond:
 
     call NF95_INQ_VARID(ncid_startphy, 'Tsoil', varid)
-    call NF95_GET_VAR(ncid_startphy, varid, tsoil)
+    call NF95_GET_VAR(ncid_startphy, varid, ftsoil)
 
     ! Lecture de l'humidite de l'air juste au dessus du sol:
 
     call NF95_INQ_VARID(ncid_startphy, "QS", varid)
     call nf95_get_var(ncid_startphy, varid, qsurf)
 
-    ! Eau dans le sol (pour le modele de sol "bucket")
-
     ierr = NF90_INQ_VARID(ncid_startphy, "QSOL", varid)
     IF (ierr == NF90_NOERR) THEN
        call nf95_get_var(ncid_startphy, varid, qsol)