--- trunk/libf/dyn3d/etat0.f90	2010/04/01 09:07:28	30
+++ trunk/libf/dyn3d/etat0.f90	2011/04/08 12:43:31	43
@@ -20,7 +20,7 @@
     ! This subroutine creates "mask".
 
     use caldyn0_m, only: caldyn0
-    use comconst, only: dtvr, daysec, cpp, kappa, pi
+    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
@@ -31,14 +31,17 @@
     use dynredem0_m, only: dynredem0
     use dynredem1_m, only: dynredem1
     use exner_hyb_m, only: exner_hyb
+    USE flincom, only: flinclo, flinopen_nozoom, flininfo
+    use flinget_m, only: flinget
+    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 indicesol, only: is_oce, is_sic, is_ter, is_lic, epsfra
     use iniadvtrac_m, only: iniadvtrac
     use inidissip_m, only: inidissip
     use inigeom_m, only: inigeom
-    USE flincom, only: flinget, flinclo, flinopen_nozoom, flininfo
-    use histcom, only: histclo
+    use nr_util, only: pi
     use paramet_m, only: ip1jm, ip1jmp1
     use phyredem_m, only: phyredem
     use pressure_var, only: pls, p3d
@@ -47,7 +50,7 @@
     use regr_pr_o3_m, only: regr_pr_o3
     use serre, only: alphax
     USE start_init_orog_m, only: start_init_orog, mask, phis
-    use start_init_phys_m, only: qsol_2d
+    use start_init_phys_m, only: start_init_phys
     use startdyn, only: start_inter_3d, start_init_dyn
     use temps, only: itau_phy, annee_ref, day_ref
 
@@ -80,7 +83,7 @@
     REAL rugmer(klon)
     real, dimension(iim + 1, jjm + 1):: relief, zstd_2d, zsig_2d, zgam_2d
     real, dimension(iim + 1, jjm + 1):: zthe_2d, zpic_2d, zval_2d
-    real, dimension(iim + 1, jjm + 1):: tsol_2d, psol
+    real, dimension(iim + 1, jjm + 1):: tsol_2d, qsol_2d, psol
     REAL zmea(klon), zstd(klon)
     REAL zsig(klon), zgam(klon)
     REAL zthe(klon)
@@ -113,11 +116,11 @@
 
     print *, "Call sequence information: etat0"
 
-    ! Construct a grid:
-
     dtvr = daysec / real(day_step)
     print *, 'dtvr = ', dtvr
 
+    ! Construct a grid:
+
     pa = 5e4
     CALL iniconst
     CALL inigeom
@@ -139,16 +142,17 @@
     zmasq = pack(mask, dyn_phy)
     PRINT *, 'Masque construit'
 
-    CALL start_init_dyn(tsol_2d, psol) ! also compute "qsol_2d"
+    call start_init_phys(tsol_2d, qsol_2d)
+    CALL start_init_dyn(tsol_2d, psol)
 
     ! 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'
 
-    pls(:, :, :) = preff * (pk(:, :, :) / cpp)**(1. / kappa)
-    PRINT *, "minval(pls(:, :, :)) = ", minval(pls(:, :, :))
-    print *, "maxval(pls(:, :, :)) = ", maxval(pls(:, :, :))
+    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, :)
@@ -159,8 +163,8 @@
     vvent(iim + 1, :, :) = vvent(1, :, :)
 
     call start_inter_3d('TEMP', rlonu, rlatv, pls, t3d)
-    PRINT *,  'minval(t3d(:, :, :)) = ', minval(t3d(:, :, :))
-    print *, "maxval(t3d(:, :, :)) = ", maxval(t3d(:, :, :))
+    PRINT *,  'minval(t3d) = ', minval(t3d)
+    print *, "maxval(t3d) = ", maxval(t3d)
 
     tpot(:iim, :, :) = t3d(:iim, :, :) * cpp / pk(:iim, :, :)
     tpot(iim + 1, :, :) = tpot(1, :, :)
@@ -171,9 +175,9 @@
     ENDDO
 
     ! Calcul de l'humidité ŕ saturation :
-    qsat(:, :, :) = q_sat(t3d, pls)
-    PRINT *, "minval(qsat(:, :, :)) = ", minval(qsat(:, :, :))
-    print *, "maxval(qsat(:, :, :)) = ", maxval(qsat(:, :, :))
+    qsat = q_sat(t3d, pls)
+    PRINT *, "minval(qsat) = ", minval(qsat)
+    print *, "maxval(qsat) = ", maxval(qsat)
     IF (MINVAL(qsat) == MAXVAL(qsat)) stop '"qsat" should not be constant'
 
     ! Water vapor:
@@ -221,7 +225,7 @@
     ALLOCATE(dlon_lic(iml_lic))
     ALLOCATE(dlat_lic(jml_lic))
     ALLOCATE(fraclic(iml_lic, jml_lic))
-    CALL flinopen_nozoom("landiceref.nc", iml_lic, jml_lic, &
+    CALL flinopen_nozoom(iml_lic, jml_lic, &
          llm_tmp, lon_lic, lat_lic, lev, ttm_tmp, itaul, date, trash,  &
          fid)
     CALL flinget(fid, 'landice', iml_lic, jml_lic, llm_tmp, ttm_tmp &