--- trunk/libf/dyn3d/etat0.f90	2011/07/19 12:54:20	48
+++ trunk/libf/dyn3d/etat0.f90	2012/09/20 13:00:41	66
@@ -17,13 +17,11 @@
 
     ! From "etat0_netcdf.F", version 1.3 2005/05/25 13:10:09
 
-    ! This subroutine creates "mask".
-
     use caldyn0_m, only: caldyn0
     use comconst, only: dtvr, daysec, cpp, kappa
     use comgeom, only: rlatu, rlonv, rlonu, rlatv, aire_2d, apoln, apols, &
          cu_2d, cv_2d
-    use comvert, only: ap, bp, preff, pa
+    use disvert_m, only: ap, bp, preff, pa
     use conf_gcm_m, only: day_step, iphysiq, dayref, anneeref
     use dimens_m, only: iim, jjm, llm, nqmx
     use dimphy, only: zmasq
@@ -35,10 +33,11 @@
     use geopot_m, only: geopot
     use grid_atob, only: grille_m
     use grid_change, only: init_dyn_phy, dyn_phy
-    use histcom, only: histclo
+    use histclo_m, only: histclo
     use indicesol, only: is_oce, is_sic, is_ter, is_lic, epsfra
     use iniadvtrac_m, only: iniadvtrac
     use inidissip_m, only: inidissip
+    use inifilr_m, only: inifilr
     use inigeom_m, only: inigeom
     use netcdf, only: nf90_nowrite
     use netcdf95, only: nf95_open, nf95_close, nf95_get_var, nf95_inq_varid
@@ -52,7 +51,8 @@
     use serre, only: alphax
     USE start_init_orog_m, only: start_init_orog, mask, phis
     use start_init_phys_m, only: start_init_phys
-    use startdyn, only: start_inter_3d, start_init_dyn
+    use startdyn, only: start_init_dyn
+    use start_inter_3d_m, only: start_inter_3d
     use temps, only: itau_phy, annee_ref, day_ref
 
     ! Variables local to the procedure:
@@ -61,8 +61,8 @@
     ! (latitude and longitude of a point of the scalar grid identified
     ! by a simple index, in °)
 
-    REAL, dimension(iim + 1, jjm + 1, llm):: uvent, t3d, tpot
-    REAL vvent(iim + 1, jjm, llm)
+    REAL, dimension(iim + 1, jjm + 1, llm):: ucov, t3d, tpot
+    REAL vcov(iim + 1, jjm, llm)
 
     REAL q3d(iim + 1, jjm + 1, llm, nqmx)
     ! (mass fractions of trace species
@@ -149,19 +149,22 @@
     ! Compute pressure on intermediate levels:
     forall(l = 1: llm + 1) p3d(:, :, l) = ap(l) + bp(l) * psol
     CALL exner_hyb(psol, p3d, pks, pk)
-    IF (MINVAL(pk) == MAXVAL(pk)) stop '"pk" should not be constant'
+    IF (MINVAL(pk) == MAXVAL(pk)) then
+       print *, '"pk" should not be constant'
+       stop 1
+    end IF
 
     pls = preff * (pk / cpp)**(1. / kappa)
     PRINT *, "minval(pls) = ", minval(pls)
     print *, "maxval(pls) = ", maxval(pls)
 
-    call start_inter_3d('U', rlonv, rlatv, pls, uvent)
-    forall (l = 1: llm) uvent(:iim, :, l) = uvent(:iim, :, l) * cu_2d(:iim, :)
-    uvent(iim+1, :, :) = uvent(1, :, :)
-
-    call start_inter_3d('V', rlonu, rlatu(:jjm), pls(:, :jjm, :), vvent)
-    forall (l = 1: llm) vvent(:iim, :, l) = vvent(:iim, :, l) * cv_2d(:iim, :)
-    vvent(iim + 1, :, :) = vvent(1, :, :)
+    call start_inter_3d('U', rlonv, rlatv, pls, ucov)
+    forall (l = 1: llm) ucov(:iim, :, l) = ucov(:iim, :, l) * cu_2d(:iim, :)
+    ucov(iim+1, :, :) = ucov(1, :, :)
+
+    call start_inter_3d('V', rlonu, rlatu(:jjm), pls(:, :jjm, :), vcov)
+    forall (l = 1: llm) vcov(:iim, :, l) = vcov(:iim, :, l) * cv_2d(:iim, :)
+    vcov(iim + 1, :, :) = vcov(1, :, :)
 
     call start_inter_3d('TEMP', rlonu, rlatv, pls, t3d)
     PRINT *,  'minval(t3d) = ', minval(t3d)
@@ -216,9 +219,9 @@
     zpic = pack(zpic_2d, dyn_phy)
     zval = pack(zval_2d, dyn_phy)
 
-    ! On initialise les sous-surfaces:
+    ! On initialise les sous-surfaces.
     ! Lecture du fichier glace de terre pour fixer la fraction de terre 
-    ! et de glace de terre:
+    ! et de glace de terre :
     CALL flininfo("landiceref.nc", iml_lic, jml_lic, llm_tmp, &
          ttm_tmp, fid)
     ALLOCATE(lat_lic(iml_lic, jml_lic))
@@ -229,11 +232,11 @@
     CALL flinopen_nozoom(iml_lic, jml_lic, &
          llm_tmp, lon_lic, lat_lic, lev, ttm_tmp, itaul, date, trash,  &
          fid)
+    CALL flinclo(fid)
     call nf95_open("landiceref.nc", nf90_nowrite, ncid)
     call nf95_inq_varid(ncid, 'landice', varid)
     call nf95_get_var(ncid, varid, fraclic)
     call nf95_close(ncid)
-    CALL flinclo(fid)
 
     ! Interpolation sur la grille T du modèle :
     PRINT *, 'Dimensions de "landice"'
@@ -305,10 +308,10 @@
     annee_ref = anneeref
 
     CALL geopot(ip1jmp1, tpot, pk , pks,  phis, phi)
-    CALL caldyn0(uvent, vvent, tpot, psol, masse, pk, phis, phi, w, pbaru, &
+    CALL caldyn0(ucov, vcov, tpot, psol, masse, pk, phis, phi, w, pbaru, &
          pbarv)
     CALL dynredem0("start.nc", dayref, phis)
-    CALL dynredem1("start.nc", vvent, uvent, tpot, q3d, masse, psol, itau=0)
+    CALL dynredem1("start.nc", vcov, ucov, tpot, q3d, masse, psol, itau=0)
 
     ! Ecriture état initial physique:
     print *, "iphysiq = ", iphysiq